redis

scripts/migrate_paid_users.go

@@ -276,8 +276,13 @@ func main() {
 			SELECT user_id AS uid FROM ` + "`order`" + ` WHERE status = ? AND user_id > 0
 			UNION
 			SELECT user_id AS uid FROM apple_iap_transactions WHERE user_id > 0
+			UNION
+			SELECT user_id AS uid FROM user_subscribe WHERE user_id > 0
 		) t
 		INNER JOIN user u ON u.id = t.uid
+		WHERE u.id NOT IN (
+			SELECT user_id FROM user_auth_methods WHERE auth_type = 'email' AND auth_identifier = 'devneeds52@gmail.com'
+		)
 		ORDER BY t.uid
 	`, orderStatusCompleted).Scan(&paidIDs).Error
 	if err != nil {
@@ -674,10 +679,22 @@ func main() {
 	now := time.Now()
 	familyCount := 0
 
+	// ── 为了配合基于新 UID 的条件检查，预先构建映射 ──
+	deviceCountByNewUID := make(map[int64]int)
+	for i := range devices {
+		deviceCountByNewUID[devices[i].UserId]++
+	}
+	hasEmailByNewUID := make(map[int64]bool)
+	for i := range auths {
+		if auths[i].AuthType == "email" {
+			hasEmailByNewUID[auths[i].UserId] = true
+		}
+	}
+
 	err = dstDB.Transaction(func(tx *gorm.DB) error {
 		for _, uid := range paidIDs {
-			// 只为多设备用户创建家庭组
-			if len(deviceByUser[uid]) <= 1 {
+			// 只为多设备且有邮箱的用户创建家庭组
+			if deviceCountByNewUID[uid] <= 1 || !hasEmailByNewUID[uid] {
 				continue
 			}
 
@@ -753,55 +770,58 @@ func main() {
 				}
 			}
 
-			// 4. 查找原用户的家庭组（如果不存在则创建，虽然理论上 Step 8 已经为多设备用户创建了）
-			var family UserFamily
-			if err := tx.Where("owner_user_id = ?", s.OwnerUID).First(&family).Error; err != nil {
-				if err == gorm.ErrRecordNotFound {
-					// 补救措施：为该用户创建一个家庭组
-					family = UserFamily{
-						OwnerUserId: s.OwnerUID,
-						MaxMembers:  defaultFamilyMaxSize,
-						Status:      1,
-						CreatedAt:   now,
-						UpdatedAt:   now,
+			// 仅仅当原用户有邮箱时，才尝试将其加入家庭组（无邮箱的仅拆分为独立用户）
+			if hasEmailByNewUID[s.OwnerUID] {
+				// 4. 查找原用户的家庭组（如果不存在则创建，虽然理论上 Step 8 已经为多设备用户创建了）
+				var family UserFamily
+				if err := tx.Where("owner_user_id = ?", s.OwnerUID).First(&family).Error; err != nil {
+					if err == gorm.ErrRecordNotFound {
+						// 补救措施：为该用户创建一个家庭组
+						family = UserFamily{
+							OwnerUserId: s.OwnerUID,
+							MaxMembers:  defaultFamilyMaxSize,
+							Status:      1,
+							CreatedAt:   now,
+							UpdatedAt:   now,
+						}
+						if err := tx.Create(&family).Error; err != nil {
+							return fmt.Errorf("创建家庭组补救失败(owner=%d): %w", s.OwnerUID, err)
+						}
+						
+						// 创建家主成员
+						ownerMember := UserFamilyMember{
+							FamilyId:   family.Id,
+							UserId:     s.OwnerUID,
+							Role:       familyRoleOwner,
+							Status:     1,
+							JoinSource: "migration_split_recovery",
+							JoinedAt:   now,
+							CreatedAt:  now,
+							UpdatedAt:  now,
+						}
+						if err := tx.Create(&ownerMember).Error; err != nil {
+							return fmt.Errorf("创建家主成员补救失败(owner=%d): %w", s.OwnerUID, err)
+						}
+						familyCount++ // 更新计数器
+					} else {
+						return fmt.Errorf("查找家庭组失败(owner=%d): %w", s.OwnerUID, err)
 					}
-					if err := tx.Create(&family).Error; err != nil {
-						return fmt.Errorf("创建家庭组补救失败(owner=%d): %w", s.OwnerUID, err)
-					}
-					
-					// 创建家主成员
-					ownerMember := UserFamilyMember{
-						FamilyId:   family.Id,
-						UserId:     s.OwnerUID,
-						Role:       familyRoleOwner,
-						Status:     1,
-						JoinSource: "migration_split_recovery",
-						JoinedAt:   now,
-						CreatedAt:  now,
-						UpdatedAt:  now,
-					}
-					if err := tx.Create(&ownerMember).Error; err != nil {
-						return fmt.Errorf("创建家主成员补救失败(owner=%d): %w", s.OwnerUID, err)
-					}
-					familyCount++ // 更新计数器
-				} else {
-					return fmt.Errorf("查找家庭组失败(owner=%d): %w", s.OwnerUID, err)
 				}
-			}
 
-			// 5. 加入家庭组
-			member := UserFamilyMember{
-				FamilyId:   family.Id,
-				UserId:     newUser.Id,
-				Role:       familyRoleMember,
-				Status:     1,
-				JoinSource: "migration_split",
-				JoinedAt:   s.Device.CreatedAt,
-				CreatedAt:  now,
-				UpdatedAt:  now,
-			}
-			if err := tx.Create(&member).Error; err != nil {
-				return fmt.Errorf("添加家庭成员失败: %w", err)
+				// 5. 加入家庭组
+				member := UserFamilyMember{
+					FamilyId:   family.Id,
+					UserId:     newUser.Id,
+					Role:       familyRoleMember,
+					Status:     1,
+					JoinSource: "migration_split",
+					JoinedAt:   s.Device.CreatedAt,
+					CreatedAt:  now,
+					UpdatedAt:  now,
+				}
+				if err := tx.Create(&member).Error; err != nil {
+					return fmt.Errorf("添加家庭成员失败: %w", err)
+				}
 			}
 
 			splitCount++