wishpal_ironfan
/
service
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feat-IRONFANS-70' into test

This commit is contained in:
lwl0608 2024-04-25 14:41:46 +08:00
parent 67c1a7ef0e a64b404298
commit 0f75a2f27e
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/proto/vas/proto/op.go
View File

@ -108,6 +108,7 @@ type OpOrderVO struct {
OrderStatus int32 `json:"order_status"` OrderStatus int32 `json:"order_status"`
OrderStatusDesc string `json:"order_status_desc"` OrderStatusDesc string `json:"order_status_desc"`
Coins int64 `json:"coins"` Coins int64 `json:"coins"`
Money int64 `json:"money"`
Ct int64 `json:"ct"` Ct int64 `json:"ct"`
ProductName string `json:"product_name"` ProductName string `json:"product_name"`
} }

3
app/mix/service/vasservice.go
View File

@ -633,9 +633,10 @@ func (s *Service) OpOrderList(ctx *gin.Context, req *vasproto.OpOrderListReq) (l
OrderStatus: o.GetOrderStatus(), OrderStatus: o.GetOrderStatus(),
OrderStatusDesc: dbstruct.OrderStatusDescMap[o.GetOrderStatus()], OrderStatusDesc: dbstruct.OrderStatusDescMap[o.GetOrderStatus()],
Coins: o.GetCoins(), Coins: o.GetCoins(),
Money: o.GetPayAmount(),
Ct: o.GetCt(), Ct: o.GetCt(),
ProductName: dbstruct.ProductIdDescMap[o.GetProductId()],
} }
item.ProductName = dbstruct.ProductIdDescMap[o.GetProductId()]
list = append(list, item) list = append(list, item)
} }
return return