- more detail error info 4 RegisterUser

business/auth2/auth2.go

@@ -86,6 +86,8 @@ var (
 	ErrInternalErrror         = errors.New("内部错误")
 	ErrTokenIsInvalid         = errors.New("Token非法")
 	ErrUserAlreadyExist       = errors.New("用户已经存在")
+	ErrUserMobileAlreadyExist = errors.New("用户手机已经存在")
+	ErrUserID2AlreadyExist    = errors.New("用户标识已经存在")
 	ErrUserNotExist           = errors.New("用户不存在")
 	ErrIllegalAuthType        = errors.New("非法的登录类型")
 	ErrAuthTypeAlreadyExist   = errors.New("要登录类型已经存在")

business/jxstore/cms/user2.go

@@ -39,14 +39,15 @@ func init() {
 	auth2.Init(userProvider)
 }
 
-func RegisterUser(user *model.User, mobileVerifyCode string, inAuthInfo *auth2.AuthInfo) (outAuthInfo *auth2.AuthInfo, err error) {
+func RegisterUser(user *model.User, mobileVerifyCode string, inAuthInfo *auth2.AuthInfo) (outAuthInfo *auth2.AuthInfo, errCode string, err error) {
+	errCode = model.ErrCodeGeneralFailed
 	if user == nil || user.UserID2 == "" || user.Name == "" || user.Mobile == "" {
-		return nil, ErrUserIDAndNameMustGiven
+		return nil, model.ErrCodeGeneralFailed, ErrUserIDAndNameMustGiven
 	}
 	mobileAuth, err2 := auth2.Login(auth2.AuthTypeMobile, user.Mobile, auth2.UserIDNone, mobileVerifyCode)
 	if err = err2; err == nil {
 		if mobileAuth.IUser != nil {
-			return nil, auth2.ErrUserAlreadyExist
+			return nil, model.ErrCodeUserAlreadyExist, auth2.ErrUserMobileAlreadyExist
 		}
 		dao.WrapAddIDCULDEntity(user, "RegisterUser")
 		user.UserID = utils.GetUUID()
@@ -55,9 +56,14 @@ func RegisterUser(user *model.User, mobileVerifyCode string, inAuthInfo *auth2.A
 			if outAuthInfo, err = auth2.BindUser(mobileAuth, user); err == nil && inAuthInfo != nil {
 				err = auth2.AddAuthBind(outAuthInfo, inAuthInfo)
 			}
+		} else if dao.IsDuplicateError(err) {
+			errCode = model.ErrCodeUserAlreadyExist
 		}
 	}
-	return outAuthInfo, err
+	if err == nil {
+		errCode = model.ErrCodeSuccess
+	}
+	return outAuthInfo, errCode, err
 }
 
 func GetUserBindAuthInfo(ctx *jxcontext.Context) (authList []*model.AuthBind, err error) {

business/model/error_code.go

@@ -9,6 +9,7 @@ const (
 	ErrCodeGeneralFailed    = "-1"
 	ErrCodeTokenIsInvalid   = "-2"
 	ErrCodeUserNotExist     = "-3"
+	ErrCodeUserAlreadyExist = "-4"
 )
 
 var (

business/model/user.go

@@ -20,7 +20,7 @@ func (*User) TableUnique() [][]string {
 	return [][]string{
 		[]string{"UserID", "DeletedAt"},
 		[]string{"UserID2", "DeletedAt"},
-		[]string{"Name", "DeletedAt"},
+		// []string{"Name", "DeletedAt"},
 		[]string{"Mobile", "DeletedAt"},
 		// []string{"Email", "DeletedAt"},
 		// []string{"IDCardNo", "DeletedAt"},

controllers/cms_user2.go

@@ -33,10 +33,10 @@ func (c *User2Controller) RegisterUser() {
 		}
 		if err == nil {
 			if err = jxutils.Strings2Objs(params.Payload, &user); err == nil {
-				retVal, err = cms.RegisterUser(&user, params.MobileVerifyCode, inAuthInfo)
+				retVal, errCode, err = cms.RegisterUser(&user, params.MobileVerifyCode, inAuthInfo)
 			}
 		}
-		return retVal, "", err
+		return retVal, errCode, err
 	})
 }