邮箱修复

internal/logic/public/user/deleteAccountLogic.go

@@ -47,6 +47,25 @@ func (l *DeleteAccountLogic) DeleteAccountAll() (resp *types.DeleteAccountRespon
 	// 事务前先查出 AuthMethods，用于事务后精确清缓存
 	authMethods, _ := l.svcCtx.UserModel.FindUserAuthMethods(l.ctx, currentUser.Id)
 
+	// 事务前查出家庭关系，判断当前用户是否为 member 且 owner 是邮箱用户
+	var familyOwnerUserID int64
+	if relation, relErr := l.findActiveFamilyRelation(currentUser.Id); relErr == nil && relation.Role == user.FamilyRoleMember {
+		// 当前用户是 member，查 owner
+		var ownerMember user.UserFamilyMember
+		if ownerErr := l.svcCtx.DB.WithContext(l.ctx).
+			Model(&user.UserFamilyMember{}).
+			Where("family_id = ? AND role = ? AND status = ?", relation.FamilyId, user.FamilyRoleOwner, user.FamilyMemberActive).
+			First(&ownerMember).Error; ownerErr == nil {
+			familyOwnerUserID = ownerMember.UserId
+		}
+	}
+
+	// 事务前查出 owner 的 AuthMethods（用于事务后清缓存）
+	var ownerAuthMethods []*user.AuthMethods
+	if familyOwnerUserID > 0 {
+		ownerAuthMethods, _ = l.svcCtx.UserModel.FindUserAuthMethods(l.ctx, familyOwnerUserID)
+	}
+
 	affectedUserIDs := []int64{currentUser.Id}
 	err = l.svcCtx.UserModel.Transaction(l.ctx, func(tx *gorm.DB) error {
 		familyUserIDs, collectErr := l.collectAffectedFamilyUserIDs(tx, currentUser.Id)
@@ -70,6 +89,36 @@ func (l *DeleteAccountLogic) DeleteAccountAll() (resp *types.DeleteAccountRespon
 			return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "delete user subscribes failed")
 		}
 
+		// 如果 owner（邮箱用户）没有其他活跃成员了，也清理 owner 的数据
+		if familyOwnerUserID > 0 {
+			var remainingMembers int64
+			if err := tx.Model(&user.UserFamilyMember{}).
+				Where("family_id IN (SELECT id FROM user_family WHERE owner_user_id = ? AND deleted_at IS NULL) AND status = ? AND deleted_at IS NULL",
+					familyOwnerUserID, user.FamilyMemberActive).
+				Count(&remainingMembers).Error; err == nil && remainingMembers <= 1 {
+				// 只剩 owner 自己（或没人了），清理 owner 数据
+				// 删除 owner 的 auth_methods
+				if err := tx.Where("user_id = ?", familyOwnerUserID).Delete(&user.AuthMethods{}).Error; err != nil {
+					l.Errorw("delete owner auth methods failed", logger.Field("owner_id", familyOwnerUserID), logger.Field("error", err.Error()))
+				}
+				// 删除 owner 的订阅
+				if err := tx.Where("user_id = ?", familyOwnerUserID).Delete(&user.Subscribe{}).Error; err != nil {
+					l.Errorw("delete owner subscribes failed", logger.Field("owner_id", familyOwnerUserID), logger.Field("error", err.Error()))
+				}
+				// 解散 owner 的家庭
+				exitHelper2 := newFamilyExitHelper(l.ctx, l.svcCtx)
+				if removeErr := exitHelper2.removeUserFromActiveFamily(tx, familyOwnerUserID, true); removeErr != nil {
+					l.Errorw("remove owner from family failed", logger.Field("owner_id", familyOwnerUserID), logger.Field("error", removeErr.Error()))
+				}
+				// 将 owner 加入 affectedUserIDs 以便清缓存
+				affectedUserIDs = append(affectedUserIDs, familyOwnerUserID)
+				l.Infow("cleaned up family owner (email user) on device account deletion",
+					logger.Field("device_user_id", currentUser.Id),
+					logger.Field("owner_user_id", familyOwnerUserID),
+				)
+			}
+		}
+
 		return nil
 	})
 	if err != nil {
@@ -96,9 +145,12 @@ func (l *DeleteAccountLogic) DeleteAccountAll() (resp *types.DeleteAccountRespon
 	}
 
 	// 主动清 auth method 相关缓存（含 email/mobile 等 key），避免缓存未命中时无法生成正确 key
-	if len(authMethods) > 0 {
+	allAuthMethods := make([]*user.AuthMethods, 0)
+	allAuthMethods = append(allAuthMethods, authMethods...)
+	allAuthMethods = append(allAuthMethods, ownerAuthMethods...)
+	if len(allAuthMethods) > 0 {
 		var authCacheKeys []string
-		for _, am := range authMethods {
+		for _, am := range allAuthMethods {
 			if am.AuthType == "email" && am.AuthIdentifier != "" {
 				authCacheKeys = append(authCacheKeys, fmt.Sprintf("cache:user:email:%s", am.AuthIdentifier))
 			}
@@ -334,3 +386,16 @@ func (l *DeleteAccountLogic) clearAllSessions(userId int64) {
 		logger.Field("count", len(sessionSet)),
 	)
 }
+
+// findActiveFamilyRelation 查找用户的活跃家庭成员记录
+func (l *DeleteAccountLogic) findActiveFamilyRelation(userID int64) (*user.UserFamilyMember, error) {
+	var relation user.UserFamilyMember
+	err := l.svcCtx.DB.WithContext(l.ctx).
+		Model(&user.UserFamilyMember{}).
+		Where("user_id = ? AND status = ?", userID, user.FamilyMemberActive).
+		First(&relation).Error
+	if err != nil {
+		return nil, err
+	}
+	return &relation, nil
+}