feat(split): 添加分账手动指定接收方功能

- 实现SplitManualService服务类,支持手动覆盖分账明细
- 新增SplitManual和SplitManualLog数据模型
- 修改SplitCalculator优先使用手动覆盖数据进行分账计算
- 添加分账记录手动指定接收方的数据库表结构
- 集成手动分账到汇付分账流程中,支持失败重试机制
- 添加商品详情内容更新SQL脚本用于汇付审核
```
这个提交包含在:
可乐加冰
2026-10-22 22:38:35 +08:00
父节点 b5142ff780
当前提交 af08af8d47
共有 11 个文件被更改,包括 1301 次插入 和 11 次删除

查看文件

@@ -3,6 +3,7 @@
namespace addons\shopro_huifu\library;
use addons\shopro\library\split\SplitCalculator;
use addons\shopro\library\split\SplitManualService;
use addons\shopro\library\split\SplitOrderHelper;
use addons\shopro\library\split\Config as SplitConfig;
use addons\shopro\model\Order;
@@ -34,6 +35,9 @@ class HuifuSplitService
}
SplitOrder::where('order_id', $orderId)->where('channel', 'huifu')->where('status', 'in', [1, 4])->delete();
$manualService = new SplitManualService();
$isManual = $manualService->hasOverride($orderId);
$calculator = new SplitCalculator();
$items = $calculator->calculate($orderId);
if (empty($items)) {
@@ -44,6 +48,7 @@ class HuifuSplitService
}
$msg = $calculator->formatEmptySplitFailureMessage($orderId);
$this->markFailed($orderId, 'HFPS' . date('YmdHis') . $orderId, $order, [], $msg);
$manualService->finishPendingRetryLog($orderId, false, $msg);
return false;
}
@@ -71,6 +76,7 @@ class HuifuSplitService
$blockReason = $this->getDelayTransBlockReason($order['order_sn'], $orderId);
if ($blockReason !== null) {
$this->markFailed($orderId, $outOrderNo, $order, $items, $blockReason);
$manualService->finishPendingRetryLog($orderId, false, $blockReason);
return false;
}
@@ -85,6 +91,7 @@ class HuifuSplitService
'total_amount' => $order['pay_fee'],
'split_amount' => $splitAmount,
'status' => 1,
'split_source' => $isManual ? 'manual' : 'auto',
]);
foreach ($items as $item) {
@@ -111,10 +118,12 @@ class HuifuSplitService
'confirm_status' => 'S',
]);
Db::commit();
$manualService->finishPendingRetryLog($orderId, true, '', $splitOrder->id);
return true;
} catch (\Exception $e) {
Db::rollback();
$this->markFailed($orderId, $outOrderNo, $order, $items, $e->getMessage());
$manualService->finishPendingRetryLog($orderId, false, $e->getMessage());
return false;
}
}
@@ -506,6 +515,7 @@ class HuifuSplitService
{
$splitOrder = SplitOrder::where('order_id', $orderId)->where('channel', 'huifu')->find();
$splitConfig = new SplitConfig();
$isManual = (new SplitManualService())->hasOverride($orderId);
if (!$splitOrder) {
$splitOrder = SplitOrder::create([
'order_id' => $orderId,
@@ -516,6 +526,7 @@ class HuifuSplitService
'total_amount' => $order['pay_fee'],
'split_amount' => array_sum(array_column($items, 'amount')),
'status' => 4,
'split_source' => $isManual ? 'manual' : 'auto',
'wx_result' => $message,
'retry_count' => 1,
'next_retry_time'=> time() + $splitConfig->getRetryInterval(),