From 9c197442a6190b82ed88a45f56541f52adccc91f Mon Sep 17 00:00:00 2001 From: shanshanzhong Date: Mon, 9 Mar 2026 01:31:04 -0700 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=97=B6=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7=E8=AE=A2=E9=98=85?= =?UTF-8?q?=E5=B9=B6=E6=B8=85=E7=90=86=E8=AE=A2=E9=98=85=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 事务内删除用户所有订阅记录 - 事务后清理订阅缓存、套餐缓存、节点缓存 --- .../logic/public/user/unbindDeviceLogic.go | 50 ++++++++++++++++++- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/internal/logic/public/user/unbindDeviceLogic.go b/internal/logic/public/user/unbindDeviceLogic.go index 94b1517..7190a00 100644 --- a/internal/logic/public/user/unbindDeviceLogic.go +++ b/internal/logic/public/user/unbindDeviceLogic.go @@ -56,7 +56,10 @@ func (l *UnbindDeviceLogic) logoutUnbind(userInfo *user.User, device *user.Devic // 2. 事务前收集受影响的家庭成员 ID(事务会改变家庭关系,之后查不到) familyMemberIDs := l.collectFamilyMemberIDs(userInfo.Id) - // 3. 事务:解绑家庭组 + 解绑非 device 的登录方式 + // 3. 事务前查出用户订阅,用于事务后清订阅缓存 + userSubscribes, _ := l.svcCtx.UserModel.QueryUserSubscribe(l.ctx, userInfo.Id) + + // 4. 事务:解绑家庭组 + 解绑非 device 的登录方式 + 删除订阅 err := l.svcCtx.DB.Transaction(func(tx *gorm.DB) error { // 解绑家庭组(owner 解散整个家庭,member 退出家庭) exitHelper := newFamilyExitHelper(l.ctx, l.svcCtx) @@ -70,6 +73,12 @@ func (l *UnbindDeviceLogic) logoutUnbind(userInfo *user.User, device *user.Devic return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseDeletedError), "delete non-device auth methods failed") } + // 删除该用户的所有订阅(解绑后不应保留原账号的订阅) + if err := tx.Where("user_id = ?", userInfo.Id). + Delete(&user.Subscribe{}).Error; err != nil { + return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "delete user subscribes failed") + } + return nil }) if err != nil { @@ -104,7 +113,44 @@ func (l *UnbindDeviceLogic) logoutUnbind(userInfo *user.User, device *user.Devic ) } - // 8. 清理受影响的家庭成员缓存(家庭解散后成员需感知变化) + // 8. 清理订阅相关缓存 + if len(userSubscribes) > 0 { + subscribeModels := make([]*user.Subscribe, 0, len(userSubscribes)+1) + subscribeModels = append(subscribeModels, &user.Subscribe{UserId: userInfo.Id}) + subscribeIDSet := make(map[int64]struct{}) + for _, sub := range userSubscribes { + subscribeModels = append(subscribeModels, &user.Subscribe{ + Id: sub.Id, + UserId: sub.UserId, + SubscribeId: sub.SubscribeId, + Token: sub.Token, + }) + if sub.SubscribeId > 0 { + subscribeIDSet[sub.SubscribeId] = struct{}{} + } + } + if clearErr := l.svcCtx.UserModel.ClearSubscribeCache(l.ctx, subscribeModels...); clearErr != nil { + l.Errorw("clear subscribe cache failed", + logger.Field("user_id", userInfo.Id), + logger.Field("error", clearErr.Error()), + ) + } + for subscribeID := range subscribeIDSet { + if clearErr := l.svcCtx.SubscribeModel.ClearCache(l.ctx, subscribeID); clearErr != nil { + l.Errorw("clear subscribe plan cache failed", + logger.Field("subscribe_id", subscribeID), + logger.Field("error", clearErr.Error()), + ) + } + } + if clearErr := l.svcCtx.NodeModel.ClearServerAllCache(l.ctx); clearErr != nil { + l.Errorw("clear server cache failed", + logger.Field("error", clearErr.Error()), + ) + } + } + + // 9. 清理受影响的家庭成员缓存(家庭解散后成员需感知变化) for _, memberID := range familyMemberIDs { if memberUser, findErr := l.svcCtx.UserModel.FindOne(l.ctx, memberID); findErr == nil { if clearErr := l.svcCtx.UserModel.ClearUserCache(l.ctx, memberUser); clearErr != nil {