From cd06eeb3d762e9dac858a2b9fc379cd63722754b Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sat, 17 Aug 2024 16:31:30 +0800
Subject: [PATCH] 1

---
 bin/marketserver/res/recharge@recharge.json   |  3 ++-
 .../marketserver/api/v1/recharge/recharge.go  |  5 +---
 server/marketserver/mtb/mtb.auto_gen.go       | 26 +++++++++----------
 server/marketserver/proto/mt.proto            |  5 ++--
 4 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/bin/marketserver/res/recharge@recharge.json b/bin/marketserver/res/recharge@recharge.json
index a8981cf1..a8e3346d 100644
--- a/bin/marketserver/res/recharge@recharge.json
+++ b/bin/marketserver/res/recharge@recharge.json
@@ -3,13 +3,14 @@
     "id": 1001,
     "diamond": 600,
     "present_diamond": 66,
-    "price": 1,
+    "price": 6,
     "max_buy_times": 1
   },
   {
     "id": 1002,
     "diamond": 6800,
     "present_diamond": 1200,
+    "price": 68,
     "max_buy_times": 68
   },
   {
diff --git a/server/marketserver/api/v1/recharge/recharge.go b/server/marketserver/api/v1/recharge/recharge.go
index 3133a9e0..1d7e9bdb 100644
--- a/server/marketserver/api/v1/recharge/recharge.go
+++ b/server/marketserver/api/v1/recharge/recharge.go
@@ -46,13 +46,10 @@ func (ea *RechargeApi) RechargeList(c *gin.Context) {
 		tmpmap := map[string]interface{}{}
 		tmpmap["goods_id"] = tb.GetId()
 		tmpmap["diamond"] = tb.GetDiamond()
+		tmpmap["present_diamond"] = tb.GetPresentDiamond()
 		tmpmap["price"] = tb.GetPrice()
 		tmpmap["max_buy_times"] = tb.GetMaxBuyTimes()
-		tmpmap["first_present_diamond"] = tb.GetFirstPresentDiamond()
 		tmpmap["is_first_recharge"] = 0
-		if ok, err := service.FirstRecharge.IsFirstRecharge(accountAddress, tb.GetId()); err == nil && ok {
-			tmpmap["is_first_recharge"] = 1
-		}
 		currencyList := []struct{
 			Name string `json:"name"`
 			Address string `json:"address"`
diff --git a/server/marketserver/mtb/mtb.auto_gen.go b/server/marketserver/mtb/mtb.auto_gen.go
index f91f1ea3..fc68632e 100644
--- a/server/marketserver/mtb/mtb.auto_gen.go
+++ b/server/marketserver/mtb/mtb.auto_gen.go
@@ -91,9 +91,9 @@ type Language struct {
 type Recharge struct {
         id int32
         diamond int32
+        present_diamond int32
         price int32
         max_buy_times int32
-        first_present_diamond int32
 
         _flags1_ uint64
         _flags2_ uint64
@@ -417,12 +417,20 @@ func (this *Recharge) HasDiamond() bool {
         return (this._flags1_ & (uint64(1) << 2)) > 0
 }
 
+func (this *Recharge) GetPresentDiamond() int32 {
+        return this.present_diamond
+}
+
+func (this *Recharge) HasPresentDiamond() bool {
+        return (this._flags1_ & (uint64(1) << 3)) > 0
+}
+
 func (this *Recharge) GetPrice() int32 {
         return this.price
 }
 
 func (this *Recharge) HasPrice() bool {
-        return (this._flags1_ & (uint64(1) << 3)) > 0
+        return (this._flags1_ & (uint64(1) << 4)) > 0
 }
 
 func (this *Recharge) GetMaxBuyTimes() int32 {
@@ -430,14 +438,6 @@ func (this *Recharge) GetMaxBuyTimes() int32 {
 }
 
 func (this *Recharge) HasMaxBuyTimes() bool {
-        return (this._flags1_ & (uint64(1) << 4)) > 0
-}
-
-func (this *Recharge) GetFirstPresentDiamond() int32 {
-        return this.first_present_diamond
-}
-
-func (this *Recharge) HasFirstPresentDiamond() bool {
         return (this._flags1_ & (uint64(1) << 5)) > 0
 }
 
@@ -521,9 +521,9 @@ func (this *Language) LoadFromKv(kv map[string]interface{}) {
 func (this *Recharge) LoadFromKv(kv map[string]interface{}) {
         f5.ReadMetaTableField(&this.id, "id", &this._flags1_, 1, kv)
         f5.ReadMetaTableField(&this.diamond, "diamond", &this._flags1_, 2, kv)
-        f5.ReadMetaTableField(&this.price, "price", &this._flags1_, 3, kv)
-        f5.ReadMetaTableField(&this.max_buy_times, "max_buy_times", &this._flags1_, 4, kv)
-        f5.ReadMetaTableField(&this.first_present_diamond, "first_present_diamond", &this._flags1_, 5, kv)
+        f5.ReadMetaTableField(&this.present_diamond, "present_diamond", &this._flags1_, 3, kv)
+        f5.ReadMetaTableField(&this.price, "price", &this._flags1_, 4, kv)
+        f5.ReadMetaTableField(&this.max_buy_times, "max_buy_times", &this._flags1_, 5, kv)
 }
 
 func (this *Web3ServiceCluster) LoadFromKv(kv map[string]interface{}) {
diff --git a/server/marketserver/proto/mt.proto b/server/marketserver/proto/mt.proto
index f69e6874..de7f5094 100644
--- a/server/marketserver/proto/mt.proto
+++ b/server/marketserver/proto/mt.proto
@@ -74,8 +74,9 @@ message Recharge
 {
     optional int32 id = 1;
     optional int32 diamond = 2;
-    optional int32 price = 3;
-    optional int32 max_buy_times = 4;
+    optional int32 present_diamond = 3;
+    optional int32 price = 4;
+    optional int32 max_buy_times = 5;
 }
 
 message Web3ServiceCluster