From 504fbd447c1418724ea05ff1b874fed8cf21bbf6 Mon Sep 17 00:00:00 2001
From: 陆恒 <luheng@puchigames.com>
Date: Sat, 20 Jun 2020 16:28:13 +0800
Subject: [PATCH] 提交

---
 src/HttpServer/logic/datadef.go  | 20 ++++++++++----------
 src/HttpServer/logic/function.go |  6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/HttpServer/logic/datadef.go b/src/HttpServer/logic/datadef.go
index 3a1f5c7..f967dd9 100644
--- a/src/HttpServer/logic/datadef.go
+++ b/src/HttpServer/logic/datadef.go
@@ -730,16 +730,16 @@ type LimitListDesc struct {
 }
 
 type GetMainPageInfoData struct {
-	LimitCatList    []int        `json:"limitCatList"`
-	CatList         []CatPosInfo `json:"catList"`
-	Coin            DoBuyCatCoin `json:"coin"`
-	AdRate          adRateData   `json:"adRate"`
-	Level           int          `json:"level"`
-	TotalCashReward float32      `json:"totalCashReward"`
-	Guide           bool         `json:"guide"`
-	Redbagnum       int          `json:"redbagnum"`
-	Flyboxnum       int          `json:"flyboxnum"`
-	Leftredbagnum   int          `json:"leftredbagnum"`
+	LimitCatList    []LimitListDesc `json:"limitCatList"`
+	CatList         []CatPosInfo    `json:"catList"`
+	Coin            DoBuyCatCoin    `json:"coin"`
+	AdRate          adRateData      `json:"adRate"`
+	Level           int             `json:"level"`
+	TotalCashReward float32         `json:"totalCashReward"`
+	Guide           bool            `json:"guide"`
+	Redbagnum       int             `json:"redbagnum"`
+	Flyboxnum       int             `json:"flyboxnum"`
+	Leftredbagnum   int             `json:"leftredbagnum"`
 }
 
 type GetMainPageInfoResp struct {
diff --git a/src/HttpServer/logic/function.go b/src/HttpServer/logic/function.go
index 7ca1b4f..4e88ee2 100644
--- a/src/HttpServer/logic/function.go
+++ b/src/HttpServer/logic/function.go
@@ -1019,8 +1019,8 @@ func (u *UserData) CalcHigestCatName() string {
 }
 
 //获取红包猫列表
-func (u *UserData) GetRedCatIdList() []int {
-	var rtsl []int
+func (u *UserData) GetRedCatIdList() []LimitListDesc {
+	var rtsl []LimitListDesc
 	nowtime := int(time.Now().Unix())
 	for _, val := range u.PosInfo {
 		if val.Cat > REDCATIDEXTRA && val.Cat < BOXGIFTEXTRA {
@@ -1031,7 +1031,7 @@ func (u *UserData) GetRedCatIdList() []int {
 					var tmp LimitListDesc
 					tmp.Cat = val.Cat
 					tmp.Money = val.RedPacket
-					rtsl = append(rtsl, val.Cat)
+					rtsl = append(rtsl, tmp)
 					//需要删除
 					u.CleadPos(val.Position)
 				}
--
libgit2 0.21.0