This commit is contained in:
yangduo 2024-08-07 11:03:15 +08:00
parent f3489c2593
commit d738c1b946

View File

@ -46,7 +46,7 @@ func (this *RechargeApi) Buy(c *gin.Context) {
reqJson := struct { reqJson := struct {
NetId int32 `json:"net_id"` NetId int32 `json:"net_id"`
GoodsId int32 `json:"goods_id"` GoodsId int32 `json:"goods_id"`
Num int32 `json:"num"` Num int32 `json:"num"`
AccountAddress string `json:"account_address"` AccountAddress string `json:"account_address"`
}{} }{}
if err := c.ShouldBindJSON(&reqJson); err != nil { if err := c.ShouldBindJSON(&reqJson); err != nil {
@ -180,15 +180,17 @@ func (ea *RechargeApi) RechargeQuery(c *gin.Context) {
ErrMsg string `json:"errmsg"` ErrMsg string `json:"errmsg"`
Page common.StreamPagination `json:"page"` Page common.StreamPagination `json:"page"`
Rows []struct { Rows []struct {
OrderID string `json:"order_id"` OrderID string `gorm:"column:order_id" json:"order_id"`
ShortOrderID string `json:"short_order_id"` ShortOrderID string `gorm:"column:short_order_id" json:"short_order_id"`
TxHash string `json:"txhash"` TxHash string `gorm:"column:txhash" json:"txhash"`
NetID int64 `json:"net_id"` NetID int64 `gorm:"column:net_id" json:"net_id"`
Currency string `json:"currency"` Currency string `gorm:"column:currency_address" json:"currency"`
CurrencyName string `json:"currency_name"` CurrencyName string `gorm:"column:currency_name" json:"currency_name"`
Amount string `json:"amount"` Amount string `gorm:"column:price" json:"amount"`
Diamond string `json:"diamond"` Diamond string `gorm:"column:diamond" json:"diamond"`
Date int32 `json:"createtime"` Date int32 `gorm:"column:createtime" json:"createtime"`
Account string `gorm:"column:account_address" json:"account_address"`
Passport string `gorm:"column:passport_address" json:"passport_address"`
} `json:"rows"` } `json:"rows"`
}{} }{}
q5.NewSlice(&rspObj.Rows, 0, 10) q5.NewSlice(&rspObj.Rows, 0, 10)
@ -206,16 +208,7 @@ func (ea *RechargeApi) RechargeQuery(c *gin.Context) {
}, },
func(ds *f5.DataSet) { func(ds *f5.DataSet) {
p := q5.NewSliceElement(&rspObj.Rows) p := q5.NewSliceElement(&rspObj.Rows)
f5.UnmarshalModel(ds, p)
p.TxHash = ds.GetByName("txhash")
p.NetID = netId
p.OrderID = ds.GetByName("order_id")
p.ShortOrderID = ds.GetByName("short_order_id")
p.Currency = ds.GetByName("currency_address")
p.CurrencyName = ds.GetByName("currency_name")
p.Amount = ds.GetByName("price")
p.Diamond = ds.GetByName("diamond")
p.Date = q5.SafeToInt32(ds.GetByName("createtime"))
}) })
c.JSON(200, rspObj) c.JSON(200, rspObj)
} }