提交

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