diff --git a/src/HttpServer/logic/datadef.go b/src/HttpServer/logic/datadef.go index 7421ef5..a72a3d4 100644 --- a/src/HttpServer/logic/datadef.go +++ b/src/HttpServer/logic/datadef.go @@ -257,6 +257,7 @@ type QueryrankinfoResp struct { type QuerydrawrewardData struct { Getgold int `json:"getgold"` Walletgold int `json:"walletgold"` + Rewardid int `json:"rewardid"` } type QuerydrawrewardResp struct { diff --git a/src/HttpServer/logic/function.go b/src/HttpServer/logic/function.go index fe0b166..b32f2dd 100644 --- a/src/HttpServer/logic/function.go +++ b/src/HttpServer/logic/function.go @@ -1041,8 +1041,9 @@ func AddCoinToSdk(uuid int, goldnum int, gameid string, channel string, atype in } //计算转盘抽奖 -func CalcTurnTableNum() int { +func CalcTurnTableNum() (int, int) { rtnum := 0 + rtid := 0 sumrate := 0 tmprate := 0 @@ -1066,12 +1067,18 @@ func CalcTurnTableNum() int { if idx == -1 { if len(cflist) > 0 { rtnum = cflist[0].Desc + rtid = 0 } } else { - rtnum = cflist[idx].Desc + if cflist[idx].Type == 101 { + rtnum = cflist[idx].Desc + } else { + rtnum = 0 + } + rtid = idx } - return rtnum + return rtnum, rtid } //计算福袋金额 diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go index 0050cba..2de4b70 100644 --- a/src/HttpServer/logic/logic.go +++ b/src/HttpServer/logic/logic.go @@ -508,7 +508,7 @@ func HandlerQuerydrawreward(w http.ResponseWriter, data string, uniqueuuid, game break } - addgold := CalcTurnTableNum() + addgold, rewardid := CalcTurnTableNum() if addgold == 0 { logger.Info("GetUserInfo HandlerQuerydrawreward data failed:%v,for:%v", err, data) @@ -535,6 +535,7 @@ func HandlerQuerydrawreward(w http.ResponseWriter, data string, uniqueuuid, game SaveUserInfo(uinfo, uniqueuuid) resp.Data.Getgold = addgold resp.Data.Walletgold = uinfo.RealGold + resp.Data.Rewardid = rewardid resp.Code = ERROR_OK break -- libgit2 0.21.0