fix: 修复订单结算逻辑和商家档案重复问题
- 修复后台编辑订单状态为已完成时缺少结算分账逻辑 - 修复商家档案存在重复建档问题,添加唯一性校验 - 修复师傅核销码位数显示错误(6位改为4位) - 重构后台支付订单详情页交互逻辑,优化复制和弹窗关闭功能
这个提交包含在:
@@ -3,6 +3,8 @@
|
||||
namespace app\admin\controller;
|
||||
|
||||
use app\common\controller\Backend;
|
||||
use app\common\library\CommissionService;
|
||||
use app\common\library\OrderStatus;
|
||||
use think\Db;
|
||||
use Exception;
|
||||
|
||||
@@ -286,6 +288,83 @@ class Order extends Backend
|
||||
'createtime' => $now,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
// 3. 后台将订单变更为已完成(COMPLETED, status=8):触发结算分账与钱包入账
|
||||
if ($oldStatus !== OrderStatus::COMPLETED
|
||||
&& $newStatus === OrderStatus::COMPLETED
|
||||
&& (int)$row['pay_status'] === 1
|
||||
&& (int)$row['settle_status'] !== 1) {
|
||||
|
||||
$lockedOrder = Db::name('order')->where('id', (int)$row['id'])->lock(true)->find();
|
||||
if ($lockedOrder && (int)$lockedOrder['settle_status'] !== 1) {
|
||||
$masterId = (int)$lockedOrder['master_id'];
|
||||
$payAmount = (float)$lockedOrder['pay_amount'];
|
||||
$settleCalc = CommissionService::calcByOrder($lockedOrder);
|
||||
$rate = $settleCalc['commission_rate'];
|
||||
$commission = $settleCalc['commission'];
|
||||
$settleAmt = $settleCalc['settle_amount'];
|
||||
|
||||
Db::name('order')->where('id', (int)$row['id'])->update([
|
||||
'settle_status' => 1,
|
||||
'settle_amount' => $settleAmt,
|
||||
'verify_time' => $now,
|
||||
'updatetime' => $now,
|
||||
]);
|
||||
|
||||
Db::name('settle')->insert([
|
||||
'order_id' => (int)$row['id'],
|
||||
'master_id' => $masterId,
|
||||
'order_amount' => $payAmount,
|
||||
'commission_rate' => $rate,
|
||||
'commission' => $commission,
|
||||
'settle_amount' => $settleAmt,
|
||||
'status' => 'settled',
|
||||
'settle_time' => $now,
|
||||
'createtime' => $now,
|
||||
]);
|
||||
|
||||
Db::name('order_log')->insert([
|
||||
'order_id' => (int)$row['id'],
|
||||
'status' => OrderStatus::COMPLETED,
|
||||
'remark' => '平台运营手动验收完成,触发结算入账 ¥' . $settleAmt,
|
||||
'operator_type' => 'admin',
|
||||
'operator_id' => (int)$this->auth->id,
|
||||
'createtime' => $now,
|
||||
]);
|
||||
|
||||
if ($masterId > 0) {
|
||||
$master = Db::name('master')->where('id', $masterId)->lock(true)->find();
|
||||
if ($master) {
|
||||
$newMoney = round((float)$master['money'] + $settleAmt, 2);
|
||||
Db::name('master')->where('id', $masterId)->update([
|
||||
'money' => $newMoney,
|
||||
'order_count' => (int)$master['order_count'] + 1,
|
||||
'updatetime' => $now,
|
||||
]);
|
||||
Db::name('wallet_log')->insert([
|
||||
'user_type' => 'master',
|
||||
'user_id' => $masterId,
|
||||
'type' => 'settle',
|
||||
'amount' => $settleAmt,
|
||||
'balance' => $newMoney,
|
||||
'order_id' => (int)$row['id'],
|
||||
'remark' => '订单结算入账(平台运营手动验收)',
|
||||
'createtime' => $now,
|
||||
]);
|
||||
Db::name('message')->insert([
|
||||
'receive_type' => 'master',
|
||||
'receive_id' => (int)$master['id'],
|
||||
'type' => 'order',
|
||||
'title' => '订单结算入账',
|
||||
'content' => '订单 ' . $row['order_no'] . ' 已由平台手动验收完成,收入 ¥' . $settleAmt,
|
||||
'order_id' => (int)$row['id'],
|
||||
'is_read' => 0,
|
||||
'createtime' => $now,
|
||||
]);
|
||||
}
|
||||
}
|
||||
}
|
||||
} elseif ($oldStatus !== $newStatus && !($targetMaster && $newMasterId !== $oldMasterId)) {
|
||||
$statusMap = $this->model->getStatusList();
|
||||
Db::name('order_log')->insert([
|
||||
|
||||
在新工单中引用
屏蔽一个用户