From c46238836a11b56ebb65ba9844a30177b822f6c1 Mon Sep 17 00:00:00 2001
From: 陆恒 <luheng@puchigames.com>
Date: Tue, 23 Jun 2020 17:24:03 +0800
Subject: [PATCH] 提交

---
 src/HttpServer/logic/datadef.go    |  4 ++++
 src/HttpServer/logic/httpserver.go |  2 +-
 src/HttpServer/logic/logic.go      | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
 3 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/src/HttpServer/logic/datadef.go b/src/HttpServer/logic/datadef.go
index 061e43e..63a41a3 100644
--- a/src/HttpServer/logic/datadef.go
+++ b/src/HttpServer/logic/datadef.go
@@ -632,6 +632,10 @@ type ChooseNumResp struct {
 	Data    ChooseNumData `json:"data"`
 }
 
+type RemoveCatReq struct {
+	CatId int `json:"catId"`
+}
+
 type TakeWareHouseReq struct {
 	CatId string `json:"catId"`
 }
diff --git a/src/HttpServer/logic/httpserver.go b/src/HttpServer/logic/httpserver.go
index 052d9ec..7d373d2 100644
--- a/src/HttpServer/logic/httpserver.go
+++ b/src/HttpServer/logic/httpserver.go
@@ -60,7 +60,7 @@ func StartHttpTicker() {
 
 									var tmp UserCaiPiaoHistory
 									tmp.RewardNum = waits[k].RewardNum
-									cid := strconv.Itoa(waits[k].CurRound) + strconv.Itoa(waits[k].RewardNum)
+									cid := strconv.Itoa(waits[k].CurRound) + strconv.Itoa(vval.ChooseNum)
 									tmp.CatId, _ = strconv.Atoi(cid)
 									tmp.Round = waits[k].CurRound
 									tmp.Cnum = vval.ChooseNum
diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go
index 51f72e8..10541e3 100644
--- a/src/HttpServer/logic/logic.go
+++ b/src/HttpServer/logic/logic.go
@@ -2507,9 +2507,32 @@ func HandlerRemoveCat(w http.ResponseWriter, data string, uuid int) {
 
 	resp.Code = 0
 	resp.Message = "success"
-
+	var rdata RemoveCatReq
+	err := json.Unmarshal([]byte(data), &rdata)
+	if err != nil {
+		logger.Info("json decode HandlerRemoveCat data failed:%v", err, " for:%v", data)
+		resp.Message = "json unmarshal failed"
+		resp.Code = 1
+		respstr, _ := json.Marshal(&resp)
+		fmt.Fprint(w, string(respstr))
+		return
+	}
 	for {
+		uinfo, err := GetUserInfo(strconv.Itoa(uuid))
+		if err != nil || uinfo == nil {
+			logger.Error("HandlerRemoveCat getuserinfo failed=%v", err)
+			resp.Code = 1
+			resp.Message = "get userinfo failed"
+			break
+		}
+
+		for i := 0; i < len(uinfo.CaiPiaoInfo); i++ {
+			if uinfo.CaiPiaoInfo[i].CatId == rdata.CatId {
+				uinfo.CaiPiaoInfo = append(uinfo.CaiPiaoInfo[:i], uinfo.CaiPiaoInfo[i+1:]...)
+			}
+		}
 
+		SaveUserInfo(uinfo, strconv.Itoa(uuid))
 		resp.Code = 0
 
 		break
@@ -2828,12 +2851,32 @@ func HandlerQueryGambling(w http.ResponseWriter, data string, uuid int) {
 			break
 		}
 
-		//先查询已开奖的
 		for _, vv := range uinfo.CaiPiaoInfo {
+
+			//先查询中奖者
+			rewardnickname := ""
+			rewardhead := ""
+			ss, err := redishandler.GetRedisClient().HGet(redis.CAIPIAOKAIJIANGHISTORY_KEY, strconv.Itoa(vv.Round))
+			if err != nil {
+				logger.Error("HandlerQueryGambling err =%v", err)
+				continue
+			}
+			var his AlreadyDuboCatList
+			json.Unmarshal([]byte(ss), &his)
+			hisinfo, err := GetUserInfo(strconv.Itoa(his.RewardUser))
+			if err == nil && hisinfo != nil {
+				rewardhead = hisinfo.Head
+				rewardnickname = hisinfo.NickName
+			} else {
+				//todo
+				rewardhead = "1"
+				rewardnickname = "他的爸爸"
+			}
+
 			var tmp QueryGamblingData
 			tmp.CatId = vv.CatId
-			tmp.Nickname = uinfo.NickName
-			tmp.HeadImg = uinfo.Head
+			tmp.Nickname = rewardnickname
+			tmp.HeadImg = rewardhead
 			tmp.MyNumber = vv.Cnum
 			tmp.RewardNumber = vv.RewardNum
 			tmp.Round = vv.Round
--
libgit2 0.21.0