Quellcode durchsuchen

fix:微信绑定了其他账户时,提示信息调整

Roc vor 3 Jahren
Ursprung
Commit
78bbb14719
3 geänderte Dateien mit 18 neuen und 4 gelöschten Zeilen
  1. 4 1
      controllers/user.go
  2. 4 1
      controllers/user_pc.go
  3. 10 2
      services/user.go

+ 4 - 1
controllers/user.go

@@ -328,9 +328,12 @@ func (this *UserNotAuthController) Login() {
 		br.ErrMsg = "无效的登录方式,Err:" + err.Error()
 		return
 	}
-	user, err = services.BindWxUser(openId, req.Mobile, req.Email, req.AreaNum, 1)
+	user, errMsg, err := services.BindWxUser(openId, req.Mobile, req.Email, req.AreaNum, 1)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "登录失败,系统处理中,请稍后重试"
+		if errMsg != `` {
+			br.Msg = errMsg
+		}
 		br.ErrMsg = "登录失败:" + err.Error()
 		return
 	}

+ 4 - 1
controllers/user_pc.go

@@ -500,9 +500,12 @@ func (this *UserPcNotAuthController) PcBind() {
 		return
 	}
 
-	user, err := services.BindWxUser(openId, req.Mobile, req.Email, req.AreaNum, 2)
+	user, errMsg, err := services.BindWxUser(openId, req.Mobile, req.Email, req.AreaNum, 2)
 	if err != nil {
 		br.Msg = "绑定失败:" + err.Error()
+		if errMsg != `` {
+			br.Msg = errMsg
+		}
 		return
 	}
 	userId := user.UserId

+ 10 - 2
services/user.go

@@ -158,8 +158,8 @@ func formatWxUser(wxUser *models.WxUserItem, platform int) {
 	return
 }
 
-//用户绑定
-func BindWxUser(openid, mobile, email string, areaNum, registerPlatform int) (wxUser *models.WxUserItem, err error) {
+// BindWxUser 用户绑定
+func BindWxUser(openid, mobile, email string, areaNum, registerPlatform int) (wxUser *models.WxUserItem, errMsg string, err error) {
 	source := 1 //绑定来源,1:微信端,2:pc网页端,3:查研观向小程序,4:每日咨询
 	if mobile == "" && email == "" {
 		err = errors.New("手机号或邮箱必填一个")
@@ -234,6 +234,14 @@ func BindWxUser(openid, mobile, email string, areaNum, registerPlatform int) (wx
 	//如果存在该手机号/邮箱,那么需要校验
 	if userRecord.UserId > 0 && userRecord.UserId != userId {
 		err = errors.New(fmt.Sprint("用户已绑定其他账户,已绑定的用户编号:", userRecord.UserId, ",不允许重复绑定"))
+		currUser, _ := models.GetWxUserItemByUserId(userRecord.UserId)
+		if currUser != nil {
+			currBindAccount := currUser.Mobile
+			if currBindAccount == `` {
+				currBindAccount = currUser.Email
+			}
+			errMsg = "微信已绑定其它账户:" + currBindAccount
+		}
 		return
 	}
 	if userRecord.UserId == 0 {