Commit af5024181009c08bfc8dc1fe91177d6e0bb8f203
1 parent
bcf0359b
Exists in
master
提交
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 { | @@ -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 | higestlv := 0 | 977 | higestlv := 0 |
| 978 | for _, val := range u.PosInfo { | 978 | for _, val := range u.PosInfo { |
| 979 | if val.Cat < BOXGIFTEXTRA && higestlv < val.Cat { | 979 | if val.Cat < BOXGIFTEXTRA && higestlv < val.Cat { |
| @@ -985,13 +985,13 @@ func (u *UserData) CalcHigestCatName() string { | @@ -985,13 +985,13 @@ func (u *UserData) CalcHigestCatName() string { | ||
| 985 | udatastr, err := redishandler.GetRedisClient().HGet(redis.USER_WAREHOUSE_INFO, strconv.Itoa(u.UserId)) | 985 | udatastr, err := redishandler.GetRedisClient().HGet(redis.USER_WAREHOUSE_INFO, strconv.Itoa(u.UserId)) |
| 986 | if err != nil { | 986 | if err != nil { |
| 987 | logger.Error("CalcHigestCatName failed err=%v", err) | 987 | logger.Error("CalcHigestCatName failed err=%v", err) |
| 988 | - return "" | 988 | + return "", 0 |
| 989 | } | 989 | } |
| 990 | wdata := new(UserWareHouseData) | 990 | wdata := new(UserWareHouseData) |
| 991 | err = json.Unmarshal([]byte(udatastr), wdata) | 991 | err = json.Unmarshal([]byte(udatastr), wdata) |
| 992 | if err != nil { | 992 | if err != nil { |
| 993 | logger.Error("CalcHigestCatName Unmarshal redis failed ") | 993 | logger.Error("CalcHigestCatName Unmarshal redis failed ") |
| 994 | - return "" | 994 | + return "", 0 |
| 995 | } | 995 | } |
| 996 | for _, val := range wdata.Info { | 996 | for _, val := range wdata.Info { |
| 997 | reallv := val.Warelv | 997 | reallv := val.Warelv |
| @@ -1005,16 +1005,16 @@ func (u *UserData) CalcHigestCatName() string { | @@ -1005,16 +1005,16 @@ func (u *UserData) CalcHigestCatName() string { | ||
| 1005 | cfg := jsonconf.GetRedCatConfig(higestlv) | 1005 | cfg := jsonconf.GetRedCatConfig(higestlv) |
| 1006 | if cfg == nil { | 1006 | if cfg == nil { |
| 1007 | logger.Error("CalcHigestCatName failed getcfg higestlv=%v", higestlv) | 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 | } else { | 1011 | } else { |
| 1012 | cfg := jsonconf.GetCatConfig(higestlv) | 1012 | cfg := jsonconf.GetCatConfig(higestlv) |
| 1013 | if cfg == nil { | 1013 | if cfg == nil { |
| 1014 | logger.Error("CalcHigestCatName failed getcfg higestlv=%v", higestlv) | 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 | } |