fix: 完善退款完成售后单自动对齐机制与汇付多日期幂等自愈
这个提交包含在:
@@ -1025,6 +1025,28 @@ trait OrderOper
|
||||
|
||||
// 退款完成
|
||||
$item->refund_status = \app\admin\model\shopro\order\OrderItem::REFUND_STATUS_FINISH; // 退款完成
|
||||
|
||||
// 自动联动对齐该商品项关联的待处理/售后中售后单状态
|
||||
$aftersales = \addons\shopro\model\OrderAftersale::where('order_item_id', $item->id)
|
||||
->where('aftersale_status', 'in', [
|
||||
\addons\shopro\model\OrderAftersale::AFTERSALE_STATUS_NOOPER,
|
||||
\addons\shopro\model\OrderAftersale::AFTERSALE_STATUS_AFTERING
|
||||
])->select();
|
||||
foreach ($aftersales as $aftersale) {
|
||||
$aftersale->aftersale_status = \addons\shopro\model\OrderAftersale::AFTERSALE_STATUS_OK;
|
||||
$aftersale->refund_status = \addons\shopro\model\OrderAftersale::REFUND_STATUS_FINISH;
|
||||
$aftersale->refund_fee = $item->refund_fee ?: $refundLog->refund_fee;
|
||||
$aftersale->save();
|
||||
|
||||
$item->aftersale_status = \addons\shopro\model\OrderAftersale::AFTERSALE_STATUS_OK;
|
||||
|
||||
\addons\shopro\model\OrderAftersaleLog::operAdd($order, $aftersale, null, 'admin', [
|
||||
'reason' => '退款完成自动对齐',
|
||||
'content' => '退款成功,系统自动将售后单对齐为完成状态',
|
||||
'images' => []
|
||||
]);
|
||||
}
|
||||
|
||||
$item->save();
|
||||
\addons\shopro\model\OrderAction::operAdd($order, $item, null, 'admin', '退款成功');
|
||||
}
|
||||
|
||||
@@ -24,20 +24,25 @@ class HuifuRefundService
|
||||
}
|
||||
|
||||
$splitOrder = SplitOrder::where('order_id', $order['id'])->where('channel', 'huifu')->where('status', 2)->find();
|
||||
if ($splitOrder && !empty($splitOrder['confirm_hf_seq_id'])) {
|
||||
return $this->confirmRefund($ext, $splitOrder, $refundLog, $refundMoney, $remark);
|
||||
}
|
||||
try {
|
||||
if ($splitOrder && !empty($splitOrder['confirm_hf_seq_id'])) {
|
||||
return $this->confirmRefund($ext, $splitOrder, $refundLog, $refundMoney, $remark);
|
||||
}
|
||||
return $this->scanpayRefund($ext, $refundLog, $refundMoney, $remark);
|
||||
} catch (\Throwable $e) {
|
||||
// 如果汇付报错 23000003(申请退款金额大于可退款余额),核查是否此前已成功退款(幂等对齐防多退)
|
||||
// 核查是否此前已在汇付成功退款(网关状态幂等自动对齐,防多退、防报错卡死)
|
||||
if ($this->isAlreadyRefunded($ext, $refundMoney)) {
|
||||
\think\Log::info('[shopro_huifu] 汇付检测到该笔退款此前已成功执行,执行本地状态自动对齐: order_id=' . $order['id']);
|
||||
$refundLog->payment_json = json_encode([
|
||||
'idempotent' => true,
|
||||
'remark' => '汇付核验已退款成功,自动对齐本地状态',
|
||||
'raw_error' => $e->getMessage(),
|
||||
], JSON_UNESCAPED_UNICODE);
|
||||
$refundLog->save();
|
||||
return true;
|
||||
}
|
||||
|
||||
if (strpos($e->getMessage(), '23000003') !== false || strpos($e->getMessage(), '申请退款金额大于可退款余额') !== false) {
|
||||
if ($this->isAlreadyRefunded($ext, $refundMoney)) {
|
||||
\think\Log::info('[shopro_huifu] 汇付检测到该笔退款此前已成功执行,执行本地状态幂等对齐: order_id=' . $order['id']);
|
||||
$refundLog->payment_json = json_encode(['idempotent' => true, 'remark' => '汇付核验已退款成功,自动对齐本地状态']);
|
||||
$refundLog->save();
|
||||
return true;
|
||||
}
|
||||
throw new \RuntimeException('汇付商户账户可用余额不足,请在汇付平台充值或留存可用资金后再退款');
|
||||
}
|
||||
throw $e;
|
||||
@@ -45,15 +50,30 @@ class HuifuRefundService
|
||||
}
|
||||
|
||||
public function isAlreadyRefunded($ext, $refundMoney)
|
||||
{
|
||||
$dates = array_filter(array_unique([
|
||||
date('Ymd'),
|
||||
!empty($ext['req_date']) ? $ext['req_date'] : null,
|
||||
]));
|
||||
|
||||
foreach ($dates as $date) {
|
||||
if ($this->checkAcctLogForRefund($date, $refundMoney)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
protected function checkAcctLogForRefund($acctDate, $refundMoney)
|
||||
{
|
||||
try {
|
||||
SdkLoader::requireRequest('V2TradeAcctpaymentAcctlogQueryRequest.php');
|
||||
$request = new \BsPaySdk\request\V2TradeAcctpaymentAcctlogQueryRequest();
|
||||
$request->setReqSeqId(date('YmdHis') . mt_rand(1000, 9999));
|
||||
$request->setHuifuId($this->config->get('huifu_id'));
|
||||
$request->setAcctDate($ext['req_date'] ?? date('Ymd'));
|
||||
$request->setAcctDate($acctDate);
|
||||
$request->setExtendInfo([
|
||||
'page_size' => '20',
|
||||
'page_size' => '50',
|
||||
'page_num' => '1',
|
||||
'acct_type' => '01',
|
||||
]);
|
||||
@@ -75,7 +95,7 @@ class HuifuRefundService
|
||||
}
|
||||
}
|
||||
} catch (\Throwable $ex) {
|
||||
\think\Log::error('[shopro_huifu] 幂等核查汇付退款流水异常: ' . $ex->getMessage());
|
||||
\think\Log::error('[shopro_huifu] 幂等核查汇付退款流水异常(' . $acctDate . '): ' . $ex->getMessage());
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
在新工单中引用
屏蔽一个用户