usermanager

business/jxstore/cms/user2.go

@@ -124,23 +124,18 @@ func init() {
 func RegisterUserWithMobile(ctx *jxcontext.Context, user *model.User, mobileVerifyCode string, inAuthInfo, manTokenInfo *auth2.AuthInfo) (outAuthInfo *auth2.AuthInfo, err error) {
 	var mobileAuth *auth2.AuthInfo
 	fakeMobile := false
-	user.Type = model.UserTypeConsumer | model.UserTypeStoreBoss // 先不区分商户与消息者
 	createName := ctx.GetRealRemoteIP()
 	authType := auth2.AuthTypeMobile
 	if manTokenInfo != nil && mobileVerifyCode == "" {
-		manUser, err2 := dao.GetUserByID(dao.GetDB(), "user_id", manTokenInfo.GetID())
+		_, err2 := dao.GetUserByID(dao.GetDB(), "user_id", manTokenInfo.GetID())
 		if err = err2; err != nil {
 			return nil, err
 		}
-		if manUser.Type&(model.UserTypeOperator|model.UserTypeBoss) == 0 {
-			return nil, fmt.Errorf("管理员才能添加商户")
-		}
 		if utils.Pointer2String(user.Mobile) == "" {
 			return nil, fmt.Errorf("管理员添加必须指定用户手机号")
 		}
 		mobileVerifyCode = auth2.InternalAuthSecret
 		fakeMobile = true
-		user.Type |= model.UserTypeStoreBoss
 		createName = manTokenInfo.GetName()
 	}
 
@@ -171,11 +166,6 @@ func RegisterUserWithMobile(ctx *jxcontext.Context, user *model.User, mobileVeri
 	}
 
 	if inAuthInfo != nil {
-		if inAuthInfo.AuthBindInfo.Type == dingding.AuthTypeStaff {
-			user.Type |= model.UserTypeOperator
-		} else if user.Mobile != nil {
-			user.Type |= model.UserTypeStoreBoss
-		}
 		createName += "," + inAuthInfo.GetAuthID()
 		authType = inAuthInfo.GetAuthType()
 		if user.Avatar == "" {
@@ -596,8 +586,13 @@ func InvestMember(ctx *jxcontext.Context, memberID int) (errCode string, err err
 func UpdateUser(ctx *jxcontext.Context, payload map[string]interface{}) (err error) {
 	var (
 		db     = dao.GetDB()
-		userID = ctx.GetUserID()
+		userID string
 	)
+	if payload["userID"] != nil {
+		userID = payload["userID"].(string)
+	} else {
+		userID = ctx.GetUserID()
+	}
 	user := &model.User{
 		UserID: userID,
 	}