家庭组 权益修改

internal/logic/public/user/getSubscribeStatusLogic.go

@@ -3,6 +3,7 @@ package user
 import (
 	"context"
 
+	commonLogic "github.com/perfect-panel/server/internal/logic/common"
 	"github.com/perfect-panel/server/internal/model/user"
 	"github.com/perfect-panel/server/internal/svc"
 	"github.com/perfect-panel/server/internal/types"
@@ -37,7 +38,8 @@ func (l *GetSubscribeStatusLogic) GetSubscribeStatus(req *types.GetSubscribeStat
 	deviceStatus := false
 	if len(u.UserDevices) > 0 {
 		if dev, err := l.svcCtx.UserModel.FindOneDeviceByIdentifier(l.ctx, u.UserDevices[0].Identifier); err == nil && dev.Id > 0 {
-			subscribes, err := l.svcCtx.UserModel.QueryUserSubscribe(l.ctx, dev.UserId)
+			effectiveUserID := l.resolveEntitlementUserID(dev.UserId)
+			subscribes, err := l.svcCtx.UserModel.QueryUserSubscribe(l.ctx, effectiveUserID)
 			if err == nil {
 				deviceStatus = len(subscribes) > 0
 			}
@@ -48,7 +50,8 @@ func (l *GetSubscribeStatusLogic) GetSubscribeStatus(req *types.GetSubscribeStat
 	emailStatus := false
 	if req.Email != "" {
 		if auth, err := l.svcCtx.UserModel.FindUserAuthMethodByOpenID(l.ctx, "email", req.Email); err == nil && auth.Id > 0 {
-			subscribes, err := l.svcCtx.UserModel.QueryUserSubscribe(l.ctx, auth.UserId)
+			effectiveUserID := l.resolveEntitlementUserID(auth.UserId)
+			subscribes, err := l.svcCtx.UserModel.QueryUserSubscribe(l.ctx, effectiveUserID)
 			if err == nil {
 				emailStatus = len(subscribes) > 0
 			}
@@ -61,3 +64,12 @@ func (l *GetSubscribeStatusLogic) GetSubscribeStatus(req *types.GetSubscribeStat
 		EmailStatus:  emailStatus,
 	}, nil
 }
+
+func (l *GetSubscribeStatusLogic) resolveEntitlementUserID(userID int64) int64 {
+	entitlement, err := commonLogic.ResolveEntitlementUser(l.ctx, l.svcCtx.DB, userID)
+	if err != nil {
+		l.Errorw("resolve family entitlement failed", logger.Field("user_id", userID), logger.Field("error", err.Error()))
+		return userID
+	}
+	return entitlement.EffectiveUserID
+}