From 67f144144f774a138cdc687d589157c7631c4b19 Mon Sep 17 00:00:00 2001 From: lwl0608 Date: Fri, 14 Jun 2024 10:26:00 +0800 Subject: [PATCH] fix --- api/proto/vas/proto/op.go | 2 ++ app/mix/service/vasservice.go | 2 ++ dbstruct/product.go | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+) diff --git a/api/proto/vas/proto/op.go b/api/proto/vas/proto/op.go index 9d7cb8f1..7d0a0542 100644 --- a/api/proto/vas/proto/op.go +++ b/api/proto/vas/proto/op.go @@ -34,6 +34,7 @@ type OpCoinOrderVO struct { Coins int64 `json:"coins"` Ct int64 `json:"ct"` ProductName string `json:"product_name"` + RefundType string `json:"refund_type"` } type OpCoinOrderListData struct { @@ -111,6 +112,7 @@ type OpOrderVO struct { Money int64 `json:"money"` Ct int64 `json:"ct"` ProductName string `json:"product_name"` + RefundType string `json:"refund_type"` } type OpOrderListData struct { diff --git a/app/mix/service/vasservice.go b/app/mix/service/vasservice.go index 7a008bc5..584a2ef6 100644 --- a/app/mix/service/vasservice.go +++ b/app/mix/service/vasservice.go @@ -678,6 +678,7 @@ func (s *Service) OpCoinOrderList(ctx *gin.Context, req *vasproto.OpCoinOrderLis OrderStatusDesc: dbstruct.CoinOrderStatusDescMap[co.GetOrderStatus()], Coins: co.GetCoins(), Ct: co.GetCt(), + RefundType: "退金币", } item.ProductName = dbstruct.ProductIdDescMap[co.GetProductId()] @@ -748,6 +749,7 @@ func (s *Service) OpOrderList(ctx *gin.Context, req *vasproto.OpOrderListReq) (l Money: o.GetPayAmount(), Ct: o.GetCt(), ProductName: dbstruct.ProductIdDescMap[o.GetProductId()], + RefundType: "退现金", } list = append(list, item) } diff --git a/dbstruct/product.go b/dbstruct/product.go index 45c4218b..b94705e0 100644 --- a/dbstruct/product.go +++ b/dbstruct/product.go @@ -17,6 +17,16 @@ const ( ProductIdH5Coin18000 = "h5_coin_18000" // H5 18000币 ProductIdH5Coin20000 = "h5_coin_20000" // H5 20000币 + ProductIdIosCoin70 = "70_gold" + ProductIdIosCoin350 = "350_gold" + ProductIdIosCoin686 = "686_gold" + ProductIdIosCoin2086 = "2086_gold" + ProductIdIosCoin4886 = "4886_gold" + ProductIdIosCoin6986 = "6986_gold" + ProductIdIosCoin9086 = "9086_gold" + ProductIdIosCoin13986 = "13986_gold" + ProductIdIosCoin20986 = "20986_gold" + ProductIdContactWechat = "contact_wechat" // 微信联系方式 ProductIdH5ContactWechat = "h5_contact_wechat" // h5的联系方式,rmb直接解锁 ProductIdSuperfanGiftContactWechat = "superfan_gift_contact_wechat" // 超粉赠送的联系方式 @@ -50,6 +60,15 @@ var ProductIdDescMap = map[string]string{ ProductIdH5ZoneMoment: "空间动态", ProductIdH5ZoneAdmission: "解锁空间", ProductIdH5ZoneSuperfanship: "解锁超粉", + ProductIdIosCoin70: "ios_70金币", + ProductIdIosCoin350: "ios_350金币", + ProductIdIosCoin686: "ios_686金币", + ProductIdIosCoin2086: "ios_2086金币", + ProductIdIosCoin4886: "ios_4886金币", + ProductIdIosCoin6986: "ios_6986金币", + ProductIdIosCoin9086: "ios_9086金币", + ProductIdIosCoin13986: "ios_13986金币", + ProductIdIosCoin20986: "ios_20986金币", } var CoinPayValidProductIdMap = map[string]bool{