diff --git a/src/HttpServer/logic/datadef.go b/src/HttpServer/logic/datadef.go index d425254..061e43e 100644 --- a/src/HttpServer/logic/datadef.go +++ b/src/HttpServer/logic/datadef.go @@ -46,8 +46,8 @@ type AddFlopResp struct { } type SettlementReq struct { - Round int `json:"round"` - RewardNum int `json:"rewardNum"` + Round int `json:"round"` + RewardNum string `json:"rewardNum"` } type SettlementData struct { diff --git a/src/HttpServer/logic/httpserver.go b/src/HttpServer/logic/httpserver.go index 235c578..aa32aa2 100644 --- a/src/HttpServer/logic/httpserver.go +++ b/src/HttpServer/logic/httpserver.go @@ -31,7 +31,7 @@ func StartHttpTicker() { floatval := float32(randint) / 100 G_randVal = 180 + floatval } - if time.Now().Hour() > 12 && time.Now().Minute() >= 5 { + if time.Now().Hour() == 12 && time.Now().Minute() < 10 { //处理开奖 logger.Info("Handle kaijian") waits := GetWaitCaiCatList() diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go index a204c80..002cc5d 100644 --- a/src/HttpServer/logic/logic.go +++ b/src/HttpServer/logic/logic.go @@ -83,20 +83,21 @@ func HandlerSettlement(w http.ResponseWriter, data string, uuid int) { } if idx != -1 { - list[idx].RewardNum = rdata.RewardNum + list[idx].RewardNum, _ = strconv.Atoi(rdata.RewardNum) for _, vval := range list[idx].List { uinfo, err := GetUserInfo(strconv.Itoa(vval.UserId)) if err != nil || uinfo == nil { continue } var tmp UserCaiPiaoHistory - tmp.RewardNum = rdata.RewardNum - tmp.CatId = 48 + tmp.RewardNum, _ = strconv.Atoi(rdata.RewardNum) + cid := strconv.Itoa(list[idx].CurRound) + rdata.RewardNum + tmp.CatId, _ = strconv.Atoi(cid) tmp.Round = rdata.Round tmp.Cnum = vval.ChooseNum uinfo.CaiPiaoInfo = append(uinfo.CaiPiaoInfo, tmp) - if vval.ChooseNum == rdata.RewardNum { + if vval.ChooseNum == tmp.RewardNum { list[idx].RewardUser = vval.UserId //给这个玩家发奖 @@ -115,7 +116,7 @@ func HandlerSettlement(w http.ResponseWriter, data string, uuid int) { var tmp AlreadyDuboCatList tmp.CurRound = rdata.Round - tmp.RewardNum = rdata.RewardNum + tmp.RewardNum, _ = strconv.Atoi(rdata.RewardNum) tmp.List = append(tmp.List, list[idx].List...) tmp.RewardUser = list[idx].RewardUser tmp.TimeStr = int(time.Now().Unix()) @@ -135,12 +136,13 @@ func HandlerSettlement(w http.ResponseWriter, data string, uuid int) { continue } var tmp UserCaiPiaoHistory - tmp.RewardNum = rdata.RewardNum - tmp.CatId = 48 + tmp.RewardNum, _ = strconv.Atoi(rdata.RewardNum) + cid := strconv.Itoa(rdata.Round) + rdata.RewardNum + tmp.CatId, _ = strconv.Atoi(cid) tmp.Round = rdata.Round tmp.Cnum = vval.ChooseNum uinfo.CaiPiaoInfo = append(uinfo.CaiPiaoInfo, tmp) - if vval.ChooseNum == rdata.RewardNum { + if vval.ChooseNum == tmp.RewardNum { rewarduser = vval.UserId //给这个玩家发奖 @@ -156,7 +158,7 @@ func HandlerSettlement(w http.ResponseWriter, data string, uuid int) { var tmp AlreadyDuboCatList tmp.CurRound = rdata.Round - tmp.RewardNum = rdata.RewardNum + tmp.RewardNum, _ = strconv.Atoi(rdata.RewardNum) tmp.List = append(tmp.List, curr.List...) tmp.RewardUser = rewarduser tmp.TimeStr = int(time.Now().Unix()) -- libgit2 0.21.0