Commit c46238836a11b56ebb65ba9844a30177b822f6c1
1 parent
c5090769
Exists in
master
提交
Showing
3 changed files
with
52 additions
and
5 deletions
Show diff stats
src/HttpServer/logic/datadef.go
| @@ -632,6 +632,10 @@ type ChooseNumResp struct { | @@ -632,6 +632,10 @@ type ChooseNumResp struct { | ||
| 632 | Data ChooseNumData `json:"data"` | 632 | Data ChooseNumData `json:"data"` |
| 633 | } | 633 | } |
| 634 | 634 | ||
| 635 | +type RemoveCatReq struct { | ||
| 636 | + CatId int `json:"catId"` | ||
| 637 | +} | ||
| 638 | + | ||
| 635 | type TakeWareHouseReq struct { | 639 | type TakeWareHouseReq struct { |
| 636 | CatId string `json:"catId"` | 640 | CatId string `json:"catId"` |
| 637 | } | 641 | } |
src/HttpServer/logic/httpserver.go
| @@ -60,7 +60,7 @@ func StartHttpTicker() { | @@ -60,7 +60,7 @@ func StartHttpTicker() { | ||
| 60 | 60 | ||
| 61 | var tmp UserCaiPiaoHistory | 61 | var tmp UserCaiPiaoHistory |
| 62 | tmp.RewardNum = waits[k].RewardNum | 62 | tmp.RewardNum = waits[k].RewardNum |
| 63 | - cid := strconv.Itoa(waits[k].CurRound) + strconv.Itoa(waits[k].RewardNum) | 63 | + cid := strconv.Itoa(waits[k].CurRound) + strconv.Itoa(vval.ChooseNum) |
| 64 | tmp.CatId, _ = strconv.Atoi(cid) | 64 | tmp.CatId, _ = strconv.Atoi(cid) |
| 65 | tmp.Round = waits[k].CurRound | 65 | tmp.Round = waits[k].CurRound |
| 66 | tmp.Cnum = vval.ChooseNum | 66 | tmp.Cnum = vval.ChooseNum |
src/HttpServer/logic/logic.go
| @@ -2507,9 +2507,32 @@ func HandlerRemoveCat(w http.ResponseWriter, data string, uuid int) { | @@ -2507,9 +2507,32 @@ func HandlerRemoveCat(w http.ResponseWriter, data string, uuid int) { | ||
| 2507 | 2507 | ||
| 2508 | resp.Code = 0 | 2508 | resp.Code = 0 |
| 2509 | resp.Message = "success" | 2509 | resp.Message = "success" |
| 2510 | - | 2510 | + var rdata RemoveCatReq |
| 2511 | + err := json.Unmarshal([]byte(data), &rdata) | ||
| 2512 | + if err != nil { | ||
| 2513 | + logger.Info("json decode HandlerRemoveCat data failed:%v", err, " for:%v", data) | ||
| 2514 | + resp.Message = "json unmarshal failed" | ||
| 2515 | + resp.Code = 1 | ||
| 2516 | + respstr, _ := json.Marshal(&resp) | ||
| 2517 | + fmt.Fprint(w, string(respstr)) | ||
| 2518 | + return | ||
| 2519 | + } | ||
| 2511 | for { | 2520 | for { |
| 2521 | + uinfo, err := GetUserInfo(strconv.Itoa(uuid)) | ||
| 2522 | + if err != nil || uinfo == nil { | ||
| 2523 | + logger.Error("HandlerRemoveCat getuserinfo failed=%v", err) | ||
| 2524 | + resp.Code = 1 | ||
| 2525 | + resp.Message = "get userinfo failed" | ||
| 2526 | + break | ||
| 2527 | + } | ||
| 2528 | + | ||
| 2529 | + for i := 0; i < len(uinfo.CaiPiaoInfo); i++ { | ||
| 2530 | + if uinfo.CaiPiaoInfo[i].CatId == rdata.CatId { | ||
| 2531 | + uinfo.CaiPiaoInfo = append(uinfo.CaiPiaoInfo[:i], uinfo.CaiPiaoInfo[i+1:]...) | ||
| 2532 | + } | ||
| 2533 | + } | ||
| 2512 | 2534 | ||
| 2535 | + SaveUserInfo(uinfo, strconv.Itoa(uuid)) | ||
| 2513 | resp.Code = 0 | 2536 | resp.Code = 0 |
| 2514 | 2537 | ||
| 2515 | break | 2538 | break |
| @@ -2828,12 +2851,32 @@ func HandlerQueryGambling(w http.ResponseWriter, data string, uuid int) { | @@ -2828,12 +2851,32 @@ func HandlerQueryGambling(w http.ResponseWriter, data string, uuid int) { | ||
| 2828 | break | 2851 | break |
| 2829 | } | 2852 | } |
| 2830 | 2853 | ||
| 2831 | - //先查询已开奖的 | ||
| 2832 | for _, vv := range uinfo.CaiPiaoInfo { | 2854 | for _, vv := range uinfo.CaiPiaoInfo { |
| 2855 | + | ||
| 2856 | + //先查询中奖者 | ||
| 2857 | + rewardnickname := "" | ||
| 2858 | + rewardhead := "" | ||
| 2859 | + ss, err := redishandler.GetRedisClient().HGet(redis.CAIPIAOKAIJIANGHISTORY_KEY, strconv.Itoa(vv.Round)) | ||
| 2860 | + if err != nil { | ||
| 2861 | + logger.Error("HandlerQueryGambling err =%v", err) | ||
| 2862 | + continue | ||
| 2863 | + } | ||
| 2864 | + var his AlreadyDuboCatList | ||
| 2865 | + json.Unmarshal([]byte(ss), &his) | ||
| 2866 | + hisinfo, err := GetUserInfo(strconv.Itoa(his.RewardUser)) | ||
| 2867 | + if err == nil && hisinfo != nil { | ||
| 2868 | + rewardhead = hisinfo.Head | ||
| 2869 | + rewardnickname = hisinfo.NickName | ||
| 2870 | + } else { | ||
| 2871 | + //todo | ||
| 2872 | + rewardhead = "1" | ||
| 2873 | + rewardnickname = "他的爸爸" | ||
| 2874 | + } | ||
| 2875 | + | ||
| 2833 | var tmp QueryGamblingData | 2876 | var tmp QueryGamblingData |
| 2834 | tmp.CatId = vv.CatId | 2877 | tmp.CatId = vv.CatId |
| 2835 | - tmp.Nickname = uinfo.NickName | ||
| 2836 | - tmp.HeadImg = uinfo.Head | 2878 | + tmp.Nickname = rewardnickname |
| 2879 | + tmp.HeadImg = rewardhead | ||
| 2837 | tmp.MyNumber = vv.Cnum | 2880 | tmp.MyNumber = vv.Cnum |
| 2838 | tmp.RewardNumber = vv.RewardNum | 2881 | tmp.RewardNumber = vv.RewardNum |
| 2839 | tmp.Round = vv.Round | 2882 | tmp.Round = vv.Round |