fix: 修复订单支付幂等性问题,防止重复激活套餐

- 使用条件更新实现支付状态原子转换（pending -> paid）
- 重复请求返回幂等成功,不再重复激活套餐
- 新增 tb_package_usage 唯一索引（order_id, package_id）
- 新增幂等性和异常状态测试,测试覆盖率 71.7%
- 归档 OpenSpec 变更 fix-order-activation-idempotency

internal/service/order/service.go

@@ -250,10 +250,6 @@ func (s *Service) WalletPay(ctx context.Context, orderID uint, buyerType string,
 		return errors.New(errors.CodeForbidden, "无权操作此订单")
 	}
 
-	if order.PaymentStatus != model.PaymentStatusPending {
-		return errors.New(errors.CodeInvalidStatus, "订单状态不允许支付")
-	}
-
 	var resourceType string
 	var resourceID uint
 
@@ -288,27 +284,48 @@ func (s *Service) WalletPay(ctx context.Context, orderID uint, buyerType string,
 
 	now := time.Now()
 	err = s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		result := tx.Model(&model.Wallet{}).
+		result := tx.Model(&model.Order{}).
+			Where("id = ? AND payment_status = ?", orderID, model.PaymentStatusPending).
+			Updates(map[string]any{
+				"payment_status": model.PaymentStatusPaid,
+				"payment_method": model.PaymentMethodWallet,
+				"paid_at":        now,
+			})
+		if result.Error != nil {
+			return errors.Wrap(errors.CodeDatabaseError, result.Error, "更新订单支付状态失败")
+		}
+
+		if result.RowsAffected == 0 {
+			var currentOrder model.Order
+			if err := tx.First(&currentOrder, orderID).Error; err != nil {
+				return errors.Wrap(errors.CodeDatabaseError, err, "查询订单失败")
+			}
+
+			switch currentOrder.PaymentStatus {
+			case model.PaymentStatusPaid:
+				return nil
+			case model.PaymentStatusCancelled:
+				return errors.New(errors.CodeInvalidStatus, "订单已取消，无法支付")
+			case model.PaymentStatusRefunded:
+				return errors.New(errors.CodeInvalidStatus, "订单已退款，无法支付")
+			default:
+				return errors.New(errors.CodeInvalidStatus, "订单状态异常")
+			}
+		}
+
+		walletResult := tx.Model(&model.Wallet{}).
 			Where("id = ? AND balance >= ? AND version = ?", wallet.ID, order.TotalAmount, wallet.Version).
 			Updates(map[string]any{
 				"balance": gorm.Expr("balance - ?", order.TotalAmount),
 				"version": gorm.Expr("version + 1"),
 			})
-		if result.Error != nil {
-			return result.Error
+		if walletResult.Error != nil {
+			return errors.Wrap(errors.CodeDatabaseError, walletResult.Error, "扣减钱包余额失败")
 		}
-		if result.RowsAffected == 0 {
+		if walletResult.RowsAffected == 0 {
 			return errors.New(errors.CodeInsufficientBalance, "余额不足或并发冲突")
 		}
 
-		if err := tx.Model(&model.Order{}).Where("id = ?", orderID).Updates(map[string]any{
-			"payment_status": model.PaymentStatusPaid,
-			"payment_method": model.PaymentMethodWallet,
-			"paid_at":        now,
-		}).Error; err != nil {
-			return err
-		}
-
 		return s.activatePackage(ctx, tx, order)
 	})
 
@@ -329,22 +346,35 @@ func (s *Service) HandlePaymentCallback(ctx context.Context, orderNo string, pay
 		return err
 	}
 
-	if order.PaymentStatus == model.PaymentStatusPaid {
-		return nil
-	}
-
-	if order.PaymentStatus != model.PaymentStatusPending {
-		return errors.New(errors.CodeInvalidStatus, "订单状态不允许支付")
-	}
-
 	now := time.Now()
 	err = s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		if err := tx.Model(&model.Order{}).Where("id = ?", order.ID).Updates(map[string]any{
-			"payment_status": model.PaymentStatusPaid,
-			"payment_method": paymentMethod,
-			"paid_at":        now,
-		}).Error; err != nil {
-			return err
+		result := tx.Model(&model.Order{}).
+			Where("id = ? AND payment_status = ?", order.ID, model.PaymentStatusPending).
+			Updates(map[string]any{
+				"payment_status": model.PaymentStatusPaid,
+				"payment_method": paymentMethod,
+				"paid_at":        now,
+			})
+		if result.Error != nil {
+			return errors.Wrap(errors.CodeDatabaseError, result.Error, "更新订单支付状态失败")
+		}
+
+		if result.RowsAffected == 0 {
+			var currentOrder model.Order
+			if err := tx.First(&currentOrder, order.ID).Error; err != nil {
+				return errors.Wrap(errors.CodeDatabaseError, err, "查询订单失败")
+			}
+
+			switch currentOrder.PaymentStatus {
+			case model.PaymentStatusPaid:
+				return nil
+			case model.PaymentStatusCancelled:
+				return errors.New(errors.CodeInvalidStatus, "订单已取消，无法支付")
+			case model.PaymentStatusRefunded:
+				return errors.New(errors.CodeInvalidStatus, "订单已退款，无法支付")
+			default:
+				return errors.New(errors.CodeInvalidStatus, "订单状态异常")
+			}
 		}
 
 		return s.activatePackage(ctx, tx, order)
@@ -359,16 +389,29 @@ func (s *Service) HandlePaymentCallback(ctx context.Context, orderNo string, pay
 }
 
 func (s *Service) activatePackage(ctx context.Context, tx *gorm.DB, order *model.Order) error {
-	items, err := s.orderItemStore.ListByOrderID(ctx, order.ID)
-	if err != nil {
-		return err
+	var items []*model.OrderItem
+	if err := tx.Where("order_id = ?", order.ID).Find(&items).Error; err != nil {
+		return errors.Wrap(errors.CodeDatabaseError, err, "查询订单明细失败")
 	}
 
 	now := time.Now()
 	for _, item := range items {
+		var existingUsage model.PackageUsage
+		err := tx.Where("order_id = ? AND package_id = ?", order.ID, item.PackageID).
+			First(&existingUsage).Error
+		if err == nil {
+			s.logger.Warn("套餐使用记录已存在，跳过创建",
+				zap.Uint("order_id", order.ID),
+				zap.Uint("package_id", item.PackageID))
+			continue
+		}
+		if err != gorm.ErrRecordNotFound {
+			return errors.Wrap(errors.CodeDatabaseError, err, "检查套餐使用记录失败")
+		}
+
 		var pkg model.Package
 		if err := tx.First(&pkg, item.PackageID).Error; err != nil {
-			return err
+			return errors.Wrap(errors.CodeDatabaseError, err, "查询套餐信息失败")
 		}
 
 		usage := &model.PackageUsage{
@@ -392,7 +435,7 @@ func (s *Service) activatePackage(ctx context.Context, tx *gorm.DB, order *model
 		}
 
 		if err := tx.Create(usage).Error; err != nil {
-			return err
+			return errors.Wrap(errors.CodeDatabaseError, err, "创建套餐使用记录失败")
 		}
 	}