From 8bc95d1e979cd19a6176067e65105db4dfdccd27 Mon Sep 17 00:00:00 2001
From: 陆恒 <luheng@puchigames.com>
Date: Wed, 24 Jun 2020 09:48:40 +0800
Subject: [PATCH] 提交

---
 src/HttpServer/logic/function.go |  4 ++--
 src/HttpServer/logic/logic.go    | 12 ++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/HttpServer/logic/function.go b/src/HttpServer/logic/function.go
index 9b7b653..361b927 100644
--- a/src/HttpServer/logic/function.go
+++ b/src/HttpServer/logic/function.go
@@ -438,12 +438,12 @@ func (u *UserData) DoFlopCardd(resp *DoFlopResp) {
 		addgold = u.Goldrate * 45 * 60
 	case FLOPTYPE_FENCAT15MIN:
 		catid = 14 + REDCATIDEXTRA
-		ctime = 15 * 60
+		ctime = 40 //15 * 60
 		catfg = jsonconf.GetRedCatConfig(catid)
 		u.SetRedCatPos(catid, ctime, catfg.Money, nowt)
 	case FLOPTYPE_FENCAT10MIN:
 		catid = 13 + REDCATIDEXTRA
-		ctime = 10 * 60
+		ctime = 20 //10 * 60
 		catfg = jsonconf.GetRedCatConfig(catid)
 		u.SetRedCatPos(catid, ctime, catfg.Money, nowt)
 	case FLOPTYPE_REDCAT:
diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go
index 981ef2f..664ec04 100644
--- a/src/HttpServer/logic/logic.go
+++ b/src/HttpServer/logic/logic.go
@@ -1745,9 +1745,9 @@ func HandlerLimitCatList(w http.ResponseWriter, data string, uuid int) {
 			break
 		}
 
-		poslist := uinfo.GetLimitCatList()
+		poslist := uinfo.GetRedCatIdList()
 		logger.Info("HandlerLimitCatList poslist=%+v", poslist)
-		nowtime := int(time.Now().Unix())
+		/*nowtime := int(time.Now().Unix())
 		for _, pos := range poslist {
 			if pos >= 0 && pos < len(uinfo.PosInfo) {
 				//如果可领取了再加入列表
@@ -1766,6 +1766,14 @@ func HandlerLimitCatList(w http.ResponseWriter, data string, uuid int) {
 				}
 
 			}
+		}*/
+		for _, v := range poslist {
+			var tmp LimitCatListData
+			tmp.CatId = v.Cat
+			tmp.Status = 0
+			tmp.Cash = v.Money
+			tmp.Date = time.Now().Format("2006-01-02T 15:04:05")
+			resp.Data = append(resp.Data, tmp)
 		}
 
 		resp.Code = 0
--
libgit2 0.21.0