Compare commits

..

No commits in common. "main" and "v1.0.2" have entirely different histories.
main ... v1.0.2

1 changed files with 35 additions and 35 deletions

View File

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