Commit 0d5ec86049a00e3517d75ee5d0de4fb0b7af9709
1 parent
7f857c59
Exists in
master
提交
Showing
3 changed files
with
14 additions
and
12 deletions
Show diff stats
src/HttpServer/logic/datadef.go
| @@ -46,8 +46,8 @@ type AddFlopResp struct { | @@ -46,8 +46,8 @@ type AddFlopResp struct { | ||
| 46 | } | 46 | } |
| 47 | 47 | ||
| 48 | type SettlementReq struct { | 48 | type SettlementReq struct { |
| 49 | - Round int `json:"round"` | ||
| 50 | - RewardNum int `json:"rewardNum"` | 49 | + Round int `json:"round"` |
| 50 | + RewardNum string `json:"rewardNum"` | ||
| 51 | } | 51 | } |
| 52 | 52 | ||
| 53 | type SettlementData struct { | 53 | type SettlementData struct { |
src/HttpServer/logic/httpserver.go
| @@ -31,7 +31,7 @@ func StartHttpTicker() { | @@ -31,7 +31,7 @@ func StartHttpTicker() { | ||
| 31 | floatval := float32(randint) / 100 | 31 | floatval := float32(randint) / 100 |
| 32 | G_randVal = 180 + floatval | 32 | G_randVal = 180 + floatval |
| 33 | } | 33 | } |
| 34 | - if time.Now().Hour() > 12 && time.Now().Minute() >= 5 { | 34 | + if time.Now().Hour() == 12 && time.Now().Minute() < 10 { |
| 35 | //处理开奖 | 35 | //处理开奖 |
| 36 | logger.Info("Handle kaijian") | 36 | logger.Info("Handle kaijian") |
| 37 | waits := GetWaitCaiCatList() | 37 | waits := GetWaitCaiCatList() |
src/HttpServer/logic/logic.go
| @@ -83,20 +83,21 @@ func HandlerSettlement(w http.ResponseWriter, data string, uuid int) { | @@ -83,20 +83,21 @@ func HandlerSettlement(w http.ResponseWriter, data string, uuid int) { | ||
| 83 | } | 83 | } |
| 84 | 84 | ||
| 85 | if idx != -1 { | 85 | if idx != -1 { |
| 86 | - list[idx].RewardNum = rdata.RewardNum | 86 | + list[idx].RewardNum, _ = strconv.Atoi(rdata.RewardNum) |
| 87 | for _, vval := range list[idx].List { | 87 | for _, vval := range list[idx].List { |
| 88 | uinfo, err := GetUserInfo(strconv.Itoa(vval.UserId)) | 88 | uinfo, err := GetUserInfo(strconv.Itoa(vval.UserId)) |
| 89 | if err != nil || uinfo == nil { | 89 | if err != nil || uinfo == nil { |
| 90 | continue | 90 | continue |
| 91 | } | 91 | } |
| 92 | var tmp UserCaiPiaoHistory | 92 | var tmp UserCaiPiaoHistory |
| 93 | - tmp.RewardNum = rdata.RewardNum | ||
| 94 | - tmp.CatId = 48 | 93 | + tmp.RewardNum, _ = strconv.Atoi(rdata.RewardNum) |
| 94 | + cid := strconv.Itoa(list[idx].CurRound) + rdata.RewardNum | ||
| 95 | + tmp.CatId, _ = strconv.Atoi(cid) | ||
| 95 | tmp.Round = rdata.Round | 96 | tmp.Round = rdata.Round |
| 96 | tmp.Cnum = vval.ChooseNum | 97 | tmp.Cnum = vval.ChooseNum |
| 97 | uinfo.CaiPiaoInfo = append(uinfo.CaiPiaoInfo, tmp) | 98 | uinfo.CaiPiaoInfo = append(uinfo.CaiPiaoInfo, tmp) |
| 98 | 99 | ||
| 99 | - if vval.ChooseNum == rdata.RewardNum { | 100 | + if vval.ChooseNum == tmp.RewardNum { |
| 100 | list[idx].RewardUser = vval.UserId | 101 | list[idx].RewardUser = vval.UserId |
| 101 | 102 | ||
| 102 | //给这个玩家发奖 | 103 | //给这个玩家发奖 |
| @@ -115,7 +116,7 @@ func HandlerSettlement(w http.ResponseWriter, data string, uuid int) { | @@ -115,7 +116,7 @@ func HandlerSettlement(w http.ResponseWriter, data string, uuid int) { | ||
| 115 | 116 | ||
| 116 | var tmp AlreadyDuboCatList | 117 | var tmp AlreadyDuboCatList |
| 117 | tmp.CurRound = rdata.Round | 118 | tmp.CurRound = rdata.Round |
| 118 | - tmp.RewardNum = rdata.RewardNum | 119 | + tmp.RewardNum, _ = strconv.Atoi(rdata.RewardNum) |
| 119 | tmp.List = append(tmp.List, list[idx].List...) | 120 | tmp.List = append(tmp.List, list[idx].List...) |
| 120 | tmp.RewardUser = list[idx].RewardUser | 121 | tmp.RewardUser = list[idx].RewardUser |
| 121 | tmp.TimeStr = int(time.Now().Unix()) | 122 | tmp.TimeStr = int(time.Now().Unix()) |
| @@ -135,12 +136,13 @@ func HandlerSettlement(w http.ResponseWriter, data string, uuid int) { | @@ -135,12 +136,13 @@ func HandlerSettlement(w http.ResponseWriter, data string, uuid int) { | ||
| 135 | continue | 136 | continue |
| 136 | } | 137 | } |
| 137 | var tmp UserCaiPiaoHistory | 138 | var tmp UserCaiPiaoHistory |
| 138 | - tmp.RewardNum = rdata.RewardNum | ||
| 139 | - tmp.CatId = 48 | 139 | + tmp.RewardNum, _ = strconv.Atoi(rdata.RewardNum) |
| 140 | + cid := strconv.Itoa(rdata.Round) + rdata.RewardNum | ||
| 141 | + tmp.CatId, _ = strconv.Atoi(cid) | ||
| 140 | tmp.Round = rdata.Round | 142 | tmp.Round = rdata.Round |
| 141 | tmp.Cnum = vval.ChooseNum | 143 | tmp.Cnum = vval.ChooseNum |
| 142 | uinfo.CaiPiaoInfo = append(uinfo.CaiPiaoInfo, tmp) | 144 | uinfo.CaiPiaoInfo = append(uinfo.CaiPiaoInfo, tmp) |
| 143 | - if vval.ChooseNum == rdata.RewardNum { | 145 | + if vval.ChooseNum == tmp.RewardNum { |
| 144 | rewarduser = vval.UserId | 146 | rewarduser = vval.UserId |
| 145 | 147 | ||
| 146 | //给这个玩家发奖 | 148 | //给这个玩家发奖 |
| @@ -156,7 +158,7 @@ func HandlerSettlement(w http.ResponseWriter, data string, uuid int) { | @@ -156,7 +158,7 @@ func HandlerSettlement(w http.ResponseWriter, data string, uuid int) { | ||
| 156 | 158 | ||
| 157 | var tmp AlreadyDuboCatList | 159 | var tmp AlreadyDuboCatList |
| 158 | tmp.CurRound = rdata.Round | 160 | tmp.CurRound = rdata.Round |
| 159 | - tmp.RewardNum = rdata.RewardNum | 161 | + tmp.RewardNum, _ = strconv.Atoi(rdata.RewardNum) |
| 160 | tmp.List = append(tmp.List, curr.List...) | 162 | tmp.List = append(tmp.List, curr.List...) |
| 161 | tmp.RewardUser = rewarduser | 163 | tmp.RewardUser = rewarduser |
| 162 | tmp.TimeStr = int(time.Now().Unix()) | 164 | tmp.TimeStr = int(time.Now().Unix()) |