- RegisterUser在已经找到相应手机号用户的情况下，返回正式登录信息

business/jxstore/cms/user2.go

@@ -12,6 +12,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/auth2/authprovider/dingding"
 	"git.rosy.net.cn/jx-callback/business/authz"
 	"git.rosy.net.cn/jx-callback/business/authz/autils"
+	"git.rosy.net.cn/jx-callback/business/jxutils/jsonerr"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
@@ -81,12 +82,11 @@ func init() {
 	auth2.Init(userProvider)
 }
 
-func RegisterUser(user *model.User, mobileVerifyCode string, inAuthInfo *auth2.AuthInfo) (outAuthInfo *auth2.AuthInfo, errCode string, err error) {
+func RegisterUser(user *model.User, mobileVerifyCode string, inAuthInfo *auth2.AuthInfo) (outAuthInfo *auth2.AuthInfo, err error) {
-	errCode = model.ErrCodeGeneralFailed
 	mobileAuth, err2 := auth2.Login(auth2.AuthTypeMobile, user.Mobile, auth2.UserIDMobile, mobileVerifyCode)
 	if err = err2; err == nil {
 		if !mobileAuth.IsUserEmpty() {
-			return nil, model.ErrCodeUserAlreadyExist, auth2.ErrUserMobileAlreadyExist
+			return nil, jsonerr.New(mobileAuth, model.ErrCodeJsonActSkuConflict)
 		}
 		user.Type = model.UserTypeConsumer
 		if inAuthInfo.AuthBindInfo.Type == dingding.AuthTypeStaff {
@@ -97,14 +97,10 @@ func RegisterUser(user *model.User, mobileVerifyCode string, inAuthInfo *auth2.A
 				err = auth2.AddAuthBind(&outAuthInfo.UserBasic, inAuthInfo)
 			}
 		} else if dao.IsDuplicateError(err) {
-			errCode = model.ErrCodeUserAlreadyExist
 			err = auth2.ErrUserID2AlreadyExist
 		}
 	}
-	if err == nil {
+	return outAuthInfo, err
-		errCode = model.ErrCodeSuccess
-	}
-	return outAuthInfo, errCode, err
 }
 
 func GetUserBindAuthInfo(ctx *jxcontext.Context) (authList []*model.AuthBind, err error) {

business/model/error_code.go

@@ -9,11 +9,12 @@ const (
 	ErrCodeGeneralFailed    = "-1"
 	ErrCodeTokenIsInvalid   = "-2"
 	ErrCodeUserNotExist     = "-3"
-	ErrCodeUserAlreadyExist = "-4"
+	ErrCodeUserAlreadyExist = "-4" // 用户已经存在错，但不能成功登录
 
 	ErrCodeJsonActSkuConflict        = "-101" // 这个错误号表示description中的是一个json对象，不是错误文本
 	ErrCodeJsonActPriceTooLarger     = "-102" // 这个错误号表示description中的是一个json对象，不是错误文本
 	ErrCodeJsonActEarningPriceIsZero = "-103"
+	ErrCodeJsonUserAlreadyExist      = "-104" // 用户已经存在错，且能成功登录
 )
 
 var (

controllers/cms_user2.go

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