提交

陆恒
1 parent 6f4f6448
Showing 2 changed files with 13 additions and 13 deletions Show diff stats
src/HttpServer/logic/datadef.go
src/HttpServer/logic/function.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 {
@@ -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)
 				}
...	...	@@ -730,16 +730,16 @@ type LimitListDesc struct {
730	730	}
731	731
732	732	type GetMainPageInfoData struct {
733		- LimitCatList []int `json:"limitCatList"`
734		- CatList []CatPosInfo `json:"catList"`
735		- Coin DoBuyCatCoin `json:"coin"`
736		- AdRate adRateData `json:"adRate"`
737		- Level int `json:"level"`
738		- TotalCashReward float32 `json:"totalCashReward"`
739		- Guide bool `json:"guide"`
740		- Redbagnum int `json:"redbagnum"`
741		- Flyboxnum int `json:"flyboxnum"`
742		- Leftredbagnum int `json:"leftredbagnum"`
	733	+ LimitCatList []LimitListDesc `json:"limitCatList"`
	734	+ CatList []CatPosInfo `json:"catList"`
	735	+ Coin DoBuyCatCoin `json:"coin"`
	736	+ AdRate adRateData `json:"adRate"`
	737	+ Level int `json:"level"`
	738	+ TotalCashReward float32 `json:"totalCashReward"`
	739	+ Guide bool `json:"guide"`
	740	+ Redbagnum int `json:"redbagnum"`
	741	+ Flyboxnum int `json:"flyboxnum"`
	742	+ Leftredbagnum int `json:"leftredbagnum"`
743	743	}
744	744
745	745	type GetMainPageInfoResp struct {
...	...
...	...	@@ -1019,8 +1019,8 @@ func (u *UserData) CalcHigestCatName() string {
1019	1019	}
1020	1020
1021	1021	//获取红包猫列表
1022		-func (u *UserData) GetRedCatIdList() []int {
1023		- var rtsl []int
	1022	+func (u *UserData) GetRedCatIdList() []LimitListDesc {
	1023	+ var rtsl []LimitListDesc
1024	1024	nowtime := int(time.Now().Unix())
1025	1025	for _, val := range u.PosInfo {
1026	1026	if val.Cat > REDCATIDEXTRA && val.Cat < BOXGIFTEXTRA {
...	...	@@ -1031,7 +1031,7 @@ func (u *UserData) GetRedCatIdList() []int {
1031	1031	var tmp LimitListDesc
1032	1032	tmp.Cat = val.Cat
1033	1033	tmp.Money = val.RedPacket
1034		- rtsl = append(rtsl, val.Cat)
	1034	+ rtsl = append(rtsl, tmp)
1035	1035	//需要删除
1036	1036	u.CleadPos(val.Position)
1037	1037	}
...	...