修复重构后逻辑问题

web/services/resource.go

@@ -294,73 +294,6 @@ func (r ResourceOnTradeComplete) OnTradeComplete(info trade2.ProductInfo, trade
 	return Resource.CreateResourceByTrade(trade.UserID, time.Time(*trade.CompletedAt), info.(*CreateResourceData), trade)
 }
 
-// type CreateResourceData struct {
-// 	Type  resource2.Type           `json:"type" validate:"required"`
-// 	Short *CreateShortResourceData `json:"short,omitempty"`
-// 	Long  *CreateLongResourceData  `json:"long,omitempty"`
-// }
-//
-// func (data *CreateResourceData) GetSubject() string {
-// 	switch data.Type {
-// 	case resource2.TypeShort:
-// 		return data.Short.GetSubject()
-// 	case resource2.TypeLong:
-// 		return data.Long.GetSubject()
-// 	default:
-// 		panic("未处理的 resource type 枚举值")
-// 	}
-// }
-//
-// func (data *CreateResourceData) GetAmount() decimal.Decimal {
-// 	switch data.Type {
-// 	case resource2.TypeShort:
-// 		return data.Short.GetAmount()
-// 	case resource2.TypeLong:
-// 		return data.Long.GetAmount()
-// 	default:
-// 		panic("未处理的 resource type 枚举值")
-// 	}
-// }
-//
-// func (data *CreateResourceData) ToData() (CreateResourceData, error) {
-// 	switch data.Type {
-// 	case resource2.TypeShort:
-// 		return data.Short, nil
-// 	case resource2.TypeLong:
-// 		return data.Long, nil
-// 	}
-//
-// 	return nil, fmt.Errorf("不支持的套餐类型")
-// }
-//
-// type PrepareResourceData struct {
-// 	CreateResourceData
-// 	PaymentMethod   trade2.Method   `json:"payment_method" validate:"required"`
-// 	PaymentPlatform trade2.Platform `json:"payment_platform" validate:"required"`
-// }
-//
-// type PrepareResourceCache struct {
-// 	Uid     int32 `json:"uid"`
-// 	TradeId int32 `json:"trade_id"`
-// 	BillId  int32 `json:"bill_id"`
-// 	*PrepareResourceData
-// }
-//
-// func (c PrepareResourceCache) MarshalBinary() (data []byte, err error) {
-// 	data, err = json.Marshal(c)
-// 	if err != nil {
-// 		return nil, err
-// 	}
-// 	return data, nil
-// }
-//
-// func (c PrepareResourceCache) UnmarshalBinary(data []byte) error {
-// 	if err := json.Unmarshal(data, &c); err != nil {
-// 		return err
-// 	}
-// 	return nil
-// }
-
 type ResourceServiceErr string
 
 func (e ResourceServiceErr) Error() string {