feat(shopro_huifu): 支持汇付分账配置rule_origin双模式

支持汇付分账配置的两种模式:
- rule_origin=01:接口发起模式,不带接收方列表,接收方在confirm时指定
- rule_origin=02:控台配置模式,需带acct_split_bunch_list固定接收方

更新SyncSplitReceivers命令支持--rule-origin选项,调整分账配置提交逻辑,
新增配置项split_config_rule_origin默认为01模式,并完善相关文档说明

BREAKING CHANGE: 分账配置流程调整,需重新配置相关参数
```
这个提交包含在:
可乐加冰
2026-10-13 10:35:02 +08:00
父节点 161d6f7e90
当前提交 b66b74b4f2
共有 4 个文件被更改,包括 97 次插入 和 38 次删除

查看文件

@@ -10,7 +10,10 @@ use think\Db;
use think\Log;
/**
* 主商户分账配置提交 + 进件子户绑定为分账接收方(v2/merchant/split/config)
* 主商户分账配置提交(v2/merchant/split/config)
*
* rule_origin=01(接口发起):不得传 acct_split_bunch_list,接收方在 delaytrans/confirm 的 acct_split_bunch 指定
* rule_origin=02(控台配置):须传 acct_split_bunch_list 固定接收方与比例
*/
class HuifuMerchantSplitService
{
@@ -117,12 +120,14 @@ class HuifuMerchantSplitService
}
$applyRatio = (string) ($options['apply_ratio'] ?? $this->resolveApplyRatio());
$ruleOrigin = trim((string) ($options['rule_origin'] ?? '01'));
if (!in_array($ruleOrigin, ['01', '02'], true)) {
$ruleOrigin = '01';
}
$ruleOrigin = $this->resolveRuleOrigin($options);
$receiverHuifuIds = $this->normalizeReceiverIds($receiverHuifuIds, $mainHuifuId);
if ($ruleOrigin === '01' && $receiverHuifuIds !== [] && empty($options['force_receiver_list'])) {
Log::write('[shopro_huifu] split/config rule_origin=01 忽略 acct_split_bunch_list('
. count($receiverHuifuIds) . ' 个接收方仅在 confirm 时指定)', 'info');
$receiverHuifuIds = [];
}
$scene = trim((string) ($options['scene'] ?? $this->resolveSplitConfigScene()));
if ($scene === '') {
@@ -150,19 +155,21 @@ class HuifuMerchantSplitService
$extend['async_return_url'] = $asyncUrl;
}
if ($receiverHuifuIds !== []) {
if ($ruleOrigin === '02') {
if ($receiverHuifuIds === []) {
throw new \InvalidArgumentException('rule_origin=02 时必须提供分账接收方列表');
}
$extend['acct_split_bunch_list'] = $this->encodeAcctSplitBunchList($receiverHuifuIds, $applyRatio);
} elseif ($ruleOrigin === '02') {
throw new \InvalidArgumentException('rule_origin=02 时必须提供分账接收方列表');
}
if ($dryRun) {
return [
'ok' => true,
'message' => 'dry-run',
'dry_run' => true,
'receivers' => $receiverHuifuIds,
'data' => ['extend' => $extend, 'huifu_id' => $mainHuifuId],
'ok' => true,
'message' => 'dry-run',
'dry_run' => true,
'receivers' => $receiverHuifuIds,
'rule_origin' => $ruleOrigin,
'data' => ['extend' => $extend, 'huifu_id' => $mainHuifuId],
];
}
@@ -176,9 +183,9 @@ class HuifuMerchantSplitService
}
/**
* 全量同步:合并远端 + 全部已进件子户,一次提交 split/config
* 提交分账配置:01 仅开通开关;02 时合并远端+本地进件后带 acct_split_bunch_list
*
* @return array{ok:bool,message:string,submitted:int,receivers:string[],remote:int,local:int}
* @return array{ok:bool,message:string,submitted:int,receivers:string[],remote:int,local:int,rule_origin?:string}
*/
public function syncAllApprovedReceivers(array $options = [])
{
@@ -186,31 +193,40 @@ class HuifuMerchantSplitService
throw new \RuntimeException('汇付插件未启用');
}
$ruleOrigin = $this->resolveRuleOrigin($options);
$main = $this->resolveMainHuifuId();
$local = $this->collectApprovedReceiverHuifuIds();
$remote = $this->fetchRemoteReceiverHuifuIds($main);
$merged = $this->normalizeReceiverIds(array_merge($remote, $local), $main);
$submit = $this->submitSplitConfig($merged, $options);
$toSubmit = $ruleOrigin === '02' ? $merged : [];
$submit = $this->submitSplitConfig($toSubmit, $options);
$ok = !empty($submit['ok']) && empty($submit['dry_run']);
$respCode = is_array($submit['data'] ?? null) ? (string) ($submit['data']['resp_code'] ?? '') : '';
$businessOk = $respCode === '' || $respCode === '00000000';
if ($ok && $businessOk && empty($options['dry_run'])) {
$this->markOnboardBindByHuifuIds($merged, 'ok', $submit['message'] ?? 'submitted');
if ($ruleOrigin === '02') {
$this->markOnboardBindByHuifuIds($merged, 'ok', $submit['message'] ?? 'submitted');
} else {
$this->markOnboardBindByHuifuIds($local, 'ok', 'rule_origin=01 分账配置已提交,接收方在 confirm 指定');
}
} elseif (!$ok && empty($options['dry_run'])) {
$this->markOnboardBindByHuifuIds($local, 'fail', $submit['message'] ?? 'submit failed');
}
return [
'ok' => !empty($submit['ok']) && ($businessOk || !empty($submit['dry_run'])),
'message' => (string) ($submit['message'] ?? ''),
'submitted' => count($merged),
'receivers' => $merged,
'remote' => count($remote),
'local' => count($local),
'resp_code' => $respCode,
'data' => $submit['data'] ?? null,
'ok' => !empty($submit['ok']) && ($businessOk || !empty($submit['dry_run'])),
'message' => (string) ($submit['message'] ?? ''),
'submitted' => $ruleOrigin === '02' ? count($merged) : 0,
'receivers' => $merged,
'remote' => count($remote),
'local' => count($local),
'resp_code' => $respCode,
'rule_origin' => $ruleOrigin,
'dry_run' => !empty($submit['dry_run']),
'data' => $submit['data'] ?? null,
];
}
@@ -240,12 +256,19 @@ class HuifuMerchantSplitService
return ['ok' => false, 'message' => 'split_auto_bind_receiver=0', 'skipped' => true];
}
$ruleOrigin = $this->resolveRuleOrigin($options);
if ($ruleOrigin === '01' && $this->isSplitConfigEffective($main)) {
$this->updateOnboardBindFields($row, 'skip', 'rule_origin=01,分账配置已生效');
return ['ok' => true, 'message' => 'split config already effective', 'skipped' => true];
}
$remote = $this->fetchRemoteReceiverHuifuIds($main);
$local = $this->collectApprovedReceiverHuifuIds();
$merged = $this->normalizeReceiverIds(array_merge($remote, $local, [$hid]), $main);
$toSubmit = $ruleOrigin === '02' ? $merged : [];
try {
$submit = $this->submitSplitConfig($merged, $options);
$submit = $this->submitSplitConfig($toSubmit, $options);
} catch (\Throwable $e) {
$this->updateOnboardBindFields($row, 'fail', $e->getMessage());
Log::error('[shopro_huifu] bind onboard split fail id=' . $row['id'] . ' ' . $e->getMessage());
@@ -284,6 +307,26 @@ class HuifuMerchantSplitService
return $scene !== '' ? $scene : 'A5';
}
public function resolveRuleOrigin(array $options = [])
{
$ruleOrigin = trim((string) ($options['rule_origin'] ?? $this->config->get('split_config_rule_origin', '01')));
if (!in_array($ruleOrigin, ['01', '02'], true)) {
$ruleOrigin = '01';
}
return $ruleOrigin;
}
public function isSplitConfigEffective($mainHuifuId = null)
{
$mainHuifuId = $mainHuifuId ?: $this->resolveMainHuifuId();
$result = $this->client->queryMerchantSplitConfig($mainHuifuId);
if (!$result['ok']) {
return false;
}
$items = HuifuClient::parseSplitBillResult($result['data']['split_bill_result'] ?? null);
return $items !== [];
}
/**
* @return string|null JSON 字符串,供 extend.split_ext_info
*/