提交

陆恒
1 parent bcf0359b
Showing 1 changed file with 7 additions and 7 deletions Show diff stats
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
 	}
  
 }
...	...	@@ -973,7 +973,7 @@ func (udata *UserData) AddToRank() error {
973	973	}
974	974
975	975	//计算最高等级猫的名字
976		-func (u *UserData) CalcHigestCatName() string {
	976	+func (u *UserData) CalcHigestCatName() (string, int) {
977	977	higestlv := 0
978	978	for _, val := range u.PosInfo {
979	979	if val.Cat < BOXGIFTEXTRA && higestlv < val.Cat {
...	...	@@ -985,13 +985,13 @@ func (u *UserData) CalcHigestCatName() string {
985	985	udatastr, err := redishandler.GetRedisClient().HGet(redis.USER_WAREHOUSE_INFO, strconv.Itoa(u.UserId))
986	986	if err != nil {
987	987	logger.Error("CalcHigestCatName failed err=%v", err)
988		- return ""
	988	+ return "", 0
989	989	}
990	990	wdata := new(UserWareHouseData)
991	991	err = json.Unmarshal([]byte(udatastr), wdata)
992	992	if err != nil {
993	993	logger.Error("CalcHigestCatName Unmarshal redis failed ")
994		- return ""
	994	+ return "", 0
995	995	}
996	996	for _, val := range wdata.Info {
997	997	reallv := val.Warelv
...	...	@@ -1005,16 +1005,16 @@ func (u *UserData) CalcHigestCatName() string {
1005	1005	cfg := jsonconf.GetRedCatConfig(higestlv)
1006	1006	if cfg == nil {
1007	1007	logger.Error("CalcHigestCatName failed getcfg higestlv=%v", higestlv)
1008		- return ""
	1008	+ return "", 0
1009	1009	}
1010		- return cfg.Name
	1010	+ return cfg.Name, higestlv
1011	1011	} else {
1012	1012	cfg := jsonconf.GetCatConfig(higestlv)
1013	1013	if cfg == nil {
1014	1014	logger.Error("CalcHigestCatName failed getcfg higestlv=%v", higestlv)
1015		- return ""
	1015	+ return "", 0
1016	1016	}
1017		- return cfg.Name
	1017	+ return cfg.Name, higestlv
1018	1018	}
1019	1019
1020	1020	}
...	...