From af5024181009c08bfc8dc1fe91177d6e0bb8f203 Mon Sep 17 00:00:00 2001
From: 陆恒 <luheng@puchigames.com>
Date: Mon, 22 Jun 2020 16:50:50 +0800
Subject: [PATCH] 提交

---
 src/HttpServer/logic/function.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/HttpServer/logic/function.go b/src/HttpServer/logic/function.go
index 61a8e82..149f396 100644
--- a/src/HttpServer/logic/function.go
+++ b/src/HttpServer/logic/function.go
@@ -973,7 +973,7 @@ func (udata *UserData) AddToRank() error {
 }
 
 //计算最高等级猫的名字
-func (u *UserData) CalcHigestCatName() string {
+func (u *UserData) CalcHigestCatName() (string, int) {
 	higestlv := 0
 	for _, val := range u.PosInfo {
 		if val.Cat < BOXGIFTEXTRA && higestlv < val.Cat {
@@ -985,13 +985,13 @@ func (u *UserData) CalcHigestCatName() string {
 	udatastr, err := redishandler.GetRedisClient().HGet(redis.USER_WAREHOUSE_INFO, strconv.Itoa(u.UserId))
 	if err != nil {
 		logger.Error("CalcHigestCatName failed err=%v", err)
-		return ""
+		return "", 0
 	}
 	wdata := new(UserWareHouseData)
 	err = json.Unmarshal([]byte(udatastr), wdata)
 	if err != nil {
 		logger.Error("CalcHigestCatName Unmarshal redis failed ")
-		return ""
+		return "", 0
 	}
 	for _, val := range wdata.Info {
 		reallv := val.Warelv
@@ -1005,16 +1005,16 @@ func (u *UserData) CalcHigestCatName() string {
 		cfg := jsonconf.GetRedCatConfig(higestlv)
 		if cfg == nil {
 			logger.Error("CalcHigestCatName failed getcfg higestlv=%v", higestlv)
-			return ""
+			return "", 0
 		}
-		return cfg.Name
+		return cfg.Name, higestlv
 	} else {
 		cfg := jsonconf.GetCatConfig(higestlv)
 		if cfg == nil {
 			logger.Error("CalcHigestCatName failed getcfg higestlv=%v", higestlv)
-			return ""
+			return "", 0
 		}
-		return cfg.Name
+		return cfg.Name, higestlv
 	}
 
 }
--
libgit2 0.21.0