From a9fa18e747e5430ec6e1e6353e133c7016a67f1e Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 7 Aug 2024 14:18:12 +0800 Subject: [PATCH] 1 --- server/marketserver/api/v1/recharge/recharge.go | 12 ++++++------ server/marketserver/mt/RechargeCurrency.go | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/server/marketserver/api/v1/recharge/recharge.go b/server/marketserver/api/v1/recharge/recharge.go index dce7b473..d4b4aea5 100644 --- a/server/marketserver/api/v1/recharge/recharge.go +++ b/server/marketserver/api/v1/recharge/recharge.go @@ -53,8 +53,8 @@ func (this *RechargeApi) Buy(c *gin.Context) { f5.RspErr(c, 1, err.Error()) return } - currencyMeta := mt.Table.Contract.GetByNetIdName(reqJson.NetId, "TestToken") - if currencyMeta == nil { + currencyContractMeta := mt.Table.Contract.GetByNetIdName(reqJson.NetId, "TestToken") + if currencyContractMeta == nil { f5.RspErr(c, 2, "server internal error") return } @@ -97,8 +97,8 @@ func (this *RechargeApi) Buy(c *gin.Context) { "account_address": reqJson.AccountAddress, "passport_address": passportAddress, "amount": price, - "currency_name": currencyMeta.GetName(), - "currency_address": currencyMeta.GetAddress(), + "currency_name": currencyContractMeta.GetName(), + "currency_address": currencyContractMeta.GetAddress(), } jsonRspObj := &struct { ErrCode int32 `json:"errcode"` @@ -130,8 +130,8 @@ func (this *RechargeApi) Buy(c *gin.Context) { reqJson.NetId, reqJson.AccountAddress, passportAddress, - currencyMeta.GetName(), - currencyMeta.GetAddress(), + currencyContractMeta.GetName(), + currencyContractMeta.GetAddress(), goodsMeta.GetId(), itemNum, price, diff --git a/server/marketserver/mt/RechargeCurrency.go b/server/marketserver/mt/RechargeCurrency.go index cde34654..d4d23e8a 100644 --- a/server/marketserver/mt/RechargeCurrency.go +++ b/server/marketserver/mt/RechargeCurrency.go @@ -20,3 +20,7 @@ func (this *RechargeCurrencyTable) PostInit1() { panic("无法读取recharge_currency.json") } } + +func (this *RechargeCurrencyTable) Get() *RechargeCurrency { + return this.selfConf +}