feat(split): 新增分账订单线下结案功能

- 添加 SplitCloseService 类用于处理订单结案逻辑
- 实现订单结案状态检查和标记功能
- 在汇付分账重试逻辑中加入结案状态验证,防止已结案订单继续重试
- 更新分账手动服务,添加结案操作类型
- 扩展钱包结算类,增加结案相关诊断方法
- 修改测试脚本,支持批量标记订单为已结案状态
- 添加数据库升级脚本,增加结案相关字段和菜单权限
```
这个提交包含在:
可乐加冰
2026-10-24 21:18:48 +08:00
父节点 557d3e69ba
当前提交 6a654070ed
共有 16 个文件被更改,包括 1314 次插入 和 96 次删除

查看文件

@@ -14,6 +14,7 @@ use addons\shopro\model\regional_agent\Reward as RegionalRewardModel;
use addons\shopro\model\split\Receiver;
use addons\shopro\model\split\SplitOrder;
use addons\shopro\model\split\SplitOrderReceiver;
use think\Db;
/**
* 支付通道分账与钱包佣金:汇付可按人混合(已进件走通道、未进件进钱包);其它通道整单成功则不入余额
@@ -174,18 +175,16 @@ class SplitWalletSettlement
->where('commission_reward_status', CommissionRewardLibrary::COMMISSION_REWARD_STATUS_WAITING)
->select();
foreach ($commissionOrders as $commissionOrder) {
if ($commissionOrder['commission_event'] !== $event && $event !== 'admin') {
continue;
}
$settleEvent = (string) ($commissionOrder['commission_event'] ?? $event);
$rewards = CommissionRewardModel::where('commission_order_id', $commissionOrder['id'])
->where('status', CommissionRewardLibrary::COMMISSION_REWARD_STATUS_WAITING)
->select();
foreach ($rewards as $reward) {
$userId = (int) $reward['agent_id'];
if ($userId > 0 && in_array($userId, $gateway['promoter'], true)) {
$commissionLib->runCommissionRewardWithoutWallet($event, $reward);
$commissionLib->runCommissionRewardWithoutWallet($settleEvent, $reward);
} else {
$commissionLib->runCommissionReward($event, $reward);
$commissionLib->runCommissionReward($settleEvent, $reward);
}
}
self::markCommissionOrderSettledIfDone($commissionOrder);
@@ -196,18 +195,16 @@ class SplitWalletSettlement
->where('commission_reward_status', RegionalRewardLibrary::STATUS_WAITING)
->select();
foreach ($regionalOrders as $regionalOrder) {
if ($regionalOrder['commission_event'] !== $event) {
continue;
}
$settleEvent = (string) ($regionalOrder['commission_event'] ?? $event);
$rewards = RegionalRewardModel::where('regional_order_id', $regionalOrder['id'])
->where('status', RegionalRewardLibrary::STATUS_WAITING)
->select();
foreach ($rewards as $reward) {
$userId = (int) $reward['agent_user_id'];
if ($userId > 0 && in_array($userId, $gateway['regional_agent'], true)) {
$regionalLib->settleRewardWithoutWallet($reward, $event);
$regionalLib->settleRewardWithoutWallet($reward, $settleEvent);
} else {
$regionalLib->settleReward($reward, $event);
$regionalLib->settleReward($reward, $settleEvent);
}
}
self::markRegionalOrderSettledIfDone($regionalOrder);
@@ -310,9 +307,8 @@ class SplitWalletSettlement
->where('commission_reward_status', CommissionRewardLibrary::COMMISSION_REWARD_STATUS_WAITING)
->select();
foreach ($commissionOrders as $commissionOrder) {
if ($commissionOrder['commission_event'] === $event || $event === 'admin') {
$commissionLib->runCommissionRewardByOrderWithoutWallet($event, $commissionOrder);
}
$settleEvent = (string) ($commissionOrder['commission_event'] ?? $event);
$commissionLib->runCommissionRewardByOrderWithoutWallet($settleEvent, $commissionOrder);
}
$regionalLib = new RegionalRewardLibrary();
@@ -320,9 +316,8 @@ class SplitWalletSettlement
->where('commission_reward_status', RegionalRewardLibrary::STATUS_WAITING)
->select();
foreach ($regionalOrders as $regionalOrder) {
if ($regionalOrder['commission_event'] === $event) {
$regionalLib->settleByRegionalOrderWithoutWallet($regionalOrder->id, $event);
}
$settleEvent = (string) ($regionalOrder['commission_event'] ?? $event);
$regionalLib->settleByRegionalOrderWithoutWallet($regionalOrder->id, $settleEvent);
}
}
@@ -333,9 +328,8 @@ class SplitWalletSettlement
->where('commission_reward_status', CommissionRewardLibrary::COMMISSION_REWARD_STATUS_WAITING)
->select();
foreach ($commissionOrders as $commissionOrder) {
if ($commissionOrder['commission_event'] === $event || $event === 'admin') {
$commissionLib->runCommissionRewardByOrder($event, $commissionOrder);
}
$settleEvent = (string) ($commissionOrder['commission_event'] ?? $event);
$commissionLib->runCommissionRewardByOrder($settleEvent, $commissionOrder);
}
$regionalLib = new RegionalRewardLibrary();
@@ -343,9 +337,106 @@ class SplitWalletSettlement
->where('commission_reward_status', RegionalRewardLibrary::STATUS_WAITING)
->select();
foreach ($regionalOrders as $regionalOrder) {
if ($regionalOrder['commission_event'] === $event) {
$regionalLib->settleByRegionalOrder($regionalOrder->id, $event);
}
$settleEvent = (string) ($regionalOrder['commission_event'] ?? $event);
$regionalLib->settleByRegionalOrder($regionalOrder->id, $settleEvent);
}
}
/**
* 汇付 confirm 重试前:佣金已入平台钱包则禁止再次分账(防双发)
*/
public static function getHuifuRetryBlockReason($orderId)
{
$orderId = intval($orderId);
if ($orderId <= 0) {
return null;
}
if (class_exists('\\addons\\shopro\\library\\split\\SplitCloseService')
&& (new SplitCloseService())->isClosed($orderId)) {
return '该订单已标记线下结案,不可重试汇付分账';
}
$wallet = self::sumOrderWalletCommission($orderId);
if (bccomp($wallet, '0.00', 2) <= 0) {
return null;
}
$splitOk = self::isSplitSuccessful($orderId);
if ($splitOk) {
return '网关分账已成功且存在钱包佣金流水,禁止重试(疑似双轨),请标记结案或人工对账';
}
return '佣金已入平台钱包兜底,禁止再次汇付 confirm(防双发);若需通道分账请先对账并标记结案';
}
/**
* @return array{settlement_source:string,settlement_source_text:string,wallet_sum:string,split_success:bool,retry_blocked:bool,retry_block_reason:string}
*/
public static function diagnoseOrderSettlement($orderId)
{
$orderId = intval($orderId);
$walletSum = self::sumOrderWalletCommission($orderId);
$splitOk = self::isSplitSuccessful($orderId);
$retryReason = self::getHuifuRetryBlockReason($orderId);
$source = 'pending';
if ($splitOk && bccomp($walletSum, '0.00', 2) > 0) {
$source = 'hybrid';
} elseif ($splitOk) {
$source = 'gateway';
} elseif (bccomp($walletSum, '0.00', 2) > 0) {
$source = 'wallet';
}
$textMap = [
'pending' => '待结算/无钱包流水',
'gateway' => '汇付通道(未入平台钱包)',
'wallet' => '平台钱包兜底',
'hybrid' => '通道+钱包混合(请核对)',
];
return [
'settlement_source' => $source,
'settlement_source_text' => $textMap[$source] ?? $source,
'wallet_sum' => $walletSum,
'split_success' => $splitOk,
'retry_blocked' => $retryReason !== null,
'retry_block_reason' => $retryReason ?: '',
];
}
protected static function sumOrderWalletCommission($orderId)
{
$orderId = intval($orderId);
if ($orderId <= 0) {
return '0.00';
}
$sum = '0.00';
$crIds = CommissionRewardModel::where('order_id', $orderId)
->where('status', CommissionRewardLibrary::COMMISSION_REWARD_STATUS_ACCOUNTED)
->column('id');
if ($crIds) {
$part = Db::name('shopro_user_wallet_log')
->where('item_id', 'in', $crIds)
->where('wallet_type', 'money')
->where('type', 'commission_income')
->sum('wallet');
$sum = bcadd($sum, number_format((float) $part, 2, '.', ''), 2);
}
$regionalOrderIds = RegionalOrderModel::where('order_id', $orderId)->column('id');
if ($regionalOrderIds) {
$rrIds = RegionalRewardModel::where('regional_order_id', 'in', $regionalOrderIds)
->where('status', RegionalRewardLibrary::STATUS_ACCOUNTED)
->column('id');
if ($rrIds) {
$part = Db::name('shopro_user_wallet_log')
->where('item_id', 'in', $rrIds)
->where('wallet_type', 'money')
->where('type', 'regional_agent_income')
->sum('wallet');
$sum = bcadd($sum, number_format((float) $part, 2, '.', ''), 2);
}
}
return $sum;
}
}