Merge branch 'dev_v4.10.5_wh' of qmx/jy into feature/v4.10.5

src/jfw/modules/subscribepay/src/service/userAccountInfo.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	jycaptcha "app.yhyue.com/moapp/jybase/captcha"
 	"bytes"
 	"context"
 	"database/sql"
@@ -20,7 +21,6 @@ import (
 	"github.com/gogf/gf/v2/util/gconv"
 
 	. "app.yhyue.com/moapp/jybase/api"
-	jycaptcha "app.yhyue.com/moapp/jybase/captcha"
 	qutil "app.yhyue.com/moapp/jybase/common"
 	. "app.yhyue.com/moapp/jybase/date"
 	"app.yhyue.com/moapp/jybase/dchest/captcha"
@@ -594,6 +594,7 @@ func (this *UserAccount) Authentication(doType string) {
 //       A账户已绑定微信，此微信必须与当前账户绑定的微信一致
 
 func (this *UserAccount) PhoneBind() {
+	log.Println("绑定手机号开始1")
 	sessVal := this.Session().GetMultiple()
 	userId, _ := sessVal["mgoUserId"].(string)
 	step, _ := this.GetInteger("step")
@@ -649,6 +650,7 @@ func (this *UserAccount) PhoneBind() {
 				return "", fmt.Errorf("获取账户信息异常")
 			}
 			exists, relationPhoneId, _ := jy.NewPhoneUtil(util.MQFW).BindPhoneIsOccupy(userId, unionid, phoneVerify)
+			log.Println("绑定手机号开始2", exists, relationPhoneId)
 			if exists { //再次校验是否使用
 				return nil, fmt.Errorf("手机号已被绑定")
 			}
@@ -726,6 +728,7 @@ func (this *UserAccount) PhoneBind() {
 					if jy.IsEmail(email) {
 						data["s_email"] = email
 					}
+					log.Println("绑定手机号开始3", relationPhoneId, data)
 					if util.Compatible.Update(relationPhoneId, map[string]interface{}{
 						"$set": data,
 					}) {
@@ -754,6 +757,8 @@ func (this *UserAccount) PhoneBind() {
 								}
 								backData[k] = v
 							}
+							log.Println("绑定手机号开始4", backData)
+
 							if util.MQFW.Save("user_merge", backData) != "" {
 								util.MQFW.Del("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(userId)})
 								jy.CreateUserMerge(util.MQFW, util.Mysql, this.Session(), config.Middleground).FlushSession(relationPhoneId)