Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

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,

modules/hero/api_selectgetlist.go

@@ -13,9 +13,9 @@ 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
+		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
 }

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
 	}