Browse Source

Make DisplayOrder effective and items sorted by ASC

pull/169/head
gdlcf88 4 years ago
parent
commit
cc062006fa
  1. 2
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductCategories/ProductCategoryAppService.cs
  2. 7
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs
  3. 3
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductViewAppService.cs

2
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductCategories/ProductCategoryAppService.cs

@ -34,6 +34,8 @@ namespace EasyAbp.EShop.Products.ProductCategories
queryable = queryable.Where(x => x.ProductId == input.ProductId);
}
queryable = queryable.OrderBy(x => x.DisplayOrder);
return queryable;
}

7
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs

@ -61,7 +61,8 @@ namespace EasyAbp.EShop.Products.Products
return query
.Where(x => x.StoreId == input.StoreId)
.WhereIf(!input.ShowHidden, x => !x.IsHidden)
.WhereIf(!input.ShowUnpublished, x => x.IsPublished);
.WhereIf(!input.ShowUnpublished, x => x.IsPublished)
.OrderBy(x => x.DisplayOrder);
}
protected override Product MapToEntity(CreateUpdateProductDto createInput)
@ -481,12 +482,12 @@ namespace EasyAbp.EShop.Products.Products
protected virtual ProductDto SortAttributesAndOptions(ProductDto productDto)
{
productDto.ProductAttributes = productDto.ProductAttributes.OrderByDescending(x => x.DisplayOrder).ToList();
productDto.ProductAttributes = productDto.ProductAttributes.OrderBy(x => x.DisplayOrder).ToList();
foreach (var productAttributeDto in productDto.ProductAttributes)
{
productAttributeDto.ProductAttributeOptions = productAttributeDto.ProductAttributeOptions
.OrderByDescending(x => x.DisplayOrder).ToList();
.OrderBy(x => x.DisplayOrder).ToList();
}
return productDto;

3
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductViewAppService.cs

@ -51,7 +51,8 @@ namespace EasyAbp.EShop.Products.Products
return query
.Where(x => x.StoreId == input.StoreId)
.WhereIf(!input.ShowHidden, x => !x.IsHidden)
.WhereIf(!input.ShowUnpublished, x => x.IsPublished);
.WhereIf(!input.ShowUnpublished, x => x.IsPublished)
.OrderBy(x => x.DisplayOrder);
}
public override async Task<PagedResultDto<ProductViewDto>> GetListAsync(GetProductListInput input)

Loading…
Cancel
Save