diff --git a/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application.Contracts/EasyAbp/EShop/Plugins/Booking/ProductAssetCategories/Dtos/GetProductAssetCategoryDto.cs b/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application.Contracts/EasyAbp/EShop/Plugins/Booking/ProductAssetCategories/Dtos/GetProductAssetCategoryListDto.cs similarity index 82% rename from plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application.Contracts/EasyAbp/EShop/Plugins/Booking/ProductAssetCategories/Dtos/GetProductAssetCategoryDto.cs rename to plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application.Contracts/EasyAbp/EShop/Plugins/Booking/ProductAssetCategories/Dtos/GetProductAssetCategoryListDto.cs index 0c219059..47f6dc8d 100644 --- a/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application.Contracts/EasyAbp/EShop/Plugins/Booking/ProductAssetCategories/Dtos/GetProductAssetCategoryDto.cs +++ b/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application.Contracts/EasyAbp/EShop/Plugins/Booking/ProductAssetCategories/Dtos/GetProductAssetCategoryListDto.cs @@ -4,7 +4,7 @@ using Volo.Abp.Application.Dtos; namespace EasyAbp.EShop.Plugins.Booking.ProductAssetCategories.Dtos; [Serializable] -public class GetProductAssetCategoryDto : PagedAndSortedResultRequestDto +public class GetProductAssetCategoryListDto : PagedAndSortedResultRequestDto { public Guid? StoreId { get; set; } diff --git a/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application.Contracts/EasyAbp/EShop/Plugins/Booking/ProductAssetCategories/IProductAssetCategoryAppService.cs b/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application.Contracts/EasyAbp/EShop/Plugins/Booking/ProductAssetCategories/IProductAssetCategoryAppService.cs index eda0cce5..8e38e9c9 100644 --- a/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application.Contracts/EasyAbp/EShop/Plugins/Booking/ProductAssetCategories/IProductAssetCategoryAppService.cs +++ b/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application.Contracts/EasyAbp/EShop/Plugins/Booking/ProductAssetCategories/IProductAssetCategoryAppService.cs @@ -9,7 +9,7 @@ namespace EasyAbp.EShop.Plugins.Booking.ProductAssetCategories ICrudAppService< ProductAssetCategoryDto, Guid, - GetProductAssetCategoryDto, + GetProductAssetCategoryListDto, CreateProductAssetCategoryDto, UpdateProductAssetCategoryDto> { diff --git a/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application.Contracts/EasyAbp/EShop/Plugins/Booking/ProductAssets/Dtos/GetProductAssetDto.cs b/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application.Contracts/EasyAbp/EShop/Plugins/Booking/ProductAssets/Dtos/GetProductAssetListDto.cs similarity index 82% rename from plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application.Contracts/EasyAbp/EShop/Plugins/Booking/ProductAssets/Dtos/GetProductAssetDto.cs rename to plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application.Contracts/EasyAbp/EShop/Plugins/Booking/ProductAssets/Dtos/GetProductAssetListDto.cs index 113df7cf..d5262816 100644 --- a/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application.Contracts/EasyAbp/EShop/Plugins/Booking/ProductAssets/Dtos/GetProductAssetDto.cs +++ b/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application.Contracts/EasyAbp/EShop/Plugins/Booking/ProductAssets/Dtos/GetProductAssetListDto.cs @@ -4,7 +4,7 @@ using Volo.Abp.Application.Dtos; namespace EasyAbp.EShop.Plugins.Booking.ProductAssets.Dtos; [Serializable] -public class GetProductAssetDto : PagedAndSortedResultRequestDto +public class GetProductAssetListDto : PagedAndSortedResultRequestDto { public Guid? StoreId { get; set; } diff --git a/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application.Contracts/EasyAbp/EShop/Plugins/Booking/ProductAssets/IProductAssetAppService.cs b/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application.Contracts/EasyAbp/EShop/Plugins/Booking/ProductAssets/IProductAssetAppService.cs index 9f732be2..6ea9b213 100644 --- a/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application.Contracts/EasyAbp/EShop/Plugins/Booking/ProductAssets/IProductAssetAppService.cs +++ b/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application.Contracts/EasyAbp/EShop/Plugins/Booking/ProductAssets/IProductAssetAppService.cs @@ -10,7 +10,7 @@ namespace EasyAbp.EShop.Plugins.Booking.ProductAssets ICrudAppService< ProductAssetDto, Guid, - GetProductAssetDto, + GetProductAssetListDto, CreateProductAssetDto, UpdateProductAssetDto> { diff --git a/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application/EasyAbp/EShop/Plugins/Booking/ProductAssetCategories/ProductAssetCategoryAppService.cs b/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application/EasyAbp/EShop/Plugins/Booking/ProductAssetCategories/ProductAssetCategoryAppService.cs index 5af372c0..e9407ce8 100644 --- a/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application/EasyAbp/EShop/Plugins/Booking/ProductAssetCategories/ProductAssetCategoryAppService.cs +++ b/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application/EasyAbp/EShop/Plugins/Booking/ProductAssetCategories/ProductAssetCategoryAppService.cs @@ -13,7 +13,7 @@ using Volo.Abp.Application.Dtos; namespace EasyAbp.EShop.Plugins.Booking.ProductAssetCategories { public class ProductAssetCategoryAppService : MultiStoreCrudAppService, + , Guid, GetProductAssetCategoryListDto, CreateProductAssetCategoryDto, UpdateProductAssetCategoryDto>, IProductAssetCategoryAppService { protected override string CrossStorePolicyName { get; set; } = BookingPermissions.ProductAssetCategory.Manage; @@ -43,7 +43,7 @@ namespace EasyAbp.EShop.Plugins.Booking.ProductAssetCategories _productAssetCategoryManager = productAssetCategoryManager; } - protected override async Task> CreateFilteredQueryAsync(GetProductAssetCategoryDto input) + protected override async Task> CreateFilteredQueryAsync(GetProductAssetCategoryListDto input) { return (await base.CreateFilteredQueryAsync(input)) .WhereIf(input.StoreId.HasValue, x => x.StoreId == input.StoreId) @@ -54,7 +54,7 @@ namespace EasyAbp.EShop.Plugins.Booking.ProductAssetCategories } public override async Task> GetListAsync( - GetProductAssetCategoryDto input) + GetProductAssetCategoryListDto input) { await CheckMultiStorePolicyAsync(input.StoreId, GetListPolicyName); diff --git a/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application/EasyAbp/EShop/Plugins/Booking/ProductAssets/ProductAssetAppService.cs b/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application/EasyAbp/EShop/Plugins/Booking/ProductAssets/ProductAssetAppService.cs index ab2f4861..8c445b6f 100644 --- a/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application/EasyAbp/EShop/Plugins/Booking/ProductAssets/ProductAssetAppService.cs +++ b/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application/EasyAbp/EShop/Plugins/Booking/ProductAssets/ProductAssetAppService.cs @@ -13,7 +13,7 @@ using Volo.Abp.Application.Dtos; namespace EasyAbp.EShop.Plugins.Booking.ProductAssets { public class ProductAssetAppService : MultiStoreCrudAppService, + , Guid, GetProductAssetListDto, CreateProductAssetDto, UpdateProductAssetDto>, IProductAssetAppService { protected override string CrossStorePolicyName { get; set; } = BookingPermissions.ProductAsset.Manage; @@ -43,7 +43,7 @@ namespace EasyAbp.EShop.Plugins.Booking.ProductAssets _productAssetManager = productAssetManager; } - protected override async Task> CreateFilteredQueryAsync(GetProductAssetDto input) + protected override async Task> CreateFilteredQueryAsync(GetProductAssetListDto input) { return (await base.CreateFilteredQueryAsync(input)) .WhereIf(input.StoreId.HasValue, x => x.StoreId == input.StoreId) @@ -54,7 +54,7 @@ namespace EasyAbp.EShop.Plugins.Booking.ProductAssets } public override async Task> GetListAsync( - GetProductAssetDto input) + GetProductAssetListDto input) { await CheckMultiStorePolicyAsync(input.StoreId, GetListPolicyName); diff --git a/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.HttpApi/EasyAbp/EShop/Plugins/Booking/ProductAssetCategories/ProductAssetCategoryController.cs b/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.HttpApi/EasyAbp/EShop/Plugins/Booking/ProductAssetCategories/ProductAssetCategoryController.cs index 445527f2..d11b1ca8 100644 --- a/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.HttpApi/EasyAbp/EShop/Plugins/Booking/ProductAssetCategories/ProductAssetCategoryController.cs +++ b/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.HttpApi/EasyAbp/EShop/Plugins/Booking/ProductAssetCategories/ProductAssetCategoryController.cs @@ -69,7 +69,7 @@ namespace EasyAbp.EShop.Plugins.Booking.ProductAssetCategories [HttpGet] [Route("")] - public virtual Task> GetListAsync(GetProductAssetCategoryDto input) + public virtual Task> GetListAsync(GetProductAssetCategoryListDto input) { return _service.GetListAsync(input); } diff --git a/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.HttpApi/EasyAbp/EShop/Plugins/Booking/ProductAssets/ProductAssetController.cs b/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.HttpApi/EasyAbp/EShop/Plugins/Booking/ProductAssets/ProductAssetController.cs index 013be0a0..27136063 100644 --- a/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.HttpApi/EasyAbp/EShop/Plugins/Booking/ProductAssets/ProductAssetController.cs +++ b/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.HttpApi/EasyAbp/EShop/Plugins/Booking/ProductAssets/ProductAssetController.cs @@ -69,7 +69,7 @@ namespace EasyAbp.EShop.Plugins.Booking.ProductAssets [HttpGet] [Route("")] - public virtual Task> GetListAsync(GetProductAssetDto input) + public virtual Task> GetListAsync(GetProductAssetListDto input) { return _service.GetListAsync(input); }