From 041e46b757d8053df3ae94c15e5b5cccd1b50d76 Mon Sep 17 00:00:00 2001
From: 陆恒 <luheng@puchigames.com>
Date: Fri, 28 Aug 2020 17:03:08 +0800
Subject: [PATCH] 提交

---
 src/HttpServer/logic/datadef.go  | 10 +++++++---
 src/HttpServer/logic/function.go | 12 ++++++------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/HttpServer/logic/datadef.go b/src/HttpServer/logic/datadef.go
index 532a707..d380da3 100644
--- a/src/HttpServer/logic/datadef.go
+++ b/src/HttpServer/logic/datadef.go
@@ -488,10 +488,14 @@ type GetCashResp struct {
 	Msg  string `json:"msg"`
 }
 
-type GetCashWechatResp struct {
-	Code  string `json:"code"`
+type GetCashWechatData struct {
 	Cdkey string `json:"cdkey"`
-	Msg   string `json:"msg"`
+}
+
+type GetCashWechatResp struct {
+	Code string            `json:"code"`
+	Data GetCashWechatData `json:"data"`
+	Msg  string            `json:"msg"`
 }
 
 type GetCashListDesc struct {
diff --git a/src/HttpServer/logic/function.go b/src/HttpServer/logic/function.go
index 4fe59e8..993b2e6 100644
--- a/src/HttpServer/logic/function.go
+++ b/src/HttpServer/logic/function.go
@@ -1361,7 +1361,7 @@ func GetCashWechatFromSDK(uuid int, goldnum int, gameid, channel, openid, nickna
 	}
 	if goldnum == 0 || uuid == 0 || gameid == "" || channel == "" || openid == "" || ver == "" {
 		logger.Error("GetCashFromSDK param empty")
-		return "", errors.New("param empty")
+		return "error", errors.New("param empty")
 	}
 	var paramlist []string
 	var params TixianDesc
@@ -1420,14 +1420,14 @@ func GetCashWechatFromSDK(uuid int, goldnum int, gameid, channel, openid, nickna
 	bys, err := json.Marshal(&params)
 	if err != nil {
 		logger.Error("GetCashWechatFromSDK failed=%v", err)
-		return "", err
+		return "error", err
 	}
 	res, err := DoHttpPost(bys, "api/server/tixiancdkey")
 	logger.Info("GetCashWechatFromSDK sumparam is:%v,sign is:%v", signsum, sign)
 	logger.Info("GetCashWechatFromSDK sumparam param=%v", string(bys))
 	if err != nil {
 		logger.Error("GetCashWechatFromSDK failed=%v", err)
-		return "", err
+		return "error", err
 	}
 
 	logger.Info("GetCashWechatFromSDK res=%v", res)
@@ -1436,15 +1436,15 @@ func GetCashWechatFromSDK(uuid int, goldnum int, gameid, channel, openid, nickna
 	err = json.Unmarshal([]byte(res), &resp)
 	if err != nil {
 		logger.Error("GetCashWechatFromSDK failed=%v", err)
-		return "", err
+		return "error", err
 	}
 
 	if resp.Code != "0" {
 		logger.Error("GetCashWechatFromSDK failed=%v", resp.Msg)
-		return "", errors.New(resp.Msg)
+		return "error", errors.New(resp.Msg)
 	}
 
-	return resp.Cdkey, nil
+	return resp.Data.Cdkey, nil
 }
 
 func GetCashFromSDK(uuid int, goldnum int, gameid, channel, openid, nickname, headurl, ver string, checkcoin int) (int, error) {
--
libgit2 0.21.0