修复订阅

internal/logic/public/user/bindEmailWithVerificationLogic.go

@@ -112,26 +112,20 @@ func (l *BindEmailWithVerificationLogic) BindEmailWithVerification(req *types.Bi
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.FamilyAlreadyBound), "email already bound to current user")
 	}
 
-	if err = familyHelper.validateJoinFamily(existingMethod.UserId, u.Id); err != nil {
+	mergeHelper := newAccountMergeHelper(l.ctx, l.svcCtx)
+	if _, err = mergeHelper.mergeIntoOwner(existingMethod.UserId, u.Id, "bind_email_with_verification"); err != nil {
 		return nil, err
 	}
-	joinResult, err := familyHelper.joinFamily(existingMethod.UserId, u.Id, "bind_email_with_verification")
-	if err != nil {
-		return nil, err
-	}
-	token, err := l.refreshBindSessionToken(u.Id)
+	token, err := l.refreshBindSessionToken(existingMethod.UserId)
 	if err != nil {
 		return nil, err
 	}
 
 	return &types.BindEmailWithVerificationResponse{
-		Success:      true,
-		Message:      "joined family successfully",
-		Token:        token,
-		UserId:       u.Id,
-		FamilyJoined: true,
-		FamilyId:     joinResult.FamilyId,
-		OwnerUserId:  joinResult.OwnerUserId,
+		Success: true,
+		Message: "email bound successfully",
+		Token:   token,
+		UserId:  existingMethod.UserId,
 	}, nil
 }