From 4ec85bbb73b3b9d21f17b5181b1e60ed0a8fa501 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Mon, 12 Aug 2019 10:59:01 +0800
Subject: [PATCH] =?UTF-8?q?-=20RegisterUser=E5=9C=A8=E5=B7=B2=E7=BB=8F?=
 =?UTF-8?q?=E6=89=BE=E5=88=B0=E7=9B=B8=E5=BA=94=E6=89=8B=E6=9C=BA=E5=8F=B7?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=AD=A3=E5=BC=8F=E7=99=BB=E5=BD=95=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/user2.go | 12 ++++--------
 business/model/error_code.go  |  3 ++-
 controllers/cms_user2.go      |  2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go
index fd1b9028d..944ce7b0f 100644
--- a/business/jxstore/cms/user2.go
+++ b/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) {
-	errCode = model.ErrCodeGeneralFailed
+func RegisterUser(user *model.User, mobileVerifyCode string, inAuthInfo *auth2.AuthInfo) (outAuthInfo *auth2.AuthInfo, err error) {
 	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 {
-		errCode = model.ErrCodeSuccess
-	}
-	return outAuthInfo, errCode, err
+	return outAuthInfo, err
 }
 
 func GetUserBindAuthInfo(ctx *jxcontext.Context) (authList []*model.AuthBind, err error) {
diff --git a/business/model/error_code.go b/business/model/error_code.go
index 188f5fa80..3afb079f1 100644
--- a/business/model/error_code.go
+++ b/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 (
diff --git a/controllers/cms_user2.go b/controllers/cms_user2.go
index dfa7fdb28..6750786cf 100644
--- a/controllers/cms_user2.go
+++ b/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