refactor: 订阅任务按租户上下文执行

src/Application/TakeoutSaaS.Application/App/Subscriptions/Handlers/BatchExtendSubscriptionsCommandHandler.cs

@@ -1,5 +1,4 @@
 using MediatR;
-using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 using System.Text.Json;
 using TakeoutSaaS.Application.App.Subscriptions.Commands;
@@ -15,7 +14,6 @@ namespace TakeoutSaaS.Application.App.Subscriptions.Handlers;
 /// </summary>
 public sealed class BatchExtendSubscriptionsCommandHandler(
     ISubscriptionRepository subscriptionRepository,
-    IHttpContextAccessor httpContextAccessor,
     IIdGenerator idGenerator,
     ILogger<BatchExtendSubscriptionsCommandHandler> logger)
     : IRequestHandler<BatchExtendSubscriptionsCommand, BatchExtendResult>
@@ -23,8 +21,6 @@ public sealed class BatchExtendSubscriptionsCommandHandler(
     /// <inheritdoc />
     public async Task<BatchExtendResult> Handle(BatchExtendSubscriptionsCommand request, CancellationToken cancellationToken)
     {
-        var ignoreTenantFilter = SubscriptionTenantAccess.ShouldIgnoreTenantFilter(httpContextAccessor);
-
         var successCount = 0;
         var failures = new List<BatchFailureItem>();
 
@@ -41,8 +37,7 @@ public sealed class BatchExtendSubscriptionsCommandHandler(
         // 查询所有订阅
         var subscriptions = await subscriptionRepository.FindByIdsAsync(
             request.SubscriptionIds,
-            cancellationToken,
+            cancellationToken);
-            ignoreTenantFilter: ignoreTenantFilter);
 
         foreach (var subscriptionId in request.SubscriptionIds)
         {

src/Application/TakeoutSaaS.Application/App/Subscriptions/Handlers/BatchSendReminderCommandHandler.cs

@@ -1,5 +1,4 @@
 using MediatR;
-using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 using System.Text.Json;
 using TakeoutSaaS.Application.App.Subscriptions.Commands;
@@ -15,7 +14,6 @@ namespace TakeoutSaaS.Application.App.Subscriptions.Handlers;
 /// </summary>
 public sealed class BatchSendReminderCommandHandler(
     ISubscriptionRepository subscriptionRepository,
-    IHttpContextAccessor httpContextAccessor,
     IIdGenerator idGenerator,
     ILogger<BatchSendReminderCommandHandler> logger)
     : IRequestHandler<BatchSendReminderCommand, BatchSendReminderResult>
@@ -23,16 +21,13 @@ public sealed class BatchSendReminderCommandHandler(
     /// <inheritdoc />
     public async Task<BatchSendReminderResult> Handle(BatchSendReminderCommand request, CancellationToken cancellationToken)
     {
-        var ignoreTenantFilter = SubscriptionTenantAccess.ShouldIgnoreTenantFilter(httpContextAccessor);
-
         var successCount = 0;
         var failures = new List<BatchFailureItem>();
 
         // 查询所有订阅及租户信息
         var subscriptions = await subscriptionRepository.FindByIdsWithTenantAsync(
             request.SubscriptionIds,
-            cancellationToken,
+            cancellationToken);
-            ignoreTenantFilter: ignoreTenantFilter);
 
         foreach (var subscriptionId in request.SubscriptionIds)
         {

src/Application/TakeoutSaaS.Application/App/Subscriptions/Handlers/ChangeSubscriptionPlanCommandHandler.cs

@@ -1,5 +1,4 @@
 using MediatR;
-using Microsoft.AspNetCore.Http;
 using TakeoutSaaS.Application.App.Subscriptions.Commands;
 using TakeoutSaaS.Application.App.Subscriptions.Dto;
 using TakeoutSaaS.Application.App.Subscriptions.Queries;
@@ -15,7 +14,6 @@ namespace TakeoutSaaS.Application.App.Subscriptions.Handlers;
 /// </summary>
 public sealed class ChangeSubscriptionPlanCommandHandler(
     ISubscriptionRepository subscriptionRepository,
-    IHttpContextAccessor httpContextAccessor,
     IIdGenerator idGenerator,
     IMediator mediator)
     : IRequestHandler<ChangeSubscriptionPlanCommand, SubscriptionDetailDto?>
@@ -23,13 +21,10 @@ public sealed class ChangeSubscriptionPlanCommandHandler(
     /// <inheritdoc />
     public async Task<SubscriptionDetailDto?> Handle(ChangeSubscriptionPlanCommand request, CancellationToken cancellationToken)
     {
-        var ignoreTenantFilter = SubscriptionTenantAccess.ShouldIgnoreTenantFilter(httpContextAccessor);
-
         // 1. 查询订阅
         var subscription = await subscriptionRepository.FindByIdAsync(
             request.SubscriptionId,
-            cancellationToken,
+            cancellationToken);
-            ignoreTenantFilter: ignoreTenantFilter);
 
         if (subscription == null)
         {

src/Application/TakeoutSaaS.Application/App/Subscriptions/Handlers/ExtendSubscriptionCommandHandler.cs

@@ -1,5 +1,4 @@
 using MediatR;
-using Microsoft.AspNetCore.Http;
 using TakeoutSaaS.Application.App.Subscriptions.Commands;
 using TakeoutSaaS.Application.App.Subscriptions.Dto;
 using TakeoutSaaS.Application.App.Subscriptions.Queries;
@@ -15,7 +14,6 @@ namespace TakeoutSaaS.Application.App.Subscriptions.Handlers;
 /// </summary>
 public sealed class ExtendSubscriptionCommandHandler(
     ISubscriptionRepository subscriptionRepository,
-    IHttpContextAccessor httpContextAccessor,
     IIdGenerator idGenerator,
     IMediator mediator)
     : IRequestHandler<ExtendSubscriptionCommand, SubscriptionDetailDto?>
@@ -23,13 +21,10 @@ public sealed class ExtendSubscriptionCommandHandler(
     /// <inheritdoc />
     public async Task<SubscriptionDetailDto?> Handle(ExtendSubscriptionCommand request, CancellationToken cancellationToken)
     {
-        var ignoreTenantFilter = SubscriptionTenantAccess.ShouldIgnoreTenantFilter(httpContextAccessor);
-
         // 1. 查询订阅
         var subscription = await subscriptionRepository.FindByIdAsync(
             request.SubscriptionId,
-            cancellationToken,
+            cancellationToken);
-            ignoreTenantFilter: ignoreTenantFilter);
 
         if (subscription == null)
         {

src/Application/TakeoutSaaS.Application/App/Subscriptions/Handlers/GetSubscriptionDetailQueryHandler.cs

@@ -1,5 +1,4 @@
 using MediatR;
-using Microsoft.AspNetCore.Http;
 using TakeoutSaaS.Application.App.Subscriptions.Dto;
 using TakeoutSaaS.Application.App.Subscriptions.Queries;
 using TakeoutSaaS.Application.App.Tenants;
@@ -12,20 +11,16 @@ namespace TakeoutSaaS.Application.App.Subscriptions.Handlers;
 /// 订阅详情查询处理器。
 /// </summary>
 public sealed class GetSubscriptionDetailQueryHandler(
-    ISubscriptionRepository subscriptionRepository,
+    ISubscriptionRepository subscriptionRepository)
-    IHttpContextAccessor httpContextAccessor)
     : IRequestHandler<GetSubscriptionDetailQuery, SubscriptionDetailDto?>
 {
     /// <inheritdoc />
     public async Task<SubscriptionDetailDto?> Handle(GetSubscriptionDetailQuery request, CancellationToken cancellationToken)
     {
-        var ignoreTenantFilter = SubscriptionTenantAccess.ShouldIgnoreTenantFilter(httpContextAccessor);
-
         // 1. 查询订阅基础信息
         var detail = await subscriptionRepository.GetDetailAsync(
             request.SubscriptionId,
-            cancellationToken,
+            cancellationToken);
-            ignoreTenantFilter: ignoreTenantFilter);
 
         if (detail == null)
         {
@@ -35,8 +30,7 @@ public sealed class GetSubscriptionDetailQueryHandler(
         // 2. 查询配额使用情况
         var quotaUsages = await subscriptionRepository.GetQuotaUsagesAsync(
             detail.Subscription.TenantId,
-            cancellationToken,
+            cancellationToken);
-            ignoreTenantFilter: ignoreTenantFilter);
 
         var quotaUsageDtos = BuildQuotaUsageDtos(detail.Package, quotaUsages);
 

src/Application/TakeoutSaaS.Application/App/Subscriptions/Handlers/GetSubscriptionListQueryHandler.cs

@@ -1,5 +1,4 @@
 using MediatR;
-using Microsoft.AspNetCore.Http;
 using TakeoutSaaS.Application.App.Subscriptions.Dto;
 using TakeoutSaaS.Application.App.Subscriptions.Queries;
 using TakeoutSaaS.Domain.Tenants.Repositories;
@@ -11,15 +10,12 @@ namespace TakeoutSaaS.Application.App.Subscriptions.Handlers;
 /// 订阅分页查询处理器。
 /// </summary>
 public sealed class GetSubscriptionListQueryHandler(
-    ISubscriptionRepository subscriptionRepository,
+    ISubscriptionRepository subscriptionRepository)
-    IHttpContextAccessor httpContextAccessor)
     : IRequestHandler<GetSubscriptionListQuery, PagedResult<SubscriptionListDto>>
 {
     /// <inheritdoc />
     public async Task<PagedResult<SubscriptionListDto>> Handle(GetSubscriptionListQuery request, CancellationToken cancellationToken)
     {
-        var ignoreTenantFilter = SubscriptionTenantAccess.ShouldIgnoreTenantFilter(httpContextAccessor);
-
         // 1. 构建查询过滤条件
         var filter = new SubscriptionSearchFilter
         {
@@ -36,8 +32,7 @@ public sealed class GetSubscriptionListQueryHandler(
         // 2. 执行分页查询
         var (items, total) = await subscriptionRepository.SearchPagedAsync(
             filter,
-            cancellationToken,
+            cancellationToken);
-            ignoreTenantFilter: ignoreTenantFilter);
 
         // 3. 映射为 DTO
         var dtos = items.Select(x => new SubscriptionListDto

src/Application/TakeoutSaaS.Application/App/Subscriptions/Handlers/ProcessAutoRenewalCommandHandler.cs

@@ -1,5 +1,4 @@
 using MediatR;
-using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 using System.Text.Json;
 using TakeoutSaaS.Application.App.Subscriptions.Commands;
@@ -14,7 +13,6 @@ namespace TakeoutSaaS.Application.App.Subscriptions.Handlers;
 /// </summary>
 public sealed class ProcessAutoRenewalCommandHandler(
     ISubscriptionRepository subscriptionRepository,
-    IHttpContextAccessor httpContextAccessor,
     ITenantBillingRepository billingRepository,
     IIdGenerator idGenerator,
     ILogger<ProcessAutoRenewalCommandHandler> logger)
@@ -23,8 +21,6 @@ public sealed class ProcessAutoRenewalCommandHandler(
     /// <inheritdoc />
     public async Task<ProcessAutoRenewalResult> Handle(ProcessAutoRenewalCommand request, CancellationToken cancellationToken)
     {
-        var ignoreTenantFilter = SubscriptionTenantAccess.ShouldIgnoreTenantFilter(httpContextAccessor);
-
         // 1. 计算续费阈值时间
         var now = DateTime.UtcNow;
         var renewalThreshold = now.AddDays(request.RenewalDaysBeforeExpiry);
@@ -33,8 +29,7 @@ public sealed class ProcessAutoRenewalCommandHandler(
         var candidates = await subscriptionRepository.FindAutoRenewalCandidatesAsync(
             now,
             renewalThreshold,
-            cancellationToken,
+            cancellationToken);
-            ignoreTenantFilter: ignoreTenantFilter);
         var createdBillCount = 0;
 
         // 3. 遍历候选订阅，生成账单

src/Application/TakeoutSaaS.Application/App/Subscriptions/Handlers/ProcessRenewalRemindersCommandHandler.cs

@@ -1,5 +1,4 @@
 using MediatR;
-using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 using System.Text.Json;
 using TakeoutSaaS.Application.App.Subscriptions.Commands;
@@ -15,7 +14,6 @@ namespace TakeoutSaaS.Application.App.Subscriptions.Handlers;
 /// </summary>
 public sealed class ProcessRenewalRemindersCommandHandler(
     ISubscriptionRepository subscriptionRepository,
-    IHttpContextAccessor httpContextAccessor,
     ITenantNotificationRepository notificationRepository,
     IIdGenerator idGenerator,
     ILogger<ProcessRenewalRemindersCommandHandler> logger)
@@ -26,8 +24,6 @@ public sealed class ProcessRenewalRemindersCommandHandler(
     /// <inheritdoc />
     public async Task<ProcessRenewalRemindersResult> Handle(ProcessRenewalRemindersCommand request, CancellationToken cancellationToken)
     {
-        var ignoreTenantFilter = SubscriptionTenantAccess.ShouldIgnoreTenantFilter(httpContextAccessor);
-
         // 1. 读取提醒配置
         var now = DateTime.UtcNow;
         var candidateCount = 0;
@@ -46,8 +42,7 @@ public sealed class ProcessRenewalRemindersCommandHandler(
             var candidates = await subscriptionRepository.FindRenewalReminderCandidatesAsync(
                 startOfDay,
                 endOfDay,
-                cancellationToken,
+                cancellationToken);
-                ignoreTenantFilter: ignoreTenantFilter);
             candidateCount += candidates.Count;
 
             foreach (var item in candidates)

src/Application/TakeoutSaaS.Application/App/Subscriptions/Handlers/ProcessSubscriptionExpiryCommandHandler.cs

@@ -1,5 +1,4 @@
 using MediatR;
-using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 using TakeoutSaaS.Application.App.Subscriptions.Commands;
 using TakeoutSaaS.Domain.Tenants.Enums;
@@ -12,26 +11,21 @@ namespace TakeoutSaaS.Application.App.Subscriptions.Handlers;
 /// </summary>
 public sealed class ProcessSubscriptionExpiryCommandHandler(
     ISubscriptionRepository subscriptionRepository,
-    IHttpContextAccessor httpContextAccessor,
     ILogger<ProcessSubscriptionExpiryCommandHandler> logger)
     : IRequestHandler<ProcessSubscriptionExpiryCommand, ProcessSubscriptionExpiryResult>
 {
     /// <inheritdoc />
     public async Task<ProcessSubscriptionExpiryResult> Handle(ProcessSubscriptionExpiryCommand request, CancellationToken cancellationToken)
     {
-        var ignoreTenantFilter = SubscriptionTenantAccess.ShouldIgnoreTenantFilter(httpContextAccessor);
-
         // 1. 查询到期订阅
         var now = DateTime.UtcNow;
         var expiredActive = await subscriptionRepository.FindExpiredActiveSubscriptionsAsync(
             now,
-            cancellationToken,
+            cancellationToken);
-            ignoreTenantFilter: ignoreTenantFilter);
         var gracePeriodExpired = await subscriptionRepository.FindGracePeriodExpiredSubscriptionsAsync(
             now,
             request.GracePeriodDays,
-            cancellationToken,
+            cancellationToken);
-            ignoreTenantFilter: ignoreTenantFilter);
 
         // 2. 更新订阅状态
         foreach (var subscription in expiredActive)

src/Application/TakeoutSaaS.Application/App/Subscriptions/Handlers/UpdateSubscriptionCommandHandler.cs

@@ -1,5 +1,4 @@
 using MediatR;
-using Microsoft.AspNetCore.Http;
 using TakeoutSaaS.Application.App.Subscriptions.Commands;
 using TakeoutSaaS.Application.App.Subscriptions.Dto;
 using TakeoutSaaS.Application.App.Subscriptions.Queries;
@@ -12,20 +11,16 @@ namespace TakeoutSaaS.Application.App.Subscriptions.Handlers;
 /// </summary>
 public sealed class UpdateSubscriptionCommandHandler(
     ISubscriptionRepository subscriptionRepository,
-    IHttpContextAccessor httpContextAccessor,
     IMediator mediator)
     : IRequestHandler<UpdateSubscriptionCommand, SubscriptionDetailDto?>
 {
     /// <inheritdoc />
     public async Task<SubscriptionDetailDto?> Handle(UpdateSubscriptionCommand request, CancellationToken cancellationToken)
     {
-        var ignoreTenantFilter = SubscriptionTenantAccess.ShouldIgnoreTenantFilter(httpContextAccessor);
-
         // 1. 查询订阅
         var subscription = await subscriptionRepository.FindByIdAsync(
             request.SubscriptionId,
-            cancellationToken,
+            cancellationToken);
-            ignoreTenantFilter: ignoreTenantFilter);
 
         if (subscription == null)
         {

src/Application/TakeoutSaaS.Application/App/Subscriptions/Handlers/UpdateSubscriptionStatusCommandHandler.cs

@@ -1,5 +1,4 @@
 using MediatR;
-using Microsoft.AspNetCore.Http;
 using TakeoutSaaS.Application.App.Subscriptions.Commands;
 using TakeoutSaaS.Application.App.Subscriptions.Dto;
 using TakeoutSaaS.Application.App.Subscriptions.Queries;
@@ -12,20 +11,16 @@ namespace TakeoutSaaS.Application.App.Subscriptions.Handlers;
 /// </summary>
 public sealed class UpdateSubscriptionStatusCommandHandler(
     ISubscriptionRepository subscriptionRepository,
-    IHttpContextAccessor httpContextAccessor,
     IMediator mediator)
     : IRequestHandler<UpdateSubscriptionStatusCommand, SubscriptionDetailDto?>
 {
     /// <inheritdoc />
     public async Task<SubscriptionDetailDto?> Handle(UpdateSubscriptionStatusCommand request, CancellationToken cancellationToken)
     {
-        var ignoreTenantFilter = SubscriptionTenantAccess.ShouldIgnoreTenantFilter(httpContextAccessor);
-
         // 1. 查询订阅
         var subscription = await subscriptionRepository.FindByIdAsync(
             request.SubscriptionId,
-            cancellationToken,
+            cancellationToken);
-            ignoreTenantFilter: ignoreTenantFilter);
 
         if (subscription == null)
         {

src/Application/TakeoutSaaS.Application/App/Subscriptions/SubscriptionTenantAccess.cs

@@ -1,18 +0,0 @@
-using Microsoft.AspNetCore.Http;
-
-namespace TakeoutSaaS.Application.App.Subscriptions;
-
-internal static class SubscriptionTenantAccess
-{
-    public static bool ShouldIgnoreTenantFilter(IHttpContextAccessor httpContextAccessor)
-    {
-        var httpContext = httpContextAccessor.HttpContext;
-        if (httpContext == null)
-        {
-            // Background jobs / out-of-request execution should process across tenants.
-            return true;
-        }
-        // (空行后) 请求上下文下强制不允许跨租户
-        return false;
-    }
-}

src/Domain/TakeoutSaaS.Domain/Tenants/Repositories/ISubscriptionRepository.cs

@@ -15,60 +15,50 @@ public interface ISubscriptionRepository
     /// </summary>
     /// <param name="subscriptionId">订阅 ID。</param>
     /// <param name="cancellationToken">取消标记。</param>
-    /// <param name="ignoreTenantFilter">是否忽略租户过滤（用于系统级任务）。</param>
     /// <returns>订阅实体，未找到返回 null。</returns>
     Task<TenantSubscription?> FindByIdAsync(
         long subscriptionId,
-        CancellationToken cancellationToken = default,
+        CancellationToken cancellationToken = default);
-        bool ignoreTenantFilter = false);
 
     /// <summary>
     /// 按 ID 列表批量查询订阅。
     /// </summary>
     /// <param name="subscriptionIds">订阅 ID 列表。</param>
     /// <param name="cancellationToken">取消标记。</param>
-    /// <param name="ignoreTenantFilter">是否忽略租户过滤（用于系统级任务）。</param>
     /// <returns>订阅实体列表。</returns>
     Task<IReadOnlyList<TenantSubscription>> FindByIdsAsync(
         IEnumerable<long> subscriptionIds,
-        CancellationToken cancellationToken = default,
+        CancellationToken cancellationToken = default);
-        bool ignoreTenantFilter = false);
 
     /// <summary>
     /// 分页查询订阅列表（含关联信息）。
     /// </summary>
     /// <param name="filter">查询过滤条件。</param>
     /// <param name="cancellationToken">取消标记。</param>
-    /// <param name="ignoreTenantFilter">是否忽略租户过滤（用于系统级任务）。</param>
     /// <returns>分页结果。</returns>
     Task<(IReadOnlyList<SubscriptionWithRelations> Items, int Total)> SearchPagedAsync(
         SubscriptionSearchFilter filter,
-        CancellationToken cancellationToken = default,
+        CancellationToken cancellationToken = default);
-        bool ignoreTenantFilter = false);
 
     /// <summary>
     /// 获取订阅详情（含关联信息）。
     /// </summary>
     /// <param name="subscriptionId">订阅 ID。</param>
     /// <param name="cancellationToken">取消标记。</param>
-    /// <param name="ignoreTenantFilter">是否忽略租户过滤（用于系统级任务）。</param>
     /// <returns>订阅详情信息。</returns>
     Task<SubscriptionDetailInfo?> GetDetailAsync(
         long subscriptionId,
-        CancellationToken cancellationToken = default,
+        CancellationToken cancellationToken = default);
-        bool ignoreTenantFilter = false);
 
     /// <summary>
     /// 按 ID 列表批量查询订阅（含租户信息）。
     /// </summary>
     /// <param name="subscriptionIds">订阅 ID 列表。</param>
     /// <param name="cancellationToken">取消标记。</param>
-    /// <param name="ignoreTenantFilter">是否忽略租户过滤（用于系统级任务）。</param>
     /// <returns>订阅与租户信息列表。</returns>
     Task<IReadOnlyList<SubscriptionWithTenant>> FindByIdsWithTenantAsync(
         IEnumerable<long> subscriptionIds,
-        CancellationToken cancellationToken = default,
+        CancellationToken cancellationToken = default);
-        bool ignoreTenantFilter = false);
 
     /// <summary>
     /// 查询自动续费候选订阅（活跃 + 开启自动续费 + 即将到期）。
@@ -76,13 +66,11 @@ public interface ISubscriptionRepository
     /// <param name="now">当前时间（UTC）。</param>
     /// <param name="renewalThreshold">续费阈值时间（UTC），到期时间小于等于该时间视为候选。</param>
     /// <param name="cancellationToken">取消标记。</param>
-    /// <param name="ignoreTenantFilter">是否忽略租户过滤（用于系统级任务）。</param>
     /// <returns>候选订阅集合（含套餐信息）。</returns>
     Task<IReadOnlyList<AutoRenewalCandidate>> FindAutoRenewalCandidatesAsync(
         DateTime now,
         DateTime renewalThreshold,
-        CancellationToken cancellationToken = default,
+        CancellationToken cancellationToken = default);
-        bool ignoreTenantFilter = false);
 
     /// <summary>
     /// 查询续费提醒候选订阅（活跃 + 未开启自动续费 + 到期时间落在指定日期范围）。
@@ -90,25 +78,21 @@ public interface ISubscriptionRepository
     /// <param name="startOfDay">筛选开始时间（UTC，含）。</param>
     /// <param name="endOfDay">筛选结束时间（UTC，不含）。</param>
     /// <param name="cancellationToken">取消标记。</param>
-    /// <param name="ignoreTenantFilter">是否忽略租户过滤（用于系统级任务）。</param>
     /// <returns>候选订阅集合（含租户与套餐信息）。</returns>
     Task<IReadOnlyList<RenewalReminderCandidate>> FindRenewalReminderCandidatesAsync(
         DateTime startOfDay,
         DateTime endOfDay,
-        CancellationToken cancellationToken = default,
+        CancellationToken cancellationToken = default);
-        bool ignoreTenantFilter = false);
 
     /// <summary>
     /// 查询已到期仍处于 Active 的订阅（用于进入宽限期）。
     /// </summary>
     /// <param name="now">当前时间（UTC）。</param>
     /// <param name="cancellationToken">取消标记。</param>
-    /// <param name="ignoreTenantFilter">是否忽略租户过滤（用于系统级任务）。</param>
     /// <returns>到期订阅集合。</returns>
     Task<IReadOnlyList<TenantSubscription>> FindExpiredActiveSubscriptionsAsync(
         DateTime now,
-        CancellationToken cancellationToken = default,
+        CancellationToken cancellationToken = default);
-        bool ignoreTenantFilter = false);
 
     /// <summary>
     /// 查询宽限期已结束的订阅（用于自动暂停）。
@@ -116,13 +100,11 @@ public interface ISubscriptionRepository
     /// <param name="now">当前时间（UTC）。</param>
     /// <param name="gracePeriodDays">宽限期天数。</param>
     /// <param name="cancellationToken">取消标记。</param>
-    /// <param name="ignoreTenantFilter">是否忽略租户过滤（用于系统级任务）。</param>
     /// <returns>宽限期到期订阅集合。</returns>
     Task<IReadOnlyList<TenantSubscription>> FindGracePeriodExpiredSubscriptionsAsync(
         DateTime now,
         int gracePeriodDays,
-        CancellationToken cancellationToken = default,
+        CancellationToken cancellationToken = default);
-        bool ignoreTenantFilter = false);
 
     #endregion
 
@@ -177,12 +159,10 @@ public interface ISubscriptionRepository
     /// </summary>
     /// <param name="tenantId">租户 ID。</param>
     /// <param name="cancellationToken">取消标记。</param>
-    /// <param name="ignoreTenantFilter">是否忽略租户过滤（用于系统级任务）。</param>
     /// <returns>配额使用列表。</returns>
     Task<IReadOnlyList<TenantQuotaUsage>> GetQuotaUsagesAsync(
         long tenantId,
-        CancellationToken cancellationToken = default,
+        CancellationToken cancellationToken = default);
-        bool ignoreTenantFilter = false);
 
     #endregion
 

src/Infrastructure/TakeoutSaaS.Infrastructure/App/Repositories/EfSubscriptionRepository.cs

@@ -17,29 +17,19 @@ public sealed class EfSubscriptionRepository(TakeoutAppDbContext dbContext, Take
     /// <inheritdoc />
     public async Task<TenantSubscription?> FindByIdAsync(
         long subscriptionId,
-        CancellationToken cancellationToken = default,
+        CancellationToken cancellationToken = default)
-        bool ignoreTenantFilter = false)
     {
-        var query = ignoreTenantFilter
+        return await dbContext.TenantSubscriptions
-            ? dbContext.TenantSubscriptions.IgnoreQueryFilters()
-            : dbContext.TenantSubscriptions;
-
-        return await query
             .FirstOrDefaultAsync(s => s.Id == subscriptionId, cancellationToken);
     }
 
     /// <inheritdoc />
     public async Task<IReadOnlyList<TenantSubscription>> FindByIdsAsync(
         IEnumerable<long> subscriptionIds,
-        CancellationToken cancellationToken = default,
+        CancellationToken cancellationToken = default)
-        bool ignoreTenantFilter = false)
     {
         var ids = subscriptionIds.ToList();
-        var query = ignoreTenantFilter
+        return await dbContext.TenantSubscriptions
-            ? dbContext.TenantSubscriptions.IgnoreQueryFilters()
-            : dbContext.TenantSubscriptions;
-
-        return await query
             .Where(s => ids.Contains(s.Id))
             .ToListAsync(cancellationToken);
     }
@@ -47,15 +37,10 @@ public sealed class EfSubscriptionRepository(TakeoutAppDbContext dbContext, Take
     /// <inheritdoc />
     public async Task<(IReadOnlyList<SubscriptionWithRelations> Items, int Total)> SearchPagedAsync(
         SubscriptionSearchFilter filter,
-        CancellationToken cancellationToken = default,
+        CancellationToken cancellationToken = default)
-        bool ignoreTenantFilter = false)
     {
         // 1. 构建基础查询
-        var subscriptionQuery = ignoreTenantFilter
+        var query = dbContext.TenantSubscriptions
-            ? dbContext.TenantSubscriptions.IgnoreQueryFilters()
-            : dbContext.TenantSubscriptions;
-
-        var query = subscriptionQuery
             .AsNoTracking()
             .Join(
                 dbContext.Tenants,
@@ -133,14 +118,9 @@ public sealed class EfSubscriptionRepository(TakeoutAppDbContext dbContext, Take
     /// <inheritdoc />
     public async Task<SubscriptionDetailInfo?> GetDetailAsync(
         long subscriptionId,
-        CancellationToken cancellationToken = default,
+        CancellationToken cancellationToken = default)
-        bool ignoreTenantFilter = false)
     {
-        var subscriptionQuery = ignoreTenantFilter
+        var result = await dbContext.TenantSubscriptions
-            ? dbContext.TenantSubscriptions.IgnoreQueryFilters()
-            : dbContext.TenantSubscriptions;
-
-        var result = await subscriptionQuery
             .AsNoTracking()
             .Where(s => s.Id == subscriptionId)
             .Select(s => new
@@ -172,16 +152,11 @@ public sealed class EfSubscriptionRepository(TakeoutAppDbContext dbContext, Take
     /// <inheritdoc />
     public async Task<IReadOnlyList<SubscriptionWithTenant>> FindByIdsWithTenantAsync(
         IEnumerable<long> subscriptionIds,
-        CancellationToken cancellationToken = default,
+        CancellationToken cancellationToken = default)
-        bool ignoreTenantFilter = false)
     {
         var ids = subscriptionIds.ToList();
 
-        var query = ignoreTenantFilter
+        return await dbContext.TenantSubscriptions
-            ? dbContext.TenantSubscriptions.IgnoreQueryFilters()
-            : dbContext.TenantSubscriptions;
-
-        return await query
             .Where(s => ids.Contains(s.Id))
             .Join(
                 dbContext.Tenants,
@@ -200,15 +175,10 @@ public sealed class EfSubscriptionRepository(TakeoutAppDbContext dbContext, Take
     public async Task<IReadOnlyList<AutoRenewalCandidate>> FindAutoRenewalCandidatesAsync(
         DateTime now,
         DateTime renewalThreshold,
-        CancellationToken cancellationToken = default,
+        CancellationToken cancellationToken = default)
-        bool ignoreTenantFilter = false)
     {
         // 1. 查询开启自动续费且即将到期的活跃订阅
-        var subscriptionQuery = ignoreTenantFilter
+        var query = dbContext.TenantSubscriptions
-            ? dbContext.TenantSubscriptions.IgnoreQueryFilters()
-            : dbContext.TenantSubscriptions;
-
-        var query = subscriptionQuery
             .Where(s => s.Status == SubscriptionStatus.Active
                         && s.AutoRenew
                         && s.EffectiveTo <= renewalThreshold
@@ -231,15 +201,10 @@ public sealed class EfSubscriptionRepository(TakeoutAppDbContext dbContext, Take
     public async Task<IReadOnlyList<RenewalReminderCandidate>> FindRenewalReminderCandidatesAsync(
         DateTime startOfDay,
         DateTime endOfDay,
-        CancellationToken cancellationToken = default,
+        CancellationToken cancellationToken = default)
-        bool ignoreTenantFilter = false)
     {
         // 1. 查询到期落在指定区间的订阅（且未开启自动续费）
-        var subscriptionQuery = ignoreTenantFilter
+        var query = dbContext.TenantSubscriptions
-            ? dbContext.TenantSubscriptions.IgnoreQueryFilters()
-            : dbContext.TenantSubscriptions;
-
-        var query = subscriptionQuery
             .Where(s => s.Status == SubscriptionStatus.Active
                         && !s.AutoRenew
                         && s.EffectiveTo >= startOfDay
@@ -267,15 +232,10 @@ public sealed class EfSubscriptionRepository(TakeoutAppDbContext dbContext, Take
     /// <inheritdoc />
     public async Task<IReadOnlyList<TenantSubscription>> FindExpiredActiveSubscriptionsAsync(
         DateTime now,
-        CancellationToken cancellationToken = default,
+        CancellationToken cancellationToken = default)
-        bool ignoreTenantFilter = false)
     {
-        var query = ignoreTenantFilter
-            ? dbContext.TenantSubscriptions.IgnoreQueryFilters()
-            : dbContext.TenantSubscriptions;
-
         // 1. 查询已到期仍为 Active 的订阅
-        return await query
+        return await dbContext.TenantSubscriptions
             .Where(s => s.Status == SubscriptionStatus.Active && s.EffectiveTo < now)
             .ToListAsync(cancellationToken);
     }
@@ -284,15 +244,10 @@ public sealed class EfSubscriptionRepository(TakeoutAppDbContext dbContext, Take
     public async Task<IReadOnlyList<TenantSubscription>> FindGracePeriodExpiredSubscriptionsAsync(
         DateTime now,
         int gracePeriodDays,
-        CancellationToken cancellationToken = default,
+        CancellationToken cancellationToken = default)
-        bool ignoreTenantFilter = false)
     {
-        var query = ignoreTenantFilter
-            ? dbContext.TenantSubscriptions.IgnoreQueryFilters()
-            : dbContext.TenantSubscriptions;
-
         // 1. 查询宽限期已结束的订阅
-        return await query
+        return await dbContext.TenantSubscriptions
             .Where(s => s.Status == SubscriptionStatus.GracePeriod
                         && s.EffectiveTo.AddDays(gracePeriodDays) < now)
             .ToListAsync(cancellationToken);
@@ -363,14 +318,9 @@ public sealed class EfSubscriptionRepository(TakeoutAppDbContext dbContext, Take
     /// <inheritdoc />
     public async Task<IReadOnlyList<TenantQuotaUsage>> GetQuotaUsagesAsync(
         long tenantId,
-        CancellationToken cancellationToken = default,
+        CancellationToken cancellationToken = default)
-        bool ignoreTenantFilter = false)
     {
-        var query = ignoreTenantFilter
+        return await dbContext.TenantQuotaUsages
-            ? dbContext.TenantQuotaUsages.IgnoreQueryFilters()
-            : dbContext.TenantQuotaUsages;
-
-        return await query
             .AsNoTracking()
             .Where(q => q.TenantId == tenantId)
             .ToListAsync(cancellationToken);

src/Modules/TakeoutSaaS.Module.Scheduler/Jobs/SubscriptionAutoRenewalJob.cs

@@ -2,7 +2,9 @@ using MediatR;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using TakeoutSaaS.Application.App.Subscriptions.Commands;
+using TakeoutSaaS.Domain.Tenants.Repositories;
 using TakeoutSaaS.Module.Scheduler.Options;
+using TakeoutSaaS.Shared.Abstractions.Tenancy;
 
 namespace TakeoutSaaS.Module.Scheduler.Jobs;
 
@@ -11,6 +13,8 @@ namespace TakeoutSaaS.Module.Scheduler.Jobs;
 /// </summary>
 public sealed class SubscriptionAutoRenewalJob(
     IMediator mediator,
+    ITenantRepository tenantRepository,
+    ITenantContextAccessor tenantContextAccessor,
     IOptionsMonitor<SubscriptionAutomationOptions> optionsMonitor,
     ILogger<SubscriptionAutoRenewalJob> logger)
 {
@@ -19,18 +23,48 @@ public sealed class SubscriptionAutoRenewalJob(
     /// </summary>
     public async Task ExecuteAsync()
     {
-        // 1. 读取配置并执行自动续费
+        // 1. 读取配置
         var options = optionsMonitor.CurrentValue;
+
+        // 2. (空行后) 获取需要处理的租户列表（排除系统租户）
+        var tenants = await tenantRepository.SearchAsync(null, null, CancellationToken.None);
+        var targets = tenants.Where(x => x.Id > 0).ToList();
+
+        // 3. (空行后) 按租户逐个执行自动续费
+        var candidateCount = 0;
+        var createdBillCount = 0;
+        var previousContext = tenantContextAccessor.Current;
+        try
+        {
+            foreach (var tenant in targets)
+            {
+                tenantContextAccessor.Current = new TenantContext(tenant.Id, tenant.Code, "scheduler");
+                try
+                {
                     var result = await mediator.Send(new ProcessAutoRenewalCommand
                     {
                         RenewalDaysBeforeExpiry = options.AutoRenewalDaysBeforeExpiry
                     });
 
-        // 2. 记录执行结果
+                    candidateCount += result.CandidateCount;
+                    createdBillCount += result.CreatedBillCount;
+                }
+                catch (Exception ex)
+                {
+                    logger.LogError(ex, "定时任务：自动续费执行失败 TenantId={TenantId}", tenant.Id);
+                }
+            }
+        }
+        finally
+        {
+            tenantContextAccessor.Current = previousContext;
+        }
+
+        // 4. (空行后) 记录执行结果
         logger.LogInformation(
-            "定时任务：自动续费处理完成，候选 {CandidateCount}，创建账单 {CreatedBillCount}",
+            "定时任务：自动续费处理完成，处理租户 {TenantCount}，候选 {CandidateCount}，创建账单 {CreatedBillCount}",
-            result.CandidateCount,
+            targets.Count,
-            result.CreatedBillCount);
+            candidateCount,
+            createdBillCount);
     }
 }
-

src/Modules/TakeoutSaaS.Module.Scheduler/Jobs/SubscriptionExpiryCheckJob.cs

@@ -2,7 +2,9 @@ using MediatR;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using TakeoutSaaS.Application.App.Subscriptions.Commands;
+using TakeoutSaaS.Domain.Tenants.Repositories;
 using TakeoutSaaS.Module.Scheduler.Options;
+using TakeoutSaaS.Shared.Abstractions.Tenancy;
 
 namespace TakeoutSaaS.Module.Scheduler.Jobs;
 
@@ -11,6 +13,8 @@ namespace TakeoutSaaS.Module.Scheduler.Jobs;
 /// </summary>
 public sealed class SubscriptionExpiryCheckJob(
     IMediator mediator,
+    ITenantRepository tenantRepository,
+    ITenantContextAccessor tenantContextAccessor,
     IOptionsMonitor<SubscriptionAutomationOptions> optionsMonitor,
     ILogger<SubscriptionExpiryCheckJob> logger)
 {
@@ -19,17 +23,48 @@ public sealed class SubscriptionExpiryCheckJob(
     /// </summary>
     public async Task ExecuteAsync()
     {
-        // 1. 读取配置并执行到期处理
+        // 1. 读取配置
         var options = optionsMonitor.CurrentValue;
+
+        // 2. (空行后) 获取需要处理的租户列表（排除系统租户）
+        var tenants = await tenantRepository.SearchAsync(null, null, CancellationToken.None);
+        var targets = tenants.Where(x => x.Id > 0).ToList();
+
+        // 3. (空行后) 按租户逐个执行到期处理
+        var enteredGracePeriodCount = 0;
+        var suspendedCount = 0;
+        var previousContext = tenantContextAccessor.Current;
+        try
+        {
+            foreach (var tenant in targets)
+            {
+                tenantContextAccessor.Current = new TenantContext(tenant.Id, tenant.Code, "scheduler");
+                try
+                {
                     var result = await mediator.Send(new ProcessSubscriptionExpiryCommand
                     {
                         GracePeriodDays = options.GracePeriodDays
                     });
 
-        // 2. 记录执行结果
+                    enteredGracePeriodCount += result.EnteredGracePeriodCount;
+                    suspendedCount += result.SuspendedCount;
+                }
+                catch (Exception ex)
+                {
+                    logger.LogError(ex, "定时任务：订阅到期检查执行失败 TenantId={TenantId}", tenant.Id);
+                }
+            }
+        }
+        finally
+        {
+            tenantContextAccessor.Current = previousContext;
+        }
+
+        // 4. (空行后) 记录执行结果
         logger.LogInformation(
-            "定时任务：订阅到期检查完成，进入宽限期 {EnteredGracePeriodCount}，暂停 {SuspendedCount}",
+            "定时任务：订阅到期检查完成，处理租户 {TenantCount}，进入宽限期 {EnteredGracePeriodCount}，暂停 {SuspendedCount}",
-            result.EnteredGracePeriodCount,
+            targets.Count,
-            result.SuspendedCount);
+            enteredGracePeriodCount,
+            suspendedCount);
     }
 }

src/Modules/TakeoutSaaS.Module.Scheduler/Jobs/SubscriptionRenewalReminderJob.cs

@@ -2,7 +2,9 @@ using MediatR;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using TakeoutSaaS.Application.App.Subscriptions.Commands;
+using TakeoutSaaS.Domain.Tenants.Repositories;
 using TakeoutSaaS.Module.Scheduler.Options;
+using TakeoutSaaS.Shared.Abstractions.Tenancy;
 
 namespace TakeoutSaaS.Module.Scheduler.Jobs;
 
@@ -11,6 +13,8 @@ namespace TakeoutSaaS.Module.Scheduler.Jobs;
 /// </summary>
 public sealed class SubscriptionRenewalReminderJob(
     IMediator mediator,
+    ITenantRepository tenantRepository,
+    ITenantContextAccessor tenantContextAccessor,
     IOptionsMonitor<SubscriptionAutomationOptions> optionsMonitor,
     ILogger<SubscriptionRenewalReminderJob> logger)
 {
@@ -19,17 +23,48 @@ public sealed class SubscriptionRenewalReminderJob(
     /// </summary>
     public async Task ExecuteAsync()
     {
-        // 1. 读取配置并执行续费提醒
+        // 1. 读取配置
         var options = optionsMonitor.CurrentValue;
+
+        // 2. (空行后) 获取需要处理的租户列表（排除系统租户）
+        var tenants = await tenantRepository.SearchAsync(null, null, CancellationToken.None);
+        var targets = tenants.Where(x => x.Id > 0).ToList();
+
+        // 3. (空行后) 按租户逐个执行续费提醒
+        var candidateCount = 0;
+        var createdReminderCount = 0;
+        var previousContext = tenantContextAccessor.Current;
+        try
+        {
+            foreach (var tenant in targets)
+            {
+                tenantContextAccessor.Current = new TenantContext(tenant.Id, tenant.Code, "scheduler");
+                try
+                {
                     var result = await mediator.Send(new ProcessRenewalRemindersCommand
                     {
                         ReminderDaysBeforeExpiry = options.ReminderDaysBeforeExpiry
                     });
 
-        // 2. 记录执行结果
+                    candidateCount += result.CandidateCount;
+                    createdReminderCount += result.CreatedReminderCount;
+                }
+                catch (Exception ex)
+                {
+                    logger.LogError(ex, "定时任务：续费提醒执行失败 TenantId={TenantId}", tenant.Id);
+                }
+            }
+        }
+        finally
+        {
+            tenantContextAccessor.Current = previousContext;
+        }
+
+        // 4. (空行后) 记录执行结果
         logger.LogInformation(
-            "定时任务：续费提醒处理完成，候选 {CandidateCount}，创建 {CreatedReminderCount}",
+            "定时任务：续费提醒处理完成，处理租户 {TenantCount}，候选 {CandidateCount}，创建 {CreatedReminderCount}",
-            result.CandidateCount,
+            targets.Count,
-            result.CreatedReminderCount);
+            candidateCount,
+            createdReminderCount);
     }
 }