diff --git a/internal/service/my_commission/service.go b/internal/service/my_commission/service.go index 8a0dd9d..a2b39fa 100644 --- a/internal/service/my_commission/service.go +++ b/internal/service/my_commission/service.go @@ -159,14 +159,19 @@ func (s *Service) CreateWithdrawalRequest(ctx context.Context, req *dto.CreateMy var withdrawalRequest *model.CommissionWithdrawalRequest err = s.db.Transaction(func(tx *gorm.DB) error { - // 冻结余额 - if err := tx.WithContext(ctx).Model(&model.AgentWallet{}). + // 冻结余额(使用条件更新 + RowsAffected 校验,防止并发重复提现) + result := tx.WithContext(ctx).Model(&model.AgentWallet{}). Where("id = ? AND balance >= ?", wallet.ID, req.Amount). Updates(map[string]interface{}{ "balance": gorm.Expr("balance - ?", req.Amount), "frozen_balance": gorm.Expr("frozen_balance + ?", req.Amount), - }).Error; err != nil { - return errors.Wrap(errors.CodeInternalError, err, "冻结余额失败") + }) + if result.Error != nil { + return errors.Wrap(errors.CodeInternalError, result.Error, "冻结余额失败") + } + // RowsAffected == 0 说明余额已不足(并发场景下被其他请求先行扣减) + if result.RowsAffected == 0 { + return errors.New(errors.CodeInsufficientBalance, "余额不足或并发冲突,请稍后重试") } // 创建提现申请