提交

陆恒
1 parent db07d5e8
Showing 3 changed files with 13 additions and 4 deletions Show diff stats
src/HttpServer/logic/datadef.go
src/HttpServer/logic/function.go
src/HttpServer/logic/logic.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 {
@@ -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
 }
  
 //计算福袋金额
@@ -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
...	...	@@ -257,6 +257,7 @@ type QueryrankinfoResp struct {
257	257	type QuerydrawrewardData struct {
258	258	Getgold int `json:"getgold"`
259	259	Walletgold int `json:"walletgold"`
	260	+ Rewardid int `json:"rewardid"`
260	261	}
261	262
262	263	type QuerydrawrewardResp struct {
...	...
...	...	@@ -1041,8 +1041,9 @@ func AddCoinToSdk(uuid int, goldnum int, gameid string, channel string, atype in
1041	1041	}
1042	1042
1043	1043	//计算转盘抽奖
1044		-func CalcTurnTableNum() int {
	1044	+func CalcTurnTableNum() (int, int) {
1045	1045	rtnum := 0
	1046	+ rtid := 0
1046	1047
1047	1048	sumrate := 0
1048	1049	tmprate := 0
...	...	@@ -1066,12 +1067,18 @@ func CalcTurnTableNum() int {
1066	1067	if idx == -1 {
1067	1068	if len(cflist) > 0 {
1068	1069	rtnum = cflist[0].Desc
	1070	+ rtid = 0
1069	1071	}
1070	1072	} else {
1071		- rtnum = cflist[idx].Desc
	1073	+ if cflist[idx].Type == 101 {
	1074	+ rtnum = cflist[idx].Desc
	1075	+ } else {
	1076	+ rtnum = 0
	1077	+ }
	1078	+ rtid = idx
1072	1079	}
1073	1080
1074		- return rtnum
	1081	+ return rtnum, rtid
1075	1082	}
1076	1083
1077	1084	//计算福袋金额
...	...
...	...	@@ -508,7 +508,7 @@ func HandlerQuerydrawreward(w http.ResponseWriter, data string, uniqueuuid, game
508	508	break
509	509	}
510	510
511		- addgold := CalcTurnTableNum()
	511	+ addgold, rewardid := CalcTurnTableNum()
512	512
513	513	if addgold == 0 {
514	514	logger.Info("GetUserInfo HandlerQuerydrawreward data failed:%v,for:%v", err, data)
...	...	@@ -535,6 +535,7 @@ func HandlerQuerydrawreward(w http.ResponseWriter, data string, uniqueuuid, game
535	535	SaveUserInfo(uinfo, uniqueuuid)
536	536	resp.Data.Getgold = addgold
537	537	resp.Data.Walletgold = uinfo.RealGold
	538	+ resp.Data.Rewardid = rewardid
538	539
539	540	resp.Code = ERROR_OK
540	541	break
...	...