Sfoglia il codice sorgente

Merge branch 'dev_v4.10.3.2_wh' of qmx/jy into hotfix/v4.10.3.2

王浩 5 mesi fa
parent
commit
73d891647a

+ 1 - 1
src/jfw/modules/subscribepay/src/go.mod

@@ -6,7 +6,7 @@ require (
 	app.yhyue.com/moapp/jyResourcesCenter v0.0.0-20250211075100-eb5d7cd299f8
 	app.yhyue.com/moapp/jybase v0.0.0-20250225094323-2f6419d0d916
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v1.32.3
+	app.yhyue.com/moapp/jypkg v1.32.6
 	bp.jydev.jianyu360.cn/BaseService/jyMicroservices v0.0.2
 	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20241213060113-ac41966a58ec
 	bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20230911091604-2faa31032743

+ 2 - 2
src/jfw/modules/subscribepay/src/go.sum

@@ -22,8 +22,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20250225094323-2f6419d0d916/go.mod h1:/HT/UZ4d
 app.yhyue.com/moapp/jyfs v0.0.0-20231024061508-480c270480d4/go.mod h1:61hzZ3dZHXL28BNl8BOgZsvM2S5UVY5YFzOkEUPrSu4=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545 h1:+Lak4m1zgsigQloOsvp8AJ+0XeX/+PGp9QP550xlbBQ=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545/go.mod h1:uFrsdUBFbETiJlEmr4PtJWPsZlUpPj2bHQRhryu6ggk=
-app.yhyue.com/moapp/jypkg v1.32.3 h1:84pjfCkhTfQ3fKeZyNOCpagp3M9hLDDBnoKsoNcef+E=
-app.yhyue.com/moapp/jypkg v1.32.3/go.mod h1:m/OMjugcf4XK5c/2mErxnXEyAZ+WNya8HP0x8jFGw4U=
+app.yhyue.com/moapp/jypkg v1.32.6 h1:SXUCWJbCqANtf37eY+pQAt0cXajmOq4knNyUnWqsCXQ=
+app.yhyue.com/moapp/jypkg v1.32.6/go.mod h1:m/OMjugcf4XK5c/2mErxnXEyAZ+WNya8HP0x8jFGw4U=
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161 h1:WGi4OEIoqw6NpNFGioUEBZnjK9aBa+xJqf/5WY+QyhM=
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161/go.mod h1:0Oj8SB4pVjdCLD28sy2zyM3hS0WHGpNuVcakLW43GmI=
 bp.jydev.jianyu360.cn/BP/jynsq v0.0.0-20220222052708-ebc43af90698/go.mod h1:ojo/AUH9Yr1wzarEjOaNMkj1Cet/9r8IgLyba64Z52E=

+ 4 - 0
src/jfw/modules/subscribepay/src/service/userAccountInfo.go

@@ -623,6 +623,7 @@ func (this *UserAccount) PhoneBind() {
 			if exists { //再次校验是否使用
 				return nil, fmt.Errorf("手机号已被绑定")
 			}
+			log.Println("4444", mode, relationPhoneId)
 			if mode == "" || relationPhoneId == "" { //主动绑定-建立双向绑定关系||跳转绑定新手机号
 				if relationPhoneId == "" {
 					//船新用户 查看是否有邀请关系 shareRedisName
@@ -655,6 +656,7 @@ func (this *UserAccount) PhoneBind() {
 				}
 				// 新用户注册 记录来源
 				sourceLabel := redis.GetStr("limitation", fmt.Sprintf("firstVisitTagByWX_%s", this.Session().Id()))
+				log.Println("111", sourceLabel)
 				if sourceLabel != "" {
 					data["s_rsource"] = sourceLabel
 				} else {
@@ -663,6 +665,8 @@ func (this *UserAccount) PhoneBind() {
 						data["s_rsource"] = activity
 					}
 				}
+				log.Println("222", this.GetString("activity"))
+				log.Println("333", userId, relationPhoneId, phoneVerify, email, &data)
 				if jy.IsEmail(email) {
 					data["s_email"] = email
 				}