From 6aaca859b60b3bc95fa0b156eb717bf8084c0baf Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Mon, 27 Nov 2023 21:32:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E6=89=8B=E6=8A=BD=E5=8D=A1=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/hero/api_selectcard.go                         |  8 ++++++--
 ...{api_selectgetlist copy.go => api_selectgetlist.go} | 10 ++++++----
 modules/hero/model_select.go                           |  4 +---
 3 files changed, 13 insertions(+), 9 deletions(-)
 rename modules/hero/{api_selectgetlist copy.go => api_selectgetlist.go} (76%)

diff --git a/modules/hero/api_selectcard.go b/modules/hero/api_selectcard.go
index 346206633..b47e7b3db 100644
--- a/modules/hero/api_selectcard.go
+++ b/modules/hero/api_selectcard.go
@@ -82,10 +82,14 @@ func (this *apiComp) SelectCard(session comm.IUserSession, req *pb.HeroSelectCar
 	}
 
 	result.Complete = true
-	//result.Cur = []string{} // 清空数据
+	result.Cur = []string{}  // 清空数据
+	result.Rst1 = []string{} // 清空数据
+	result.Rst2 = []string{} // 清空数据
 	if err = this.module.modelSelect.ChangeHeroSelectData(session.GetUserId(), map[string]interface{}{
 		"complete": result.Complete,
-		//"cur":      result.Cur,
+		"cur":      result.Cur,
+		"rst1":     result.Rst1,
+		"rst2":     result.Rst2,
 	}); err != nil {
 		errdata = &pb.ErrorData{
 			Code:    pb.ErrorCode_DBError,
diff --git a/modules/hero/api_selectgetlist copy.go b/modules/hero/api_selectgetlist.go
similarity index 76%
rename from modules/hero/api_selectgetlist copy.go
rename to modules/hero/api_selectgetlist.go
index be4232b4b..1e5972e9f 100644
--- a/modules/hero/api_selectgetlist copy.go	
+++ b/modules/hero/api_selectgetlist.go
@@ -12,10 +12,10 @@ func (this *apiComp) SelectGetListCheck(session comm.IUserSession, req *pb.HeroS
 
 func (this *apiComp) SelectGetList(session comm.IUserSession, req *pb.HeroSelectGetListReq) (errdata *pb.ErrorData) {
 	var (
-		err error
+		err  error
+		list *pb.DBSelectDraw
 	)
-	rsp := &pb.HeroSelectGetListResp{}
-	if rsp.Data, err = this.module.modelSelect.GetDrawSelectData(session.GetUserId()); err != nil {
+	if list, err = this.module.modelSelect.GetDrawSelectData(session.GetUserId()); err != nil {
 		errdata = &pb.ErrorData{
 			Code:    pb.ErrorCode_DBError,
 			Title:   pb.ErrorCode_DBError.ToString(),
@@ -23,6 +23,8 @@ func (this *apiComp) SelectGetList(session comm.IUserSession, req *pb.HeroSelect
 		}
 		return
 	}
-	session.SendMsg(string(this.module.GetType()), "selectgetlist", rsp)
+	session.SendMsg(string(this.module.GetType()), "selectgetlist", &pb.HeroSelectGetListResp{
+		Data: list,
+	})
 	return
 }
diff --git a/modules/hero/model_select.go b/modules/hero/model_select.go
index d6f86b7dd..8de78cc81 100644
--- a/modules/hero/model_select.go
+++ b/modules/hero/model_select.go
@@ -31,9 +31,7 @@ func (this *ModelSelect) GetDrawSelectData(uid string) (result *pb.DBSelectDraw,
 		if mongo.ErrNoDocuments == err { // 创建一条新的数据
 			result.Id = primitive.NewObjectID().Hex()
 			result.Uid = uid
-
-			this.Add(uid, result)
-			err = nil
+			err = this.Add(uid, result)
 		}
 		return
 	}