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

feat: 列表接口分页排序与验证

Browse Source
This commit is contained in:
MSuMshk
2025-12-02 11:13:14 +08:00
parent 92e4f8caa4
commit e8777faf71
19 changed files with 110 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Application/TakeoutSaaS.Application/App/Deliveries/Handlers/SearchDeliveryOrdersQueryHandler.cs
View File

@@ -2,6 +2,7 @@ using MediatR;
using TakeoutSaaS.Application.App.Deliveries.Dto;
using TakeoutSaaS.Application.App.Deliveries.Queries;
using TakeoutSaaS.Domain.Deliveries.Repositories;
using TakeoutSaaS.Shared.Abstractions.Results;
using TakeoutSaaS.Shared.Abstractions.Tenancy;
namespace TakeoutSaaS.Application.App.Deliveries.Handlers;
@@ -12,13 +13,13 @@ namespace TakeoutSaaS.Application.App.Deliveries.Handlers;
public sealed class SearchDeliveryOrdersQueryHandler(
IDeliveryRepository deliveryRepository,
ITenantProvider tenantProvider)
: IRequestHandler<SearchDeliveryOrdersQuery, IReadOnlyList<DeliveryOrderDto>>
: IRequestHandler<SearchDeliveryOrdersQuery, PagedResult<DeliveryOrderDto>>
{
private readonly IDeliveryRepository _deliveryRepository = deliveryRepository;
private readonly ITenantProvider _tenantProvider = tenantProvider;
/// <inheritdoc />
public async Task<IReadOnlyList<DeliveryOrderDto>> Handle(SearchDeliveryOrdersQuery request, CancellationToken cancellationToken)
public async Task<PagedResult<DeliveryOrderDto>> Handle(SearchDeliveryOrdersQuery request, CancellationToken cancellationToken)
{
var tenantId = _tenantProvider.GetCurrentTenantId();
var orders = await _deliveryRepository.SearchAsync(tenantId, request.Status, request.OrderId, cancellationToken);
@@ -29,7 +30,7 @@ public sealed class SearchDeliveryOrdersQueryHandler(
.Take(request.PageSize)
.ToList();
return paged.Select(order => new DeliveryOrderDto
var items = paged.Select(order => new DeliveryOrderDto
{
Id = order.Id,
TenantId = order.TenantId,
@@ -46,6 +47,8 @@ public sealed class SearchDeliveryOrdersQueryHandler(
FailureReason = order.FailureReason,
CreatedAt = order.CreatedAt
}).ToList();
return new PagedResult<DeliveryOrderDto>(items, request.Page, request.PageSize, orders.Count);
}
private static IOrderedEnumerable<Domain.Deliveries.Entities.DeliveryOrder> ApplySorting(

3
src/Application/TakeoutSaaS.Application/App/Deliveries/Queries/SearchDeliveryOrdersQuery.cs
View File

@@ -1,13 +1,14 @@
using MediatR;
using TakeoutSaaS.Application.App.Deliveries.Dto;
using TakeoutSaaS.Domain.Deliveries.Enums;
using TakeoutSaaS.Shared.Abstractions.Results;
namespace TakeoutSaaS.Application.App.Deliveries.Queries;
/// <summary>
/// 配送单列表查询。
/// </summary>
public sealed class SearchDeliveryOrdersQuery : IRequest<IReadOnlyList<DeliveryOrderDto>>
public sealed class SearchDeliveryOrdersQuery : IRequest<PagedResult<DeliveryOrderDto>>
{
/// <summary>
/// 订单 ID（可选）。

9
src/Application/TakeoutSaaS.Application/App/Merchants/Handlers/SearchMerchantsQueryHandler.cs
View File

@@ -2,6 +2,7 @@ using MediatR;
using TakeoutSaaS.Application.App.Merchants.Dto;
using TakeoutSaaS.Application.App.Merchants.Queries;
using TakeoutSaaS.Domain.Merchants.Repositories;
using TakeoutSaaS.Shared.Abstractions.Results;
using TakeoutSaaS.Shared.Abstractions.Tenancy;
namespace TakeoutSaaS.Application.App.Merchants.Handlers;
@@ -12,13 +13,13 @@ namespace TakeoutSaaS.Application.App.Merchants.Handlers;
public sealed class SearchMerchantsQueryHandler(
IMerchantRepository merchantRepository,
ITenantProvider tenantProvider)
: IRequestHandler<SearchMerchantsQuery, IReadOnlyList<MerchantDto>>
: IRequestHandler<SearchMerchantsQuery, PagedResult<MerchantDto>>
{
private readonly IMerchantRepository _merchantRepository = merchantRepository;
private readonly ITenantProvider _tenantProvider = tenantProvider;
/// <inheritdoc />
public async Task<IReadOnlyList<MerchantDto>> Handle(SearchMerchantsQuery request, CancellationToken cancellationToken)
public async Task<PagedResult<MerchantDto>> Handle(SearchMerchantsQuery request, CancellationToken cancellationToken)
{
var tenantId = _tenantProvider.GetCurrentTenantId();
var merchants = await _merchantRepository.SearchAsync(tenantId, request.Status, cancellationToken);
@@ -29,7 +30,7 @@ public sealed class SearchMerchantsQueryHandler(
.Take(request.PageSize)
.ToList();
return paged.Select(merchant => new MerchantDto
var items = paged.Select(merchant => new MerchantDto
{
Id = merchant.Id,
TenantId = merchant.TenantId,
@@ -43,6 +44,8 @@ public sealed class SearchMerchantsQueryHandler(
JoinedAt = merchant.JoinedAt,
CreatedAt = merchant.CreatedAt
}).ToList();
return new PagedResult<MerchantDto>(items, request.Page, request.PageSize, merchants.Count);
}
private static IOrderedEnumerable<Domain.Merchants.Entities.Merchant> ApplySorting(

3
src/Application/TakeoutSaaS.Application/App/Merchants/Queries/SearchMerchantsQuery.cs
View File

@@ -1,13 +1,14 @@
using MediatR;
using TakeoutSaaS.Application.App.Merchants.Dto;
using TakeoutSaaS.Domain.Merchants.Enums;
using TakeoutSaaS.Shared.Abstractions.Results;
namespace TakeoutSaaS.Application.App.Merchants.Queries;
/// <summary>
/// 搜索商户列表。
/// </summary>
public sealed class SearchMerchantsQuery : IRequest<IReadOnlyList<MerchantDto>>
public sealed class SearchMerchantsQuery : IRequest<PagedResult<MerchantDto>>
{
/// <summary>
/// 按状态过滤。

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

@@ -2,6 +2,7 @@ using MediatR;
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;
@@ -12,13 +13,13 @@ namespace TakeoutSaaS.Application.App.Orders.Handlers;
public sealed class SearchOrdersQueryHandler(
IOrderRepository orderRepository,
ITenantProvider tenantProvider)
: IRequestHandler<SearchOrdersQuery, IReadOnlyList<OrderDto>>
: IRequestHandler<SearchOrdersQuery, PagedResult<OrderDto>>
{
private readonly IOrderRepository _orderRepository = orderRepository;
private readonly ITenantProvider _tenantProvider = tenantProvider;
/// <inheritdoc />
public async Task<IReadOnlyList<OrderDto>> Handle(SearchOrdersQuery request, CancellationToken cancellationToken)
public async Task<PagedResult<OrderDto>> Handle(SearchOrdersQuery request, CancellationToken cancellationToken)
{
var tenantId = _tenantProvider.GetCurrentTenantId();
var orders = await _orderRepository.SearchAsync(tenantId, request.Status, request.PaymentStatus, cancellationToken);
@@ -42,7 +43,7 @@ public sealed class SearchOrdersQueryHandler(
.Take(request.PageSize)
.ToList();
return paged.Select(order => new OrderDto
var items = paged.Select(order => new OrderDto
{
Id = order.Id,
TenantId = order.TenantId,
@@ -68,6 +69,8 @@ public sealed class SearchOrdersQueryHandler(
Remark = order.Remark,
CreatedAt = order.CreatedAt
}).ToList();
return new PagedResult<OrderDto>(items, request.Page, request.PageSize, orders.Count);
}
private static IOrderedEnumerable<Domain.Orders.Entities.Order> ApplySorting(

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

@@ -2,13 +2,14 @@ using MediatR;
using TakeoutSaaS.Application.App.Orders.Dto;
using TakeoutSaaS.Domain.Orders.Enums;
using TakeoutSaaS.Domain.Payments.Enums;
using TakeoutSaaS.Shared.Abstractions.Results;
namespace TakeoutSaaS.Application.App.Orders.Queries;
/// <summary>
/// 订单列表查询。
/// </summary>
public sealed class SearchOrdersQuery : IRequest<IReadOnlyList<OrderDto>>
public sealed class SearchOrdersQuery : IRequest<PagedResult<OrderDto>>
{
/// <summary>
/// 门店 ID（可选）。

9
src/Application/TakeoutSaaS.Application/App/Payments/Handlers/SearchPaymentsQueryHandler.cs
View File

@@ -3,6 +3,7 @@ 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.Results;
using TakeoutSaaS.Shared.Abstractions.Tenancy;
namespace TakeoutSaaS.Application.App.Payments.Handlers;
@@ -13,13 +14,13 @@ namespace TakeoutSaaS.Application.App.Payments.Handlers;
public sealed class SearchPaymentsQueryHandler(
IPaymentRepository paymentRepository,
ITenantProvider tenantProvider)
: IRequestHandler<SearchPaymentsQuery, IReadOnlyList<PaymentDto>>
: IRequestHandler<SearchPaymentsQuery, PagedResult<PaymentDto>>
{
private readonly IPaymentRepository _paymentRepository = paymentRepository;
private readonly ITenantProvider _tenantProvider = tenantProvider;
/// <inheritdoc />
public async Task<IReadOnlyList<PaymentDto>> Handle(SearchPaymentsQuery request, CancellationToken cancellationToken)
public async Task<PagedResult<PaymentDto>> Handle(SearchPaymentsQuery request, CancellationToken cancellationToken)
{
var tenantId = _tenantProvider.GetCurrentTenantId();
var payments = await _paymentRepository.SearchAsync(tenantId, request.Status, cancellationToken);
@@ -35,7 +36,7 @@ public sealed class SearchPaymentsQueryHandler(
.Take(request.PageSize)
.ToList();
return paged.Select(payment => new PaymentDto
var items = paged.Select(payment => new PaymentDto
{
Id = payment.Id,
TenantId = payment.TenantId,
@@ -50,6 +51,8 @@ public sealed class SearchPaymentsQueryHandler(
Payload = payment.Payload,
CreatedAt = payment.CreatedAt
}).ToList();
return new PagedResult<PaymentDto>(items, request.Page, request.PageSize, payments.Count);
}
private static IOrderedEnumerable<Domain.Payments.Entities.PaymentRecord> ApplySorting(

3
src/Application/TakeoutSaaS.Application/App/Payments/Queries/SearchPaymentsQuery.cs
View File

@@ -1,13 +1,14 @@
using MediatR;
using TakeoutSaaS.Application.App.Payments.Dto;
using TakeoutSaaS.Domain.Payments.Enums;
using TakeoutSaaS.Shared.Abstractions.Results;
namespace TakeoutSaaS.Application.App.Payments.Queries;
/// <summary>
/// 支付记录列表查询。
/// </summary>
public sealed class SearchPaymentsQuery : IRequest<IReadOnlyList<PaymentDto>>
public sealed class SearchPaymentsQuery : IRequest<PagedResult<PaymentDto>>
{
/// <summary>
/// 订单 ID（可选）。

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

@@ -2,6 +2,7 @@ using MediatR;
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;
@@ -12,13 +13,13 @@ namespace TakeoutSaaS.Application.App.Products.Handlers;
public sealed class SearchProductsQueryHandler(
IProductRepository productRepository,
ITenantProvider tenantProvider)
: IRequestHandler<SearchProductsQuery, IReadOnlyList<ProductDto>>
: IRequestHandler<SearchProductsQuery, PagedResult<ProductDto>>
{
private readonly IProductRepository _productRepository = productRepository;
private readonly ITenantProvider _tenantProvider = tenantProvider;
/// <inheritdoc />
public async Task<IReadOnlyList<ProductDto>> Handle(SearchProductsQuery request, CancellationToken cancellationToken)
public async Task<PagedResult<ProductDto>> Handle(SearchProductsQuery request, CancellationToken cancellationToken)
{
var tenantId = _tenantProvider.GetCurrentTenantId();
var products = await _productRepository.SearchAsync(tenantId, request.CategoryId, request.Status, cancellationToken);
@@ -34,7 +35,8 @@ public sealed class SearchProductsQueryHandler(
.Take(request.PageSize)
.ToList();
return paged.Select(MapToDto).ToList();
var items = paged.Select(MapToDto).ToList();
return new PagedResult<ProductDto>(items, request.Page, request.PageSize, products.Count);
}
private static IOrderedEnumerable<Domain.Products.Entities.Product> ApplySorting(

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

@@ -1,13 +1,14 @@
using MediatR;
using TakeoutSaaS.Application.App.Products.Dto;
using TakeoutSaaS.Domain.Products.Enums;
using TakeoutSaaS.Shared.Abstractions.Results;
namespace TakeoutSaaS.Application.App.Products.Queries;
/// <summary>
/// 商品列表查询。
/// </summary>
public sealed class SearchProductsQuery : IRequest<IReadOnlyList<ProductDto>>
public sealed class SearchProductsQuery : IRequest<PagedResult<ProductDto>>
{
/// <summary>
/// 门店 ID（可选）。

8
src/Application/TakeoutSaaS.Application/App/Stores/Handlers/SearchStoresQueryHandler.cs
View File

@@ -2,6 +2,7 @@ using MediatR;
using TakeoutSaaS.Application.App.Stores.Dto;
using TakeoutSaaS.Application.App.Stores.Queries;
using TakeoutSaaS.Domain.Stores.Repositories;
using TakeoutSaaS.Shared.Abstractions.Results;
using TakeoutSaaS.Shared.Abstractions.Tenancy;
namespace TakeoutSaaS.Application.App.Stores.Handlers;
@@ -12,13 +13,13 @@ namespace TakeoutSaaS.Application.App.Stores.Handlers;
public sealed class SearchStoresQueryHandler(
IStoreRepository storeRepository,
ITenantProvider tenantProvider)
: IRequestHandler<SearchStoresQuery, IReadOnlyList<StoreDto>>
: IRequestHandler<SearchStoresQuery, PagedResult<StoreDto>>
{
private readonly IStoreRepository _storeRepository = storeRepository;
private readonly ITenantProvider _tenantProvider = tenantProvider;
/// <inheritdoc />
public async Task<IReadOnlyList<StoreDto>> Handle(SearchStoresQuery request, CancellationToken cancellationToken)
public async Task<PagedResult<StoreDto>> Handle(SearchStoresQuery request, CancellationToken cancellationToken)
{
var tenantId = _tenantProvider.GetCurrentTenantId();
var stores = await _storeRepository.SearchAsync(tenantId, request.Status, cancellationToken);
@@ -34,7 +35,8 @@ public sealed class SearchStoresQueryHandler(
.Take(request.PageSize)
.ToList();
return paged.Select(MapToDto).ToList();
var items = paged.Select(MapToDto).ToList();
return new PagedResult<StoreDto>(items, request.Page, request.PageSize, stores.Count);
}
private static IOrderedEnumerable<Domain.Stores.Entities.Store> ApplySorting(

3
src/Application/TakeoutSaaS.Application/App/Stores/Queries/SearchStoresQuery.cs
View File

@@ -1,13 +1,14 @@
using MediatR;
using TakeoutSaaS.Application.App.Stores.Dto;
using TakeoutSaaS.Domain.Stores.Enums;
using TakeoutSaaS.Shared.Abstractions.Results;
namespace TakeoutSaaS.Application.App.Stores.Queries;
/// <summary>
/// 门店列表查询。
/// </summary>
public sealed class SearchStoresQuery : IRequest<IReadOnlyList<StoreDto>>
public sealed class SearchStoresQuery : IRequest<PagedResult<StoreDto>>
{
/// <summary>
/// 商户 ID（可选）。