diff --git a/common.props b/common.props index 897e606f..da3e11c8 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 0.8.4 + 0.8.5 $(NoWarn);CS1591 true EasyAbp Team diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application.Contracts/EasyAbp/EShop/Orders/Orders/Dtos/GetOrderListDto.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application.Contracts/EasyAbp/EShop/Orders/Orders/Dtos/GetOrderListDto.cs index 359040e6..1a1d5a42 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application.Contracts/EasyAbp/EShop/Orders/Orders/Dtos/GetOrderListDto.cs +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application.Contracts/EasyAbp/EShop/Orders/Orders/Dtos/GetOrderListDto.cs @@ -8,5 +8,10 @@ namespace EasyAbp.EShop.Orders.Orders.Dtos public Guid? StoreId { get; set; } public Guid? CustomerUserId { get; set; } + + public GetOrderListDto() + { + MaxMaxResultCount = 50; + } } } \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application/EasyAbp/EShop/Orders/Orders/OrderAppService.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application/EasyAbp/EShop/Orders/Orders/OrderAppService.cs index d55aa3ee..1b966cd0 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application/EasyAbp/EShop/Orders/Orders/OrderAppService.cs +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application/EasyAbp/EShop/Orders/Orders/OrderAppService.cs @@ -10,7 +10,6 @@ using Microsoft.AspNetCore.Authorization; using Volo.Abp; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; -using Volo.Abp.Timing; using Volo.Abp.Users; namespace EasyAbp.EShop.Orders.Orders @@ -23,7 +22,6 @@ namespace EasyAbp.EShop.Orders.Orders protected override string GetPolicyName { get; set; } = OrdersPermissions.Orders.Default; protected override string GetListPolicyName { get; set; } = OrdersPermissions.Orders.Default; - private readonly IClock _clock; private readonly INewOrderGenerator _newOrderGenerator; private readonly IProductAppService _productAppService; private readonly IPurchasableChecker _purchasableChecker; @@ -31,14 +29,12 @@ namespace EasyAbp.EShop.Orders.Orders private readonly IOrderRepository _repository; public OrderAppService( - IClock clock, INewOrderGenerator newOrderGenerator, IProductAppService productAppService, IPurchasableChecker purchasableChecker, IOrderManager orderManager, IOrderRepository repository) : base(repository) { - _clock = clock; _newOrderGenerator = newOrderGenerator; _productAppService = productAppService; _purchasableChecker = purchasableChecker; @@ -48,7 +44,7 @@ namespace EasyAbp.EShop.Orders.Orders protected override IQueryable CreateFilteredQuery(GetOrderListDto input) { - var query = base.CreateFilteredQuery(input); + var query = _repository.WithDetails(); if (input.StoreId.HasValue) {