From a6194027a6c019945376f9a3a9a6379b5fb3236d Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Thu, 10 Aug 2023 11:04:31 +0800
Subject: [PATCH] update

---
 modules/uigame/api_latticefinish.go | 37 ++++++++++++++---------------
 modules/uigame/api_puzzlereward.go  | 30 +++++++++++------------
 2 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/modules/uigame/api_latticefinish.go b/modules/uigame/api_latticefinish.go
index 1f59a00a2..2c42cbc0d 100644
--- a/modules/uigame/api_latticefinish.go
+++ b/modules/uigame/api_latticefinish.go
@@ -26,32 +26,31 @@ func (this *apiComp) LatticeFinish(session comm.IUserSession, req *pb.UiGameLatt
 		atno []*pb.UserAtno
 	)
 	list, _ := this.module.modelLattice.getLatticeList(session.GetUserId(), req.Hdid)
-	if conf, err := this.module.configure.GetLatticeConsumConf(); err != nil {
+	conf, err := this.module.configure.GetLatticeConsumConf()
+	if err != nil {
 		errdata = &pb.ErrorData{
 			Code:    pb.ErrorCode_ConfigNoFound,
 			Title:   pb.ErrorCode_ConfigNoFound.ToString(),
 			Message: err.Error(),
 		}
 		return
-	} else {
-		list, _ := this.module.modelLattice.getLatticeList(session.GetUserId(), req.Hdid)
-		if list.BReward {
-			errdata = &pb.ErrorData{
-				Code:  pb.ErrorCode_ActivityRepatReward,
-				Title: pb.ErrorCode_ActivityRepatReward.ToString(),
-			}
-			return
-		}
-
-		if errdata, atno = this.module.DispenseAtno(session, conf.Reward, true); errdata != nil {
-			return
-		}
-		// 记录数据
-		list.BReward = true
-		update := make(map[string]interface{}, 0)
-		update["bReward"] = list.BReward
-		this.module.modelLattice.modifyLatticeListByObjId(session.GetUserId(), update) // 修改进度
 	}
+	if list.BReward {
+		errdata = &pb.ErrorData{
+			Code:  pb.ErrorCode_ActivityRepatReward,
+			Title: pb.ErrorCode_ActivityRepatReward.ToString(),
+		}
+		return
+	}
+
+	if errdata, atno = this.module.DispenseAtno(session, conf.Reward, true); errdata != nil {
+		return
+	}
+	// 记录数据
+	list.BReward = true
+	update := make(map[string]interface{}, 0)
+	update["bReward"] = list.BReward
+	this.module.modelLattice.modifyLatticeListByObjId(session.GetUserId(), update) // 修改进度
 
 	session.SendMsg(string(this.module.GetType()), "latticefinish", &pb.UiGameLatticeFinishResp{
 		Data: list,
diff --git a/modules/uigame/api_puzzlereward.go b/modules/uigame/api_puzzlereward.go
index c0ec2a8be..05d580600 100644
--- a/modules/uigame/api_puzzlereward.go
+++ b/modules/uigame/api_puzzlereward.go
@@ -21,29 +21,29 @@ func (this *apiComp) PuzzleReward(session comm.IUserSession, req *pb.UiGamePuzzl
 		atno []*pb.UserAtno
 	)
 	list, _ := this.module.modelPuzzle.getPuzzleList(session.GetUserId(), req.Hdid)
-	if conf, err := this.module.configure.GetPuzzleConf(req.PuzzleId); err != nil {
+	conf, err := this.module.configure.GetPuzzleConf(req.PuzzleId)
+	if err != nil {
 		errdata = &pb.ErrorData{
 			Code:    pb.ErrorCode_ConfigNoFound,
 			Title:   pb.ErrorCode_ConfigNoFound.ToString(),
 			Message: err.Error(),
 		}
 		return
-	} else {
-		list, _ := this.module.modelPuzzle.getPuzzleList(session.GetUserId(), req.Hdid)
-		if _, ok := list.Gotarr[req.PuzzleId]; ok {
-			return
-		}
-
-		if errdata, atno = this.module.DispenseAtno(session, conf.Puzzleward, true); errdata != nil {
-			return
-		}
-		// 记录数据
-		list.Gotarr[req.PuzzleId] = 1
-		update := make(map[string]interface{}, 0)
-		update["gotarr"] = list.Gotarr
-		this.module.modelPuzzle.modifyPuzzleListByObjId(session.GetUserId(), update) // 修改进度
 	}
 
+	if _, ok := list.Gotarr[req.PuzzleId]; ok {
+		return
+	}
+
+	if errdata, atno = this.module.DispenseAtno(session, conf.Puzzleward, true); errdata != nil {
+		return
+	}
+	// 记录数据
+	list.Gotarr[req.PuzzleId] = 1
+	update := make(map[string]interface{}, 0)
+	update["gotarr"] = list.Gotarr
+	this.module.modelPuzzle.modifyPuzzleListByObjId(session.GetUserId(), update) // 修改进度
+
 	session.SendMsg(string(this.module.GetType()), "puzzlereward", &pb.UiGamePuzzleRewardResp{
 		Data: list,
 		Atno: atno,