fix: 优化生产环境收益稳定发放与队列可靠性,支持自动对账补偿与幂等防重

这个提交包含在:
chen
2026-09-19 16:12:08 +08:00
父节点 aff03bff44
当前提交 7cd54ac592
共有 10 个文件被更改,包括 823 次插入 和 72 次删除

查看文件

@@ -35,6 +35,10 @@ class PartnerRewardService
}
$buyerId = intval($order['user_id']);
// 确保双向保活已更新(即使钩子丢失或补偿场景也能准确刷新)
$paidTime = !empty($order['paid_time']) ? intval($order['paid_time']) : time();
$this->touchOrderTimes($buyerId, $paidTime);
$active = new ActiveService();
$chainService = new ChainService();
$parentChain = $chainService->collect($buyerId, false);
@@ -54,6 +58,14 @@ class PartnerRewardService
(new VoucherService())->grant($order, $buyerId, $orderRules);
// 清理可能存在的历史重试失败标记
$ext = is_array($order->ext) ? $order->ext : (json_decode($order->ext ?? '', true) ?: []);
if (!empty($ext['reward_settle_failed'])) {
unset($ext['reward_settle_failed'], $ext['reward_settle_error'], $ext['reward_settle_failed_time'], $ext['reward_settle_attempts']);
$order->ext = $ext;
$order->save();
}
return true;
});
}
@@ -275,14 +287,21 @@ class PartnerRewardService
try {
$row = RewardModel::create($payload);
self::$lastWriteCreated = true;
if ($row) {
$row->_isNewCreated = true;
}
return $row;
} catch (\Exception $e) {
$msg = $e->getMessage();
if (stripos($msg, 'Duplicate') !== false || stripos($msg, '1062') !== false) {
return RewardModel::where('order_id', $payload['order_id'])
$existing = RewardModel::where('order_id', $payload['order_id'])
->where('user_id', $payload['user_id'])
->where('reward_type', $payload['reward_type'])
->find();
if ($existing) {
$existing->_isNewCreated = false;
}
return $existing;
}
throw $e;
}
@@ -325,7 +344,8 @@ class PartnerRewardService
'ext' => $ext,
'status' => 1,
]);
if ($row && self::$lastWriteCreated && (float) $amount > 0 && $userId > 0 && $row->status == 1 && in_array($type, PartnerConfig::instantTypes())) {
$isNew = ($row && !empty($row->_isNewCreated)) || self::$lastWriteCreated;
if ($row && $isNew && (float) $amount > 0 && $userId > 0 && $row->status == 1 && in_array($type, PartnerConfig::instantTypes())) {
Wallet::change($userId, $walletType, $amount, $type, [
'partner_reward_id' => $row->id,
'order_id' => $orderId,