fix: 增强充值队列与日结全链路幂等防重机制,彻底杜绝重复发放与脏写

这个提交包含在:
chen
2026-09-19 16:26:59 +08:00
父节点 3738bf04c2
当前提交 cbac2a69f4
共有 6 个文件被更改,包括 144 次插入 和 40 次删除

查看文件

@@ -375,7 +375,7 @@ class DailySettleService
$distributed = 0;
$walletType = PartnerConfig::rewardWalletType();
foreach ($userIds as $userId) {
PartnerRewardService::write([
$record = PartnerRewardService::write([
'order_id' => $orderId,
'user_id' => $userId,
'role' => $role,
@@ -390,7 +390,8 @@ class DailySettleService
],
'status' => 1,
]);
if ((float) $each > 0) {
$isNew = ($record && !empty($record->_isNewCreated)) || PartnerRewardService::$lastWriteCreated;
if ($isNew && (float) $each > 0) {
Wallet::change($userId, $walletType, $each, $type, [
'settle_date' => $settleDate,
]);
@@ -456,7 +457,7 @@ class DailySettleService
$walletType = PartnerConfig::rewardWalletType();
foreach ($userIds as $userId) {
PartnerRewardService::write([
$record = PartnerRewardService::write([
'order_id' => $virtualOrderId,
'buyer_id' => 0,
'user_id' => $userId,
@@ -474,7 +475,8 @@ class DailySettleService
],
'status' => 1,
]);
if ((float) $each > 0) {
$isNew = ($record && !empty($record->_isNewCreated)) || PartnerRewardService::$lastWriteCreated;
if ($isNew && (float) $each > 0) {
Wallet::change($userId, $walletType, $each, $type, [
'minute_settle' => 1,
'orders' => $orderIds,

查看文件

@@ -11,6 +11,18 @@ class MadowService
{
public function share($settleDate, $gmv, $userIds)
{
// 幂等防重:检查该结算日期是否已分发过madow
$existing = \think\Db::name('shopro_partner_reward')
->where('settle_date', $settleDate)
->where('reward_type', 'madow_share')
->find();
if ($existing) {
$pool = (float) $gmv;
$count = count($userIds);
$each = $existing['madow'] ?? 0;
return ['pool' => $pool, 'count' => $count, 'each' => $each];
}
$count = count($userIds);
$pool = (float) $gmv;
if ($pool <= 0) {

查看文件

@@ -294,10 +294,13 @@ class PartnerRewardService
} catch (\Exception $e) {
$msg = $e->getMessage();
if (stripos($msg, 'Duplicate') !== false || stripos($msg, '1062') !== false) {
$existing = RewardModel::where('order_id', $payload['order_id'])
$existingQuery = RewardModel::where('order_id', $payload['order_id'])
->where('user_id', $payload['user_id'])
->where('reward_type', $payload['reward_type'])
->find();
->where('reward_type', $payload['reward_type']);
if (!empty($payload['settle_date'])) {
$existingQuery->where('settle_date', $payload['settle_date']);
}
$existing = $existingQuery->find();
if ($existing) {
$existing->_isNewCreated = false;
}

查看文件

@@ -253,6 +253,16 @@ class VoucherService
public function releaseByDate($settleDate)
{
// 幂等防重:检查该结算日期是否已释放过兑换券
$existingCount = RewardModel::where('settle_date', $settleDate)
->where('reward_type', 'voucher_release')
->count();
if ($existingCount > 0) {
return (float) RewardModel::where('settle_date', $settleDate)
->where('reward_type', 'voucher_release')
->sum('amount');
}
$plans = VoucherPlan::where('status', 1)
->where('start_date', '<=', $settleDate)
->select();