Browse Source

Get order list with details.

pull/87/head 0.8.5
gdlcf88 6 years ago
parent
commit
ac750c4ee6
  1. 2
      common.props
  2. 5
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application.Contracts/EasyAbp/EShop/Orders/Orders/Dtos/GetOrderListDto.cs
  3. 6
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application/EasyAbp/EShop/Orders/Orders/OrderAppService.cs

2
common.props

@ -1,7 +1,7 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<Version>0.8.4</Version> <Version>0.8.5</Version>
<NoWarn>$(NoWarn);CS1591</NoWarn> <NoWarn>$(NoWarn);CS1591</NoWarn>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>EasyAbp Team</Authors> <Authors>EasyAbp Team</Authors>

5
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? StoreId { get; set; }
public Guid? CustomerUserId { get; set; } public Guid? CustomerUserId { get; set; }
public GetOrderListDto()
{
MaxMaxResultCount = 50;
}
} }
} }

6
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;
using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Dtos;
using Volo.Abp.Application.Services; using Volo.Abp.Application.Services;
using Volo.Abp.Timing;
using Volo.Abp.Users; using Volo.Abp.Users;
namespace EasyAbp.EShop.Orders.Orders 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 GetPolicyName { get; set; } = OrdersPermissions.Orders.Default;
protected override string GetListPolicyName { get; set; } = OrdersPermissions.Orders.Default; protected override string GetListPolicyName { get; set; } = OrdersPermissions.Orders.Default;
private readonly IClock _clock;
private readonly INewOrderGenerator _newOrderGenerator; private readonly INewOrderGenerator _newOrderGenerator;
private readonly IProductAppService _productAppService; private readonly IProductAppService _productAppService;
private readonly IPurchasableChecker _purchasableChecker; private readonly IPurchasableChecker _purchasableChecker;
@ -31,14 +29,12 @@ namespace EasyAbp.EShop.Orders.Orders
private readonly IOrderRepository _repository; private readonly IOrderRepository _repository;
public OrderAppService( public OrderAppService(
IClock clock,
INewOrderGenerator newOrderGenerator, INewOrderGenerator newOrderGenerator,
IProductAppService productAppService, IProductAppService productAppService,
IPurchasableChecker purchasableChecker, IPurchasableChecker purchasableChecker,
IOrderManager orderManager, IOrderManager orderManager,
IOrderRepository repository) : base(repository) IOrderRepository repository) : base(repository)
{ {
_clock = clock;
_newOrderGenerator = newOrderGenerator; _newOrderGenerator = newOrderGenerator;
_productAppService = productAppService; _productAppService = productAppService;
_purchasableChecker = purchasableChecker; _purchasableChecker = purchasableChecker;
@ -48,7 +44,7 @@ namespace EasyAbp.EShop.Orders.Orders
protected override IQueryable<Order> CreateFilteredQuery(GetOrderListDto input) protected override IQueryable<Order> CreateFilteredQuery(GetOrderListDto input)
{ {
var query = base.CreateFilteredQuery(input); var query = _repository.WithDetails();
if (input.StoreId.HasValue) if (input.StoreId.HasValue)
{ {

Loading…
Cancel
Save