feat: 支付模块支持tenantId可选过滤

src/Api/TakeoutSaaS.AdminApi/Controllers/PaymentsController.cs

@@ -44,6 +44,7 @@ public sealed class PaymentsController(IMediator mediator) : BaseApiController
     [PermissionAuthorize("payment:read")]
     [ProducesResponseType(typeof(ApiResponse<PagedResult<PaymentDto>>), StatusCodes.Status200OK)]
     public async Task<ApiResponse<PagedResult<PaymentDto>>> List(
+        [FromQuery] long? tenantId,
         [FromQuery] long? orderId,
         [FromQuery] PaymentStatus? status,
         [FromQuery] int page = 1,
@@ -55,6 +56,7 @@ public sealed class PaymentsController(IMediator mediator) : BaseApiController
         // 1. 组装查询参数并执行查询
         var result = await mediator.Send(new SearchPaymentsQuery
         {
+            TenantId = tenantId,
             OrderId = orderId,
             Status = status,
             Page = page,

src/Application/TakeoutSaaS.Application/App/Payments/Handlers/CreatePaymentCommandHandler.cs

@@ -2,25 +2,37 @@ using MediatR;
 using Microsoft.Extensions.Logging;
 using TakeoutSaaS.Application.App.Payments.Commands;
 using TakeoutSaaS.Application.App.Payments.Dto;
+using TakeoutSaaS.Domain.Orders.Repositories;
 using TakeoutSaaS.Domain.Payments.Entities;
 using TakeoutSaaS.Domain.Payments.Repositories;
+using TakeoutSaaS.Shared.Abstractions.Constants;
+using TakeoutSaaS.Shared.Abstractions.Exceptions;
 
 namespace TakeoutSaaS.Application.App.Payments.Handlers;
 
 /// <summary>
 /// 创建支付记录命令处理器。
 /// </summary>
-public sealed class CreatePaymentCommandHandler(IPaymentRepository paymentRepository, ILogger<CreatePaymentCommandHandler> logger)
+public sealed class CreatePaymentCommandHandler(
+    IPaymentRepository paymentRepository,
+    IOrderRepository orderRepository,
+    ILogger<CreatePaymentCommandHandler> logger)
     : IRequestHandler<CreatePaymentCommand, PaymentDto>
 {
-    private readonly IPaymentRepository _paymentRepository = paymentRepository;
-    private readonly ILogger<CreatePaymentCommandHandler> _logger = logger;
-
     /// <inheritdoc />
     public async Task<PaymentDto> Handle(CreatePaymentCommand request, CancellationToken cancellationToken)
     {
+        // 1. 查询订单以确定租户
+        var order = await orderRepository.FindByIdAsync(request.OrderId, cancellationToken);
+        if (order is null)
+        {
+            throw new BusinessException(ErrorCodes.NotFound, "订单不存在");
+        }
+
+        // 2. (空行后) 构建支付记录并写入租户
         var payment = new PaymentRecord
         {
+            TenantId = order.TenantId,
             OrderId = request.OrderId,
             Method = request.Method,
             Status = request.Status,
@@ -32,10 +44,12 @@ public sealed class CreatePaymentCommandHandler(IPaymentRepository paymentReposi
             Payload = request.Payload
         };
 
-        await _paymentRepository.AddPaymentAsync(payment, cancellationToken);
+        // 3. (空行后) 持久化
-        await _paymentRepository.SaveChangesAsync(cancellationToken);
+        await paymentRepository.AddPaymentAsync(payment, cancellationToken);
-        _logger.LogInformation("创建支付记录 {PaymentId} 对应订单 {OrderId}", payment.Id, payment.OrderId);
+        await paymentRepository.SaveChangesAsync(cancellationToken);
+        logger.LogInformation("创建支付记录 {PaymentId} 对应订单 {OrderId}", payment.Id, payment.OrderId);
 
+        // 4. (空行后) 返回 DTO
         return MapToDto(payment, []);
     }
 

src/Application/TakeoutSaaS.Application/App/Payments/Handlers/DeletePaymentCommandHandler.cs

@@ -2,7 +2,6 @@ using MediatR;
 using Microsoft.Extensions.Logging;
 using TakeoutSaaS.Application.App.Payments.Commands;
 using TakeoutSaaS.Domain.Payments.Repositories;
-using TakeoutSaaS.Shared.Abstractions.Tenancy;
 
 namespace TakeoutSaaS.Application.App.Payments.Handlers;
 
@@ -11,27 +10,23 @@ namespace TakeoutSaaS.Application.App.Payments.Handlers;
 /// </summary>
 public sealed class DeletePaymentCommandHandler(
     IPaymentRepository paymentRepository,
-    ITenantProvider tenantProvider,
     ILogger<DeletePaymentCommandHandler> logger)
     : IRequestHandler<DeletePaymentCommand, bool>
 {
-    private readonly IPaymentRepository _paymentRepository = paymentRepository;
-    private readonly ITenantProvider _tenantProvider = tenantProvider;
-    private readonly ILogger<DeletePaymentCommandHandler> _logger = logger;
-
     /// <inheritdoc />
     public async Task<bool> Handle(DeletePaymentCommand request, CancellationToken cancellationToken)
     {
-        var tenantId = _tenantProvider.GetCurrentTenantId();
+        // 1. 查询支付记录（跨租户）
-        var existing = await _paymentRepository.FindByIdAsync(request.PaymentId, tenantId, cancellationToken);
+        var existing = await paymentRepository.FindByIdAsync(request.PaymentId, cancellationToken);
         if (existing == null)
         {
             return false;
         }
 
-        await _paymentRepository.DeletePaymentAsync(request.PaymentId, tenantId, cancellationToken);
+        // 2. (空行后) 删除并持久化（按支付租户）
-        await _paymentRepository.SaveChangesAsync(cancellationToken);
+        await paymentRepository.DeletePaymentAsync(request.PaymentId, existing.TenantId, cancellationToken);
-        _logger.LogInformation("删除支付记录 {PaymentId}", request.PaymentId);
+        await paymentRepository.SaveChangesAsync(cancellationToken);
+        logger.LogInformation("删除支付记录 {PaymentId}", request.PaymentId);
 
         return true;
     }

src/Application/TakeoutSaaS.Application/App/Payments/Handlers/GetPaymentByIdQueryHandler.cs

@@ -3,7 +3,6 @@ using TakeoutSaaS.Application.App.Payments.Dto;
 using TakeoutSaaS.Application.App.Payments.Queries;
 using TakeoutSaaS.Domain.Payments.Entities;
 using TakeoutSaaS.Domain.Payments.Repositories;
-using TakeoutSaaS.Shared.Abstractions.Tenancy;
 
 namespace TakeoutSaaS.Application.App.Payments.Handlers;
 
@@ -11,24 +10,21 @@ namespace TakeoutSaaS.Application.App.Payments.Handlers;
 /// 支付记录详情查询处理器。
 /// </summary>
 public sealed class GetPaymentByIdQueryHandler(
-    IPaymentRepository paymentRepository,
+    IPaymentRepository paymentRepository)
-    ITenantProvider tenantProvider)
     : IRequestHandler<GetPaymentByIdQuery, PaymentDto?>
 {
-    private readonly IPaymentRepository _paymentRepository = paymentRepository;
-    private readonly ITenantProvider _tenantProvider = tenantProvider;
-
     /// <inheritdoc />
     public async Task<PaymentDto?> Handle(GetPaymentByIdQuery request, CancellationToken cancellationToken)
     {
-        var tenantId = _tenantProvider.GetCurrentTenantId();
+        // 1. 查询支付记录（跨租户）
-        var payment = await _paymentRepository.FindByIdAsync(request.PaymentId, tenantId, cancellationToken);
+        var payment = await paymentRepository.FindByIdAsync(request.PaymentId, cancellationToken);
         if (payment == null)
         {
             return null;
         }
 
-        var refunds = await _paymentRepository.GetRefundsAsync(payment.Id, tenantId, cancellationToken);
+        // 2. (空行后) 查询退款记录（按支付租户）
+        var refunds = await paymentRepository.GetRefundsAsync(payment.Id, payment.TenantId, cancellationToken);
         return MapToDto(payment, refunds);
     }
 

src/Application/TakeoutSaaS.Application/App/Payments/Handlers/SearchPaymentsQueryHandler.cs

@@ -3,7 +3,6 @@ using TakeoutSaaS.Application.App.Payments.Dto;
 using TakeoutSaaS.Application.App.Payments.Queries;
 using TakeoutSaaS.Domain.Payments.Repositories;
 using TakeoutSaaS.Shared.Abstractions.Results;
-using TakeoutSaaS.Shared.Abstractions.Tenancy;
 
 namespace TakeoutSaaS.Application.App.Payments.Handlers;
 
@@ -11,30 +10,29 @@ namespace TakeoutSaaS.Application.App.Payments.Handlers;
 /// 支付记录列表查询处理器。
 /// </summary>
 public sealed class SearchPaymentsQueryHandler(
-    IPaymentRepository paymentRepository,
+    IPaymentRepository paymentRepository)
-    ITenantProvider tenantProvider)
     : IRequestHandler<SearchPaymentsQuery, PagedResult<PaymentDto>>
 {
-    private readonly IPaymentRepository _paymentRepository = paymentRepository;
-    private readonly ITenantProvider _tenantProvider = tenantProvider;
-
     /// <inheritdoc />
     public async Task<PagedResult<PaymentDto>> Handle(SearchPaymentsQuery request, CancellationToken cancellationToken)
     {
-        var tenantId = _tenantProvider.GetCurrentTenantId();
+        // 1. 查询支付记录（可选租户过滤）
-        var payments = await _paymentRepository.SearchAsync(tenantId, request.Status, cancellationToken);
+        var payments = await paymentRepository.SearchAsync(request.TenantId, request.Status, cancellationToken);
 
+        // 2. (空行后) 可选过滤：订单
         if (request.OrderId.HasValue)
         {
             payments = payments.Where(x => x.OrderId == request.OrderId.Value).ToList();
         }
 
+        // 3. (空行后) 排序与分页
         var sorted = ApplySorting(payments, request.SortBy, request.SortDescending);
         var paged = sorted
             .Skip((request.Page - 1) * request.PageSize)
             .Take(request.PageSize)
             .ToList();
 
+        // 4. (空行后) 映射 DTO 并返回分页结果
         var items = paged.Select(payment => new PaymentDto
         {
             Id = payment.Id,

src/Application/TakeoutSaaS.Application/App/Payments/Handlers/UpdatePaymentCommandHandler.cs

@@ -4,7 +4,6 @@ using TakeoutSaaS.Application.App.Payments.Commands;
 using TakeoutSaaS.Application.App.Payments.Dto;
 using TakeoutSaaS.Domain.Payments.Entities;
 using TakeoutSaaS.Domain.Payments.Repositories;
-using TakeoutSaaS.Shared.Abstractions.Tenancy;
 
 namespace TakeoutSaaS.Application.App.Payments.Handlers;
 
@@ -13,24 +12,20 @@ namespace TakeoutSaaS.Application.App.Payments.Handlers;
 /// </summary>
 public sealed class UpdatePaymentCommandHandler(
     IPaymentRepository paymentRepository,
-    ITenantProvider tenantProvider,
     ILogger<UpdatePaymentCommandHandler> logger)
     : IRequestHandler<UpdatePaymentCommand, PaymentDto?>
 {
-    private readonly IPaymentRepository _paymentRepository = paymentRepository;
-    private readonly ITenantProvider _tenantProvider = tenantProvider;
-    private readonly ILogger<UpdatePaymentCommandHandler> _logger = logger;
-
     /// <inheritdoc />
     public async Task<PaymentDto?> Handle(UpdatePaymentCommand request, CancellationToken cancellationToken)
     {
-        var tenantId = _tenantProvider.GetCurrentTenantId();
+        // 1. 查询支付记录（跨租户）
-        var existing = await _paymentRepository.FindByIdAsync(request.PaymentId, tenantId, cancellationToken);
+        var existing = await paymentRepository.FindByIdAsync(request.PaymentId, cancellationToken);
         if (existing == null)
         {
             return null;
         }
 
+        // 2. (空行后) 更新字段
         existing.OrderId = request.OrderId;
         existing.Method = request.Method;
         existing.Status = request.Status;
@@ -41,11 +36,13 @@ public sealed class UpdatePaymentCommandHandler(
         existing.Remark = request.Remark?.Trim();
         existing.Payload = request.Payload;
 
-        await _paymentRepository.UpdatePaymentAsync(existing, cancellationToken);
+        // 3. (空行后) 持久化
-        await _paymentRepository.SaveChangesAsync(cancellationToken);
+        await paymentRepository.UpdatePaymentAsync(existing, cancellationToken);
-        _logger.LogInformation("更新支付记录 {PaymentId}", existing.Id);
+        await paymentRepository.SaveChangesAsync(cancellationToken);
+        logger.LogInformation("更新支付记录 {PaymentId}", existing.Id);
 
-        var refunds = await _paymentRepository.GetRefundsAsync(existing.Id, tenantId, cancellationToken);
+        // 4. (空行后) 查询退款记录并返回
+        var refunds = await paymentRepository.GetRefundsAsync(existing.Id, existing.TenantId, cancellationToken);
         return MapToDto(existing, refunds);
     }
 

src/Application/TakeoutSaaS.Application/App/Payments/Queries/SearchPaymentsQuery.cs

@@ -10,6 +10,11 @@ namespace TakeoutSaaS.Application.App.Payments.Queries;
 /// </summary>
 public sealed class SearchPaymentsQuery : IRequest<PagedResult<PaymentDto>>
 {
+    /// <summary>
+    /// 租户 ID（可选，空表示跨租户查询）。
+    /// </summary>
+    public long? TenantId { get; init; }
+
     /// <summary>
     /// 订单 ID（可选）。
     /// </summary>

src/Domain/TakeoutSaaS.Domain/Payments/Repositories/IPaymentRepository.cs

@@ -17,6 +17,14 @@ public interface IPaymentRepository
     /// <returns>支付记录或 null。</returns>
     Task<PaymentRecord?> FindByIdAsync(long paymentId, long tenantId, CancellationToken cancellationToken = default);
 
+    /// <summary>
+    /// 依据标识获取支付记录（跨租户）。
+    /// </summary>
+    /// <param name="paymentId">支付记录 ID。</param>
+    /// <param name="cancellationToken">取消标记。</param>
+    /// <returns>支付记录或 null。</returns>
+    Task<PaymentRecord?> FindByIdAsync(long paymentId, CancellationToken cancellationToken = default);
+
     /// <summary>
     /// 依据订单标识获取支付记录。
     /// </summary>
@@ -67,6 +75,15 @@ public interface IPaymentRepository
     /// <returns>支付记录列表。</returns>
     Task<IReadOnlyList<PaymentRecord>> SearchAsync(long tenantId, PaymentStatus? status, CancellationToken cancellationToken = default);
 
+    /// <summary>
+    /// 按状态筛选支付记录（可选租户过滤）。
+    /// </summary>
+    /// <param name="tenantId">租户 ID（可选，空表示跨租户查询）。</param>
+    /// <param name="status">支付状态。</param>
+    /// <param name="cancellationToken">取消标记。</param>
+    /// <returns>支付记录列表。</returns>
+    Task<IReadOnlyList<PaymentRecord>> SearchAsync(long? tenantId, PaymentStatus? status, CancellationToken cancellationToken = default);
+
     /// <summary>
     /// 更新支付记录。
     /// </summary>

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

@@ -23,6 +23,16 @@ public sealed class EfPaymentRepository(TakeoutAdminDbContext context) : IPaymen
             .FirstOrDefaultAsync(cancellationToken);
     }
 
+    /// <inheritdoc />
+    public Task<PaymentRecord?> FindByIdAsync(long paymentId, CancellationToken cancellationToken = default)
+    {
+        // 1. 按主键查询（跨租户）
+        return context.PaymentRecords
+            .AsNoTracking()
+            .Where(x => x.Id == paymentId)
+            .FirstOrDefaultAsync(cancellationToken);
+    }
+
     /// <inheritdoc />
     public Task<PaymentRecord?> FindByOrderIdAsync(long orderId, long tenantId, CancellationToken cancellationToken = default)
     {
@@ -73,6 +83,28 @@ public sealed class EfPaymentRepository(TakeoutAdminDbContext context) : IPaymen
             .ToListAsync(cancellationToken);
     }
 
+    /// <inheritdoc />
+    public async Task<IReadOnlyList<PaymentRecord>> SearchAsync(long? tenantId, PaymentStatus? status, CancellationToken cancellationToken = default)
+    {
+        // 1. 构建查询（可选租户过滤）
+        var query = context.PaymentRecords.AsNoTracking();
+        if (tenantId.HasValue)
+        {
+            query = query.Where(x => x.TenantId == tenantId.Value);
+        }
+
+        // 2. (空行后) 可选过滤：支付状态
+        if (status.HasValue)
+        {
+            query = query.Where(x => x.Status == status.Value);
+        }
+
+        // 3. (空行后) 排序并返回
+        return await query
+            .OrderByDescending(x => x.CreatedAt)
+            .ToListAsync(cancellationToken);
+    }
+
     /// <inheritdoc />
     public Task SaveChangesAsync(CancellationToken cancellationToken = default)
     {