```
feat(split): 添加微信分账V3版本验证和汇付分账冻结资金处理 - 在ProfitSharingService中添加Yansongda Pay V3版本验证,确保微信官方分账功能正常运行 - 实现汇付分账冻结资金检测逻辑,当资金被冻结时标记分账失败而非抛出异常 - 在管理后台控制器中增强错误处理和状态显示功能 - 优化前端界面,根据分账模式动态显示相应操作按钮 ```
这个提交包含在:
@@ -67,7 +67,11 @@ class HuifuSplitService
|
||||
|
||||
$outOrderNo = 'HFPS' . date('YmdHis') . $orderId;
|
||||
$ext = HuifuPayService::getPayExt($orderId);
|
||||
$this->assertDelayFundsReadyForConfirm($order['order_sn']);
|
||||
$blockReason = $this->getDelayFundsBlockReason($order['order_sn']);
|
||||
if ($blockReason !== null) {
|
||||
$this->markFailed($orderId, $outOrderNo, $order, $items, $blockReason);
|
||||
return false;
|
||||
}
|
||||
|
||||
Db::startTrans();
|
||||
try {
|
||||
@@ -197,17 +201,19 @@ class HuifuSplitService
|
||||
|
||||
/**
|
||||
* 微信小程序 + 延时分账:通道侧资金可能处于 FREEZE,需发货/确认收货或等待解冻后才能 delaytrans/confirm。
|
||||
*
|
||||
* @return string|null 不可 confirm 时返回说明文案,否则 null
|
||||
*/
|
||||
protected function assertDelayFundsReadyForConfirm($orderSn)
|
||||
protected function getDelayFundsBlockReason($orderSn)
|
||||
{
|
||||
try {
|
||||
$query = (new HuifuQueryService())->queryByOrderSn($orderSn);
|
||||
} catch (\Throwable $e) {
|
||||
return;
|
||||
return null;
|
||||
}
|
||||
$freezeStat = strtoupper(trim((string) ($this->queryFieldRecursive($query, 'fund_freeze_stat') ?? '')));
|
||||
if ($freezeStat !== 'FREEZE') {
|
||||
return;
|
||||
return null;
|
||||
}
|
||||
$unfreezeTime = trim((string) ($this->queryFieldRecursive($query, 'unfreeze_time') ?? ''));
|
||||
$hint = '汇付查单 fund_freeze_stat=FREEZE:延迟交易资金仍被通道冻结,暂不能交易确认分账。'
|
||||
@@ -216,7 +222,7 @@ class HuifuSplitService
|
||||
if ($unfreezeTime !== '') {
|
||||
$hint .= ' 预计解冻时间(unfreeze_time)=' . $unfreezeTime;
|
||||
}
|
||||
throw new \RuntimeException($hint);
|
||||
return $hint;
|
||||
}
|
||||
|
||||
protected function resolveConfirmPayFee($orderSn, $orderPayFee)
|
||||
|
||||
在新工单中引用
屏蔽一个用户