diff --git a/src/HttpServer/logic/datadef.go b/src/HttpServer/logic/datadef.go
index e0cddf2..91fc7aa 100644
--- a/src/HttpServer/logic/datadef.go
+++ b/src/HttpServer/logic/datadef.go
@@ -723,6 +723,7 @@ type UserData struct {
 	LastTimingRewardHour int                  //上次领取整点奖励的时刻
 	FlopCardCnt          int                  //翻牌次数计数
 	FlopCardLefCnt       int                  //剩余翻拍次数
+	TodayZhaocai         float32              //当天招财猫收益
 	CatShopInfo          CatShopData          //猫咖门店数据
 	Taskinfo             TaskData             //任务数据
 	AchieveMent          AchieveMentData      //成就数据
diff --git a/src/HttpServer/logic/httpserver.go b/src/HttpServer/logic/httpserver.go
index f02cf02..1deb744 100644
--- a/src/HttpServer/logic/httpserver.go
+++ b/src/HttpServer/logic/httpserver.go
@@ -139,7 +139,7 @@ func startServerHttpServe() {
 	http.HandleFunc("/api/gambling/removeCat", RemoveCat)                   //清除猫
 
 	/////---------------------------------------------------------------------old
-	http.HandleFunc("/happycat/exchangetwoPos", ExchangePos)  //交换位置
+	//http.HandleFunc("/happycat/exchangetwoPos", ExchangePos)  //交换位置
 	http.HandleFunc("/happycat/clickcatbox", ClickCatBox)     //请求点击猫箱子
 	http.HandleFunc("/happycat/upgradecatbox", UpgradeCatBox) //请求点击猫箱子
 	//http.HandleFunc("/happycat/acclecte", AcclecteGold)       //请求点击猫箱子
diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go
index 3afd334..e24648d 100644
--- a/src/HttpServer/logic/logic.go
+++ b/src/HttpServer/logic/logic.go
@@ -792,14 +792,19 @@ func HandlerLimitCatList(w http.ResponseWriter, data string, uuid int) {
 
 		poslist := uinfo.GetLimitCatList()
 
+		nowtime := int(time.Now().Unix())
 		for _, pos := range poslist {
 			if pos > 0 && pos < len(uinfo.PosInfo) {
-				var tmp LimitCatListData
-				tmp.CatId = uinfo.PosInfo[pos].Cat
-				tmp.Status = 0
-				tmp.Cash = uinfo.PosInfo[pos].RedPacket
-				tmp.Date = time.Now().Format("2006-01-02T 15:04:05")
-				resp.Data = append(resp.Data, tmp)
+				//如果可领取了再加入列表
+				if nowtime > uinfo.PosInfo[pos].StartTime+uinfo.PosInfo[pos].Time {
+					var tmp LimitCatListData
+					tmp.CatId = uinfo.PosInfo[pos].Cat
+					tmp.Status = 0
+					tmp.Cash = uinfo.PosInfo[pos].RedPacket
+					tmp.Date = time.Now().Format("2006-01-02T 15:04:05")
+					resp.Data = append(resp.Data, tmp)
+				}
+
 			}
 		}
 
@@ -868,6 +873,7 @@ func HandlerRecvRedCat(w http.ResponseWriter, data string, uuid int) {
 		uinfo.CleadPos(cpos)
 
 		uinfo.CalcGoldRate()
+		uinfo.TodayZhaocai += addredpack
 
 		resp.Data.Num = addredpack
 		resp.Code = 0
--
libgit2 0.21.0