From 70307a2d71620fce16a77780e830c1a26adb542c Mon Sep 17 00:00:00 2001 From: gdlcf88 Date: Mon, 25 May 2020 18:29:58 +0800 Subject: [PATCH] Added GetByCodeAsync method --- modules/EasyAbp.EShop.Baskets/common.props | 2 +- modules/EasyAbp.EShop.Orders/common.props | 2 +- modules/EasyAbp.EShop.Payments/common.props | 2 +- modules/EasyAbp.EShop.Products/common.props | 2 +- .../Products/Products/IProductAppService.cs | 2 ++ .../Products/Products/ProductAppService.cs | 23 ++++++++++++++++++- modules/EasyAbp.EShop.Stores/common.props | 2 +- 7 files changed, 29 insertions(+), 6 deletions(-) diff --git a/modules/EasyAbp.EShop.Baskets/common.props b/modules/EasyAbp.EShop.Baskets/common.props index cd7e8f8d..bf9c7312 100644 --- a/modules/EasyAbp.EShop.Baskets/common.props +++ b/modules/EasyAbp.EShop.Baskets/common.props @@ -1,7 +1,7 @@ latest - 0.1.15 + 0.1.16 $(NoWarn);CS1591 true EasyAbp Team diff --git a/modules/EasyAbp.EShop.Orders/common.props b/modules/EasyAbp.EShop.Orders/common.props index cd7e8f8d..bf9c7312 100644 --- a/modules/EasyAbp.EShop.Orders/common.props +++ b/modules/EasyAbp.EShop.Orders/common.props @@ -1,7 +1,7 @@ latest - 0.1.15 + 0.1.16 $(NoWarn);CS1591 true EasyAbp Team diff --git a/modules/EasyAbp.EShop.Payments/common.props b/modules/EasyAbp.EShop.Payments/common.props index cd7e8f8d..bf9c7312 100644 --- a/modules/EasyAbp.EShop.Payments/common.props +++ b/modules/EasyAbp.EShop.Payments/common.props @@ -1,7 +1,7 @@ latest - 0.1.15 + 0.1.16 $(NoWarn);CS1591 true EasyAbp Team diff --git a/modules/EasyAbp.EShop.Products/common.props b/modules/EasyAbp.EShop.Products/common.props index cd7e8f8d..bf9c7312 100644 --- a/modules/EasyAbp.EShop.Products/common.props +++ b/modules/EasyAbp.EShop.Products/common.props @@ -1,7 +1,7 @@ latest - 0.1.15 + 0.1.16 $(NoWarn);CS1591 true EasyAbp Team diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/IProductAppService.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/IProductAppService.cs index 54a0fe83..9dac6b72 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/IProductAppService.cs +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/IProductAppService.cs @@ -22,6 +22,8 @@ namespace EasyAbp.EShop.Products.Products Task GetAsync(Guid id, Guid storeId); + Task GetByCodeAsync(string code, Guid storeId); + Task DeleteSkuAsync(Guid productId, Guid productSkuId, Guid storeId); } } \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs index 49292d5f..112b1089 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs @@ -239,7 +239,28 @@ namespace EasyAbp.EShop.Products.Products if (!dto.IsPublished) { - await CheckStoreIsProductOwnerAsync(id, storeId); + await CheckStoreIsProductOwnerAsync(dto.Id, storeId); + } + + await LoadRealInventoriesAsync(product, dto, storeId); + + dto.CategoryIds = (await _productCategoryRepository.GetListByProductIdAsync(dto.Id)) + .Select(x => x.CategoryId).ToList(); + + return dto; + } + + public virtual async Task GetByCodeAsync(string code, Guid storeId) + { + await CheckGetPolicyAsync(); + + var product = await _repository.GetAsync(x => x.Code == code); + + var dto = MapToGetOutputDto(product); + + if (!dto.IsPublished) + { + await CheckStoreIsProductOwnerAsync(dto.Id, storeId); } await LoadRealInventoriesAsync(product, dto, storeId); diff --git a/modules/EasyAbp.EShop.Stores/common.props b/modules/EasyAbp.EShop.Stores/common.props index cd7e8f8d..bf9c7312 100644 --- a/modules/EasyAbp.EShop.Stores/common.props +++ b/modules/EasyAbp.EShop.Stores/common.props @@ -1,7 +1,7 @@ latest - 0.1.15 + 0.1.16 $(NoWarn);CS1591 true EasyAbp Team