fix(pay): 修复区域代理分佣脏数据导致支付事务回滚与订单未付款问题并增加核心支付隔离保护
这个提交包含在:
@@ -3,6 +3,7 @@
|
||||
namespace addons\shopro\library\regional_agent;
|
||||
|
||||
use addons\shopro\model\Order as OrderModel;
|
||||
use addons\shopro\model\User as UserModel;
|
||||
use addons\shopro\model\regional_agent\Agent as AgentModel;
|
||||
use addons\shopro\model\regional_agent\Level as LevelModel;
|
||||
use addons\shopro\model\regional_agent\Order as RegionalOrderModel;
|
||||
@@ -86,6 +87,12 @@ class Commission
|
||||
}
|
||||
$agent = AgentModel::findByArea($areaId, $areaLevel);
|
||||
if ($agent) {
|
||||
// 校验代理绑定的用户是否存在,防止脏数据导致分佣结算崩溃
|
||||
$agentUser = UserModel::get($agent['user_id']);
|
||||
if (!$agentUser) {
|
||||
\think\Log::error("[regional_agent] agent id={$agent['id']} user_id={$agent['user_id']} not found in fa_user, skipped");
|
||||
continue;
|
||||
}
|
||||
$matched[] = [
|
||||
'agent' => $agent,
|
||||
'area_id' => $areaId,
|
||||
|
||||
@@ -49,13 +49,23 @@ class Reward
|
||||
return false;
|
||||
}
|
||||
|
||||
$agent->setInc('total_income', $reward['commission']);
|
||||
UserModel::money($reward['commission'], $reward['agent_user_id'], 'regional_agent_income', $reward['id'], '区域公司差价', $reward);
|
||||
$agentUser = UserModel::get($reward['agent_user_id']);
|
||||
if (!$agentUser) {
|
||||
\think\Log::error("[regional_agent] settleReward fail: agent_user_id={$reward['agent_user_id']} not found in fa_user");
|
||||
return false;
|
||||
}
|
||||
|
||||
$reward->status = self::STATUS_ACCOUNTED;
|
||||
$reward->save();
|
||||
try {
|
||||
$agent->setInc('total_income', $reward['commission']);
|
||||
UserModel::money($reward['commission'], $reward['agent_user_id'], 'regional_agent_income', $reward['id'], '区域公司差价', $reward);
|
||||
|
||||
return true;
|
||||
$reward->status = self::STATUS_ACCOUNTED;
|
||||
$reward->save();
|
||||
return true;
|
||||
} catch (\Throwable $e) {
|
||||
\think\Log::error("[regional_agent] settleReward money error: " . $e->getMessage());
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public function backByRegionalOrder($regionalOrderId, $event)
|
||||
|
||||
@@ -838,14 +838,22 @@ trait OrderOper
|
||||
|
||||
$order->save();
|
||||
|
||||
saveUserMessage([
|
||||
'user_id' => $order->id,
|
||||
'content' => "付款成功,订单号:{$order->order_sn}",
|
||||
'create_time' => time()
|
||||
]);
|
||||
try {
|
||||
saveUserMessage([
|
||||
'user_id' => $order->user_id,
|
||||
'content' => "付款成功,订单号:{$order->order_sn}",
|
||||
'create_time' => time()
|
||||
]);
|
||||
} catch (\Throwable $e) {
|
||||
\think\Log::error('[order_pay] saveUserMessage failed: ' . $e->getMessage());
|
||||
}
|
||||
|
||||
$user = User::where('id', $order->user_id)->find();
|
||||
OrderAction::operAdd($order, null, $user, 'user', '用户支付成功');
|
||||
try {
|
||||
OrderAction::operAdd($order, null, $user, 'user', '用户支付成功');
|
||||
} catch (\Throwable $e) {
|
||||
\think\Log::error('[order_pay] operAdd failed: ' . $e->getMessage());
|
||||
}
|
||||
|
||||
// 组合支付扣除用户余额
|
||||
if ($order->pay_type == 'group') {
|
||||
@@ -862,10 +870,18 @@ trait OrderOper
|
||||
}
|
||||
|
||||
$data = ['order' => $order];
|
||||
\think\Hook::listen('order_payed_after', $data);
|
||||
try {
|
||||
\think\Hook::listen('order_payed_after', $data);
|
||||
} catch (\Throwable $e) {
|
||||
\think\Log::error('[order_pay] order_payed_after hook failed: ' . $e->getMessage());
|
||||
}
|
||||
|
||||
// 支付成功后续使用异步队列处理
|
||||
\think\Queue::push('\addons\shopro\job\OrderPayed@payed', ['order' => $order, 'user' => $user], 'shopro-high');
|
||||
try {
|
||||
\think\Queue::push('\addons\shopro\job\OrderPayed@payed', ['order' => $order, 'user' => $user], 'shopro-high');
|
||||
} catch (\Throwable $e) {
|
||||
\think\Log::error('[order_pay] push OrderPayed job failed: ' . $e->getMessage());
|
||||
}
|
||||
return $order;
|
||||
}
|
||||
|
||||
|
||||
@@ -133,7 +133,14 @@ class HuifuNotifyHandler
|
||||
$order->paymentProcess($order, $notify);
|
||||
});
|
||||
} catch (\Throwable $e) {
|
||||
Log::error('[shopro_huifu] notify process fail: ' . $e->getMessage());
|
||||
$msg = trim($e->getMessage());
|
||||
if ($e instanceof \think\exception\HttpResponseException) {
|
||||
$resp = $e->getResponse();
|
||||
$msg = 'HttpResponseException: ' . json_encode($resp ? $resp->getData() : null, JSON_UNESCAPED_UNICODE);
|
||||
} elseif ($msg === '') {
|
||||
$msg = get_class($e) . ' @ ' . basename($e->getFile()) . ':' . $e->getLine();
|
||||
}
|
||||
Log::error('[shopro_huifu] notify process fail: ' . $msg);
|
||||
return $this->ack($reqSeqId, false);
|
||||
}
|
||||
|
||||
|
||||
在新工单中引用
屏蔽一个用户