From 67208ab3bdaa7cbe039a738f75cc5726aa1bdc31 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 2 Aug 2024 13:23:07 +0800
Subject: [PATCH] 1

---
 server/jccommon/constant.go                   |  4 ++++
 .../marketserver/api/v1/recharge/recharge.go  | 24 ++++++++++++++++---
 server/marketserver/mtb/mtb.auto_gen.go       |  4 ++--
 server/marketserver/proto/mt.proto            | 10 ++++----
 4 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/server/jccommon/constant.go b/server/jccommon/constant.go
index c1820416..bae5a70e 100644
--- a/server/jccommon/constant.go
+++ b/server/jccommon/constant.go
@@ -130,3 +130,7 @@ const (
 	TRANS_ID_MIN_LEN = 77
 	TRANS_ID_MAX_LEN = 78
 )
+
+const (
+	TRANS_ID_FUNC_NORMAL = 1
+)
diff --git a/server/marketserver/api/v1/recharge/recharge.go b/server/marketserver/api/v1/recharge/recharge.go
index dbce3c91..77cec734 100644
--- a/server/marketserver/api/v1/recharge/recharge.go
+++ b/server/marketserver/api/v1/recharge/recharge.go
@@ -43,7 +43,7 @@ func (ea *RechargeApi) RechargeList(c *gin.Context) {
 func (this *RechargeApi) Buy(c *gin.Context) {
 	reqJson := struct {
 		NetId          int32  `json:"net_id"`
-		GoodsId        string `json:"goods_id"`
+		GoodsId        int32 `json:"goods_id"`
 		AccountAddress string `json:"account_address"`
 	}{}
 	if err := c.ShouldBindJSON(&reqJson); err != nil {
@@ -58,8 +58,26 @@ func (this *RechargeApi) Buy(c *gin.Context) {
 		f5.RspErr(c, 2, "goods id param error")
 		return
 	}
-	shortOrderId := q5.ToString(f5.GetApp().NewLockNodeUuid())
-	orderId := q5.ToString(shortOrderId)
+	shortOrderId := f5.GetApp().NewLockNodeUuid()
+	orderId := ""
+	{
+		transId := jccommon.NewTransId()
+		transId.Init(
+			jccommon.TRANS_ID_FUNC_NORMAL,
+			0,
+			0,
+			[3]int64{
+				0,
+				0,
+				shortOrderId,
+			})
+		var err error
+		orderId, err = transId.ToString()
+		if err != nil {
+			f5.RspErr(c, 2, "server internal error")
+			return
+		}
+	}
 	params := map[string]string{
 		"c":        "BcService",
 		"a":        "recharge",
diff --git a/server/marketserver/mtb/mtb.auto_gen.go b/server/marketserver/mtb/mtb.auto_gen.go
index c74375c0..0689ba4d 100644
--- a/server/marketserver/mtb/mtb.auto_gen.go
+++ b/server/marketserver/mtb/mtb.auto_gen.go
@@ -84,7 +84,7 @@ type Recharge struct {
         recharge_item int32
         recharge_type int32
         recharge_item_num int32
-        id string
+        id int32
         recharge_currency string
 
         _flags1_ uint64
@@ -401,7 +401,7 @@ func (this *Recharge) HasRechargeItemNum() bool {
         return (this._flags1_ & (uint64(1) << 5)) > 0
 }
 
-func (this *Recharge) GetId() string {
+func (this *Recharge) GetId() int32 {
         return this.id
 }
 
diff --git a/server/marketserver/proto/mt.proto b/server/marketserver/proto/mt.proto
index b7cb7fcc..e7547be8 100644
--- a/server/marketserver/proto/mt.proto
+++ b/server/marketserver/proto/mt.proto
@@ -65,11 +65,11 @@ message Language
 message Recharge
 {
     optional string recharge_cost_num = 1;
-	optional string recharge_icon     =2;
-	optional int32 recharge_item     =3;
-	optional int32 recharge_type     =4;
-	optional int32 recharge_item_num =5;
-	optional string id                =6;
+    optional string recharge_icon     =2;
+    optional int32 recharge_item     =3;
+    optional int32 recharge_type     =4;
+    optional int32 recharge_item_num =5;
+    optional int32 id                =6;
     optional string recharge_currency = 7;
 }