feat: 新增师傅入驻审核与接单状态联动功能

- 新增师傅资质审核模块及权限
- 未审核通过的师傅默认禁用接单状态
- 新增售后退款申诉功能与相关界面
- 新增用户钱包管理及充值功能
- 更新服务定价矩阵相关数据库结构
- 修复微信支付证书验证问题
这个提交包含在:
2026-11-17 10:28:01 +08:00
父节点 ad73da1db4
当前提交 0370cb9bd6
共有 107 个文件被更改,包括 13666 次插入 和 1447 次删除

查看文件

@@ -658,13 +658,17 @@ class Home extends Base
$ret = [];
foreach ($specs as $sp) {
$spImg = isset($sp['image']) ? trim((string)$sp['image']) : '';
$spPrices = !empty($sp['service_prices']) ? (json_decode($sp['service_prices'], true) ?: []) : [];
$spAddons = !empty($sp['addon_prices']) ? (json_decode($sp['addon_prices'], true) ?: []) : [];
$ret[] = [
'id' => (int)$sp['id'],
'service_id' => (int)$sp['service_id'],
'name' => $sp['name'],
'image_url' => $spImg !== '' ? (strpos($spImg, 'http') === 0 ? $spImg : cdnurl($spImg, true)) : '',
'description' => (string)$sp['description'],
'base_price' => (float)$sp['base_price'],
'id' => (int)$sp['id'],
'service_id' => (int)$sp['service_id'],
'name' => $sp['name'],
'image_url' => $spImg !== '' ? (strpos($spImg, 'http') === 0 ? $spImg : cdnurl($spImg, true)) : '',
'description' => (string)$sp['description'],
'base_price' => (float)$sp['base_price'],
'service_prices' => $spPrices,
'addon_prices' => $spAddons,
];
}
$this->success('', ['list' => $ret]);
@@ -682,7 +686,30 @@ class Home extends Base
}
$cat = Db::name('service_cat')->where('id', $service['cat_id'])->find();
$service['cat_name'] = $cat ? $cat['name'] : '';
$this->success('', ['detail' => $this->formatService($service)]);
$detail = $this->formatService($service);
$specs = Db::name('service_spec')
->where('service_id', $id)
->where('status', 'normal')
->order('weigh desc, id asc')
->select();
$specList = [];
foreach ($specs as $sp) {
$spImg = isset($sp['image']) ? trim((string)$sp['image']) : '';
$spPrices = !empty($sp['service_prices']) ? (json_decode($sp['service_prices'], true) ?: []) : [];
$spAddons = !empty($sp['addon_prices']) ? (json_decode($sp['addon_prices'], true) ?: []) : [];
$specList[] = [
'id' => (int)$sp['id'],
'service_id' => $id,
'name' => $sp['name'],
'image_url' => $spImg !== '' ? (strpos($spImg, 'http') === 0 ? $spImg : cdnurl($spImg, true)) : '',
'description' => (string)$sp['description'],
'base_price' => (float)$sp['base_price'],
'service_prices' => $spPrices,
'addon_prices' => $spAddons,
];
}
$detail['specs'] = $specList;
$this->success('', ['detail' => $detail]);
}
/**
@@ -712,11 +739,12 @@ class Home extends Base
$this->success('', [
'count' => (int)$total,
'is_local' => $matchedLocal,
'platform_count' => $platformCount,
'region' => trim($city . ' ' . $district),
'tip' => $matchedLocal
? "该地区可提供服务的师傅共 {$total} 位"
: "平台认证可服务师傅共 {$total} 位",
: "全网已调度认证服务师傅共 {$total} 位",
]);
}
@@ -846,7 +874,9 @@ class Home extends Base
}
}
$specRow = null;
$specPrice = 0.0;
$specPricesMap = [];
if ($specId > 0 && $dbSvc) {
$cacheKey = $sid . ':' . $specId;
if (!array_key_exists($cacheKey, $specCache)) {
@@ -856,8 +886,12 @@ class Home extends Base
->where('status', 'normal')
->find() ?: null;
}
if (!empty($specCache[$cacheKey])) {
$specPrice = (float)$specCache[$cacheKey]['base_price'];
$specRow = $specCache[$cacheKey];
if (!empty($specRow)) {
$specPrice = (float)$specRow['base_price'];
if (!empty($specRow['service_prices'])) {
$specPricesMap = json_decode((string)$specRow['service_prices'], true) ?: [];
}
}
}
@@ -876,14 +910,22 @@ class Home extends Base
$matchedTypePrice = isset($st['price']) ? (float)$st['price'] : 0.0;
}
}
$effectiveTargetCode = ($reqServiceType !== '') ? $reqServiceType : $defaultCode;
// 若规格设置了专属一口价(>0)且当前为默认主服务,则优先采用规格专属价;否则采用所选主服务定价或商品默认价
$isDefaultService = ($reqServiceType === '' || $reqServiceType === $defaultCode || $reqServiceType === 'install');
if ($specPrice > 0 && $isDefaultService) {
// 1. 若当前规格对当前工项设置了专属定价 (>0),直接采用规格专属一口价!
if (isset($specPricesMap[$effectiveTargetCode]) && (float)$specPricesMap[$effectiveTargetCode] > 0) {
$itemPrice = (float)$specPricesMap[$effectiveTargetCode];
}
// 2. 兼容历史数据:若规格设置了 base_price > 0 且当前为默认主服务工项
elseif ($specPrice > 0 && ($effectiveTargetCode === $defaultCode || $effectiveTargetCode === 'install')) {
$itemPrice = $specPrice;
} elseif ($matchedTypePrice > 0) {
}
// 3. 继承父级:沿用商品父级中当前工项设置的基准一口价
elseif ($matchedTypePrice > 0) {
$itemPrice = $matchedTypePrice;
} elseif ($specPrice > 0) {
}
// 4. 兜底保护:规格或商品级默认基准价
elseif ($specPrice > 0) {
$itemPrice = $specPrice;
} elseif ((float)$dbSvc['base_price'] > 0) {
$itemPrice = (float)$dbSvc['base_price'];
@@ -898,6 +940,15 @@ class Home extends Base
$dbAddonsMap[(string)$ad['code']] = (float)$ad['price'];
}
}
// 若当前规格配置了增值服务专属加价字典,覆盖对应增值项
if (!empty($specRow['addon_prices'])) {
$specAddonMap = json_decode((string)$specRow['addon_prices'], true) ?: [];
foreach ($specAddonMap as $sKey => $sVal) {
if ((float)$sVal > 0) {
$dbAddonsMap[(string)$sKey] = (float)$sVal;
}
}
}
}
if ($isFixedLike && $itemPrice <= 0) {
@@ -906,9 +957,12 @@ class Home extends Base
$itemNum = isset($g['num']) ? max(1, (int)$g['num']) : (isset($g['goods_num']) ? max(1, (int)$g['goods_num']) : 1);
$base += round($itemPrice * $itemNum, 2);
if (!empty($g['extras']) && is_array($g['extras'])) {
foreach ($g['extras'] as $ex) {
$exNum = isset($ex['num']) ? max(0, (int)$ex['num']) : 0;
$curAddonsList = !empty($g['extras']) && is_array($g['extras'])
? $g['extras']
: (!empty($g['addons']) && is_array($g['addons']) ? $g['addons'] : []);
if (!empty($curAddonsList)) {
foreach ($curAddonsList as $ex) {
$exNum = isset($ex['num']) ? max(0, (int)$ex['num']) : (isset($ex['count']) ? max(0, (int)$ex['count']) : 1);
if ($exNum <= 0) {
continue;
}
@@ -934,14 +988,18 @@ class Home extends Base
$specId = isset($params['spec_id']) ? (int)$params['spec_id'] : 0;
$reqServiceType = isset($params['service_type']) ? trim((string)$params['service_type']) : '';
$specPrice = 0.0;
$specPricesMap = [];
if ($specId > 0) {
$spRow = Db::name('service_spec')
->where('id', $specId)
->where('service_id', (int)$service['id'])
->where('status', 'normal')
->find();
if ($spRow && (float)$spRow['base_price'] > 0) {
if ($spRow) {
$specPrice = (float)$spRow['base_price'];
if (!empty($spRow['service_prices'])) {
$specPricesMap = json_decode((string)$spRow['service_prices'], true) ?: [];
}
}
}
$svcTypes = !empty($service['service_types']) ? (json_decode((string)$service['service_types'], true) ?: []) : [];
@@ -955,12 +1013,22 @@ class Home extends Base
$matchedTypePrice = isset($st['price']) ? (float)$st['price'] : 0.0;
}
}
$isDefaultService = ($reqServiceType === '' || $reqServiceType === $defaultCode || $reqServiceType === 'install');
if ($specPrice > 0 && $isDefaultService) {
$effectiveTargetCode = ($reqServiceType !== '') ? $reqServiceType : $defaultCode;
// 1. 若当前规格对当前工项设置了专属定价 (>0),直接采用规格专属一口价!
if (isset($specPricesMap[$effectiveTargetCode]) && (float)$specPricesMap[$effectiveTargetCode] > 0) {
$unitPrice = (float)$specPricesMap[$effectiveTargetCode];
}
// 2. 兼容历史数据:若规格设置了 base_price > 0 且当前为默认主服务工项
elseif ($specPrice > 0 && ($effectiveTargetCode === $defaultCode || $effectiveTargetCode === 'install')) {
$unitPrice = $specPrice;
} elseif ($matchedTypePrice > 0) {
}
// 3. 继承父级:沿用商品父级中当前工项设置的基准一口价
elseif ($matchedTypePrice > 0) {
$unitPrice = $matchedTypePrice;
} elseif ($specPrice > 0) {
}
// 4. 兜底保护:规格专属价或商品级默认基准价
elseif ($specPrice > 0) {
$unitPrice = $specPrice;
}
if ($isFixedLike && $unitPrice <= 0) {
@@ -968,6 +1036,47 @@ class Home extends Base
}
$goodsNum = isset($params['goods_num']) ? max(1, (int)$params['goods_num']) : 1;
$base = round($unitPrice * $goodsNum, 2);
$singleAddons = !empty($params['extras']) && is_array($params['extras'])
? $params['extras']
: (!empty($params['addons']) && is_array($params['addons']) ? $params['addons'] : []);
if (!empty($singleAddons)) {
$dbAddonsMap = [];
$svcAddons = !empty($service['addons']) ? (json_decode((string)$service['addons'], true) ?: []) : [];
foreach ($svcAddons as $ad) {
if (!empty($ad['name']) && isset($ad['price']) && (float)$ad['price'] > 0) {
$dbAddonsMap[(string)$ad['name']] = (float)$ad['price'];
}
if (!empty($ad['code']) && isset($ad['price']) && (float)$ad['price'] > 0) {
$dbAddonsMap[(string)$ad['code']] = (float)$ad['price'];
}
}
if (!empty($spRow['addon_prices'])) {
$specAddonMap = json_decode((string)$spRow['addon_prices'], true) ?: [];
foreach ($specAddonMap as $sKey => $sVal) {
if ((float)$sVal > 0) {
$dbAddonsMap[(string)$sKey] = (float)$sVal;
}
}
}
foreach ($singleAddons as $ex) {
$exNum = isset($ex['num']) ? max(0, (int)$ex['num']) : (isset($ex['count']) ? max(0, (int)$ex['count']) : 1);
if ($exNum <= 0) {
continue;
}
$exPrice = 0.0;
$exName = isset($ex['name']) ? (string)$ex['name'] : '';
$exCode = isset($ex['code']) ? (string)$ex['code'] : '';
if ($exName !== '' && isset($dbAddonsMap[$exName])) {
$exPrice = $dbAddonsMap[$exName];
} elseif ($exCode !== '' && isset($dbAddonsMap[$exCode])) {
$exPrice = $dbAddonsMap[$exCode];
} elseif (!$isFixedLike && isset($ex['price'])) {
$exPrice = max(0, (float)$ex['price']);
}
$base += round($exPrice * $exNum, 2);
}
}
} elseif ($isFixedLike && (!empty($params['is_custom']) || $isStrict || (isset($params['base_price']) && (float)$params['base_price'] > 0))) {
throw new \InvalidArgumentException('自定义商品不支持一口价模式,请关联有效服务项目或切换为师傅报价/自主定价');
}
@@ -986,14 +1095,15 @@ class Home extends Base
$urgentAmount = 0;
} else {
$floor = max(0, (int)$params['floor']);
$freeFloor = $service ? (int)$service['free_floor'] : 2;
$floorFee = $service ? (float)$service['floor_fee'] : 10.0;
$freeFloor = ($service && (int)$service['free_floor'] > 0) ? (int)$service['free_floor'] : 2;
$floorFee = ($service && (float)$service['floor_fee'] > 0) ? (float)$service['floor_fee'] : 10.0;
if ((int)$params['has_elevator'] === 0 && $floor > $freeFloor) {
$floorAmount = ($floor - $freeFloor) * $floorFee;
}
$urgentAmount = (int)$params['urgent'] === 1 ? round($base * 0.2, 2) : 0;
$singleUrgent = max(20.0, min(200.0, round($base * 0.2, 2)));
$urgentAmount = (int)$params['urgent'] === 1 ? $singleUrgent : 0;
$total = round($base + $floorAmount + $urgentAmount, 2);
}
@@ -1020,6 +1130,7 @@ class Home extends Base
'base_amount' => $type === 'quote' ? 0 : round($base, 2),
'floor_amount' => round($floorAmount, 2),
'urgent_amount' => round($urgentAmount, 2),
'estimated_urgent_amount' => round(max(20.0, min(200.0, round($base * 0.2, 2))), 2),
'total_amount' => $total,
'discount_amount' => round($discount, 2),
'pay_amount' => max(0, round($total - $discount, 2)),
@@ -1157,13 +1268,17 @@ class Home extends Base
$specsMap[$sid] = [];
}
$spImg = isset($sp['image']) ? trim((string)$sp['image']) : '';
$spPrices = !empty($sp['service_prices']) ? (json_decode($sp['service_prices'], true) ?: []) : [];
$spAddons = !empty($sp['addon_prices']) ? (json_decode($sp['addon_prices'], true) ?: []) : [];
$specsMap[$sid][] = [
'id' => (int)$sp['id'],
'service_id' => $sid,
'name' => $sp['name'],
'image_url' => $spImg !== '' ? (strpos($spImg, 'http') === 0 ? $spImg : cdnurl($spImg, true)) : '',
'description' => (string)$sp['description'],
'base_price' => (float)$sp['base_price'],
'id' => (int)$sp['id'],
'service_id' => $sid,
'name' => $sp['name'],
'image_url' => $spImg !== '' ? (strpos($spImg, 'http') === 0 ? $spImg : cdnurl($spImg, true)) : '',
'description' => (string)$sp['description'],
'base_price' => (float)$sp['base_price'],
'service_prices' => $spPrices,
'addon_prices' => $spAddons,
];
}
}