From 77712249a209fcbe64409e38a62f83515254121a Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 13 Aug 2024 15:11:34 +0800
Subject: [PATCH] 1

---
 .../marketserver/api/v1/recharge/recharge.go  |  3 +-
 server/marketserver/service/recharge.go       | 36 ++++++++++---------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/server/marketserver/api/v1/recharge/recharge.go b/server/marketserver/api/v1/recharge/recharge.go
index 8ec1efaf..4055023c 100644
--- a/server/marketserver/api/v1/recharge/recharge.go
+++ b/server/marketserver/api/v1/recharge/recharge.go
@@ -174,7 +174,8 @@ func (this *RechargeApi) internalBuy(c *gin.Context,
 				goodsMeta.GetId(),
 				itemNum,
 				q5.ToString(price),
-				diamond) {
+				diamond,
+				email) {
 				f5.RspErr(c, 500, "server internal error")
 				return
 			}
diff --git a/server/marketserver/service/recharge.go b/server/marketserver/service/recharge.go
index 82ce0e3e..45fd52ad 100644
--- a/server/marketserver/service/recharge.go
+++ b/server/marketserver/service/recharge.go
@@ -9,9 +9,27 @@ import (
 func AddRechargeOrder(orderId string, shortOrderId string,
 	netId int32, accountAddress string, passportAddress string,
 	currencyAddress string, currencyName string, itemId int32, itemNum int32,
-	price string, diamond int64) bool {
+	price string, diamond int64, email string) bool {
 	ok := false
 	nowTime := f5.GetApp().GetRealSeconds()
+	fields := [][]string{
+		{"order_id", orderId},
+		{"short_order_id", shortOrderId},
+		{"net_id", q5.ToString(netId)},
+		{"account_address", accountAddress},
+		{"passport_address", passportAddress},
+		{"currency_name", currencyName},
+		{"currency_address", currencyAddress},
+		{"item_id", q5.ToString(itemId)},
+		{"item_num", q5.ToString(itemNum)},
+		{"price", price},
+		{"diamond", q5.ToString(diamond)},
+		{"createtime", q5.ToString(nowTime)},
+		{"modifytime", q5.ToString(nowTime)},
+	}
+	if email != "" {
+		q5.AppendSlice(&fields, []string{"email", email})
+	}
 	f5.GetGoStyleDb().UpsertEx(
 		constant.BCNFT_DB,
 		"t_recharge_order",
@@ -20,21 +38,7 @@ func AddRechargeOrder(orderId string, shortOrderId string,
 		},
 		[][]string{
 		},
-		[][]string{
-			{"order_id", orderId},
-			{"short_order_id", shortOrderId},
-			{"net_id", q5.ToString(netId)},
-			{"account_address", accountAddress},
-			{"passport_address", passportAddress},
-			{"currency_name", currencyName},
-			{"currency_address", currencyAddress},
-			{"item_id", q5.ToString(itemId)},
-			{"item_num", q5.ToString(itemNum)},
-			{"price", price},
-			{"diamond", q5.ToString(diamond)},
-			{"createtime", q5.ToString(nowTime)},
-			{"modifytime", q5.ToString(nowTime)},
-		},
+		fields,
 		func (err error, lastInsertId int64, rowsAffected int64) {
 			ok = err == nil
 		},