fix(force-recharge): 补充强充配置缺失的接口和数据库字段

- 订单管理：增加 payment_method 字段支持，合并代购订单逻辑
- 套餐系列分配：增加强充配置字段（enable_force_recharge、force_recharge_amount、force_recharge_trigger_type）
- 数据库迁移：添加 force_recharge_trigger_type 字段
- 测试：更新订单服务测试用例
- OpenSpec：归档 fix-force-recharge-missing-interfaces 变更

internal/model/dto/order_dto.go

@@ -3,10 +3,11 @@ package dto
 import "time"
 
 type CreateOrderRequest struct {
-	OrderType  string `json:"order_type" validate:"required,oneof=single_card device" required:"true" description:"订单类型 (single_card:单卡购买, device:设备购买)"`
-	IotCardID  *uint  `json:"iot_card_id" validate:"required_if=OrderType single_card" description:"IoT卡ID(单卡购买时必填)"`
-	DeviceID   *uint  `json:"device_id" validate:"required_if=OrderType device" description:"设备ID(设备购买时必填)"`
-	PackageIDs []uint `json:"package_ids" validate:"required,min=1,max=10,dive,min=1" required:"true" minItems:"1" maxItems:"10" description:"套餐ID列表"`
+	OrderType     string `json:"order_type" validate:"required,oneof=single_card device" required:"true" description:"订单类型 (single_card:单卡购买, device:设备购买)"`
+	IotCardID     *uint  `json:"iot_card_id" validate:"required_if=OrderType single_card" description:"IoT卡ID(单卡购买时必填)"`
+	DeviceID      *uint  `json:"device_id" validate:"required_if=OrderType device" description:"设备ID(设备购买时必填)"`
+	PackageIDs    []uint `json:"package_ids" validate:"required,min=1,max=10,dive,min=1" required:"true" minItems:"1" maxItems:"10" description:"套餐ID列表"`
+	PaymentMethod string `json:"payment_method" validate:"required,oneof=wallet offline" required:"true" description:"支付方式 (wallet:钱包支付, offline:线下支付)"`
 }
 
 type OrderListRequest struct {
@@ -45,6 +46,7 @@ type OrderResponse struct {
 	PaymentStatus           int                  `json:"payment_status" description:"支付状态 (1:待支付, 2:已支付, 3:已取消, 4:已退款)"`
 	PaymentStatusText       string               `json:"payment_status_text" description:"支付状态文本"`
 	PaidAt                  *time.Time           `json:"paid_at,omitempty" description:"支付时间"`
+	IsPurchaseOnBehalf      bool                 `json:"is_purchase_on_behalf" description:"是否为代购订单"`
 	CommissionStatus        int                  `json:"commission_status" description:"佣金状态 (1:待计算, 2:已计算)"`
 	CommissionConfigVersion int                  `json:"commission_config_version" description:"佣金配置版本"`
 	Items                   []*OrderItemResponse `json:"items" description:"订单明细列表"`
@@ -87,10 +89,3 @@ type PurchaseCheckResponse struct {
 	WalletCredit        int64  `json:"wallet_credit" description:"钱包到账金额(分)"`
 	Message             string `json:"message" description:"提示信息"`
 }
-
-type CreatePurchaseOnBehalfRequest struct {
-	OrderType  string `json:"order_type" validate:"required,oneof=single_card device" required:"true" description:"订单类型 (single_card:单卡购买, device:设备购买)"`
-	IotCardID  *uint  `json:"iot_card_id" validate:"required_if=OrderType single_card" description:"IoT卡ID(单卡购买时必填)"`
-	DeviceID   *uint  `json:"device_id" validate:"required_if=OrderType device" description:"设备ID(设备购买时必填)"`
-	PackageIDs []uint `json:"package_ids" validate:"required,min=1,max=10,dive,min=1" required:"true" minItems:"1" maxItems:"10" description:"套餐ID列表"`
-}

internal/model/dto/shop_series_allocation.go

@@ -26,18 +26,24 @@ type OneTimeCommissionTierEntry struct {
 
 // CreateShopSeriesAllocationRequest 创建套餐系列分配请求
 type CreateShopSeriesAllocationRequest struct {
-	ShopID                  uint                     `json:"shop_id" validate:"required" required:"true" description:"被分配的店铺ID"`
-	SeriesID                uint                     `json:"series_id" validate:"required" required:"true" description:"套餐系列ID"`
-	BaseCommission          BaseCommissionConfig     `json:"base_commission" validate:"required" required:"true" description:"基础返佣配置"`
-	EnableOneTimeCommission bool                     `json:"enable_one_time_commission" description:"是否启用一次性佣金"`
-	OneTimeCommissionConfig *OneTimeCommissionConfig `json:"one_time_commission_config" validate:"omitempty" description:"一次性佣金配置（启用一次性佣金时必填）"`
+	ShopID                   uint                     `json:"shop_id" validate:"required" required:"true" description:"被分配的店铺ID"`
+	SeriesID                 uint                     `json:"series_id" validate:"required" required:"true" description:"套餐系列ID"`
+	BaseCommission           BaseCommissionConfig     `json:"base_commission" validate:"required" required:"true" description:"基础返佣配置"`
+	EnableOneTimeCommission  bool                     `json:"enable_one_time_commission" description:"是否启用一次性佣金"`
+	OneTimeCommissionConfig  *OneTimeCommissionConfig `json:"one_time_commission_config" validate:"omitempty" description:"一次性佣金配置（启用一次性佣金时必填）"`
+	EnableForceRecharge      *bool                    `json:"enable_force_recharge,omitempty" description:"是否启用强充(累计充值强充)"`
+	ForceRechargeAmount      *int64                   `json:"force_recharge_amount,omitempty" description:"强充金额(分,0表示使用阈值金额)"`
+	ForceRechargeTriggerType *int                     `json:"force_recharge_trigger_type,omitempty" description:"强充触发类型(1:单次充值, 2:累计充值)"`
 }
 
 // UpdateShopSeriesAllocationRequest 更新套餐系列分配请求
 type UpdateShopSeriesAllocationRequest struct {
-	BaseCommission          *BaseCommissionConfig    `json:"base_commission" validate:"omitempty" description:"基础返佣配置"`
-	EnableOneTimeCommission *bool                    `json:"enable_one_time_commission" description:"是否启用一次性佣金"`
-	OneTimeCommissionConfig *OneTimeCommissionConfig `json:"one_time_commission_config" validate:"omitempty" description:"一次性佣金配置"`
+	BaseCommission           *BaseCommissionConfig    `json:"base_commission" validate:"omitempty" description:"基础返佣配置"`
+	EnableOneTimeCommission  *bool                    `json:"enable_one_time_commission" description:"是否启用一次性佣金"`
+	OneTimeCommissionConfig  *OneTimeCommissionConfig `json:"one_time_commission_config" validate:"omitempty" description:"一次性佣金配置"`
+	EnableForceRecharge      *bool                    `json:"enable_force_recharge,omitempty" description:"是否启用强充(累计充值强充)"`
+	ForceRechargeAmount      *int64                   `json:"force_recharge_amount,omitempty" description:"强充金额(分,0表示使用阈值金额)"`
+	ForceRechargeTriggerType *int                     `json:"force_recharge_trigger_type,omitempty" description:"强充触发类型(1:单次充值, 2:累计充值)"`
 }
 
 // ShopSeriesAllocationListRequest 套餐系列分配列表请求
@@ -56,19 +62,22 @@ type UpdateShopSeriesAllocationStatusRequest struct {
 
 // ShopSeriesAllocationResponse 套餐系列分配响应
 type ShopSeriesAllocationResponse struct {
-	ID                      uint                     `json:"id" description:"分配ID"`
-	ShopID                  uint                     `json:"shop_id" description:"被分配的店铺ID"`
-	ShopName                string                   `json:"shop_name" description:"被分配的店铺名称"`
-	SeriesID                uint                     `json:"series_id" description:"套餐系列ID"`
-	SeriesName              string                   `json:"series_name" description:"套餐系列名称"`
-	AllocatorShopID         uint                     `json:"allocator_shop_id" description:"分配者店铺ID"`
-	AllocatorShopName       string                   `json:"allocator_shop_name" description:"分配者店铺名称"`
-	BaseCommission          BaseCommissionConfig     `json:"base_commission" description:"基础返佣配置"`
-	EnableOneTimeCommission bool                     `json:"enable_one_time_commission" description:"是否启用一次性佣金"`
-	OneTimeCommissionConfig *OneTimeCommissionConfig `json:"one_time_commission_config,omitempty" description:"一次性佣金配置"`
-	Status                  int                      `json:"status" description:"状态 (1:启用, 2:禁用)"`
-	CreatedAt               string                   `json:"created_at" description:"创建时间"`
-	UpdatedAt               string                   `json:"updated_at" description:"更新时间"`
+	ID                       uint                     `json:"id" description:"分配ID"`
+	ShopID                   uint                     `json:"shop_id" description:"被分配的店铺ID"`
+	ShopName                 string                   `json:"shop_name" description:"被分配的店铺名称"`
+	SeriesID                 uint                     `json:"series_id" description:"套餐系列ID"`
+	SeriesName               string                   `json:"series_name" description:"套餐系列名称"`
+	AllocatorShopID          uint                     `json:"allocator_shop_id" description:"分配者店铺ID"`
+	AllocatorShopName        string                   `json:"allocator_shop_name" description:"分配者店铺名称"`
+	BaseCommission           BaseCommissionConfig     `json:"base_commission" description:"基础返佣配置"`
+	EnableOneTimeCommission  bool                     `json:"enable_one_time_commission" description:"是否启用一次性佣金"`
+	OneTimeCommissionConfig  *OneTimeCommissionConfig `json:"one_time_commission_config,omitempty" description:"一次性佣金配置"`
+	EnableForceRecharge      bool                     `json:"enable_force_recharge" description:"是否启用强充"`
+	ForceRechargeAmount      int64                    `json:"force_recharge_amount" description:"强充金额(分)"`
+	ForceRechargeTriggerType int                      `json:"force_recharge_trigger_type" description:"强充触发类型(1:单次充值, 2:累计充值)"`
+	Status                   int                      `json:"status" description:"状态 (1:启用, 2:禁用)"`
+	CreatedAt                string                   `json:"created_at" description:"创建时间"`
+	UpdatedAt                string                   `json:"updated_at" description:"更新时间"`
 }
 
 // ShopSeriesAllocationPageResult 套餐系列分配分页结果

internal/model/shop_series_allocation.go

@@ -25,8 +25,9 @@ type ShopSeriesAllocation struct {
 	OneTimeCommissionValue     int64  `gorm:"column:one_time_commission_value;type:bigint;default:0;comment:佣金金额(分)或比例(千分比)" json:"one_time_commission_value"`
 
 	// 强充配置
-	EnableForceRecharge bool  `gorm:"column:enable_force_recharge;type:boolean;default:false;comment:是否启用强充(累计充值时可选)" json:"enable_force_recharge"`
-	ForceRechargeAmount int64 `gorm:"column:force_recharge_amount;type:bigint;default:0;comment:强充金额(分,0表示使用阈值金额)" json:"force_recharge_amount"`
+	EnableForceRecharge      bool  `gorm:"column:enable_force_recharge;type:boolean;default:false;comment:是否启用强充(累计充值时可选)" json:"enable_force_recharge"`
+	ForceRechargeAmount      int64 `gorm:"column:force_recharge_amount;type:bigint;default:0;comment:强充金额(分,0表示使用阈值金额)" json:"force_recharge_amount"`
+	ForceRechargeTriggerType int   `gorm:"column:force_recharge_trigger_type;type:int;default:2;comment:强充触发类型(1:单次充值, 2:累计充值)" json:"force_recharge_trigger_type"`
 
 	Status int `gorm:"column:status;type:int;default:1;not null;comment:状态 1-启用 2-禁用" json:"status"`
 }