msumshk/TakeoutSaaS.AdminApi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 订单商品查询支持tenantId可选过滤

Browse Source
This commit is contained in:
MSuMshk
2026-01-29 12:14:43 +00:00
parent 7661c2aea1
commit 63b05da39a
13 changed files with 166 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Api/TakeoutSaaS.AdminApi/Controllers/OrdersController.cs
View File

@@ -45,6 +45,7 @@ public sealed class OrdersController(IMediator mediator) : BaseApiController
[PermissionAuthorize("order:read")]
[ProducesResponseType(typeof(ApiResponse<PagedResult<OrderDto>>), StatusCodes.Status200OK)]
public async Task<ApiResponse<PagedResult<OrderDto>>> List(
[FromQuery] long? tenantId,
[FromQuery] long? storeId,
[FromQuery] OrderStatus? status,
[FromQuery] PaymentStatus? paymentStatus,
@@ -58,6 +59,7 @@ public sealed class OrdersController(IMediator mediator) : BaseApiController
// 1. 组装查询参数并执行查询
var result = await mediator.Send(new SearchOrdersQuery
{
TenantId = tenantId,
StoreId = storeId,
Status = status,
PaymentStatus = paymentStatus,

2
src/Api/TakeoutSaaS.AdminApi/Controllers/ProductsController.cs
View File

@@ -44,6 +44,7 @@ public sealed class ProductsController(IMediator mediator) : BaseApiController
[PermissionAuthorize("product:read")]
[ProducesResponseType(typeof(ApiResponse<PagedResult<ProductDto>>), StatusCodes.Status200OK)]
public async Task<ApiResponse<PagedResult<ProductDto>>> List(
[FromQuery] long? tenantId,
[FromQuery] long? storeId,
[FromQuery] long? categoryId,
[FromQuery] ProductStatus? status,
@@ -56,6 +57,7 @@ public sealed class ProductsController(IMediator mediator) : BaseApiController
// 1. 组装查询参数并执行查询
var result = await mediator.Send(new SearchProductsQuery
{
TenantId = tenantId,
StoreId = storeId,
CategoryId = categoryId,
Status = status,

16
src/Application/TakeoutSaaS.Application/App/Orders/Handlers/GetOrderByIdQueryHandler.cs
View File

@@ -3,7 +3,6 @@ using TakeoutSaaS.Application.App.Orders.Dto;
using TakeoutSaaS.Application.App.Orders.Queries;
using TakeoutSaaS.Domain.Orders.Entities;
using TakeoutSaaS.Domain.Orders.Repositories;
using TakeoutSaaS.Shared.Abstractions.Tenancy;
namespace TakeoutSaaS.Application.App.Orders.Handlers;
@@ -11,29 +10,26 @@ namespace TakeoutSaaS.Application.App.Orders.Handlers;
/// 订单详情查询处理器。
/// </summary>
public sealed class GetOrderByIdQueryHandler(
IOrderRepository orderRepository,
ITenantProvider tenantProvider)
IOrderRepository orderRepository)
: IRequestHandler<GetOrderByIdQuery, OrderDto?>
{
/// <inheritdoc />
public async Task<OrderDto?> Handle(GetOrderByIdQuery request, CancellationToken cancellationToken)
{
// 1. 获取当前租户
var tenantId = tenantProvider.GetCurrentTenantId();
// 2. 查询订单主体
var order = await orderRepository.FindByIdAsync(request.OrderId, tenantId, cancellationToken);
// 1. 查询订单主体（跨租户）
var order = await orderRepository.FindByIdAsync(request.OrderId, cancellationToken);
if (order == null)
{
return null;
}
// 3. 查询关联明细
// 2. (空行后) 查询关联明细（按订单租户）
var tenantId = order.TenantId;
var items = await orderRepository.GetItemsAsync(order.Id, tenantId, cancellationToken);
var histories = await orderRepository.GetStatusHistoryAsync(order.Id, tenantId, cancellationToken);
var refunds = await orderRepository.GetRefundsAsync(order.Id, tenantId, cancellationToken);
// 4. 映射并返回
// 3. (空行后) 映射并返回
return MapToDto(order, items, histories, refunds);
}

19
src/Application/TakeoutSaaS.Application/App/Orders/Handlers/SearchOrdersQueryHandler.cs
View File

@@ -3,7 +3,6 @@ using TakeoutSaaS.Application.App.Orders.Dto;
using TakeoutSaaS.Application.App.Orders.Queries;
using TakeoutSaaS.Domain.Orders.Repositories;
using TakeoutSaaS.Shared.Abstractions.Results;
using TakeoutSaaS.Shared.Abstractions.Tenancy;
namespace TakeoutSaaS.Application.App.Orders.Handlers;
@@ -11,24 +10,22 @@ namespace TakeoutSaaS.Application.App.Orders.Handlers;
/// 订单列表查询处理器。
/// </summary>
public sealed class SearchOrdersQueryHandler(
IOrderRepository orderRepository,
ITenantProvider tenantProvider)
IOrderRepository orderRepository)
: IRequestHandler<SearchOrdersQuery, PagedResult<OrderDto>>
{
/// <inheritdoc />
public async Task<PagedResult<OrderDto>> Handle(SearchOrdersQuery request, CancellationToken cancellationToken)
{
// 1. 获取当前租户并查询订单
var tenantId = tenantProvider.GetCurrentTenantId();
var orders = await orderRepository.SearchAsync(tenantId, request.Status, request.PaymentStatus, cancellationToken);
// 1. 查询订单（可选租户过滤）
var orders = await orderRepository.SearchAsync(request.TenantId, request.Status, request.PaymentStatus, cancellationToken);
// 2. 可选过滤：门店
// 2. (空行后) 可选过滤：门店
if (request.StoreId.HasValue)
{
orders = orders.Where(x => x.StoreId == request.StoreId.Value).ToList();
}
// 3. 可选过滤：订单号模糊
// 3. (空行后) 可选过滤：订单号模糊
if (!string.IsNullOrWhiteSpace(request.OrderNo))
{
var orderNo = request.OrderNo.Trim();
@@ -37,14 +34,14 @@ public sealed class SearchOrdersQueryHandler(
.ToList();
}
// 4. 排序与分页
// 4. (空行后) 排序与分页
var sorted = ApplySorting(orders, request.SortBy, request.SortDescending);
var paged = sorted
.Skip((request.Page - 1) * request.PageSize)
.Take(request.PageSize)
.ToList();
// 5. 映射 DTO
// 5. (空行后) 映射 DTO
var items = paged.Select(order => new OrderDto
{
Id = order.Id,
@@ -72,7 +69,7 @@ public sealed class SearchOrdersQueryHandler(
CreatedAt = order.CreatedAt
}).ToList();
// 6. 返回分页结果
// 6. (空行后) 返回分页结果
return new PagedResult<OrderDto>(items, request.Page, request.PageSize, orders.Count);
}

5
src/Application/TakeoutSaaS.Application/App/Orders/Queries/SearchOrdersQuery.cs
View File

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

13
src/Application/TakeoutSaaS.Application/App/Products/Handlers/GetProductByIdQueryHandler.cs
View File

@@ -1,9 +1,7 @@
using MediatR;
using TakeoutSaaS.Application.App.Products.Dto;
using TakeoutSaaS.Application.App.Products.Queries;
using TakeoutSaaS.Domain.Products.Entities;
using TakeoutSaaS.Domain.Products.Repositories;
using TakeoutSaaS.Shared.Abstractions.Tenancy;
namespace TakeoutSaaS.Application.App.Products.Handlers;
@@ -11,18 +9,15 @@ namespace TakeoutSaaS.Application.App.Products.Handlers;
/// 商品详情查询处理器。
/// </summary>
public sealed class GetProductByIdQueryHandler(
IProductRepository productRepository,
ITenantProvider tenantProvider)
IProductRepository productRepository)
: IRequestHandler<GetProductByIdQuery, ProductDto?>
{
private readonly IProductRepository _productRepository = productRepository;
private readonly ITenantProvider _tenantProvider = tenantProvider;
/// <inheritdoc />
public async Task<ProductDto?> Handle(GetProductByIdQuery request, CancellationToken cancellationToken)
{
var tenantId = _tenantProvider.GetCurrentTenantId();
var product = await _productRepository.FindByIdAsync(request.ProductId, tenantId, cancellationToken);
// 1. 查询商品（跨租户）
var product = await productRepository.FindByIdAsync(request.ProductId, cancellationToken);
// 2. (空行后) 映射并返回
return product == null ? null : ProductMapping.ToDto(product);
}
}

14
src/Application/TakeoutSaaS.Application/App/Products/Handlers/GetProductDetailQueryHandler.cs
View File

@@ -2,7 +2,6 @@ using MediatR;
using TakeoutSaaS.Application.App.Products.Dto;
using TakeoutSaaS.Application.App.Products.Queries;
using TakeoutSaaS.Domain.Products.Repositories;
using TakeoutSaaS.Shared.Abstractions.Tenancy;
namespace TakeoutSaaS.Application.App.Products.Handlers;
@@ -10,22 +9,21 @@ namespace TakeoutSaaS.Application.App.Products.Handlers;
/// 商品全量详情查询处理器。
/// </summary>
public sealed class GetProductDetailQueryHandler(
IProductRepository productRepository,
ITenantProvider tenantProvider)
IProductRepository productRepository)
: IRequestHandler<GetProductDetailQuery, ProductDetailDto?>
{
/// <inheritdoc />
public async Task<ProductDetailDto?> Handle(GetProductDetailQuery request, CancellationToken cancellationToken)
{
// 1. 读取 SPU
var tenantId = tenantProvider.GetCurrentTenantId();
var product = await productRepository.FindByIdAsync(request.ProductId, tenantId, cancellationToken);
// 1. 读取 SPU（跨租户）
var product = await productRepository.FindByIdAsync(request.ProductId, cancellationToken);
if (product is null)
{
return null;
}
// 2. 查询子项
// 2. (空行后) 读取租户并查询子项
var tenantId = product.TenantId;
var skusTask = productRepository.GetSkusAsync(product.Id, tenantId, cancellationToken);
var attrGroupsTask = productRepository.GetAttributeGroupsAsync(product.Id, tenantId, cancellationToken);
var attrOptionsTask = productRepository.GetAttributeOptionsAsync(product.Id, tenantId, cancellationToken);
@@ -36,7 +34,7 @@ public sealed class GetProductDetailQueryHandler(
await Task.WhenAll(skusTask, attrGroupsTask, attrOptionsTask, addonGroupsTask, addonOptionsTask, mediaTask, pricingTask);
// 3. 组装 DTO
// 3. (空行后) 组装 DTO
var skus = await skusTask;
var attrGroups = await attrGroupsTask;
var attrOptions = (await attrOptionsTask).ToLookup(x => x.AttributeGroupId);

18
src/Application/TakeoutSaaS.Application/App/Products/Handlers/SearchProductsQueryHandler.cs
View File

@@ -3,7 +3,6 @@ using TakeoutSaaS.Application.App.Products.Dto;
using TakeoutSaaS.Application.App.Products.Queries;
using TakeoutSaaS.Domain.Products.Repositories;
using TakeoutSaaS.Shared.Abstractions.Results;
using TakeoutSaaS.Shared.Abstractions.Tenancy;
namespace TakeoutSaaS.Application.App.Products.Handlers;
@@ -11,25 +10,28 @@ namespace TakeoutSaaS.Application.App.Products.Handlers;
/// 商品列表查询处理器。
/// </summary>
public sealed class SearchProductsQueryHandler(
IProductRepository productRepository,
ITenantProvider tenantProvider)
IProductRepository productRepository)
: IRequestHandler<SearchProductsQuery, PagedResult<ProductDto>>
{
private readonly IProductRepository _productRepository = productRepository;
private readonly ITenantProvider _tenantProvider = tenantProvider;
/// <inheritdoc />
public async Task<PagedResult<ProductDto>> Handle(SearchProductsQuery request, CancellationToken cancellationToken)
{
var tenantId = _tenantProvider.GetCurrentTenantId();
var products = await _productRepository.SearchAsync(tenantId, request.StoreId, request.CategoryId, request.Status, cancellationToken);
// 1. 查询商品列表（可选租户过滤）
var products = await productRepository.SearchAsync(
request.TenantId,
request.StoreId,
request.CategoryId,
request.Status,
cancellationToken);
// 2. (空行后) 排序与分页
var sorted = ApplySorting(products, request.SortBy, request.SortDescending);
var paged = sorted
.Skip((request.Page - 1) * request.PageSize)
.Take(request.PageSize)
.ToList();
// 3. (空行后) 映射 DTO 并返回分页结果
var items = paged.Select(MapToDto).ToList();
return new PagedResult<ProductDto>(items, request.Page, request.PageSize, products.Count);
}

5
src/Application/TakeoutSaaS.Application/App/Products/Queries/SearchProductsQuery.cs
View File

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

18
src/Domain/TakeoutSaaS.Domain/Orders/Repositories/IOrderRepository.cs
View File

@@ -18,6 +18,14 @@ public interface IOrderRepository
/// <returns>订单实体或 null。</returns>
Task<Order?> FindByIdAsync(long orderId, long tenantId, CancellationToken cancellationToken = default);
/// <summary>
/// 依据标识获取订单（跨租户）。
/// </summary>
/// <param name="orderId">订单 ID。</param>
/// <param name="cancellationToken">取消标记。</param>
/// <returns>订单实体或 null。</returns>
Task<Order?> FindByIdAsync(long orderId, CancellationToken cancellationToken = default);
/// <summary>
/// 依据订单号获取订单。
/// </summary>
@@ -37,6 +45,16 @@ public interface IOrderRepository
/// <returns>订单集合。</returns>
Task<IReadOnlyList<Order>> SearchAsync(long tenantId, OrderStatus? status, PaymentStatus? paymentStatus, CancellationToken cancellationToken = default);
/// <summary>
/// 按状态筛选订单列表（可选租户过滤）。
/// </summary>
/// <param name="tenantId">租户 ID（可选，空表示跨租户查询）。</param>
/// <param name="status">订单状态。</param>
/// <param name="paymentStatus">支付状态。</param>
/// <param name="cancellationToken">取消标记。</param>
/// <returns>订单集合。</returns>
Task<IReadOnlyList<Order>> SearchAsync(long? tenantId, OrderStatus? status, PaymentStatus? paymentStatus, CancellationToken cancellationToken = default);
/// <summary>
/// 获取订单明细行。
/// </summary>

10
src/Domain/TakeoutSaaS.Domain/Products/Repositories/IProductRepository.cs
View File

@@ -13,11 +13,21 @@ public interface IProductRepository
/// </summary>
Task<Product?> FindByIdAsync(long productId, long tenantId, CancellationToken cancellationToken = default);
/// <summary>
/// 依据标识获取商品（跨租户）。
/// </summary>
Task<Product?> FindByIdAsync(long productId, CancellationToken cancellationToken = default);
/// <summary>
/// 按分类与状态筛选商品列表。
/// </summary>
Task<IReadOnlyList<Product>> SearchAsync(long tenantId, long? storeId, long? categoryId, ProductStatus? status, CancellationToken cancellationToken = default, DateTime? updatedAfter = null);
/// <summary>
/// 按分类与状态筛选商品列表（可选租户过滤）。
/// </summary>
Task<IReadOnlyList<Product>> SearchAsync(long? tenantId, long? storeId, long? categoryId, ProductStatus? status, CancellationToken cancellationToken = default, DateTime? updatedAfter = null);
/// <summary>
/// 获取租户下的商品分类。
/// </summary>

39
src/Infrastructure/TakeoutSaaS.Infrastructure/App/Repositories/EfOrderRepository.cs
View File

@@ -24,6 +24,16 @@ public sealed class EfOrderRepository(TakeoutAdminDbContext context) : IOrderRep
.FirstOrDefaultAsync(cancellationToken);
}
/// <inheritdoc />
public Task<Order?> FindByIdAsync(long orderId, CancellationToken cancellationToken = default)
{
// 1. 按主键查询（跨租户）
return context.Orders
.AsNoTracking()
.Where(x => x.Id == orderId)
.FirstOrDefaultAsync(cancellationToken);
}
/// <inheritdoc />
public Task<Order?> FindByOrderNoAsync(string orderNo, long tenantId, CancellationToken cancellationToken = default)
{
@@ -57,6 +67,35 @@ public sealed class EfOrderRepository(TakeoutAdminDbContext context) : IOrderRep
return orders;
}
/// <inheritdoc />
public async Task<IReadOnlyList<Order>> SearchAsync(long? tenantId, OrderStatus? status, PaymentStatus? paymentStatus, CancellationToken cancellationToken = default)
{
// 1. 构建查询（可选租户过滤）
var query = context.Orders.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. (空行后) 可选过滤：支付状态
if (paymentStatus.HasValue)
{
query = query.Where(x => x.PaymentStatus == paymentStatus.Value);
}
// 4. (空行后) 排序并返回
var orders = await query
.OrderByDescending(x => x.CreatedAt)
.ToListAsync(cancellationToken);
return orders;
}
/// <inheritdoc />
public async Task<IReadOnlyList<OrderItem>> GetItemsAsync(long orderId, long tenantId, CancellationToken cancellationToken = default)
{

51
src/Infrastructure/TakeoutSaaS.Infrastructure/App/Repositories/EfProductRepository.cs
View File

@@ -25,6 +25,16 @@ public sealed class EfProductRepository(TakeoutAdminDbContext context) : IProduc
.FirstOrDefaultAsync(cancellationToken);
}
/// <inheritdoc />
public Task<Product?> FindByIdAsync(long productId, CancellationToken cancellationToken = default)
{
// 1. 按主键查询（跨租户）
return context.Products
.AsNoTracking()
.Where(x => x.Id == productId)
.FirstOrDefaultAsync(cancellationToken);
}
/// <inheritdoc />
public async Task<IReadOnlyList<Product>> SearchAsync(long tenantId, long? storeId, long? categoryId, ProductStatus? status, CancellationToken cancellationToken = default, DateTime? updatedAfter = null)
{
@@ -59,6 +69,47 @@ public sealed class EfProductRepository(TakeoutAdminDbContext context) : IProduc
return products;
}
/// <inheritdoc />
public async Task<IReadOnlyList<Product>> SearchAsync(long? tenantId, long? storeId, long? categoryId, ProductStatus? status, CancellationToken cancellationToken = default, DateTime? updatedAfter = null)
{
// 1. 构建查询（可选租户过滤）
var query = context.Products.AsNoTracking();
if (tenantId.HasValue)
{
query = query.Where(x => x.TenantId == tenantId.Value);
}
// 2. (空行后) 可选过滤：门店
if (storeId.HasValue)
{
query = query.Where(x => x.StoreId == storeId.Value);
}
// 3. (空行后) 可选过滤：分类
if (categoryId.HasValue)
{
query = query.Where(x => x.CategoryId == categoryId.Value);
}
// 4. (空行后) 可选过滤：状态
if (status.HasValue)
{
query = query.Where(x => x.Status == status.Value);
}
// 5. (空行后) 可选过滤：更新时间下限
if (updatedAfter.HasValue)
{
query = query.Where(x => (x.UpdatedAt ?? x.CreatedAt) >= updatedAfter.Value);
}
// 6. (空行后) 排序并返回
var products = await query
.OrderBy(x => x.Name)
.ToListAsync(cancellationToken);
return products;
}
/// <inheritdoc />
public async Task<IReadOnlyList<ProductCategory>> GetCategoriesAsync(long tenantId, CancellationToken cancellationToken = default)
{