From 95abf5628f36612d89e24b81077884515209404a Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Thu, 23 Nov 2023 10:02:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=98=B5=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/user/api_create.go | 45 ++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/modules/user/api_create.go b/modules/user/api_create.go
index 8a610cbdd..2f8a8af92 100644
--- a/modules/user/api_create.go
+++ b/modules/user/api_create.go
@@ -62,19 +62,22 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (e
 	}
 
 	//查询昵称是否重复
-	// if ok := this.module.modelUser.NickNameIsExist(req.NickName); !ok {
-	// 	errdata = &pb.ErrorData{
-	// 		Code:  pb.ErrorCode_UserNickNameExist,
-	// 		Title: pb.ErrorCode_UserNickNameExist.ToString(),
-	// 	}
-	// 	return
-	// }
+	if req.NickName != "" {
+		if ok := this.module.modelUser.NickNameIsExist(req.NickName); !ok {
+			errdata = &pb.ErrorData{
+				Code:  pb.ErrorCode_UserNickNameExist,
+				Title: pb.ErrorCode_UserNickNameExist.ToString(),
+			}
+			return
+		}
+	}
+
 	update := map[string]interface{}{
-		// "name":    req.NickName, //设置昵称
-		"created": true,       //创角标识
-		"figure":  req.Figure, //设置形象
-		"gender":  req.Gender, //设置性别
-		"ps":      0,          //设置初始体力 调整未0 由策划初始表发放
+		"name":    req.NickName, //设置昵称
+		"created": true,         //创角标识
+		"figure":  req.Figure,   //设置形象
+		"gender":  req.Gender,   //设置性别
+		"ps":      0,            //设置初始体力 调整未0 由策划初始表发放
 	}
 	globalConf := this.module.globalConf
 	if req.Gender == 0 {
@@ -95,14 +98,6 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (e
 		)
 		return
 	}
-
-	tasks = append(tasks, comm.GetBuriedParam(comm.Rtype72, 1))
-	session.SendMsg(string(this.module.GetType()), UserSubTypeCreate, &pb.UserCreateResp{
-		NickName: req.NickName,
-		Figure:   req.Figure,
-		Gender:   req.Gender,
-		Award:    award,
-	})
 	//初始化创角资源
 	if val, err := this.module.configure.GetGlobalInitConf(); err == nil {
 		for _, v := range val.GetDataList() {
@@ -112,13 +107,21 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (e
 			this.module.Error("发放资源失败!", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "err", Value: errdata.String()})
 		}
 	}
+	tasks = append(tasks, comm.GetBuriedParam(comm.Rtype72, 1))
+	session.SendMsg(string(this.module.GetType()), UserSubTypeCreate, &pb.UserCreateResp{
+		NickName: req.NickName,
+		Figure:   req.Figure,
+		Gender:   req.Gender,
+		Award:    award,
+	})
+
 	//异步逻辑
 	go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
 		this.mail.SendMailByCid(session, comm.Welcomemail, nil)
 		if len(tasks) > 0 {
 			this.module.ModuleBuried.TriggerBuried(session, tasks...)
 		}
-		this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "UserCreateReq", res)
+		this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "UserCreateReq", award)
 	})
 	return
 }