feat: 钱包系统分离 - 代理钱包与卡钱包完全隔离

## 变更概述将统一钱包系统拆分为代理钱包和卡钱包两个独立系统，实现数据表和代码层面的完全隔离。 ## 数据库变更 - 新增 6 张表：tb_agent_wallet、tb_agent_wallet_transaction、tb_agent_recharge_record、tb_card_wallet、tb_card_wallet_transaction、tb_card_recharge_record - 删除 3 张旧表：tb_wallet、tb_wallet_transaction、tb_recharge_record - 代理钱包：按 (shop_id, wallet_type) 唯一标识，支持主钱包和分佣钱包 - 卡钱包：按 (resource_type, resource_id) 唯一标识，支持物联网卡和设备 ## 代码变更 - Model 层：新增 AgentWallet、AgentWalletTransaction、AgentRechargeRecord、CardWallet、CardWalletTransaction、CardRechargeRecord 模型 - Store 层：新增 6 个独立 Store，支持事务、乐观锁、Redis 缓存 - Service 层：重构 commission_calculation、commission_withdrawal、order、recharge 等 8 个服务 - Bootstrap 层：更新 Store 和 Service 依赖注入 - 常量层：按钱包类型重新组织常量和 Redis Key 生成函数 ## 技术特性 - 乐观锁：使用 version 字段防止并发冲突 - 多租户：支持 shop_id_tag 和 enterprise_id_tag 过滤 - 事务管理：所有余额变动使用事务保证 ACID - 缓存策略：Cache-Aside 模式，余额变动后删除缓存 ## 业务影响 - 代理钱包和卡钱包业务完全隔离，互不影响 - 为独立监控、优化、扩展打下基础 - 提升代理钱包的稳定性和独立性 Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
2026-02-25 09:51:00 +08:00
parent f32d32cd36
commit 18daeae65a
66 changed files with 4420 additions and 1090 deletions
--- a/internal/service/order/service.go
+++ b/internal/service/order/service.go
@@ -30,7 +30,8 @@ type Service struct {
 	redis                      *redis.Client
 	orderStore                 *postgres.OrderStore
 	orderItemStore             *postgres.OrderItemStore
-	walletStore                *postgres.WalletStore
+	agentWalletStore           *postgres.AgentWalletStore
+	cardWalletStore            *postgres.CardWalletStore
 	purchaseValidationService  *purchase_validation.Service
 	shopPackageAllocationStore *postgres.ShopPackageAllocationStore
 	shopSeriesAllocationStore  *postgres.ShopSeriesAllocationStore
@@ -49,7 +50,8 @@ func New(
 	redisClient *redis.Client,
 	orderStore *postgres.OrderStore,
 	orderItemStore *postgres.OrderItemStore,
-	walletStore *postgres.WalletStore,
+	agentWalletStore *postgres.AgentWalletStore,
+	cardWalletStore *postgres.CardWalletStore,
 	purchaseValidationService *purchase_validation.Service,
 	shopPackageAllocationStore *postgres.ShopPackageAllocationStore,
 	shopSeriesAllocationStore *postgres.ShopSeriesAllocationStore,
@@ -67,7 +69,8 @@ func New(
 		redis:                      redisClient,
 		orderStore:                 orderStore,
 		orderItemStore:             orderItemStore,
-		walletStore:                walletStore,
+		agentWalletStore:           agentWalletStore,
+		cardWalletStore:            cardWalletStore,
 		purchaseValidationService:  purchaseValidationService,
 		shopPackageAllocationStore: shopPackageAllocationStore,
 		shopSeriesAllocationStore:  shopSeriesAllocationStore,
@@ -430,64 +433,128 @@ func (s *Service) WalletPay(ctx context.Context, orderID uint, buyerType string,
 		return errors.New(errors.CodeInvalidParam, "不支持的买家类型")
 	}

-	wallet, err := s.walletStore.GetByResourceTypeAndID(ctx, resourceType, resourceID, "main")
-	if err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return errors.New(errors.CodeWalletNotFound, "钱包不存在")
-		}
-		return err
-	}
-
-	if wallet.Balance < order.TotalAmount {
-		return errors.New(errors.CodeInsufficientBalance, "余额不足")
-	}
-
+	// 根据资源类型选择对应的钱包系统
 	now := time.Now()
-	err = s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		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 resourceType == "shop" {
+		// 代理钱包系统（店铺）
+		wallet, err := s.agentWalletStore.GetMainWallet(ctx, resourceID)
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				return errors.New(errors.CodeWalletNotFound, "钱包不存在")
+			}
+			return err
 		}

-		if result.RowsAffected == 0 {
-			var currentOrder model.Order
-			if err := tx.First(&currentOrder, orderID).Error; err != nil {
-				return errors.Wrap(errors.CodeDatabaseError, err, "查询订单失败")
+		if wallet.Balance < order.TotalAmount {
+			return errors.New(errors.CodeInsufficientBalance, "余额不足")
+		}
+
+		err = s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+			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, "更新订单支付状态失败")
 			}

-			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, "订单状态异常")
+			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.AgentWallet{}).
+				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 walletResult.Error != nil {
+				return errors.Wrap(errors.CodeDatabaseError, walletResult.Error, "扣减钱包余额失败")
+			}
+			if walletResult.RowsAffected == 0 {
+				return errors.New(errors.CodeInsufficientBalance, "余额不足或并发冲突")
+			}
+
+			return s.activatePackage(ctx, tx, order)
+		})
+	} else {
+		// 卡钱包系统（iot_card 或 device）
+		wallet, err := s.cardWalletStore.GetByResourceTypeAndID(ctx, resourceType, resourceID)
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				return errors.New(errors.CodeWalletNotFound, "钱包不存在")
+			}
+			return err
 		}

-		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 walletResult.Error != nil {
-			return errors.Wrap(errors.CodeDatabaseError, walletResult.Error, "扣减钱包余额失败")
-		}
-		if walletResult.RowsAffected == 0 {
-			return errors.New(errors.CodeInsufficientBalance, "余额不足或并发冲突")
+		if wallet.Balance < order.TotalAmount {
+			return errors.New(errors.CodeInsufficientBalance, "余额不足")
 		}

-		return s.activatePackage(ctx, tx, order)
-	})
+		err = s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+			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.CardWallet{}).
+				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 walletResult.Error != nil {
+				return errors.Wrap(errors.CodeDatabaseError, walletResult.Error, "扣减钱包余额失败")
+			}
+			if walletResult.RowsAffected == 0 {
+				return errors.New(errors.CodeInsufficientBalance, "余额不足或并发冲突")
+			}
+
+			return s.activatePackage(ctx, tx, order)
+		})
+	}

 	if err != nil {
 		return err