From 9066d1f190ceef179976712a3503723c48e38c0a Mon Sep 17 00:00:00 2001
From: 陆恒 <luheng@puchigames.com>
Date: Tue, 23 Jun 2020 16:58:53 +0800
Subject: [PATCH] 提交

---
 src/HttpServer/logic/logic.go | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go
index 6fecf7e..ffc11c6 100644
--- a/src/HttpServer/logic/logic.go
+++ b/src/HttpServer/logic/logic.go
@@ -85,8 +85,8 @@ func HandlerSettlement(w http.ResponseWriter, data string, uuid int) {
 			if idx != -1 {
 				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 {
+					uinfo1, err := GetUserInfo(strconv.Itoa(vval.UserId))
+					if err != nil || uinfo1 == nil {
 						continue
 					}
 					var tmp UserCaiPiaoHistory
@@ -95,7 +95,7 @@ func HandlerSettlement(w http.ResponseWriter, data string, uuid int) {
 					tmp.CatId, _ = strconv.Atoi(cid)
 					tmp.Round = rdata.Round
 					tmp.Cnum = vval.ChooseNum
-					uinfo.CaiPiaoInfo = append(uinfo.CaiPiaoInfo, tmp)
+					uinfo1.CaiPiaoInfo = append(uinfo1.CaiPiaoInfo, tmp)
 
 					if vval.ChooseNum == tmp.RewardNum {
 						list[idx].RewardUser = vval.UserId
@@ -104,7 +104,7 @@ func HandlerSettlement(w http.ResponseWriter, data string, uuid int) {
 						cfg := jsonconf.GetRedCatConfig(48)
 						if cfg != nil {
 
-							uinfo.AddRedPackect(cfg.Money, 100)
+							uinfo1.AddRedPackect(cfg.Money, 100)
 						}
 
 					}
@@ -131,18 +131,19 @@ func HandlerSettlement(w http.ResponseWriter, data string, uuid int) {
 			rewarduser := 0
 			if curr.CurRound == rdata.Round {
 				for _, vval := range curr.List {
-					uinfo, err := GetUserInfo(strconv.Itoa(vval.UserId))
-					logger.Info("HandlerSettlement111111111111 uinfo.CaiPiaoInfo=%+v", uinfo.CaiPiaoInfo)
-					if err != nil || uinfo == nil {
+					uinfo2, err := GetUserInfo(strconv.Itoa(vval.UserId))
+
+					if err != nil || uinfo2 == nil {
 						continue
 					}
+					logger.Info("HandlerSettlement111111111111 uinfo.CaiPiaoInfo=%+v", uinfo2.CaiPiaoInfo)
 					var tmp UserCaiPiaoHistory
 					tmp.RewardNum, _ = strconv.Atoi(rdata.RewardNum)
 					cid := strconv.Itoa(rdata.Round) + strconv.Itoa(vval.ChooseNum)
 					tmp.CatId, _ = strconv.Atoi(cid)
 					tmp.Round = rdata.Round
 					tmp.Cnum = vval.ChooseNum
-					uinfo.CaiPiaoInfo = append(uinfo.CaiPiaoInfo, tmp)
+					uinfo2.CaiPiaoInfo = append(uinfo2.CaiPiaoInfo, tmp)
 
 					if vval.ChooseNum == tmp.RewardNum {
 						rewarduser = vval.UserId
@@ -151,13 +152,13 @@ func HandlerSettlement(w http.ResponseWriter, data string, uuid int) {
 						cfg := jsonconf.GetRedCatConfig(48)
 						if cfg != nil {
 
-							uinfo.AddRedPackect(cfg.Money, 100)
+							uinfo2.AddRedPackect(cfg.Money, 100)
 						}
 
 					}
 
-					logger.Info("HandlerSettlement2222222222222222222 uinfo.CaiPiaoInfo=%+v", uinfo.CaiPiaoInfo)
-					err = SaveUserInfo(uinfo, strconv.Itoa(vval.UserId))
+					logger.Info("HandlerSettlement2222222222222222222 uinfo.CaiPiaoInfo=%+v", uinfo2.CaiPiaoInfo)
+					err = SaveUserInfo(uinfo2, strconv.Itoa(vval.UserId))
 					if err != nil {
 						logger.Error("HandlerSettlement err=%v", err)
 					}
--
libgit2 0.21.0