Commit 1b499c3fd3b34cbbade303b2535104bd54776168
1 parent
d728847d
Exists in
master
提交
Showing
2 changed files
with
8 additions
and
2 deletions
Show diff stats
src/HttpServer/logic/function.go
| @@ -1040,7 +1040,7 @@ func (u *UserData) GetRedCatIdList() []LimitListDesc { | @@ -1040,7 +1040,7 @@ func (u *UserData) GetRedCatIdList() []LimitListDesc { | ||
| 1040 | } | 1040 | } |
| 1041 | } | 1041 | } |
| 1042 | 1042 | ||
| 1043 | - udatastr, err := redishandler.GetRedisClient().HGet(redis.USER_WAREHOUSE_INFO, strconv.Itoa(u.UserId)) | 1043 | + /*udatastr, err := redishandler.GetRedisClient().HGet(redis.USER_WAREHOUSE_INFO, strconv.Itoa(u.UserId)) |
| 1044 | if err != nil { | 1044 | if err != nil { |
| 1045 | logger.Error("CalcGoldRate failed err=%v", err) | 1045 | logger.Error("CalcGoldRate failed err=%v", err) |
| 1046 | return rtsl | 1046 | return rtsl |
| @@ -1069,7 +1069,7 @@ func (u *UserData) GetRedCatIdList() []LimitListDesc { | @@ -1069,7 +1069,7 @@ func (u *UserData) GetRedCatIdList() []LimitListDesc { | ||
| 1069 | wdata.Info = append(wdata.Info[:i], wdata.Info[i+1:]...) | 1069 | wdata.Info = append(wdata.Info[:i], wdata.Info[i+1:]...) |
| 1070 | i-- | 1070 | i-- |
| 1071 | } | 1071 | } |
| 1072 | - } | 1072 | + }*/ |
| 1073 | 1073 | ||
| 1074 | return rtsl | 1074 | return rtsl |
| 1075 | 1075 |
src/HttpServer/logic/logic.go
| @@ -2804,6 +2804,12 @@ func HandlerPutCattoWareHouse(w http.ResponseWriter, data string, uuid int) { | @@ -2804,6 +2804,12 @@ func HandlerPutCattoWareHouse(w http.ResponseWriter, data string, uuid int) { | ||
| 2804 | resp.Message = "posnotvalid" | 2804 | resp.Message = "posnotvalid" |
| 2805 | break | 2805 | break |
| 2806 | } | 2806 | } |
| 2807 | + if uinfo.PosInfo[rdata.Position].StartTime != 0 { | ||
| 2808 | + logger.Error("HandlerPutCattoWareHouse not right failed=%v", err) | ||
| 2809 | + resp.Code = 1 | ||
| 2810 | + resp.Message = "分红猫无法放入仓库！" | ||
| 2811 | + break | ||
| 2812 | + } | ||
| 2807 | 2813 | ||
| 2808 | //合成界面红包猫的等级采用id+37的形式 | 2814 | //合成界面红包猫的等级采用id+37的形式 |
| 2809 | rtval := uinfo.tryPutToWareHouse(udata, rdata.Position, uuid) | 2815 | rtval := uinfo.tryPutToWareHouse(udata, rdata.Position, uuid) |