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

feat: 增加分页排序与FluentValidation

Browse Source
This commit is contained in:
MSuMshk
2025-12-02 10:50:43 +08:00
parent 93141fbf0c
commit 97bf6cacb0
63 changed files with 904 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Api/TakeoutSaaS.AdminApi/Controllers/DeliveriesController.cs
View File

@@ -49,12 +49,23 @@ public sealed class DeliveriesController : BaseApiController
[HttpGet]
[PermissionAuthorize("delivery:read")]
[ProducesResponseType(typeof(ApiResponse<IReadOnlyList<DeliveryOrderDto>>), StatusCodes.Status200OK)]
public async Task<ApiResponse<IReadOnlyList<DeliveryOrderDto>>> List([FromQuery] long? orderId, [FromQuery] DeliveryStatus? status, CancellationToken cancellationToken)
public async Task<ApiResponse<IReadOnlyList<DeliveryOrderDto>>> List(
[FromQuery] long? orderId,
[FromQuery] DeliveryStatus? status,
[FromQuery] int page = 1,
[FromQuery] int pageSize = 20,
[FromQuery] string? sortBy = null,
[FromQuery] bool sortDesc = true,
CancellationToken cancellationToken = default)
{
var result = await _mediator.Send(new SearchDeliveryOrdersQuery
{
OrderId = orderId,
Status = status
Status = status,
Page = page,
PageSize = pageSize,
SortBy = sortBy,
SortDescending = sortDesc
}, cancellationToken);
return ApiResponse<IReadOnlyList<DeliveryOrderDto>>.Ok(result);

17
src/Api/TakeoutSaaS.AdminApi/Controllers/MerchantsController.cs
View File

@@ -49,9 +49,22 @@ public sealed class MerchantsController : BaseApiController
[HttpGet]
[PermissionAuthorize("merchant:read")]
[ProducesResponseType(typeof(ApiResponse<IReadOnlyList<MerchantDto>>), StatusCodes.Status200OK)]
public async Task<ApiResponse<IReadOnlyList<MerchantDto>>> List([FromQuery] MerchantStatus? status, CancellationToken cancellationToken)
public async Task<ApiResponse<IReadOnlyList<MerchantDto>>> List(
[FromQuery] MerchantStatus? status,
[FromQuery] int page = 1,
[FromQuery] int pageSize = 20,
[FromQuery] string? sortBy = null,
[FromQuery] bool sortDesc = true,
CancellationToken cancellationToken = default)
{
var result = await _mediator.Send(new SearchMerchantsQuery { Status = status }, cancellationToken);
var result = await _mediator.Send(new SearchMerchantsQuery
{
Status = status,
Page = page,
PageSize = pageSize,
SortBy = sortBy,
SortDescending = sortDesc
}, cancellationToken);
return ApiResponse<IReadOnlyList<MerchantDto>>.Ok(result);
}

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

@@ -55,14 +55,22 @@ public sealed class OrdersController : BaseApiController
[FromQuery] OrderStatus? status,
[FromQuery] PaymentStatus? paymentStatus,
[FromQuery] string? orderNo,
CancellationToken cancellationToken)
[FromQuery] int page = 1,
[FromQuery] int pageSize = 20,
[FromQuery] string? sortBy = null,
[FromQuery] bool sortDesc = true,
CancellationToken cancellationToken = default)
{
var result = await _mediator.Send(new SearchOrdersQuery
{
StoreId = storeId,
Status = status,
PaymentStatus = paymentStatus,
OrderNo = orderNo
OrderNo = orderNo,
Page = page,
PageSize = pageSize,
SortBy = sortBy,
SortDescending = sortDesc
}, cancellationToken);
return ApiResponse<IReadOnlyList<OrderDto>>.Ok(result);

15
src/Api/TakeoutSaaS.AdminApi/Controllers/PaymentsController.cs
View File

@@ -49,12 +49,23 @@ public sealed class PaymentsController : BaseApiController
[HttpGet]
[PermissionAuthorize("payment:read")]
[ProducesResponseType(typeof(ApiResponse<IReadOnlyList<PaymentDto>>), StatusCodes.Status200OK)]
public async Task<ApiResponse<IReadOnlyList<PaymentDto>>> List([FromQuery] long? orderId, [FromQuery] PaymentStatus? status, CancellationToken cancellationToken)
public async Task<ApiResponse<IReadOnlyList<PaymentDto>>> List(
[FromQuery] long? orderId,
[FromQuery] PaymentStatus? status,
[FromQuery] int page = 1,
[FromQuery] int pageSize = 20,
[FromQuery] string? sortBy = null,
[FromQuery] bool sortDesc = true,
CancellationToken cancellationToken = default)
{
var result = await _mediator.Send(new SearchPaymentsQuery
{
OrderId = orderId,
Status = status
Status = status,
Page = page,
PageSize = pageSize,
SortBy = sortBy,
SortDescending = sortDesc
}, cancellationToken);
return ApiResponse<IReadOnlyList<PaymentDto>>.Ok(result);

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

@@ -49,13 +49,25 @@ public sealed class ProductsController : BaseApiController
[HttpGet]
[PermissionAuthorize("product:read")]
[ProducesResponseType(typeof(ApiResponse<IReadOnlyList<ProductDto>>), StatusCodes.Status200OK)]
public async Task<ApiResponse<IReadOnlyList<ProductDto>>> List([FromQuery] long? storeId, [FromQuery] long? categoryId, [FromQuery] ProductStatus? status, CancellationToken cancellationToken)
public async Task<ApiResponse<IReadOnlyList<ProductDto>>> List(
[FromQuery] long? storeId,
[FromQuery] long? categoryId,
[FromQuery] ProductStatus? status,
[FromQuery] int page = 1,
[FromQuery] int pageSize = 20,
[FromQuery] string? sortBy = null,
[FromQuery] bool sortDesc = true,
CancellationToken cancellationToken = default)
{
var result = await _mediator.Send(new SearchProductsQuery
{
StoreId = storeId,
CategoryId = categoryId,
Status = status
Status = status,
Page = page,
PageSize = pageSize,
SortBy = sortBy,
SortDescending = sortDesc
}, cancellationToken);
return ApiResponse<IReadOnlyList<ProductDto>>.Ok(result);

15
src/Api/TakeoutSaaS.AdminApi/Controllers/StoresController.cs
View File

@@ -49,12 +49,23 @@ public sealed class StoresController : BaseApiController
[HttpGet]
[PermissionAuthorize("store:read")]
[ProducesResponseType(typeof(ApiResponse<IReadOnlyList<StoreDto>>), StatusCodes.Status200OK)]
public async Task<ApiResponse<IReadOnlyList<StoreDto>>> List([FromQuery] long? merchantId, [FromQuery] StoreStatus? status, CancellationToken cancellationToken)
public async Task<ApiResponse<IReadOnlyList<StoreDto>>> List(
[FromQuery] long? merchantId,
[FromQuery] StoreStatus? status,
[FromQuery] int page = 1,
[FromQuery] int pageSize = 20,
[FromQuery] string? sortBy = null,
[FromQuery] bool sortDesc = true,
CancellationToken cancellationToken = default)
{
var result = await _mediator.Send(new SearchStoresQuery
{
MerchantId = merchantId,
Status = status
Status = status,
Page = page,
PageSize = pageSize,
SortBy = sortBy,
SortDescending = sortDesc
}, cancellationToken);
return ApiResponse<IReadOnlyList<StoreDto>>.Ok(result);