diff --git a/api/v1/key/models.go b/api/v1/key/models.go index adf4740..f0824a0 100644 --- a/api/v1/key/models.go +++ b/api/v1/key/models.go @@ -111,24 +111,24 @@ type OrderInfo struct { } type NotifyData struct { - NotifyId string `json:"notify_id" validate:"required,alphanum,min=2,max=32"` - OutBizNo string `json:"out_biz_no" validate:"required,alphanum,min=2,max=32"` - TradeNo string `json:"trade_no" validate:"required,alphanum,min=2,max=32"` - Key string `json:"key,omitempty"` - UsableNum uint32 `json:"usable_num"` - UsageNum uint32 `json:"usage_num"` - Status Status `json:"status" validate:"required"` - Url string `json:"url,omitempty"` - Amount float32 `json:"amount,omitempty"` - PayAmount float32 `json:"pay_amount,omitempty"` - PayTime string `json:"pay_time,omitempty"` - SettlementPrice float32 `json:"settlement_price,omitempty"` - ValidBeginTime string `json:"valid_begin_time,omitempty"` - ValidEndTime string `json:"valid_end_time,omitempty"` - UsageTime string `json:"usage_time,omitempty"` - DiscardTime string `json:"discard_time,omitempty"` - Account string `json:"account,omitempty"` // 可兑换账号 - OrderInfo OrderInfo `json:"order_info,omitempty"` + NotifyId string `json:"notify_id" validate:"required,alphanum,min=2,max=32"` + OutBizNo string `json:"out_biz_no" validate:"required,alphanum,min=2,max=32"` + TradeNo string `json:"trade_no" validate:"required,alphanum,min=2,max=32"` + Key string `json:"key,omitempty"` + UsableNum uint32 `json:"usable_num"` + UsageNum uint32 `json:"usage_num"` + Status Status `json:"status" validate:"required"` + Url string `json:"url,omitempty"` + Amount float32 `json:"amount,omitempty"` + PayAmount float32 `json:"pay_amount,omitempty"` + PayTime string `json:"pay_time,omitempty"` + SettlementPrice float32 `json:"settlement_price,omitempty"` + ValidBeginTime string `json:"valid_begin_time,omitempty"` + ValidEndTime string `json:"valid_end_time,omitempty"` + UsageTime string `json:"usage_time,omitempty"` + DiscardTime string `json:"discard_time,omitempty"` + Account string `json:"account,omitempty"` // 可兑换账号 + OrderInfo *OrderInfo `json:"order_info,omitempty"` } type Notify struct { AppId string `json:"app_id" validate:"required"` @@ -192,23 +192,23 @@ func (a *Notify) SignString() string { // Data 查询响应数据 type Data struct { - OutBizNo string `json:"out_biz_no"` - TradeNo string `json:"trade_no"` - Key string `json:"key,omitempty"` - UsableNum uint32 `json:"usable_num,omitempty"` - UsageNum uint32 `json:"usage_num,omitempty"` - Status Status `json:"status,omitempty"` - Url string `json:"url,omitempty"` - Amount float32 `json:"amount,omitempty"` - PayAmount float32 `json:"pay_amount,omitempty"` - PayTime string `json:"pay_time,omitempty"` - SettlementPrice float32 `json:"settlement_price,omitempty"` - ValidBeginTime string `json:"valid_begin_time,omitempty"` - ValidEndTime string `json:"valid_end_time,omitempty"` - UsageTime string `json:"usage_time,omitempty"` - DiscardTime string `json:"discard_time,omitempty"` - Account string `json:"account,omitempty"` // 可兑换账号 - OrderInfoArr []OrderInfo `json:"order_info_arr,omitempty"` + OutBizNo string `json:"out_biz_no"` + TradeNo string `json:"trade_no"` + Key string `json:"key,omitempty"` + UsableNum uint32 `json:"usable_num,omitempty"` + UsageNum uint32 `json:"usage_num,omitempty"` + Status Status `json:"status,omitempty"` + Url string `json:"url,omitempty"` + Amount float32 `json:"amount,omitempty"` + PayAmount float32 `json:"pay_amount,omitempty"` + PayTime string `json:"pay_time,omitempty"` + SettlementPrice float32 `json:"settlement_price,omitempty"` + ValidBeginTime string `json:"valid_begin_time,omitempty"` + ValidEndTime string `json:"valid_end_time,omitempty"` + UsageTime string `json:"usage_time,omitempty"` + DiscardTime string `json:"discard_time,omitempty"` + Account string `json:"account,omitempty"` // 可兑换账号 + OrderInfoArr []*OrderInfo `json:"order_info_arr,omitempty"` } func ConvertData(b []byte) (*Data, error) {