diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Orders.Plugins.FlashSales.Application/EasyAbp/EShop/Orders/Orders/CreateFlashSalesOrderEventHandler.cs b/plugins/FlashSales/src/EasyAbp.EShop.Orders.Plugins.FlashSales.Application/EasyAbp/EShop/Orders/Orders/CreateFlashSaleOrderEventHandler.cs similarity index 85% rename from plugins/FlashSales/src/EasyAbp.EShop.Orders.Plugins.FlashSales.Application/EasyAbp/EShop/Orders/Orders/CreateFlashSalesOrderEventHandler.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Orders.Plugins.FlashSales.Application/EasyAbp/EShop/Orders/Orders/CreateFlashSaleOrderEventHandler.cs index 2e524250..7866406c 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Orders.Plugins.FlashSales.Application/EasyAbp/EShop/Orders/Orders/CreateFlashSalesOrderEventHandler.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Orders.Plugins.FlashSales.Application/EasyAbp/EShop/Orders/Orders/CreateFlashSaleOrderEventHandler.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using EasyAbp.EShop.Orders.Orders.Dtos; +using EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; using EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; using EasyAbp.EShop.Products.ProductDetails.Dtos; using EasyAbp.EShop.Products.Products.Dtos; @@ -12,7 +13,7 @@ using Volo.Abp.Uow; namespace EasyAbp.EShop.Orders.Orders; -public class CreateFlashSalesOrderEventHandler : IDistributedEventHandler, ITransientDependency +public class CreateFlashSaleOrderEventHandler : IDistributedEventHandler, ITransientDependency { protected INewOrderGenerator NewOrderGenerator { get; } @@ -24,7 +25,7 @@ public class CreateFlashSalesOrderEventHandler : IDistributedEventHandler orderDiscountProviders, @@ -39,7 +40,7 @@ public class CreateFlashSalesOrderEventHandler : IDistributedEventHandler() { - {eventData.Product.Id, ObjectMapper.Map(eventData.Product)} + {eventData.Product.Id, ObjectMapper.Map(eventData.Product)} }; var productDetailDict = new Dictionary() { - {eventData.ProductDetail.Id, ObjectMapper.Map(eventData.ProductDetail)} + {eventData.ProductDetail.Id, ObjectMapper.Map(eventData.ProductDetail)} }; var order = await NewOrderGenerator.GenerateAsync(eventData.UserId, input, productDict, productDetailDict); @@ -70,7 +71,7 @@ public class CreateFlashSalesOrderEventHandler : IDistributedEventHandler(MemberList.Destination) + CreateMap(MemberList.Destination) .Ignore(dto => dto.Sold) .Ignore(dto => dto.MinimumPrice) .Ignore(dto => dto.MaximumPrice) .MapExtraProperties(); - CreateMap(MemberList.Destination) + CreateMap(MemberList.Destination) .ForSourceMember(entity => entity.SerializedAttributeOptionIds, opt => opt.DoNotValidate()) .Ignore(dto => dto.DiscountedPrice) .Ignore(dto => dto.Inventory) .Ignore(dto => dto.Sold) .MapExtraProperties(); - CreateMap(MemberList.Destination) + CreateMap(MemberList.Destination) .MapExtraProperties(); - CreateMap(MemberList.Destination) + CreateMap(MemberList.Destination) .MapExtraProperties(); - CreateMap(MemberList.Destination) + CreateMap(MemberList.Destination) .MapExtraProperties(); } } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Orders.Plugins.FlashSales.Application/EasyAbp/EShop/Orders/Plugins/FlashSales/EShopOrdersPluginsFlashSalesApplicationModule.cs b/plugins/FlashSales/src/EasyAbp.EShop.Orders.Plugins.FlashSales.Application/EasyAbp/EShop/Orders/Plugins/FlashSales/EShopOrdersPluginsFlashSalesApplicationModule.cs index 75ba925b..1f38ffa1 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Orders.Plugins.FlashSales.Application/EasyAbp/EShop/Orders/Plugins/FlashSales/EShopOrdersPluginsFlashSalesApplicationModule.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Orders.Plugins.FlashSales.Application/EasyAbp/EShop/Orders/Plugins/FlashSales/EShopOrdersPluginsFlashSalesApplicationModule.cs @@ -15,11 +15,6 @@ namespace EasyAbp.EShop.Orders.Plugins.FlashSales; )] public class EShopOrdersPluginsFlashSalesApplicationModule : AbpModule { - public override void PreConfigureServices(ServiceConfigurationContext context) - { - context.Services.AddSingleton(); - } - public override void ConfigureServices(ServiceConfigurationContext context) { context.Services.AddAutoMapperObjectMapper(); diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/Dtos/CreateOrderInput.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/Dtos/CreateOrderInput.cs new file mode 100644 index 00000000..a9661459 --- /dev/null +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/Dtos/CreateOrderInput.cs @@ -0,0 +1,8 @@ +using Volo.Abp.Application.Dtos; + +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans.Dtos; + +public class CreateOrderInput : ExtensibleEntityDto +{ + public string CustomerRemark { get; set; } +} diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/Dtos/FlashSalesPlanCreateDto.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/Dtos/FlashSalePlanCreateDto.cs similarity index 71% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/Dtos/FlashSalesPlanCreateDto.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/Dtos/FlashSalePlanCreateDto.cs index c8848d1d..40b5d80c 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/Dtos/FlashSalesPlanCreateDto.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/Dtos/FlashSalePlanCreateDto.cs @@ -2,10 +2,10 @@ using System; using EasyAbp.EShop.Stores.Stores; using Volo.Abp.Application.Dtos; -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans.Dtos; +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans.Dtos; [Serializable] -public class FlashSalesPlanCreateDto : ExtensibleEntityDto, IMultiStore +public class FlashSalePlanCreateDto : ExtensibleEntityDto, IMultiStore { public Guid StoreId { get; set; } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/Dtos/FlashSalesPlanDto.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/Dtos/FlashSalePlanDto.cs similarity index 71% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/Dtos/FlashSalesPlanDto.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/Dtos/FlashSalePlanDto.cs index d488fe6d..5e16106e 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/Dtos/FlashSalesPlanDto.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/Dtos/FlashSalePlanDto.cs @@ -2,10 +2,10 @@ using System; using Volo.Abp.Application.Dtos; using Volo.Abp.Domain.Entities; -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans.Dtos; +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans.Dtos; [Serializable] -public class FlashSalesPlanDto : ExtensibleFullAuditedEntityDto, IHasConcurrencyStamp +public class FlashSalePlanDto : ExtensibleFullAuditedEntityDto, IHasConcurrencyStamp { public Guid StoreId { get; set; } @@ -18,6 +18,6 @@ public class FlashSalesPlanDto : ExtensibleFullAuditedEntityDto, IHasConcu public Guid ProductSkuId { get; set; } public bool IsPublished { get; set; } - + public string ConcurrencyStamp { get; set; } } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/Dtos/FlashSalesPlanGetListInput.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/Dtos/FlashSalePlanGetListInput.cs similarity index 68% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/Dtos/FlashSalesPlanGetListInput.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/Dtos/FlashSalePlanGetListInput.cs index 13a623dd..9192589a 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/Dtos/FlashSalesPlanGetListInput.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/Dtos/FlashSalePlanGetListInput.cs @@ -1,10 +1,10 @@ using System; using Volo.Abp.Application.Dtos; -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans.Dtos; +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans.Dtos; [Serializable] -public class FlashSalesPlanGetListInput : ExtensiblePagedAndSortedResultRequestDto +public class FlashSalePlanGetListInput : ExtensiblePagedAndSortedResultRequestDto { public Guid? StoreId { get; set; } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/Dtos/FlashSalesPlanUpdateDto.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/Dtos/FlashSalePlanUpdateDto.cs similarity index 70% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/Dtos/FlashSalesPlanUpdateDto.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/Dtos/FlashSalePlanUpdateDto.cs index 269fc645..0a4075f3 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/Dtos/FlashSalesPlanUpdateDto.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/Dtos/FlashSalePlanUpdateDto.cs @@ -2,10 +2,10 @@ using System; using Volo.Abp.Application.Dtos; using Volo.Abp.Domain.Entities; -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans.Dtos; +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans.Dtos; [Serializable] -public class FlashSalesPlanUpdateDto : ExtensibleEntityDto, IHasConcurrencyStamp +public class FlashSalePlanUpdateDto : ExtensibleEntityDto, IHasConcurrencyStamp { public DateTime BeginTime { get; set; } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/IFlashSalePlanAppService.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/IFlashSalePlanAppService.cs new file mode 100644 index 00000000..d7b58b48 --- /dev/null +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/IFlashSalePlanAppService.cs @@ -0,0 +1,21 @@ +using System; +using System.Threading.Tasks; +using EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans.Dtos; +using Volo.Abp.Application.Services; + +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; + +public interface IFlashSalePlanAppService : + ICrudAppService< + FlashSalePlanDto, + Guid, + FlashSalePlanGetListInput, + FlashSalePlanCreateDto, + FlashSalePlanUpdateDto> +{ + Task PreOrderAsync(Guid id); + + Task CheckPreOrderAsync(Guid id); + + Task CreateOrderAsync(Guid id, CreateOrderInput input); +} diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/Dtos/FlashSalesResultDto.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/Dtos/FlashSaleResultDto.cs similarity index 59% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/Dtos/FlashSalesResultDto.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/Dtos/FlashSaleResultDto.cs index 8cd4cd9f..db177a87 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/Dtos/FlashSalesResultDto.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/Dtos/FlashSaleResultDto.cs @@ -1,15 +1,15 @@ using System; using Volo.Abp.Application.Dtos; -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults.Dtos; +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults.Dtos; -public class FlashSalesResultDto : ExtensibleFullAuditedEntityDto +public class FlashSaleResultDto : ExtensibleFullAuditedEntityDto { public virtual Guid StoreId { get; set; } public virtual Guid PlanId { get; set; } - public virtual FlashSalesResultStatus Status { get; set; } + public virtual FlashSaleResultStatus Status { get; set; } public virtual string Reason { get; set; } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/Dtos/FlashSalesResultGetListInput.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/Dtos/FlashSaleResultGetListInput.cs similarity index 53% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/Dtos/FlashSalesResultGetListInput.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/Dtos/FlashSaleResultGetListInput.cs index 4b063273..b5e0b823 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/Dtos/FlashSalesResultGetListInput.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/Dtos/FlashSaleResultGetListInput.cs @@ -1,15 +1,15 @@ using System; using Volo.Abp.Application.Dtos; -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults.Dtos; +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults.Dtos; -public class FlashSalesResultGetListInput : ExtensiblePagedAndSortedResultRequestDto +public class FlashSaleResultGetListInput : ExtensiblePagedAndSortedResultRequestDto { public virtual Guid? StoreId { get; set; } public virtual Guid? PlanId { get; set; } - public virtual FlashSalesResultStatus? Status { get; set; } + public virtual FlashSaleResultStatus? Status { get; set; } public virtual Guid? UserId { get; set; } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/IFlashSaleResultAppService.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/IFlashSaleResultAppService.cs new file mode 100644 index 00000000..3c1bce94 --- /dev/null +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/IFlashSaleResultAppService.cs @@ -0,0 +1,14 @@ +using System; +using EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults.Dtos; +using Volo.Abp.Application.Services; + +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults; + +public interface IFlashSaleResultAppService : + IReadOnlyAppService< + FlashSaleResultDto, + Guid, + FlashSaleResultGetListInput> +{ + +} diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/Dtos/CreateOrderInput.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/Dtos/CreateOrderInput.cs deleted file mode 100644 index b696292b..00000000 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/Dtos/CreateOrderInput.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using Volo.Abp.Application.Dtos; - -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans.Dtos; - -public class CreateOrderInput : ExtensibleEntityDto -{ - public string CustomerRemark { get; set; } -} diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/IFlashSalesPlanAppService.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/IFlashSalesPlanAppService.cs deleted file mode 100644 index 0dcaafc6..00000000 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/IFlashSalesPlanAppService.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Threading.Tasks; -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans.Dtos; -using Volo.Abp.Application.Services; - -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; - -public interface IFlashSalesPlanAppService : - ICrudAppService< - FlashSalesPlanDto, - Guid, - FlashSalesPlanGetListInput, - FlashSalesPlanCreateDto, - FlashSalesPlanUpdateDto> -{ - Task PreOrderAsync(Guid id); - - Task CheckPreOrderAsync(Guid id); - - Task CreateOrderAsync(Guid id, CreateOrderInput input); -} diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/IFlashSalesResultAppService.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/IFlashSalesResultAppService.cs deleted file mode 100644 index 0b9a013e..00000000 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/IFlashSalesResultAppService.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults.Dtos; -using Volo.Abp.Application.Services; - -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults; - -public interface IFlashSalesResultAppService : - IReadOnlyAppService< - FlashSalesResultDto, - Guid, - FlashSalesResultGetListInput> -{ - -} diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/Permissions/FlashSalesPermissionDefinitionProvider.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/Permissions/FlashSalesPermissionDefinitionProvider.cs index f4edc186..fa604608 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/Permissions/FlashSalesPermissionDefinitionProvider.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/Permissions/FlashSalesPermissionDefinitionProvider.cs @@ -10,15 +10,15 @@ public class FlashSalesPermissionDefinitionProvider : PermissionDefinitionProvid { var myGroup = context.AddGroup(FlashSalesPermissions.GroupName, L("Permission:FlashSales")); - var flashSalesPlanPermission = myGroup.AddPermission(FlashSalesPermissions.FlashSalesPlan.Default, L("Permission:FlashSalesPlan")); - flashSalesPlanPermission.AddChild(FlashSalesPermissions.FlashSalesPlan.Manage, L("Permission:Manage")); - flashSalesPlanPermission.AddChild(FlashSalesPermissions.FlashSalesPlan.CrossStore, L("Permission:CrossStore")); - flashSalesPlanPermission.AddChild(FlashSalesPermissions.FlashSalesPlan.Create, L("Permission:Create")); - flashSalesPlanPermission.AddChild(FlashSalesPermissions.FlashSalesPlan.Update, L("Permission:Update")); - flashSalesPlanPermission.AddChild(FlashSalesPermissions.FlashSalesPlan.Delete, L("Permission:Delete")); + var flashSalePlanPermission = myGroup.AddPermission(FlashSalesPermissions.FlashSalePlan.Default, L("Permission:FlashSalePlan")); + flashSalePlanPermission.AddChild(FlashSalesPermissions.FlashSalePlan.Manage, L("Permission:Manage")); + flashSalePlanPermission.AddChild(FlashSalesPermissions.FlashSalePlan.CrossStore, L("Permission:CrossStore")); + flashSalePlanPermission.AddChild(FlashSalesPermissions.FlashSalePlan.Create, L("Permission:Create")); + flashSalePlanPermission.AddChild(FlashSalesPermissions.FlashSalePlan.Update, L("Permission:Update")); + flashSalePlanPermission.AddChild(FlashSalesPermissions.FlashSalePlan.Delete, L("Permission:Delete")); - var flashSalesResultPermission = myGroup.AddPermission(FlashSalesPermissions.FlashSalesResult.Default, L("Permission:FlashSalesResult")); - flashSalesResultPermission.AddChild(FlashSalesPermissions.FlashSalesResult.Manage, L("Permission:Manage")); + var flashSaleResultPermission = myGroup.AddPermission(FlashSalesPermissions.FlashSaleResult.Default, L("Permission:FlashSaleResult")); + flashSaleResultPermission.AddChild(FlashSalesPermissions.FlashSaleResult.Manage, L("Permission:Manage")); } private static LocalizableString L(string name) diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/Permissions/FlashSalesPermissions.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/Permissions/FlashSalesPermissions.cs index d7202cf5..4259a5f3 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/Permissions/FlashSalesPermissions.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application.Contracts/EasyAbp/EShop/Plugins/FlashSales/Permissions/FlashSalesPermissions.cs @@ -11,9 +11,9 @@ public class FlashSalesPermissions return ReflectionHelper.GetPublicConstantsRecursively(typeof(FlashSalesPermissions)); } - public class FlashSalesPlan + public class FlashSalePlan { - public const string Default = GroupName + ".FlashSalesPlan"; + public const string Default = GroupName + ".FlashSalePlan"; public const string Manage = Default + ".Manage"; public const string CrossStore = Default + ".CrossStore"; public const string Update = Default + ".Update"; @@ -21,9 +21,9 @@ public class FlashSalesPermissions public const string Delete = Default + ".Delete"; } - public class FlashSalesResult + public class FlashSaleResult { - public const string Default = GroupName + ".FlashSalesResult"; + public const string Default = GroupName + ".FlashSaleResult"; public const string Manage = Default + ".Manage"; } } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlanAppService.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlanAppService.cs similarity index 66% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlanAppService.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlanAppService.cs index ac8c24f2..4dad2b85 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlanAppService.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlanAppService.cs @@ -1,8 +1,9 @@ using System; using System.Linq; using System.Threading.Tasks; -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans.Dtos; -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults; +using EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; +using EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans.Dtos; +using EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults; using EasyAbp.EShop.Plugins.FlashSales.Permissions; using EasyAbp.EShop.Products.Products; using EasyAbp.EShop.Products.Products.Dtos; @@ -21,69 +22,69 @@ using Volo.Abp.Users; namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; [Authorize] -public class FlashSalesPlanAppService : - MultiStoreCrudAppService, - IFlashSalesPlanAppService +public class FlashSalePlanAppService : + MultiStoreCrudAppService, + IFlashSalePlanAppService { - protected override string CrossStorePolicyName { get; set; } = FlashSalesPermissions.FlashSalesPlan.CrossStore; + protected override string CrossStorePolicyName { get; set; } = FlashSalesPermissions.FlashSalePlan.CrossStore; protected override string GetPolicyName { get; set; } protected override string GetListPolicyName { get; set; } - protected override string CreatePolicyName { get; set; } = FlashSalesPermissions.FlashSalesPlan.Create; - protected override string UpdatePolicyName { get; set; } = FlashSalesPermissions.FlashSalesPlan.Update; - protected override string DeletePolicyName { get; set; } = FlashSalesPermissions.FlashSalesPlan.Delete; + protected override string CreatePolicyName { get; set; } = FlashSalesPermissions.FlashSalePlan.Create; + protected override string UpdatePolicyName { get; set; } = FlashSalesPermissions.FlashSalePlan.Update; + protected override string DeletePolicyName { get; set; } = FlashSalesPermissions.FlashSalePlan.Delete; - protected IFlashSalesPlanRepository FlashSalesPlanRepository { get; } + protected IFlashSalePlanRepository FlashSalePlanRepository { get; } protected IProductAppService ProductAppService { get; } protected IDistributedCache TokenDistributedCache { get; } - protected IDistributedCache DistributedCache { get; } + protected IDistributedCache DistributedCache { get; } protected IDistributedEventBus DistributedEventBus { get; } - protected IFlashSalesResultRepository FlashSalesResultRepository { get; } + protected IFlashSaleResultRepository FlashSaleResultRepository { get; } protected IAbpDistributedLock DistributedLock { get; } - protected IFlashSalesPlanHasher FlashSalesPlanHasher { get; } + protected IFlashSalePlanHasher FlashSalesPlanHasher { get; } - public FlashSalesPlanAppService( - IFlashSalesPlanRepository flashSalesPlanRepository, + public FlashSalePlanAppService( + IFlashSalePlanRepository flashSalePlanRepository, IProductAppService productAppService, IDistributedCache tokenDistributedCache, - IDistributedCache distributedCache, + IDistributedCache distributedCache, IDistributedEventBus distributedEventBus, - IFlashSalesResultRepository flashSalesResultRepository, + IFlashSaleResultRepository flashSaleResultRepository, IAbpDistributedLock distributedLock, - IFlashSalesPlanHasher flashSalesPlanHasher) - : base(flashSalesPlanRepository) + IFlashSalePlanHasher flashSalesPlanHasher) + : base(flashSalePlanRepository) { - FlashSalesPlanRepository = flashSalesPlanRepository; + FlashSalePlanRepository = flashSalePlanRepository; ProductAppService = productAppService; TokenDistributedCache = tokenDistributedCache; DistributedCache = distributedCache; DistributedEventBus = distributedEventBus; - FlashSalesResultRepository = flashSalesResultRepository; + FlashSaleResultRepository = flashSaleResultRepository; DistributedLock = distributedLock; FlashSalesPlanHasher = flashSalesPlanHasher; } - public override async Task GetAsync(Guid id) + public override async Task GetAsync(Guid id) { - var flashSalesPlan = await GetEntityByIdAsync(id); + var flashSalePlan = await GetEntityByIdAsync(id); - await CheckMultiStorePolicyAsync(flashSalesPlan.StoreId, GetPolicyName); + await CheckMultiStorePolicyAsync(flashSalePlan.StoreId, GetPolicyName); - if (!flashSalesPlan.IsPublished) + if (!flashSalePlan.IsPublished) { - await CheckMultiStorePolicyAsync(flashSalesPlan.StoreId, FlashSalesPermissions.FlashSalesPlan.Manage); + await CheckMultiStorePolicyAsync(flashSalePlan.StoreId, FlashSalesPermissions.FlashSalePlan.Manage); } - return await MapToGetOutputDtoAsync(flashSalesPlan); + return await MapToGetOutputDtoAsync(flashSalePlan); } - public override async Task CreateAsync(FlashSalesPlanCreateDto input) + public override async Task CreateAsync(FlashSalePlanCreateDto input) { await CheckMultiStorePolicyAsync(input.StoreId, CreatePolicyName); @@ -92,7 +93,7 @@ public class FlashSalesPlanAppService : await ValidateCreateOrUpdateProductAsync(input.ProductId, product, input.ProductSkuId, productSku, input.StoreId); - var flashSalesPlan = new FlashSalesPlan( + var flashSalePlan = new FlashSalePlan( GuidGenerator.Create(), CurrentTenant.Id, input.StoreId, @@ -103,56 +104,56 @@ public class FlashSalesPlanAppService : input.IsPublished ); - await FlashSalesPlanRepository.InsertAsync(flashSalesPlan, autoSave: true); + await FlashSalePlanRepository.InsertAsync(flashSalePlan, autoSave: true); - return await MapToGetOutputDtoAsync(flashSalesPlan); + return await MapToGetOutputDtoAsync(flashSalePlan); } - public override async Task UpdateAsync(Guid id, FlashSalesPlanUpdateDto input) + public override async Task UpdateAsync(Guid id, FlashSalePlanUpdateDto input) { - var flashSalesPlan = await GetEntityByIdAsync(id); + var flashSalePlan = await GetEntityByIdAsync(id); var product = await ProductAppService.GetAsync(input.ProductId); var productSku = product.GetSkuById(input.ProductSkuId); await CheckMultiStorePolicyAsync(product.StoreId, UpdatePolicyName); - await ValidateCreateOrUpdateProductAsync(input.ProductId, product, input.ProductSkuId, productSku, flashSalesPlan.StoreId); + await ValidateCreateOrUpdateProductAsync(input.ProductId, product, input.ProductSkuId, productSku, flashSalePlan.StoreId); - if (await ExistRelatedFlashSalesResultsAsync(id) && (input.ProductId != flashSalesPlan.ProductId || input.ProductSkuId != flashSalesPlan.ProductSkuId)) + if (await ExistRelatedFlashSalesResultsAsync(id) && (input.ProductId != flashSalePlan.ProductId || input.ProductSkuId != flashSalePlan.ProductSkuId)) { - throw new ExistRelatedFlashSalesResultsException(id); + throw new RelatedFlashSaleResultsExistException(id); } - flashSalesPlan.SetTimeRange(input.BeginTime, input.EndTime); - flashSalesPlan.SetProductSku(flashSalesPlan.StoreId, input.ProductId, input.ProductSkuId); - flashSalesPlan.SetPublished(input.IsPublished); + flashSalePlan.SetTimeRange(input.BeginTime, input.EndTime); + flashSalePlan.SetProductSku(flashSalePlan.StoreId, input.ProductId, input.ProductSkuId); + flashSalePlan.SetPublished(input.IsPublished); - flashSalesPlan.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp); + flashSalePlan.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp); - await FlashSalesPlanRepository.UpdateAsync(flashSalesPlan, autoSave: true); + await FlashSalePlanRepository.UpdateAsync(flashSalePlan, autoSave: true); - return await MapToGetOutputDtoAsync(flashSalesPlan); + return await MapToGetOutputDtoAsync(flashSalePlan); } public override async Task DeleteAsync(Guid id) { - var flashSalesPlan = await GetEntityByIdAsync(id); + var flashSalePlan = await GetEntityByIdAsync(id); - await CheckMultiStorePolicyAsync(flashSalesPlan.StoreId, DeletePolicyName); + await CheckMultiStorePolicyAsync(flashSalePlan.StoreId, DeletePolicyName); if (await ExistRelatedFlashSalesResultsAsync(id)) { - throw new ExistRelatedFlashSalesResultsException(id); + throw new RelatedFlashSaleResultsExistException(id); } - await FlashSalesPlanRepository.DeleteAsync(flashSalesPlan); + await FlashSalePlanRepository.DeleteAsync(flashSalePlan); } - protected override async Task> CreateFilteredQueryAsync(FlashSalesPlanGetListInput input) + protected override async Task> CreateFilteredQueryAsync(FlashSalePlanGetListInput input) { if (input.IncludeUnpublished) { - await CheckMultiStorePolicyAsync(input.StoreId, FlashSalesPermissions.FlashSalesPlan.Manage); + await CheckMultiStorePolicyAsync(input.StoreId, FlashSalesPermissions.FlashSalePlan.Manage); } return (await base.CreateFilteredQueryAsync(input)) @@ -166,7 +167,7 @@ public class FlashSalesPlanAppService : public virtual async Task PreOrderAsync(Guid id) { - var plan = await GetFlashSalesPlanCacheAsync(id); + var plan = await GetFlashSalePlanCacheAsync(id); var product = await ProductAppService.GetAsync(plan.ProductId); var productSku = product.GetSkuById(plan.ProductSkuId); @@ -177,7 +178,7 @@ public class FlashSalesPlanAppService : public virtual async Task CheckPreOrderAsync(Guid id) { - var plan = await GetFlashSalesPlanCacheAsync(id); + var plan = await GetFlashSalePlanCacheAsync(id); var cacheHashToken = await GetCacheHashTokenAsync(plan); if (cacheHashToken.IsNullOrWhiteSpace()) @@ -198,7 +199,7 @@ public class FlashSalesPlanAppService : public virtual async Task CreateOrderAsync(Guid id, CreateOrderInput input) { - var plan = await GetFlashSalesPlanCacheAsync(id); + var plan = await GetFlashSalePlanCacheAsync(id); var now = Clock.Now; if (plan.BeginTime > now) { @@ -231,18 +232,18 @@ public class FlashSalesPlanAppService : await DistributedEventBus.PublishAsync(flashSalesReduceInventoryEto); } - protected virtual Task PrepareFlashSalesReduceInventoryEtoAsync( - FlashSalesPlanCacheItem plan, + protected virtual Task PrepareFlashSalesReduceInventoryEtoAsync( + FlashSalePlanCacheItem plan, Guid resultId, CreateOrderInput input, Guid userId, DateTime now, string hashToken) { - var planEto = ObjectMapper.Map(plan); + var planEto = ObjectMapper.Map(plan); planEto.TenantId = CurrentTenant.Id; - var eto = new FlashSalesReduceInventoryEto() + var eto = new FlashSaleReduceInventoryEto() { TenantId = CurrentTenant.Id, PlanId = plan.Id, @@ -264,31 +265,31 @@ public class FlashSalesPlanAppService : return Task.FromResult(eto); } - protected virtual async Task GetFlashSalesPlanCacheAsync(Guid id) + protected virtual async Task GetFlashSalePlanCacheAsync(Guid id) { return await DistributedCache.GetOrAddAsync(id, async () => { - var flashSalesPlan = await FlashSalesPlanRepository.GetAsync(id); - return ObjectMapper.Map(flashSalesPlan); + var flashSalesPlan = await FlashSalePlanRepository.GetAsync(id); + return ObjectMapper.Map(flashSalesPlan); }); } - protected virtual Task GetCacheKeyAsync(FlashSalesPlanCacheItem plan) + protected virtual Task GetCacheKeyAsync(FlashSalePlanCacheItem plan) { return Task.FromResult($"eshopflashsales_{CurrentTenant.Id}_{CurrentUser.Id}_{plan.ProductSkuId}"); } - protected virtual async Task GetCacheHashTokenAsync(FlashSalesPlanCacheItem plan) + protected virtual async Task GetCacheHashTokenAsync(FlashSalePlanCacheItem plan) { return await TokenDistributedCache.GetStringAsync(await GetCacheKeyAsync(plan)); } - protected virtual async Task RemoveCacheHashTokenAsync(FlashSalesPlanCacheItem plan) + protected virtual async Task RemoveCacheHashTokenAsync(FlashSalePlanCacheItem plan) { await TokenDistributedCache.RemoveAsync(await GetCacheKeyAsync(plan)); } - protected virtual async Task SetCacheHashTokenAsync(FlashSalesPlanCacheItem plan, ProductDto product, ProductSkuDto productSku) + protected virtual async Task SetCacheHashTokenAsync(FlashSalePlanCacheItem plan, ProductDto product, ProductSkuDto productSku) { var hashToken = await FlashSalesPlanHasher.HashAsync(plan.LastModificationTime, product.LastModificationTime, productSku.LastModificationTime); @@ -298,7 +299,7 @@ public class FlashSalesPlanAppService : }); } - protected virtual async Task CompareHashTokenAsync(string cacheHashToken, FlashSalesPlanCacheItem plan, ProductDto product, ProductSkuDto productSku) + protected virtual async Task CompareHashTokenAsync(string cacheHashToken, FlashSalePlanCacheItem plan, ProductDto product, ProductSkuDto productSku) { if (cacheHashToken.IsNullOrWhiteSpace()) { @@ -310,7 +311,7 @@ public class FlashSalesPlanAppService : return cacheHashToken == hashToken; } - protected virtual async Task CreatePendingFlashSalesResultAsync(FlashSalesPlanCacheItem plan, Guid userId) + protected virtual async Task CreatePendingFlashSalesResultAsync(FlashSalePlanCacheItem plan, Guid userId) { var lockKey = $"create-flash-sales-order-{plan.Id}-{userId}"; @@ -322,27 +323,27 @@ public class FlashSalesPlanAppService : } // Prevent repeat submit - if (await FlashSalesResultRepository.AnyAsync(x => - x.PlanId == plan.Id && x.UserId == userId && (x.Status == FlashSalesResultStatus.Successful || x.Status == FlashSalesResultStatus.Pending)) + if (await FlashSaleResultRepository.AnyAsync(x => + x.PlanId == plan.Id && x.UserId == userId && (x.Status == FlashSaleResultStatus.Successful || x.Status == FlashSaleResultStatus.Pending)) ) { throw new BusinessException(FlashSalesErrorCodes.DuplicateFlashSalesOrder); } - var result = new FlashSalesResult( + var result = new FlashSaleResult( id: GuidGenerator.Create(), tenantId: CurrentTenant.Id, storeId: plan.StoreId, planId: plan.Id, - status: FlashSalesResultStatus.Pending, + status: FlashSaleResultStatus.Pending, reason: null, userId: userId, orderId: null ); - return await FlashSalesResultRepository.InsertAsync(result, autoSave: true); + return await FlashSaleResultRepository.InsertAsync(result, autoSave: true); } - protected virtual Task ValidatePreOrderAsync(FlashSalesPlanCacheItem plan, ProductDto product, ProductSkuDto productSku) + protected virtual Task ValidatePreOrderAsync(FlashSalePlanCacheItem plan, ProductDto product, ProductSkuDto productSku) { if (!product.IsPublished) { @@ -356,7 +357,7 @@ public class FlashSalesPlanAppService : if (!plan.IsPublished) { - throw new EntityNotFoundException(typeof(FlashSalesPlan), plan.Id); + throw new EntityNotFoundException(typeof(FlashSalePlan), plan.Id); } if (Clock.Now >= plan.EndTime) @@ -374,7 +375,7 @@ public class FlashSalesPlanAppService : protected virtual async Task ExistRelatedFlashSalesResultsAsync(Guid planId) { - return await FlashSalesResultRepository.AnyAsync(x => x.PlanId == planId); + return await FlashSaleResultRepository.AnyAsync(x => x.PlanId == planId); } protected virtual Task ValidateCreateOrUpdateProductAsync(Guid productId, ProductDto product, Guid productSkuId, ProductSkuDto productSku, Guid storeId) diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlanCacheInvalidator.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlanCacheInvalidator.cs similarity index 64% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlanCacheInvalidator.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlanCacheInvalidator.cs index 1fb0f488..1b56092a 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlanCacheInvalidator.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlanCacheInvalidator.cs @@ -1,5 +1,6 @@ using System; using System.Threading.Tasks; +using EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; using Volo.Abp.Caching; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Entities.Events; @@ -8,20 +9,20 @@ using Volo.Abp.Uow; namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; -public class FlashSalesPlanCacheInvalidator : ILocalEventHandler>, ITransientDependency +public class FlashSalePlanCacheInvalidator : ILocalEventHandler>, ITransientDependency { - protected IDistributedCache DistributedCache { get; } + protected IDistributedCache DistributedCache { get; } protected IUnitOfWorkManager UnitOfWorkManager { get; } - public FlashSalesPlanCacheInvalidator( - IDistributedCache distributedCache, + public FlashSalePlanCacheInvalidator( + IDistributedCache distributedCache, IUnitOfWorkManager unitOfWorkManager) { DistributedCache = distributedCache; UnitOfWorkManager = unitOfWorkManager; } - public virtual Task HandleEventAsync(EntityChangedEventData eventData) + public virtual Task HandleEventAsync(EntityChangedEventData eventData) { UnitOfWorkManager.Current.OnCompleted(async () => { diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlanCacheItem.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlanCacheItem.cs similarity index 53% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlanCacheItem.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlanCacheItem.cs index c6ea6537..0bb2d31e 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlanCacheItem.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlanCacheItem.cs @@ -1,10 +1,10 @@ using System; -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans.Dtos; +using EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans.Dtos; namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; [Serializable] -public class FlashSalesPlanCacheItem : FlashSalesPlanDto +public class FlashSalePlanCacheItem : FlashSalePlanDto { public Guid? TenantId { get; set; } } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/ProductIsNotInThisStoreException.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/ProductIsNotInThisStoreException.cs similarity index 100% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/ProductIsNotInThisStoreException.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/ProductIsNotInThisStoreException.cs diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/ProductSkuIsNotFoundException.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/ProductSkuIsNotFoundException.cs similarity index 100% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/ProductSkuIsNotFoundException.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/ProductSkuIsNotFoundException.cs diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/ExistRelatedFlashSalesResultsException.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/RelatedFlashSaleResultsExistException.cs similarity index 50% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/ExistRelatedFlashSalesResultsException.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/RelatedFlashSaleResultsExistException.cs index dcf50d5b..e0c9f49f 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/ExistRelatedFlashSalesResultsException.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/RelatedFlashSaleResultsExistException.cs @@ -5,9 +5,9 @@ using Volo.Abp; namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; [Serializable] -public class ExistRelatedFlashSalesResultsException : BusinessException +public class RelatedFlashSaleResultsExistException : BusinessException { - public ExistRelatedFlashSalesResultsException(Guid planId) : base(FlashSalesErrorCodes.ExistRelatedFlashSalesResults) + public RelatedFlashSaleResultsExistException(Guid planId) : base(FlashSalesErrorCodes.RelatedFlashSaleResultsExist) { WithData(nameof(planId), planId); } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/UnexpectedInventoryStrategyException.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/UnexpectedInventoryStrategyException.cs similarity index 100% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/UnexpectedInventoryStrategyException.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/UnexpectedInventoryStrategyException.cs diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResultAppService.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResultAppService.cs similarity index 64% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResultAppService.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResultAppService.cs index 854ca5e2..a710c0f4 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResultAppService.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResultAppService.cs @@ -1,26 +1,27 @@ using System; using System.Linq; using System.Threading.Tasks; -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults.Dtos; +using EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults; +using EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults.Dtos; using EasyAbp.EShop.Plugins.FlashSales.Permissions; using Volo.Abp.Application.Services; namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults; -public class FlashSalesResultAppService : - ReadOnlyAppService, - IFlashSalesResultAppService +public class FlashSaleResultAppService : + ReadOnlyAppService, + IFlashSaleResultAppService { protected override string GetPolicyName { get; set; } protected override string GetListPolicyName { get; set; } - protected IFlashSalesResultRepository FlashSalesResultRepository { get; } + protected IFlashSaleResultRepository FlashSaleResultRepository { get; } - public FlashSalesResultAppService(IFlashSalesResultRepository flashSalesResultRepository) : base(flashSalesResultRepository) + public FlashSaleResultAppService(IFlashSaleResultRepository flashSalesResultRepository) : base(flashSalesResultRepository) { } - public override async Task GetAsync(Guid id) + public override async Task GetAsync(Guid id) { await CheckGetPolicyAsync(); @@ -28,17 +29,17 @@ public class FlashSalesResultAppService : if (flashSalesPlan.UserId != CurrentUser.Id) { - await CheckPolicyAsync(FlashSalesPermissions.FlashSalesResult.Manage); + await CheckPolicyAsync(FlashSalesPermissions.FlashSaleResult.Manage); } return await MapToGetOutputDtoAsync(flashSalesPlan); } - protected override async Task> CreateFilteredQueryAsync(FlashSalesResultGetListInput input) + protected override async Task> CreateFilteredQueryAsync(FlashSaleResultGetListInput input) { if (input.UserId != CurrentUser.Id) { - await CheckPolicyAsync(FlashSalesPermissions.FlashSalesResult.Manage); + await CheckPolicyAsync(FlashSalesPermissions.FlashSaleResult.Manage); } return (await base.CreateFilteredQueryAsync(input)) diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalesApplicationAutoMapperProfile.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalesApplicationAutoMapperProfile.cs index 8e597523..51b1f941 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalesApplicationAutoMapperProfile.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Application/EasyAbp/EShop/Plugins/FlashSales/FlashSalesApplicationAutoMapperProfile.cs @@ -1,8 +1,9 @@ using AutoMapper; +using EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; +using EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans.Dtos; +using EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults; +using EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults.Dtos; using EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans.Dtos; -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults; -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults.Dtos; namespace EasyAbp.EShop.Plugins.FlashSales; @@ -13,16 +14,16 @@ public class FlashSalesApplicationAutoMapperProfile : Profile /* You can configure your AutoMapper mapping configuration here. * Alternatively, you can split your mapping configurations * into multiple profile classes for a better organization. */ - CreateMap() + CreateMap() .MapExtraProperties(); - CreateMap(MemberList.Source); - CreateMap(MemberList.Source); - CreateMap() + CreateMap(MemberList.Source); + CreateMap(MemberList.Source); + CreateMap() .MapExtraProperties(); - CreateMap() + CreateMap() .MapExtraProperties(); - CreateMap() + CreateMap() .MapExtraProperties(); } } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/CreateFlashSalesOrderCompleteEto.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/CreateFlashSaleOrderCompleteEto.cs similarity index 85% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/CreateFlashSalesOrderCompleteEto.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/CreateFlashSaleOrderCompleteEto.cs index 6427320b..083afbfb 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/CreateFlashSalesOrderCompleteEto.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/CreateFlashSaleOrderCompleteEto.cs @@ -4,7 +4,7 @@ using Volo.Abp.ObjectExtending; namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; -public class CreateFlashSalesOrderCompleteEto : ExtensibleObject, IMultiTenant +public class CreateFlashSaleOrderCompleteEto : ExtensibleObject, IMultiTenant { public Guid? TenantId { get; set; } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/CreateFlashSalesOrderEto.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/CreateFlashSaleOrderEto.cs similarity index 56% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/CreateFlashSalesOrderEto.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/CreateFlashSaleOrderEto.cs index 27a45274..df9dc25a 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/CreateFlashSalesOrderEto.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/CreateFlashSaleOrderEto.cs @@ -1,12 +1,11 @@ using System; -using EasyAbp.EShop.Products.Products; using Volo.Abp.MultiTenancy; using Volo.Abp.ObjectExtending; -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; [Serializable] -public class CreateFlashSalesOrderEto : ExtensibleObject, IMultiTenant +public class CreateFlashSaleOrderEto : ExtensibleObject, IMultiTenant { public Guid? TenantId { get; set; } @@ -24,9 +23,9 @@ public class CreateFlashSalesOrderEto : ExtensibleObject, IMultiTenant public int Quantity { get; set; } - public FlashSalesProductEto Product { get; set; } + public FlashSaleProductEto Product { get; set; } - public FlashSalesProductDetailEto ProductDetail { get; set; } + public FlashSaleProductDetailEto ProductDetail { get; set; } - public FlashSalesPlanEto Plan { get; set; } + public FlashSalePlanEto Plan { get; set; } } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlanEto.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlanEto.cs similarity index 74% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlanEto.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlanEto.cs index 06cc6fdd..275e352f 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlanEto.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlanEto.cs @@ -2,10 +2,10 @@ using Volo.Abp.MultiTenancy; using Volo.Abp.ObjectExtending; -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; [Serializable] -public class FlashSalesPlanEto : FullAuditedEntityEto, IMultiTenant +public class FlashSalePlanEto : FullAuditedEntityEto, IMultiTenant { public Guid? TenantId { get; set; } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlanHasher.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlanHasher.cs similarity index 85% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlanHasher.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlanHasher.cs index 069689c4..8531b8a7 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlanHasher.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlanHasher.cs @@ -4,9 +4,9 @@ using System.Text; using System.Threading.Tasks; using Volo.Abp.DependencyInjection; -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; -public class FlashSalesPlanHasher : IFlashSalesPlanHasher, ITransientDependency +public class FlashSalePlanHasher : IFlashSalePlanHasher, ITransientDependency { public virtual Task HashAsync(DateTime? planLastModificationTime, DateTime? productLastModificationTime, DateTime? productSkuLastModificationTime) { diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesProductAttributeEto.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSaleProductAttributeEto.cs similarity index 50% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesProductAttributeEto.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSaleProductAttributeEto.cs index d68e06af..7e9f1e8c 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesProductAttributeEto.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSaleProductAttributeEto.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using EasyAbp.EShop.Products.Products; -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; [Serializable] -public class FlashSalesProductAttributeEto : FullAuditedEntityEto, IProductAttribute +public class FlashSaleProductAttributeEto : FullAuditedEntityEto, IProductAttribute { public string DisplayName { get; set; } @@ -13,5 +13,5 @@ public class FlashSalesProductAttributeEto : FullAuditedEntityEto, IProduc public int DisplayOrder { get; set; } - public List ProductAttributeOptions { get; set; } + public List ProductAttributeOptions { get; set; } } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesProductAttributeOptionEto.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSaleProductAttributeOptionEto.cs similarity index 55% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesProductAttributeOptionEto.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSaleProductAttributeOptionEto.cs index 67116407..4548b41c 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesProductAttributeOptionEto.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSaleProductAttributeOptionEto.cs @@ -1,10 +1,10 @@ using System; using EasyAbp.EShop.Products.Products; -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; [Serializable] -public class FlashSalesProductAttributeOptionEto : FullAuditedEntityEto, IProductAttributeOption +public class FlashSaleProductAttributeOptionEto : FullAuditedEntityEto, IProductAttributeOption { public string DisplayName { get; set; } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/ProductDetailEto.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSaleProductDetailEto.cs similarity index 56% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/ProductDetailEto.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSaleProductDetailEto.cs index 71e05917..9b2a267d 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/ProductDetailEto.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSaleProductDetailEto.cs @@ -1,10 +1,10 @@ using System; using Volo.Abp.MultiTenancy; -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; [Serializable] -public class FlashSalesProductDetailEto : FullAuditedEntityEto, IMultiTenant +public class FlashSaleProductDetailEto : FullAuditedEntityEto, IMultiTenant { public Guid? TenantId { get; set; } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesProductEto.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSaleProductEto.cs similarity index 74% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesProductEto.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSaleProductEto.cs index 57922d52..6fe3f12c 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesProductEto.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSaleProductEto.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using EasyAbp.EShop.Products.Products; using Volo.Abp.MultiTenancy; -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; [Serializable] -public class FlashSalesProductEto : FullAuditedEntityEto, IProduct, IMultiTenant +public class FlashSaleProductEto : FullAuditedEntityEto, IProduct, IMultiTenant { public Guid? TenantId { get; set; } @@ -38,7 +38,7 @@ public class FlashSalesProductEto : FullAuditedEntityEto, IProduct, IMulti public TimeSpan? PaymentExpireIn { get; set; } - public List ProductAttributes { get; set; } + public List ProductAttributes { get; set; } - public List ProductSkus { get; set; } + public List ProductSkus { get; set; } } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesProductSkuEto.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSaleProductSkuEto.cs similarity index 81% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesProductSkuEto.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSaleProductSkuEto.cs index 3df32c9b..c629db7f 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesProductSkuEto.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSaleProductSkuEto.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using EasyAbp.EShop.Products.Products; -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; [Serializable] -public class FlashSalesProductSkuEto : FullAuditedEntityEto, IProductSku +public class FlashSaleProductSkuEto : FullAuditedEntityEto, IProductSku { public List AttributeOptionIds { get; set; } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesReduceInventoryEto.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSaleReduceInventoryEto.cs similarity index 72% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesReduceInventoryEto.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSaleReduceInventoryEto.cs index 4286811c..a77bfb77 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesReduceInventoryEto.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSaleReduceInventoryEto.cs @@ -2,10 +2,10 @@ using Volo.Abp.MultiTenancy; using Volo.Abp.ObjectExtending; -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; [Serializable] -public class FlashSalesReduceInventoryEto : ExtensibleObject, IMultiTenant +public class FlashSaleReduceInventoryEto : ExtensibleObject, IMultiTenant { public Guid? TenantId { get; set; } @@ -23,7 +23,7 @@ public class FlashSalesReduceInventoryEto : ExtensibleObject, IMultiTenant public int Quantity { get; set; } - public FlashSalesPlanEto Plan { get; set; } + public FlashSalePlanEto Plan { get; set; } public string HashToken { get; set; } } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/IFlashSalesPlanHasher.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/IFlashSalePlanHasher.cs similarity index 66% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/IFlashSalesPlanHasher.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/IFlashSalePlanHasher.cs index 153f7b11..6da39e91 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/IFlashSalesPlanHasher.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/IFlashSalePlanHasher.cs @@ -1,9 +1,9 @@ using System; using System.Threading.Tasks; -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; -public interface IFlashSalesPlanHasher +public interface IFlashSalePlanHasher { Task HashAsync(DateTime? planLastModificationTime, DateTime? productLastModificationTime, DateTime? productSkuLastModificationTime); } \ No newline at end of file diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResultFailedReason.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResultFailedReason.cs similarity index 57% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResultFailedReason.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResultFailedReason.cs index 76f3d5c7..e18b76cb 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResultFailedReason.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResultFailedReason.cs @@ -1,6 +1,6 @@ -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults; +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults; -public static class FlashSalesResultFailedReason +public static class FlashSaleResultFailedReason { public const string InsufficientInventory = nameof(InsufficientInventory); diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResultStatus.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResultStatus.cs new file mode 100644 index 00000000..4b2c972b --- /dev/null +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResultStatus.cs @@ -0,0 +1,8 @@ +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults; + +public enum FlashSaleResultStatus +{ + Pending = 0, + Successful = 1, + Failed = 2 +} diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesErrorCodes.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesErrorCodes.cs index ba672872..5857aaba 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesErrorCodes.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesErrorCodes.cs @@ -26,5 +26,5 @@ public static class FlashSalesErrorCodes public const string DuplicateFlashSalesOrder = $"{Namespace}:{nameof(DuplicateFlashSalesOrder)}"; - public const string ExistRelatedFlashSalesResults = $"{Namespace}:{nameof(ExistRelatedFlashSalesResults)}"; + public const string RelatedFlashSaleResultsExist = $"{Namespace}:{nameof(RelatedFlashSaleResultsExist)}"; } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResultStatus.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResultStatus.cs deleted file mode 100644 index 2f242858..00000000 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResultStatus.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults; - -public enum FlashSalesResultStatus -{ - Pending = 0, - Successful = 1, - Failed = 2 -} diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/Localization/en.json b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/Localization/en.json index c4a32c55..a0863199 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/Localization/en.json +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/Localization/en.json @@ -6,47 +6,47 @@ "EasyAbp.EShop.Plugins.FlashSales:ProductSkuIsNotFound": "ProductSku '{productSkuId}' is not found", "EasyAbp.EShop.Plugins.FlashSales:ProductIsNotPublished": "Product is not published", "EasyAbp.EShop.Plugins.FlashSales:ProductSkuInventoryExceeded": "ProductSku inventory exceeded", - "EasyAbp.EShop.Plugins.FlashSales:UnexpectedInventoryStrategy": "Only the specified inventory strategy {expectedInventoryStrategy} is allowed.", + "EasyAbp.EShop.Plugins.FlashSales:UnexpectedInventoryStrategy": "Only the specified inventory strategy {expectedInventoryStrategy} product is allowed.", "EasyAbp.EShop.Plugins.FlashSales:PreOrderExpired": "Pre order expired", "EasyAbp.EShop.Plugins.FlashSales:FlashSaleNotStarted": "Flash-sale not started", "EasyAbp.EShop.Plugins.FlashSales:FlashSaleIsOver": "Flash-sale is over", "EasyAbp.EShop.Plugins.FlashSales:BusyToCreateFlashSaleOrder": "Busy to create flash-sale order", "EasyAbp.EShop.Plugins.FlashSales:DuplicateFlashSalesOrder": "Duplicate flash-sales order", - "EasyAbp.EShop.Plugins.FlashSales:ExistRelatedFlashSalesResults": "Exist Related flash-sales results", - "Menu:FlashSalesManagement": "FlashSales Management", - "Permission:FlashSalesPlan": "FlashSales Plan", + "EasyAbp.EShop.Plugins.FlashSales:RelatedFlashSaleResultsExist": "Related flash-sales results exist", + "Menu:FlashSalesManagement": "Flash-Sales Management", + "Permission:FlashSalePlan": "FlashSale Plan", "Permission:Manage": "Manage", "Permission:Create": "Create", "Permission:Update": "Update", "Permission:Delete": "Delete", - "Menu:FlashSalesPlan": "FlashSales Plan", - "FlashSalesPlan": "FlashSales Plan", - "FlashSalesPlanStoreId": "Store ID", - "FlashSalesPlanBeginTime": "Begin Time", - "FlashSalesPlanEndTime": "End Time", - "FlashSalesPlanProductId": "Product ID", - "FlashSalesPlanProductSkuId": "Product SKU ID", - "FlashSalesPlanIsPublished": "Is Published", - "CreateFlashSalesPlan": "Create", - "EditFlashSalesPlan": "Edit", - "FlashSalesPlanDeletionConfirmationMessage": "Are you sure to delete the flashSalesPlan {0}?", + "Menu:FlashSalePlan": "Flash-Sale Plan", + "FlashSalePlan": "Flash-Sale Plan", + "FlashSalePlanStoreId": "Store ID", + "FlashSalePlanBeginTime": "Begin Time", + "FlashSalePlanEndTime": "End Time", + "FlashSalePlanProductId": "Product ID", + "FlashSalePlanProductSkuId": "Product SKU ID", + "FlashSalePlanIsPublished": "Is Published", + "CreateFlashSalePlan": "Create", + "EditFlashSalePlan": "Edit", + "FlashSalePlanDeletionConfirmationMessage": "Are you sure to delete the flash-sale plan {0}?", "SuccessfullyDeleted": "Successfully deleted", - "Permission:FlashSalesResult": "FlashSales Result", - "Menu:FlashSalesResult": "FlashSales Result", - "FlashSalesResult": "FlashSales Result", - "FlashSalesResultStoreId": "Store ID", - "FlashSalesResultPlanId": "Plan ID", - "FlashSalesResultStatus": "Status", - "FlashSalesResultReason": "Reason", - "FlashSalesResultUserId": "User ID", - "FlashSalesResultOrderId": "Order ID", - "FlashSalesResultCreationTime": "Creation Time", - "ViewFlashSalesResult": "View", - "Enum:FlashSalesResultStatus.Pending": "Pending", - "Enum:FlashSalesResultStatus.Successful": "Successful", - "Enum:FlashSalesResultStatus.Failed": "Failed", - "Enum:FlashSalesResultStatus.0": "Pending", - "Enum:FlashSalesResultStatus.1": "Successful", - "Enum:FlashSalesResultStatus.2": "Failed" + "Permission:FlashSaleResult": "Flash-Sale Result", + "Menu:FlashSaleResult": "Flash-Sale Result", + "FlashSaleResult": "Flash-Sale Result", + "FlashSaleResultStoreId": "Store ID", + "FlashSaleResultPlanId": "Plan ID", + "FlashSaleResultStatus": "Status", + "FlashSaleResultReason": "Reason", + "FlashSaleResultUserId": "User ID", + "FlashSaleResultOrderId": "Order ID", + "FlashSaleResultCreationTime": "Creation Time", + "ViewFlashSaleResult": "View", + "Enum:FlashSaleResultStatus.Pending": "Pending", + "Enum:FlashSaleResultStatus.Successful": "Successful", + "Enum:FlashSaleResultStatus.Failed": "Failed", + "Enum:FlashSaleResultStatus.0": "Pending", + "Enum:FlashSaleResultStatus.1": "Successful", + "Enum:FlashSaleResultStatus.2": "Failed" } } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/Localization/zh-Hans.json b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/Localization/zh-Hans.json index 8e7293e2..2327818b 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/Localization/zh-Hans.json +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/Localization/zh-Hans.json @@ -6,47 +6,47 @@ "EasyAbp.EShop.Plugins.FlashSales:ProductSkuIsNotFound": "产品SKU'{productSkuId}'不存在", "EasyAbp.EShop.Plugins.FlashSales:ProductIsNotPublished": "产品尚未发布", "EasyAbp.EShop.Plugins.FlashSales:ProductSkuInventoryExceeded": "产品SKU库存不足", - "EasyAbp.EShop.Plugins.FlashSales:UnexpectedInventoryStrategy": "只允许使用指定的{expectedInventoryStrategy}库存策略", + "EasyAbp.EShop.Plugins.FlashSales:UnexpectedInventoryStrategy": "只允许使用指定{expectedInventoryStrategy}库存策略的产品", "EasyAbp.EShop.Plugins.FlashSales:PreOrderExpired": "预下单已过期", "EasyAbp.EShop.Plugins.FlashSales:FlashSaleNotStarted": "闪购尚未开始", "EasyAbp.EShop.Plugins.FlashSales:FlashSaleIsOver": "闪购已经结束", "EasyAbp.EShop.Plugins.FlashSales:BusyToCreateFlashSaleOrder": "闪购下单繁忙", "EasyAbp.EShop.Plugins.FlashSales:DuplicateFlashSalesOrder": "重复闪购下单", - "EasyAbp.EShop.Plugins.FlashSales:ExistRelatedFlashSalesResults": "已存在关联的闪购结果", + "EasyAbp.EShop.Plugins.FlashSales:RelatedFlashSaleResultsExist": "已存在关联的闪购结果", "Menu:FlashSalesManagement": "闪购", - "Permission:FlashSalesPlan": "闪购计划", + "Permission:FlashSalePlan": "闪购计划", "Permission:Manage": "管理", "Permission:Create": "新建", "Permission:Update": "更新", "Permission:Delete": "删除", - "Menu:FlashSalesPlan": "闪购计划", - "FlashSalesPlan": "闪购计划", - "FlashSalesPlanStoreId": "店铺 ID", - "FlashSalesPlanBeginTime": "开始时间", - "FlashSalesPlanEndTime": "结束时间", - "FlashSalesPlanProductId": "产品 ID", - "FlashSalesPlanProductSkuId": "产品SKU ID", - "FlashSalesPlanIsPublished": "发布", - "CreateFlashSalesPlan": "新建", - "EditFlashSalesPlan": "編輯", - "FlashSalesPlanDeletionConfirmationMessage": "确认删除闪购计划 {0}?", + "Menu:FlashSalePlan": "闪购计划", + "FlashSalePlan": "闪购计划", + "FlashSalePlanStoreId": "店铺 ID", + "FlashSalePlanBeginTime": "开始时间", + "FlashSalePlanEndTime": "结束时间", + "FlashSalePlanProductId": "产品 ID", + "FlashSalePlanProductSkuId": "产品SKU ID", + "FlashSalePlanIsPublished": "发布", + "CreateFlashSalePlan": "新建", + "EditFlashSalePlan": "編輯", + "FlashSalePlanDeletionConfirmationMessage": "确认删除闪购计划 {0}?", "SuccessfullyDeleted": "删除成功", - "Permission:FlashSalesResult": "闪购结果", - "Menu:FlashSalesResult": "闪购结果", - "FlashSalesResult": "闪购结果", - "FlashSalesResultStoreId": "店铺 ID", - "FlashSalesResultPlanId": "计划 ID", - "FlashSalesResultStatus": "状态", - "FlashSalesResultReason": "原因", - "FlashSalesResultUserId": "用户 ID", - "FlashSalesResultOrderId": "订单 ID", - "FlashSalesResultCreationTime": "创建时间", - "ViewFlashSalesResult": "查看", - "Enum:FlashSalesResultStatus.Pending": "等待中", - "Enum:FlashSalesResultStatus.Successful": "成功", - "Enum:FlashSalesResultStatus.Failed": "失败", - "Enum:FlashSalesResultStatus.0": "等待中", - "Enum:FlashSalesResultStatus.1": "成功", - "Enum:FlashSalesResultStatus.2": "失败" + "Permission:FlashSaleResult": "闪购结果", + "Menu:FlashSaleResult": "闪购结果", + "FlashSaleResult": "闪购结果", + "FlashSaleResultStoreId": "店铺 ID", + "FlashSaleResultPlanId": "计划 ID", + "FlashSaleResultStatus": "状态", + "FlashSaleResultReason": "原因", + "FlashSaleResultUserId": "用户 ID", + "FlashSaleResultOrderId": "订单 ID", + "FlashSaleResultCreationTime": "创建时间", + "ViewFlashSaleResult": "查看", + "Enum:FlashSaleResultStatus.Pending": "等待中", + "Enum:FlashSaleResultStatus.Successful": "成功", + "Enum:FlashSaleResultStatus.Failed": "失败", + "Enum:FlashSaleResultStatus.0": "等待中", + "Enum:FlashSaleResultStatus.1": "成功", + "Enum:FlashSaleResultStatus.2": "失败" } } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/Localization/zh-Hant.json b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/Localization/zh-Hant.json index 14084ab1..2b7767ee 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/Localization/zh-Hant.json +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared/EasyAbp/EShop/Plugins/FlashSales/Localization/zh-Hant.json @@ -6,47 +6,47 @@ "EasyAbp.EShop.Plugins.FlashSales:ProductSkuIsNotFound": "產品SKU'{productSkuId}'不存在", "EasyAbp.EShop.Plugins.FlashSales:ProductIsNotPublished": "產品尚未發佈", "EasyAbp.EShop.Plugins.FlashSales:ProductSkuInventoryExceeded": "產品SKU庫存不足", - "EasyAbp.EShop.Plugins.FlashSales:UnexpectedInventoryStrategy": "只允許使用指定的{expectedInventoryStrategy}庫存策略", + "EasyAbp.EShop.Plugins.FlashSales:UnexpectedInventoryStrategy": "只允許使用指定的{expectedInventoryStrategy}庫存策略的產品", "EasyAbp.EShop.Plugins.FlashSales:PreOrderExpired": "預下單已過期", "EasyAbp.EShop.Plugins.FlashSales:FlashSaleNotStarted": "閃購尚未開始", "EasyAbp.EShop.Plugins.FlashSales:FlashSaleIsOver": "閃購已經結束", "EasyAbp.EShop.Plugins.FlashSales:BusyToCreateFlashSaleOrder": "閃購下單繁忙", "EasyAbp.EShop.Plugins.FlashSales:DuplicateFlashSalesOrder": "重複閃購下單", - "EasyAbp.EShop.Plugins.FlashSales:ExistRelatedFlashSalesResults": "已存在關聯的閃購結果", + "EasyAbp.EShop.Plugins.FlashSales:RelatedFlashSaleResultsExist": "已存在關聯的閃購結果", "Menu:FlashSalesManagement": "閃購管理", - "Permission:FlashSalesPlan": "閃購計畫", + "Permission:FlashSalePlan": "閃購計畫", "Permission:Manage": "管理", "Permission:Create": "新建", "Permission:Update": "更新", "Permission:Delete": "删除", - "Menu:FlashSalesPlan": "閃購計畫", - "FlashSalesPlan": "閃購計畫", - "FlashSalesPlanStoreId": "店鋪ID", - "FlashSalesPlanBeginTime": "開始時間", - "FlashSalesPlanEndTime": "結束時間", - "FlashSalesPlanProductId": "產品ID", - "FlashSalesPlanProductSkuId": "產品SKU ID", - "FlashSalesPlanIsPublished": "發佈", - "CreateFlashSalesPlan": "新建", - "EditFlashSalesPlan": "更新", - "FlashSalesPlanDeletionConfirmationMessage": "確認删除閃購計畫 {0}?", + "Menu:FlashSalePlan": "閃購計畫", + "FlashSalePlan": "閃購計畫", + "FlashSalePlanStoreId": "店鋪ID", + "FlashSalePlanBeginTime": "開始時間", + "FlashSalePlanEndTime": "結束時間", + "FlashSalePlanProductId": "產品ID", + "FlashSalePlanProductSkuId": "產品SKU ID", + "FlashSalePlanIsPublished": "發佈", + "CreateFlashSalePlan": "新建", + "EditFlashSalePlan": "更新", + "FlashSalePlanDeletionConfirmationMessage": "確認删除閃購計畫 {0}?", "SuccessfullyDeleted": "删除成功", - "Permission:FlashSalesResult": "閃購結果", - "Menu:FlashSalesResult": "閃購結果", - "FlashSalesResult": "閃購結果", - "FlashSalesResultStoreId": "店铺 ID", - "FlashSalesResultPlanId": "計畫 ID", - "FlashSalesResultStatus": "狀態", - "FlashSalesResultReason": "原因", - "FlashSalesResultUserId": "用戶 ID", - "FlashSalesResultOrderId": "訂單 ID", - "FlashSalesResultCreationTime": "創建時間", - "ViewFlashSalesResult": "查看", - "Enum:FlashSalesResultStatus.Pending": "等待中", - "Enum:FlashSalesResultStatus.Successful": "成功", - "Enum:FlashSalesResultStatus.Failed": "失敗", - "Enum:FlashSalesResultStatus.0": "等待中", - "Enum:FlashSalesResultStatus.1": "成功", - "Enum:FlashSalesResultStatus.2": "失敗" + "Permission:FlashSaleResult": "閃購結果", + "Menu:FlashSaleResult": "閃購結果", + "FlashSaleResult": "閃購結果", + "FlashSaleResultStoreId": "店铺 ID", + "FlashSaleResultPlanId": "計畫 ID", + "FlashSaleResultStatus": "狀態", + "FlashSaleResultReason": "原因", + "FlashSaleResultUserId": "用戶 ID", + "FlashSaleResultOrderId": "訂單 ID", + "FlashSaleResultCreationTime": "創建時間", + "ViewFlashSaleResult": "查看", + "Enum:FlashSaleResultStatus.Pending": "等待中", + "Enum:FlashSaleResultStatus.Successful": "成功", + "Enum:FlashSaleResultStatus.Failed": "失敗", + "Enum:FlashSaleResultStatus.0": "等待中", + "Enum:FlashSaleResultStatus.1": "成功", + "Enum:FlashSaleResultStatus.2": "失敗" } } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/EShopPluginsFlashSalesDomainAutoMapperProfile.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/EShopPluginsFlashSalesDomainAutoMapperProfile.cs index df4eb669..fed8b5cd 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/EShopPluginsFlashSalesDomainAutoMapperProfile.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/EShopPluginsFlashSalesDomainAutoMapperProfile.cs @@ -1,5 +1,5 @@ using AutoMapper; -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; +using EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; namespace EasyAbp.EShop.Plugins.FlashSales; @@ -10,7 +10,7 @@ public class EShopPluginsFlashSalesDomainAutoMapperProfile : Profile /* You can configure your AutoMapper mapping configuration here. * Alternatively, you can split your mapping configurations * into multiple profile classes for a better organization. */ - CreateMap() + CreateMap() .MapExtraProperties(); } } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/EShopPluginsFlashSalesDomainModule.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/EShopPluginsFlashSalesDomainModule.cs index 826de7aa..f05ee3d6 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/EShopPluginsFlashSalesDomainModule.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/EShopPluginsFlashSalesDomainModule.cs @@ -1,4 +1,4 @@ -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; +using EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; using Microsoft.Extensions.DependencyInjection; using Volo.Abp.AutoMapper; using Volo.Abp.Domain; @@ -25,9 +25,9 @@ public class EShopPluginsFlashSalesDomainModule : AbpModule Configure(options => { - options.EtoMappings.Add(typeof(EShopPluginsFlashSalesDomainModule)); + options.EtoMappings.Add(typeof(EShopPluginsFlashSalesDomainModule)); - options.AutoEventSelectors.Add(); + options.AutoEventSelectors.Add(); }); } } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan.cs similarity index 78% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan.cs index 83bf7f97..45d9f05e 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan.cs @@ -3,9 +3,9 @@ using EasyAbp.EShop.Stores.Stores; using Volo.Abp.Domain.Entities.Auditing; using Volo.Abp.MultiTenancy; -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; -public class FlashSalesPlan : FullAuditedAggregateRoot, IMultiTenant, IMultiStore +public class FlashSalePlan : FullAuditedAggregateRoot, IMultiTenant, IMultiStore { public virtual Guid? TenantId { get; protected set; } @@ -21,11 +21,11 @@ public class FlashSalesPlan : FullAuditedAggregateRoot, IMultiTenant, IMul public virtual bool IsPublished { get; protected set; } - protected FlashSalesPlan() + protected FlashSalePlan() { } - public FlashSalesPlan(Guid id, Guid? tenantId, Guid storeId, DateTime beginTime, DateTime endTime, Guid productId, Guid productSkuId, bool isPublished) + public FlashSalePlan(Guid id, Guid? tenantId, Guid storeId, DateTime beginTime, DateTime endTime, Guid productId, Guid productSkuId, bool isPublished) : base(id) { TenantId = tenantId; diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/IFlashSalePlanRepository.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/IFlashSalePlanRepository.cs new file mode 100644 index 00000000..6fba405c --- /dev/null +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/IFlashSalePlanRepository.cs @@ -0,0 +1,8 @@ +using System; +using Volo.Abp.Domain.Repositories; + +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; + +public interface IFlashSalePlanRepository : IRepository +{ +} \ No newline at end of file diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/InvalidEndTimeException.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/InvalidEndTimeException.cs similarity index 75% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/InvalidEndTimeException.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/InvalidEndTimeException.cs index e3721b43..72ff19ef 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/InvalidEndTimeException.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/InvalidEndTimeException.cs @@ -1,6 +1,6 @@ using Volo.Abp; -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; public class InvalidEndTimeException : BusinessException { diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/CreateFlashSalesOrderCompleteEventHandler.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/CreateFlashSaleOrderCompleteEventHandler.cs similarity index 61% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/CreateFlashSalesOrderCompleteEventHandler.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/CreateFlashSaleOrderCompleteEventHandler.cs index b7dc305a..297a1342 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/CreateFlashSalesOrderCompleteEventHandler.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/CreateFlashSaleOrderCompleteEventHandler.cs @@ -5,21 +5,21 @@ using Volo.Abp.EventBus.Distributed; using Volo.Abp.Guids; using Volo.Abp.Uow; -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults; +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults; -public class CreateFlashSalesOrderCompleteEventHandler : IDistributedEventHandler, ITransientDependency +public class CreateFlashSaleOrderCompleteEventHandler : IDistributedEventHandler, ITransientDependency { - protected IFlashSalesResultRepository FlashSalesResultRepository { get; } + protected IFlashSaleResultRepository FlashSalesResultRepository { get; } protected IGuidGenerator GuidGenerator { get; } - public CreateFlashSalesOrderCompleteEventHandler(IFlashSalesResultRepository flashSalesResultRepository, IGuidGenerator guidGenerator) + public CreateFlashSaleOrderCompleteEventHandler(IFlashSaleResultRepository flashSalesResultRepository, IGuidGenerator guidGenerator) { FlashSalesResultRepository = flashSalesResultRepository; GuidGenerator = guidGenerator; } [UnitOfWork] - public virtual async Task HandleEventAsync(CreateFlashSalesOrderCompleteEto eventData) + public virtual async Task HandleEventAsync(CreateFlashSaleOrderCompleteEto eventData) { var flashSalesResult = await FlashSalesResultRepository.GetAsync(eventData.PendingResultId); diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResult.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResult.cs similarity index 63% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResult.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResult.cs index de3a83df..48f2cdfe 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResult.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResult.cs @@ -3,9 +3,9 @@ using Volo.Abp; using Volo.Abp.Domain.Entities.Auditing; using Volo.Abp.MultiTenancy; -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults; +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults; -public class FlashSalesResult : FullAuditedAggregateRoot, IMultiTenant +public class FlashSaleResult : FullAuditedAggregateRoot, IMultiTenant { public virtual Guid? TenantId { get; protected set; } @@ -13,7 +13,7 @@ public class FlashSalesResult : FullAuditedAggregateRoot, IMultiTenant public virtual Guid PlanId { get; protected set; } - public virtual FlashSalesResultStatus Status { get; protected set; } + public virtual FlashSaleResultStatus Status { get; protected set; } public virtual string Reason { get; protected set; } @@ -21,9 +21,9 @@ public class FlashSalesResult : FullAuditedAggregateRoot, IMultiTenant public virtual Guid? OrderId { get; protected set; } - protected FlashSalesResult() { } + protected FlashSaleResult() { } - public FlashSalesResult(Guid id, Guid? tenantId, Guid storeId, Guid planId, FlashSalesResultStatus status, string reason, Guid userId, Guid? orderId) + public FlashSaleResult(Guid id, Guid? tenantId, Guid storeId, Guid planId, FlashSaleResultStatus status, string reason, Guid userId, Guid? orderId) : base(id) { TenantId = tenantId; @@ -37,13 +37,13 @@ public class FlashSalesResult : FullAuditedAggregateRoot, IMultiTenant public void MarkAsSuccessful(Guid orderId) { - Status = FlashSalesResultStatus.Successful; + Status = FlashSaleResultStatus.Successful; OrderId = orderId; } public void MarkAsFailed(string reason) { - Status = FlashSalesResultStatus.Failed; + Status = FlashSaleResultStatus.Failed; Reason = Check.NotNullOrEmpty(reason, nameof(reason)); } } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/IFlashSaleResultRepository.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/IFlashSaleResultRepository.cs new file mode 100644 index 00000000..dc30ef1b --- /dev/null +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/IFlashSaleResultRepository.cs @@ -0,0 +1,9 @@ +using System; +using Volo.Abp.Domain.Repositories; + +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults; + +public interface IFlashSaleResultRepository : IRepository +{ + +} diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/IFlashSalesPlanRepository.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/IFlashSalesPlanRepository.cs deleted file mode 100644 index 41f32db0..00000000 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/IFlashSalesPlanRepository.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; -using Volo.Abp.Domain.Repositories; - -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; - -public interface IFlashSalesPlanRepository : IRepository -{ -} \ No newline at end of file diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/IFlashSalesResultRepository.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/IFlashSalesResultRepository.cs deleted file mode 100644 index d09be083..00000000 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Domain/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/IFlashSalesResultRepository.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; -using Volo.Abp.Domain.Repositories; - -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults; - -public interface IFlashSalesResultRepository : IRepository -{ - -} diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/EntityFrameworkCore/EShopPluginsFlashSalesEntityFrameworkCoreModule.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/EntityFrameworkCore/EShopPluginsFlashSalesEntityFrameworkCoreModule.cs index a573c7e9..336d42e3 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/EntityFrameworkCore/EShopPluginsFlashSalesEntityFrameworkCoreModule.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/EntityFrameworkCore/EShopPluginsFlashSalesEntityFrameworkCoreModule.cs @@ -1,5 +1,5 @@ -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults; +using EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; +using EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults; using Microsoft.Extensions.DependencyInjection; using Volo.Abp.EntityFrameworkCore; using Volo.Abp.Modularity; @@ -16,8 +16,8 @@ public class EShopPluginsFlashSalesEntityFrameworkCoreModule : AbpModule { context.Services.AddAbpDbContext(options => { - options.AddRepository(); - options.AddRepository(); + options.AddRepository(); + options.AddRepository(); }); } } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/EntityFrameworkCore/FlashSalesDbContext.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/EntityFrameworkCore/FlashSalesDbContext.cs index 41d0d253..d9002f5c 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/EntityFrameworkCore/FlashSalesDbContext.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/EntityFrameworkCore/FlashSalesDbContext.cs @@ -1,5 +1,5 @@ -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults; +using EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; +using EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults; using Microsoft.EntityFrameworkCore; using Volo.Abp.Data; using Volo.Abp.EntityFrameworkCore; @@ -9,9 +9,9 @@ namespace EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore; [ConnectionStringName(FlashSalesDbProperties.ConnectionStringName)] public class FlashSalesDbContext : AbpDbContext, IFlashSalesDbContext { - public DbSet Plans { get; set; } + public DbSet FlashSalePlans { get; set; } - public DbSet Results { get; set; } + public DbSet FlashSaleResults { get; set; } public FlashSalesDbContext(DbContextOptions options) : base(options) diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/EntityFrameworkCore/FlashSalesDbContextModelCreatingExtensions.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/EntityFrameworkCore/FlashSalesDbContextModelCreatingExtensions.cs index 284a5122..f12853a7 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/EntityFrameworkCore/FlashSalesDbContextModelCreatingExtensions.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/EntityFrameworkCore/FlashSalesDbContextModelCreatingExtensions.cs @@ -1,5 +1,5 @@ -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults; +using EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; +using EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults; using Microsoft.EntityFrameworkCore; using Volo.Abp; using Volo.Abp.EntityFrameworkCore.Modeling; @@ -13,17 +13,17 @@ public static class FlashSalesDbContextModelCreatingExtensions { Check.NotNull(builder, nameof(builder)); - builder.Entity(b => + builder.Entity(b => { - b.ToTable(FlashSalesDbProperties.DbTablePrefix + "Plans", FlashSalesDbProperties.DbSchema); + b.ToTable(FlashSalesDbProperties.DbTablePrefix + "FlashSalePlans", FlashSalesDbProperties.DbSchema); b.ConfigureByConvention(); /* Configure more properties here */ }); - builder.Entity(b => + builder.Entity(b => { - b.ToTable(FlashSalesDbProperties.DbTablePrefix + "Results", FlashSalesDbProperties.DbSchema); + b.ToTable(FlashSalesDbProperties.DbTablePrefix + "FlashSaleResults", FlashSalesDbProperties.DbSchema); b.ConfigureByConvention(); /* Configure more properties here */ diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/EntityFrameworkCore/IFlashSalesDbContext.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/EntityFrameworkCore/IFlashSalesDbContext.cs index 46a6766b..a0bfd185 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/EntityFrameworkCore/IFlashSalesDbContext.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/EntityFrameworkCore/IFlashSalesDbContext.cs @@ -1,5 +1,5 @@ -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults; +using EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; +using EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults; using Microsoft.EntityFrameworkCore; using Volo.Abp.Data; using Volo.Abp.EntityFrameworkCore; @@ -9,7 +9,7 @@ namespace EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore; [ConnectionStringName(FlashSalesDbProperties.ConnectionStringName)] public interface IFlashSalesDbContext : IEfCoreDbContext { - DbSet Plans { get; set; } + DbSet FlashSalePlans { get; set; } - DbSet Results { get; set; } + DbSet FlashSaleResults { get; set; } } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/EfCoreFlashSalePlanRepository.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/EfCoreFlashSalePlanRepository.cs new file mode 100644 index 00000000..b78bffbd --- /dev/null +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/EfCoreFlashSalePlanRepository.cs @@ -0,0 +1,21 @@ +using System; +using System.Linq; +using System.Threading.Tasks; +using EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore; +using Volo.Abp.Domain.Repositories.EntityFrameworkCore; +using Volo.Abp.EntityFrameworkCore; + +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans +{ + public class EfCoreFlashSalePlanRepository : EfCoreRepository, IFlashSalePlanRepository + { + public EfCoreFlashSalePlanRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) + { + } + + public override async Task> WithDetailsAsync() + { + return (await GetQueryableAsync()).IncludeDetails(); + } + } +} diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlanEfCoreQuerableExtensions.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlanEfCoreQuerableExtensions.cs new file mode 100644 index 00000000..cbbad1a8 --- /dev/null +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlanEfCoreQuerableExtensions.cs @@ -0,0 +1,18 @@ +using System.Linq; + +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; + +public static class FlashSalePlanEfCoreQueryableExtensions +{ + public static IQueryable IncludeDetails(this IQueryable queryable, bool include = true) + { + if (!include) + { + return queryable; + } + + return queryable + // .Include(x => x.xxx) // TODO: AbpHelper generated + ; + } +} \ No newline at end of file diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/EfCoreFlashSaleResultRepository.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/EfCoreFlashSaleResultRepository.cs new file mode 100644 index 00000000..937ecdf5 --- /dev/null +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/EfCoreFlashSaleResultRepository.cs @@ -0,0 +1,20 @@ +using System; +using System.Linq; +using System.Threading.Tasks; +using EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore; +using Volo.Abp.Domain.Repositories.EntityFrameworkCore; +using Volo.Abp.EntityFrameworkCore; + +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults; + +public class EfCoreFlashSaleResultRepository : EfCoreRepository, IFlashSaleResultRepository +{ + public EfCoreFlashSaleResultRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) + { + } + + public override async Task> WithDetailsAsync() + { + return (await GetQueryableAsync()).IncludeDetails(); + } +} diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResultEfCoreQuerableExtensions.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResultEfCoreQuerableExtensions.cs new file mode 100644 index 00000000..ef21cde9 --- /dev/null +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResultEfCoreQuerableExtensions.cs @@ -0,0 +1,16 @@ +using System.Linq; + +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults; + +public static class FlashSaleResultEfCoreQuerableExtensions +{ + public static IQueryable IncludeDetails(this IQueryable queryable, bool include = true) + { + if (!include) + { + return queryable; + } + + return queryable; + } +} \ No newline at end of file diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/EfCoreFlashSalesPlanRepository.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/EfCoreFlashSalesPlanRepository.cs deleted file mode 100644 index 7926de36..00000000 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/EfCoreFlashSalesPlanRepository.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Linq; -using System.Threading.Tasks; -using EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore; -using Volo.Abp.Domain.Repositories.EntityFrameworkCore; -using Volo.Abp.EntityFrameworkCore; - -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans -{ - public class EfCoreFlashSalesPlanRepository : EfCoreRepository, IFlashSalesPlanRepository - { - public EfCoreFlashSalesPlanRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) - { - } - - public override async Task> WithDetailsAsync() - { - return (await GetQueryableAsync()).IncludeDetails(); - } - } -} diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlanEfCoreQuerableExtensions.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlanEfCoreQuerableExtensions.cs deleted file mode 100644 index 5bccbeee..00000000 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlanEfCoreQuerableExtensions.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Linq; - -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; - -public static class FlashSalesPlanEfCoreQueryableExtensions -{ - public static IQueryable IncludeDetails(this IQueryable queryable, bool include = true) - { - if (!include) - { - return queryable; - } - - return queryable - // .Include(x => x.xxx) // TODO: AbpHelper generated - ; - } -} \ No newline at end of file diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/EfCoreFlashSalesResultRepository.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/EfCoreFlashSalesResultRepository.cs deleted file mode 100644 index e4fc4185..00000000 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/EfCoreFlashSalesResultRepository.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Linq; -using System.Threading.Tasks; -using EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore; -using Volo.Abp.Domain.Repositories.EntityFrameworkCore; -using Volo.Abp.EntityFrameworkCore; - -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults; - -public class EfCoreFlashSalesResultRepository : EfCoreRepository, IFlashSalesResultRepository -{ - public EfCoreFlashSalesResultRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) - { - } - - public override async Task> WithDetailsAsync() - { - return (await GetQueryableAsync()).IncludeDetails(); - } -} diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResultEfCoreQuerableExtensions.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResultEfCoreQuerableExtensions.cs deleted file mode 100644 index 141898bd..00000000 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.EntityFrameworkCore/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResultEfCoreQuerableExtensions.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Linq; - -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults; - -public static class FlashSalesResultEfCoreQuerableExtensions -{ - public static IQueryable IncludeDetails(this IQueryable queryable, bool include = true) - { - if (!include) - { - return queryable; - } - - return queryable; - } -} \ No newline at end of file diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.HttpApi/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlanController.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.HttpApi/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlanController.cs similarity index 60% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.HttpApi/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlanController.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.HttpApi/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlanController.cs index 1bd611d8..90551b2f 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.HttpApi/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlanController.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.HttpApi/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlanController.cs @@ -1,46 +1,46 @@ using System; using System.Threading.Tasks; -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans.Dtos; +using EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans.Dtos; using Microsoft.AspNetCore.Mvc; using Volo.Abp; using Volo.Abp.Application.Dtos; -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; [Area(EShopPluginsFlashSalesRemoteServiceConsts.ModuleName)] [RemoteService(Name = EShopPluginsFlashSalesRemoteServiceConsts.RemoteServiceName)] -[Route("/api/e-shop/plugins/flash-sales/flash-sales-plan")] -public class FlashSalesPlanController : +[Route("/api/e-shop/plugins/flash-sales/flash-sale-plan")] +public class FlashSalePlanController : FlashSalesController, - IFlashSalesPlanAppService + IFlashSalePlanAppService { - protected IFlashSalesPlanAppService Service { get; } + protected IFlashSalePlanAppService Service { get; } - public FlashSalesPlanController(IFlashSalesPlanAppService flashSalesPlanAppService) + public FlashSalePlanController(IFlashSalePlanAppService flashSalePlanAppService) { - Service = flashSalesPlanAppService; + Service = flashSalePlanAppService; } [HttpGet("{id}")] - public virtual Task GetAsync(Guid id) + public virtual Task GetAsync(Guid id) { return Service.GetAsync(id); } [HttpGet] - public virtual Task> GetListAsync(FlashSalesPlanGetListInput input) + public virtual Task> GetListAsync(FlashSalePlanGetListInput input) { return Service.GetListAsync(input); } [HttpPost("{id}")] - public virtual Task CreateAsync(FlashSalesPlanCreateDto input) + public virtual Task CreateAsync(FlashSalePlanCreateDto input) { return Service.CreateAsync(input); } [HttpPut("{id}")] - public virtual Task UpdateAsync(Guid id, FlashSalesPlanUpdateDto input) + public virtual Task UpdateAsync(Guid id, FlashSalePlanUpdateDto input) { return Service.UpdateAsync(id, input); } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.HttpApi/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResultController.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.HttpApi/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResultController.cs new file mode 100644 index 00000000..b0095dcc --- /dev/null +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.HttpApi/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResultController.cs @@ -0,0 +1,33 @@ +using System; +using System.Threading.Tasks; +using EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults.Dtos; +using Microsoft.AspNetCore.Mvc; +using Volo.Abp; +using Volo.Abp.Application.Dtos; + +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults; + +[Area(EShopPluginsFlashSalesRemoteServiceConsts.ModuleName)] +[RemoteService(Name = EShopPluginsFlashSalesRemoteServiceConsts.RemoteServiceName)] +[Route("/api/e-shop/plugins/flash-sales/flash-sale-result")] +public class FlashSaleResultController : FlashSalesController, IFlashSaleResultAppService +{ + protected IFlashSaleResultAppService Service { get; } + + public FlashSaleResultController(IFlashSaleResultAppService service) + { + Service = service; + } + + [HttpGet("{id}")] + public virtual Task GetAsync(Guid id) + { + return Service.GetAsync(id); + } + + [HttpGet] + public virtual Task> GetListAsync(FlashSaleResultGetListInput input) + { + return Service.GetListAsync(input); + } +} diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.HttpApi/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResultController.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.HttpApi/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResultController.cs deleted file mode 100644 index f74846e3..00000000 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.HttpApi/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResultController.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using System.Threading.Tasks; -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults.Dtos; -using Microsoft.AspNetCore.Mvc; -using Volo.Abp; -using Volo.Abp.Application.Dtos; - -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults; - -[Area(EShopPluginsFlashSalesRemoteServiceConsts.ModuleName)] -[RemoteService(Name = EShopPluginsFlashSalesRemoteServiceConsts.RemoteServiceName)] -[Route("/api/e-shop/plugins/flash-sales/flash-sales-result")] -public class FlashSalesResultController : FlashSalesController, IFlashSalesResultAppService -{ - protected IFlashSalesResultAppService Service { get; } - - public FlashSalesResultController(IFlashSalesResultAppService service) - { - Service = service; - } - - [HttpGet("{id}")] - public virtual Task GetAsync(Guid id) - { - return Service.GetAsync(id); - } - - [HttpGet] - public virtual Task> GetListAsync(FlashSalesResultGetListInput input) - { - return Service.GetListAsync(input); - } -} diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.MongoDB/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/MongoFlashSalePlanRepository.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.MongoDB/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/MongoFlashSalePlanRepository.cs new file mode 100644 index 00000000..4e0c476b --- /dev/null +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.MongoDB/EasyAbp/EShop/Plugins/FlashSales/FlashSalePlans/MongoFlashSalePlanRepository.cs @@ -0,0 +1,13 @@ +using System; +using EasyAbp.EShop.Plugins.FlashSales.MongoDB; +using Volo.Abp.Domain.Repositories.MongoDB; +using Volo.Abp.MongoDB; + +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; + +public class MongoFlashSalePlanRepository : MongoDbRepository, IFlashSalePlanRepository +{ + public MongoFlashSalePlanRepository(IMongoDbContextProvider dbContextProvider) : base(dbContextProvider) + { + } +} diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.MongoDB/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/MongoFlashSaleResultRepository.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.MongoDB/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/MongoFlashSaleResultRepository.cs new file mode 100644 index 00000000..fc8a74a2 --- /dev/null +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.MongoDB/EasyAbp/EShop/Plugins/FlashSales/FlashSaleResults/MongoFlashSaleResultRepository.cs @@ -0,0 +1,13 @@ +using System; +using EasyAbp.EShop.Plugins.FlashSales.MongoDB; +using Volo.Abp.Domain.Repositories.MongoDB; +using Volo.Abp.MongoDB; + +namespace EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults; + +public class MongoFlashSaleResultRepository : MongoDbRepository, IFlashSaleResultRepository +{ + public MongoFlashSaleResultRepository(IMongoDbContextProvider dbContextProvider) : base(dbContextProvider) + { + } +} diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.MongoDB/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/MongoFlashSalesPlanRepository.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.MongoDB/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/MongoFlashSalesPlanRepository.cs deleted file mode 100644 index e573f156..00000000 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.MongoDB/EasyAbp/EShop/Plugins/FlashSales/FlashSalesPlans/MongoFlashSalesPlanRepository.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using EasyAbp.EShop.Plugins.FlashSales.MongoDB; -using Volo.Abp.Domain.Repositories.MongoDB; -using Volo.Abp.MongoDB; - -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; - -public class MongoFlashSalesPlanRepository : MongoDbRepository, IFlashSalesPlanRepository -{ - public MongoFlashSalesPlanRepository(IMongoDbContextProvider dbContextProvider) : base(dbContextProvider) - { - } -} diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.MongoDB/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/MongoFlashSalesResultRepository.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.MongoDB/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/MongoFlashSalesResultRepository.cs deleted file mode 100644 index 8621e83e..00000000 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.MongoDB/EasyAbp/EShop/Plugins/FlashSales/FlashSalesResults/MongoFlashSalesResultRepository.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using EasyAbp.EShop.Plugins.FlashSales.MongoDB; -using Volo.Abp.Domain.Repositories.MongoDB; -using Volo.Abp.MongoDB; - -namespace EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults; - -public class MongoFlashSalesResultRepository : MongoDbRepository, IFlashSalesResultRepository -{ - public MongoFlashSalesResultRepository(IMongoDbContextProvider dbContextProvider) : base(dbContextProvider) - { - } -} diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.MongoDB/EasyAbp/EShop/Plugins/FlashSales/MongoDB/EShopPluginsFlashSalesMongoDbModule.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.MongoDB/EasyAbp/EShop/Plugins/FlashSales/MongoDB/EShopPluginsFlashSalesMongoDbModule.cs index 728dbbde..fcfceade 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.MongoDB/EasyAbp/EShop/Plugins/FlashSales/MongoDB/EShopPluginsFlashSalesMongoDbModule.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.MongoDB/EasyAbp/EShop/Plugins/FlashSales/MongoDB/EShopPluginsFlashSalesMongoDbModule.cs @@ -1,5 +1,5 @@ -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults; +using EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; +using EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults; using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Modularity; using Volo.Abp.MongoDB; @@ -16,8 +16,8 @@ public class EShopPluginsFlashSalesMongoDbModule : AbpModule { context.Services.AddMongoDbContext(options => { - options.AddRepository(); - options.AddRepository(); + options.AddRepository(); + options.AddRepository(); }); } } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.MongoDB/EasyAbp/EShop/Plugins/FlashSales/MongoDB/FlashSalesMongoDbContext.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.MongoDB/EasyAbp/EShop/Plugins/FlashSales/MongoDB/FlashSalesMongoDbContext.cs index 3e2028e8..b7dfc7a2 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.MongoDB/EasyAbp/EShop/Plugins/FlashSales/MongoDB/FlashSalesMongoDbContext.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.MongoDB/EasyAbp/EShop/Plugins/FlashSales/MongoDB/FlashSalesMongoDbContext.cs @@ -1,5 +1,5 @@ -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults; +using EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; +using EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults; using MongoDB.Driver; using Volo.Abp.Data; using Volo.Abp.MongoDB; @@ -9,9 +9,9 @@ namespace EasyAbp.EShop.Plugins.FlashSales.MongoDB; [ConnectionStringName(FlashSalesDbProperties.ConnectionStringName)] public class FlashSalesMongoDbContext : AbpMongoDbContext, IFlashSalesMongoDbContext { - public IMongoCollection Plans => Collection(); + public IMongoCollection FlashSalePlans => Collection(); - public IMongoCollection Results => Collection(); + public IMongoCollection FlashSaleResults => Collection(); protected override void CreateModel(IMongoModelBuilder modelBuilder) { diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.MongoDB/EasyAbp/EShop/Plugins/FlashSales/MongoDB/FlashSalesMongoDbContextExtensions.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.MongoDB/EasyAbp/EShop/Plugins/FlashSales/MongoDB/FlashSalesMongoDbContextExtensions.cs index 5bdad8d4..e3d2201a 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.MongoDB/EasyAbp/EShop/Plugins/FlashSales/MongoDB/FlashSalesMongoDbContextExtensions.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.MongoDB/EasyAbp/EShop/Plugins/FlashSales/MongoDB/FlashSalesMongoDbContextExtensions.cs @@ -1,5 +1,5 @@ -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults; +using EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; +using EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults; using Volo.Abp; using Volo.Abp.MongoDB; @@ -12,8 +12,8 @@ public static class FlashSalesMongoDbContextExtensions { Check.NotNull(builder, nameof(builder)); - builder.Entity(b => b.CollectionName = FlashSalesDbProperties.DbTablePrefix + "Plans"); + builder.Entity(b => b.CollectionName = FlashSalesDbProperties.DbTablePrefix + "FlashSalePlans"); - builder.Entity(b => b.CollectionName = FlashSalesDbProperties.DbTablePrefix + "Results"); + builder.Entity(b => b.CollectionName = FlashSalesDbProperties.DbTablePrefix + "FlashSaleResults"); } } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.MongoDB/EasyAbp/EShop/Plugins/FlashSales/MongoDB/IFlashSalesMongoDbContext.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.MongoDB/EasyAbp/EShop/Plugins/FlashSales/MongoDB/IFlashSalesMongoDbContext.cs index 5cc3f8e8..6a4c7951 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.MongoDB/EasyAbp/EShop/Plugins/FlashSales/MongoDB/IFlashSalesMongoDbContext.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.MongoDB/EasyAbp/EShop/Plugins/FlashSales/MongoDB/IFlashSalesMongoDbContext.cs @@ -1,5 +1,5 @@ -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults; +using EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; +using EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults; using MongoDB.Driver; using Volo.Abp.Data; using Volo.Abp.MongoDB; @@ -9,7 +9,7 @@ namespace EasyAbp.EShop.Plugins.FlashSales.MongoDB; [ConnectionStringName(FlashSalesDbProperties.ConnectionStringName)] public interface IFlashSalesMongoDbContext : IAbpMongoDbContext { - IMongoCollection Plans { get; } + IMongoCollection FlashSalePlans { get; } - IMongoCollection Results { get; } + IMongoCollection FlashSaleResults { get; } } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/EShopPluginsFlashSalesWebAutoMapperProfile.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/EShopPluginsFlashSalesWebAutoMapperProfile.cs index 4eb9cde3..5a88342e 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/EShopPluginsFlashSalesWebAutoMapperProfile.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/EShopPluginsFlashSalesWebAutoMapperProfile.cs @@ -1,8 +1,8 @@ using AutoMapper; -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans.Dtos; -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults.Dtos; -using EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSalesPlans.FlashSalesPlan.ViewModels; -using EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSalesResults.FlashSalesResult.ViewModels; +using EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans.Dtos; +using EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults.Dtos; +using EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSalePlans.FlashSalePlan.ViewModels; +using EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSaleResults.FlashSaleResult.ViewModels; namespace EasyAbp.EShop.Plugins.FlashSales.Web; @@ -13,13 +13,13 @@ public class EShopPluginsFlashSalesWebAutoMapperProfile : Profile /* You can configure your AutoMapper mapping configuration here. * Alternatively, you can split your mapping configurations * into multiple profile classes for a better organization. */ - CreateMap() + CreateMap(MemberList.Destination) .ForMember(dest => dest.ExtraProperties, opt => opt.Ignore()); - CreateMap() + CreateMap(MemberList.Destination) .ForMember(dest => dest.ExtraProperties, opt => opt.Ignore()); - CreateMap() + CreateMap(MemberList.Destination) .ForSourceMember(dest => dest.ExtraProperties, opt => opt.DoNotValidate()); - CreateMap() + CreateMap(MemberList.Destination) .ForSourceMember(dest => dest.ExtraProperties, opt => opt.DoNotValidate()); } } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/EasyAbp.EShop.Plugins.FlashSales.Web.csproj b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/EasyAbp.EShop.Plugins.FlashSales.Web.csproj index 94d9b52e..cedf9892 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/EasyAbp.EShop.Plugins.FlashSales.Web.csproj +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/EasyAbp.EShop.Plugins.FlashSales.Web.csproj @@ -37,9 +37,4 @@ - - - - - diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Menus/FlashSalesMenuContributor.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Menus/FlashSalesMenuContributor.cs index 6ab46dea..50d1a707 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Menus/FlashSalesMenuContributor.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Menus/FlashSalesMenuContributor.cs @@ -22,24 +22,24 @@ public class FlashSalesMenuContributor : IMenuContributor //Add main menu items. var flashSalesManagementMenuItem = new ApplicationMenuItem(FlashSalesMenus.Prefix, l["Menu:FlashSalesManagement"]); - if (await context.IsGrantedAsync(FlashSalesPermissions.FlashSalesPlan.Default)) + if (await context.IsGrantedAsync(FlashSalesPermissions.FlashSalePlan.Default)) { flashSalesManagementMenuItem.AddItem( new ApplicationMenuItem( - FlashSalesMenus.FlashSalesPlan, - l["Menu:FlashSalesPlan"], - "/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan" + FlashSalesMenus.FlashSalePlan, + l["Menu:FlashSalePlan"], + "/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan" ) ); } - if (await context.IsGrantedAsync(FlashSalesPermissions.FlashSalesResult.Default)) + if (await context.IsGrantedAsync(FlashSalesPermissions.FlashSaleResult.Default)) { flashSalesManagementMenuItem.AddItem( new ApplicationMenuItem( - FlashSalesMenus.FlashSalesResult, - l["Menu:FlashSalesResult"], - "/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResult" + FlashSalesMenus.FlashSaleResult, + l["Menu:FlashSaleResult"], + "/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResult" ) ); } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Menus/FlashSalesMenus.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Menus/FlashSalesMenus.cs index cad519a2..e792e1aa 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Menus/FlashSalesMenus.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Menus/FlashSalesMenus.cs @@ -6,7 +6,7 @@ public static class FlashSalesMenus public const string Prefix = ModuleGroupPrefix + ".Plugins.FlashSales"; - public const string FlashSalesPlan = Prefix + ".FlashSalesPlan"; + public const string FlashSalePlan = Prefix + ".FlashSalePlan"; - public const string FlashSalesResult = Prefix + ".FlashSalesResult"; + public const string FlashSaleResult = Prefix + ".FlashSaleResult"; } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan/CreateModal.cshtml b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/CreateModal.cshtml similarity index 80% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan/CreateModal.cshtml rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/CreateModal.cshtml index 32a1aa21..8e86f4a7 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan/CreateModal.cshtml +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/CreateModal.cshtml @@ -2,7 +2,7 @@ @using Microsoft.AspNetCore.Mvc.Localization @using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal @using EasyAbp.EShop.Plugins.FlashSales.Localization -@using EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSalesPlans.FlashSalesPlan +@using EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSalePlans.FlashSalePlan @inject IHtmlLocalizer L @model CreateModalModel @@ -12,7 +12,7 @@ - + diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/CreateModal.cshtml.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/CreateModal.cshtml.cs new file mode 100644 index 00000000..08eab7da --- /dev/null +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/CreateModal.cshtml.cs @@ -0,0 +1,27 @@ +using System.Threading.Tasks; +using EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; +using EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans.Dtos; +using EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSalePlans.FlashSalePlan.ViewModels; +using Microsoft.AspNetCore.Mvc; + +namespace EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSalePlans.FlashSalePlan; + +public class CreateModalModel : FlashSalesPageModel +{ + [BindProperty] + public CreateFlashSalePlanViewModel ViewModel { get; set; } + + protected IFlashSalePlanAppService Service { get; } + + public CreateModalModel(IFlashSalePlanAppService service) + { + Service = service; + } + + public virtual async Task OnPostAsync() + { + var dto = ObjectMapper.Map(ViewModel); + await Service.CreateAsync(dto); + return NoContent(); + } +} \ No newline at end of file diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan/EditModal.cshtml b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/EditModal.cshtml similarity index 84% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan/EditModal.cshtml rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/EditModal.cshtml index faa6ffc9..356d19dd 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan/EditModal.cshtml +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/EditModal.cshtml @@ -2,7 +2,7 @@ @using EasyAbp.EShop.Plugins.FlashSales.Localization @using Microsoft.AspNetCore.Mvc.Localization @using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal -@using EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSalesPlans.FlashSalesPlan +@using EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSalePlans.FlashSalePlan @inject IHtmlLocalizer L @model EditModalModel @@ -12,7 +12,7 @@ - + diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan/EditModal.cshtml.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/EditModal.cshtml.cs similarity index 52% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan/EditModal.cshtml.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/EditModal.cshtml.cs index faa49dd3..faa08b8e 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan/EditModal.cshtml.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/EditModal.cshtml.cs @@ -1,11 +1,11 @@ using System; using System.Threading.Tasks; +using EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; +using EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans.Dtos; +using EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSalePlans.FlashSalePlan.ViewModels; using Microsoft.AspNetCore.Mvc; -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans.Dtos; -using EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSalesPlans.FlashSalesPlan.ViewModels; -namespace EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSalesPlans.FlashSalesPlan; +namespace EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSalePlans.FlashSalePlan; public class EditModalModel : FlashSalesPageModel { @@ -14,11 +14,11 @@ public class EditModalModel : FlashSalesPageModel public Guid Id { get; set; } [BindProperty] - public EditFlashSalesPlanViewModel ViewModel { get; set; } + public EditFlashSalePlanViewModel ViewModel { get; set; } - protected IFlashSalesPlanAppService Service { get; } + protected IFlashSalePlanAppService Service { get; } - public EditModalModel(IFlashSalesPlanAppService service) + public EditModalModel(IFlashSalePlanAppService service) { Service = service; } @@ -26,12 +26,12 @@ public class EditModalModel : FlashSalesPageModel public virtual async Task OnGetAsync() { var dto = await Service.GetAsync(Id); - ViewModel = ObjectMapper.Map(dto); + ViewModel = ObjectMapper.Map(dto); } public virtual async Task OnPostAsync() { - var dto = ObjectMapper.Map(ViewModel); + var dto = ObjectMapper.Map(ViewModel); await Service.UpdateAsync(Id, dto); return NoContent(); } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan/Index.cshtml b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/Index.cshtml similarity index 53% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan/Index.cshtml rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/Index.cshtml index d96bb645..ece592b6 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan/Index.cshtml +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/Index.cshtml @@ -3,7 +3,7 @@ @using Microsoft.AspNetCore.Authorization @using Microsoft.AspNetCore.Mvc.Localization @using Volo.Abp.AspNetCore.Mvc.UI.Layout -@using EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSalesPlans.FlashSalesPlan +@using EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSalePlans.FlashSalePlan @using EasyAbp.EShop.Plugins.FlashSales.Localization @using EasyAbp.EShop.Plugins.FlashSales.Web.Menus @@ -13,31 +13,31 @@ @inject IHtmlLocalizer L @inject IAuthorizationService Authorization @{ - PageLayout.Content.Title = L["FlashSalesPlan"].Value; - PageLayout.Content.BreadCrumb.Add(L["Menu:FlashSalesPlan"].Value); - PageLayout.Content.MenuItemName = FlashSalesMenus.FlashSalesPlan; + PageLayout.Content.Title = L["FlashSalePlan"].Value; + PageLayout.Content.BreadCrumb.Add(L["Menu:FlashSalePlan"].Value); + PageLayout.Content.MenuItemName = FlashSalesMenus.FlashSalePlan; } @section scripts { - + } @section styles { - + } - @L["FlashSalesPlan"] + @L["FlashSalePlan"] - @if (await Authorization.IsGrantedAsync(FlashSalesPermissions.FlashSalesPlan.Create)) + @if (await Authorization.IsGrantedAsync(FlashSalesPermissions.FlashSalePlan.Create)) { - } @@ -45,6 +45,6 @@ - + diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan/Index.cshtml.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/Index.cshtml.cs similarity index 83% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan/Index.cshtml.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/Index.cshtml.cs index 2203fdef..c45df6d6 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan/Index.cshtml.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/Index.cshtml.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSalesPlans.FlashSalesPlan; +namespace EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSalePlans.FlashSalePlan; public class IndexModel : FlashSalesPageModel { diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/ViewModels/CreateFlashSalePlanViewModel.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/ViewModels/CreateFlashSalePlanViewModel.cs new file mode 100644 index 00000000..8f167e89 --- /dev/null +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/ViewModels/CreateFlashSalePlanViewModel.cs @@ -0,0 +1,25 @@ +using System; +using System.ComponentModel.DataAnnotations; + +namespace EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSalePlans.FlashSalePlan.ViewModels; + +public class CreateFlashSalePlanViewModel +{ + [Display(Name = "FlashSalePlanStoreId")] + public Guid StoreId { get; set; } + + [Display(Name = "FlashSalePlanBeginTime")] + public DateTime BeginTime { get; set; } + + [Display(Name = "FlashSalePlanEndTime")] + public DateTime EndTime { get; set; } + + [Display(Name = "FlashSalePlanProductId")] + public Guid ProductId { get; set; } + + [Display(Name = "FlashSalePlanProductSkuId")] + public Guid ProductSkuId { get; set; } + + [Display(Name = "FlashSalePlanIsPublished")] + public bool IsPublished { get; set; } +} diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan/ViewModels/EditFlashSalesPlanViewModel.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/ViewModels/EditFlashSalePlanViewModel.cs similarity index 59% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan/ViewModels/EditFlashSalesPlanViewModel.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/ViewModels/EditFlashSalePlanViewModel.cs index 972d0980..a7cab334 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan/ViewModels/EditFlashSalesPlanViewModel.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/ViewModels/EditFlashSalePlanViewModel.cs @@ -4,28 +4,28 @@ using Microsoft.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form; using Volo.Abp.Domain.Entities; -namespace EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSalesPlans.FlashSalesPlan.ViewModels; +namespace EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSalePlans.FlashSalePlan.ViewModels; -public class EditFlashSalesPlanViewModel : IHasConcurrencyStamp +public class EditFlashSalePlanViewModel : IHasConcurrencyStamp { [DisabledInput] [ReadOnlyInput] - [Display(Name = "FlashSalesPlanStoreId")] + [Display(Name = "FlashSalePlanStoreId")] public Guid StoreId { get; set; } - [Display(Name = "FlashSalesPlanBeginTime")] + [Display(Name = "FlashSalePlanBeginTime")] public DateTime BeginTime { get; set; } - [Display(Name = "FlashSalesPlanEndTime")] + [Display(Name = "FlashSalePlanEndTime")] public DateTime EndTime { get; set; } - [Display(Name = "FlashSalesPlanProductId")] + [Display(Name = "FlashSalePlanProductId")] public Guid ProductId { get; set; } - [Display(Name = "FlashSalesPlanProductSkuId")] + [Display(Name = "FlashSalePlanProductSkuId")] public Guid ProductSkuId { get; set; } - [Display(Name = "FlashSalesPlanIsPublished")] + [Display(Name = "FlashSalePlanIsPublished")] public bool IsPublished { get; set; } [HiddenInput] diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan/index.css b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/index.css similarity index 100% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan/index.css rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/index.css diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan/index.js b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/index.js similarity index 75% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan/index.js rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/index.js index 04d2156e..e9976c18 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan/index.js +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/index.js @@ -2,11 +2,11 @@ $(function () { var l = abp.localization.getResource('EasyAbpEShopPluginsFlashSales'); - var service = easyAbp.eShop.plugins.flashSales.flashSalesPlans.flashSalesPlan; - var createModal = new abp.ModalManager(abp.appPath + 'EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan/CreateModal'); - var editModal = new abp.ModalManager(abp.appPath + 'EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan/EditModal'); + var service = easyAbp.eShop.plugins.flashSales.flashSalePlans.flashSalePlan; + var createModal = new abp.ModalManager(abp.appPath + 'EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/CreateModal'); + var editModal = new abp.ModalManager(abp.appPath + 'EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/EditModal'); - var dataTable = $('#FlashSalesPlanTable').DataTable(abp.libs.datatables.normalizeConfiguration({ + var dataTable = $('#FlashSalePlanTable').DataTable(abp.libs.datatables.normalizeConfiguration({ processing: true, serverSide: true, paging: true, @@ -16,7 +16,7 @@ $(function () { order: [[2, "asc"]], ajax: abp.libs.datatables.createAjax(service.getList, function () { return { - includeUnpublished: abp.auth.isGranted('EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlan.Manage') + includeUnpublished: abp.auth.isGranted('EasyAbp.EShop.Plugins.FlashSales.FlashSalePlan.Manage') }; }), columnDefs: [ @@ -26,14 +26,14 @@ $(function () { [ { text: l('Edit'), - visible: abp.auth.isGranted('EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlan.Update'), + visible: abp.auth.isGranted('EasyAbp.EShop.Plugins.FlashSales.FlashSalePlan.Update'), action: function (data) { editModal.open({ id: data.record.id }); } }, { text: l('Delete'), - visible: abp.auth.isGranted('EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlan.Delete'), + visible: abp.auth.isGranted('EasyAbp.EShop.Plugins.FlashSales.FlashSalePlan.Delete'), confirmMessage: function (data) { return l('FlashSalesPlanDeletionConfirmationMessage', data.record.id); }, @@ -49,29 +49,29 @@ $(function () { } }, { - title: l('FlashSalesPlanStoreId'), + title: l('FlashSalePlanStoreId'), data: "storeId" }, { - title: l('FlashSalesPlanBeginTime'), + title: l('FlashSalePlanBeginTime'), data: "beginTime", dataFormat: 'datetime' }, { - title: l('FlashSalesPlanEndTime'), + title: l('FlashSalePlanEndTime'), data: "endTime", dataFormat: 'datetime' }, { - title: l('FlashSalesPlanProductId'), + title: l('FlashSalePlanProductId'), data: "productId" }, { - title: l('FlashSalesPlanProductSkuId'), + title: l('FlashSalePlanProductSkuId'), data: "productSkuId" }, { - title: l('FlashSalesPlanIsPublished'), + title: l('FlashSalePlanIsPublished'), data: "isPublished", dataFormat: 'boolean' }, @@ -86,7 +86,7 @@ $(function () { dataTable.ajax.reload(); }); - $('#NewFlashSalesPlanButton').click(function (e) { + $('#NewFlashSalePlanButton').click(function (e) { e.preventDefault(); createModal.open(); }); diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResult/Index.cshtml b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResult/Index.cshtml similarity index 55% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResult/Index.cshtml rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResult/Index.cshtml index ba1d6a72..38c98091 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResult/Index.cshtml +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResult/Index.cshtml @@ -3,7 +3,7 @@ @using Microsoft.AspNetCore.Authorization @using Microsoft.AspNetCore.Mvc.Localization @using Volo.Abp.AspNetCore.Mvc.UI.Layout -@using EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSalesResults.FlashSalesResult +@using EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSaleResults.FlashSalesResult @using EasyAbp.EShop.Plugins.FlashSales.Localization @using EasyAbp.EShop.Plugins.FlashSales.Web.Menus @@ -13,29 +13,29 @@ @inject IHtmlLocalizer L @inject IAuthorizationService Authorization @{ - PageLayout.Content.Title = L["FlashSalesResult"].Value; - PageLayout.Content.BreadCrumb.Add(L["Menu:FlashSalesResult"].Value); - PageLayout.Content.MenuItemName = FlashSalesMenus.FlashSalesResult; + PageLayout.Content.Title = L["FlashSaleResult"].Value; + PageLayout.Content.BreadCrumb.Add(L["Menu:FlashSaleResult"].Value); + PageLayout.Content.MenuItemName = FlashSalesMenus.FlashSaleResult; } @section scripts { - + } @section styles { - + } - @L["FlashSalesResult"] + @L["FlashSaleResult"] - + diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResult/Index.cshtml.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResult/Index.cshtml.cs similarity index 81% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResult/Index.cshtml.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResult/Index.cshtml.cs index ae48fd64..a237d092 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResult/Index.cshtml.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResult/Index.cshtml.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; -namespace EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSalesResults.FlashSalesResult; +namespace EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSaleResults.FlashSalesResult; public class IndexModel : PageModel { diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResult/ViewModal.cshtml b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResult/ViewModal.cshtml similarity index 80% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResult/ViewModal.cshtml rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResult/ViewModal.cshtml index ef929eab..789f6864 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResult/ViewModal.cshtml +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResult/ViewModal.cshtml @@ -2,7 +2,7 @@ @using EasyAbp.EShop.Plugins.FlashSales.Localization @using Microsoft.AspNetCore.Mvc.Localization @using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal -@using EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSalesResults.FlashSalesResult +@using EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSaleResults.FlashSaleResult @inject IHtmlLocalizer L @model ViewModalModel @@ -12,7 +12,7 @@ - + diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResult/ViewModal.cshtml.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResult/ViewModal.cshtml.cs similarity index 50% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResult/ViewModal.cshtml.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResult/ViewModal.cshtml.cs index 9d5fa316..40d67ff5 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResult/ViewModal.cshtml.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResult/ViewModal.cshtml.cs @@ -1,11 +1,11 @@ using System; using System.Threading.Tasks; -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults; -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults.Dtos; -using EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSalesResults.FlashSalesResult.ViewModels; +using EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults; +using EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults.Dtos; +using EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSaleResults.FlashSaleResult.ViewModels; using Microsoft.AspNetCore.Mvc; -namespace EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSalesResults.FlashSalesResult; +namespace EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSaleResults.FlashSaleResult; public class ViewModalModel : FlashSalesPageModel { @@ -14,11 +14,11 @@ public class ViewModalModel : FlashSalesPageModel public Guid Id { get; set; } [BindProperty] - public ViewFlashSalesResultViewModel ViewModel { get; set; } + public ViewFlashSaleResultViewModel ViewModel { get; set; } - protected IFlashSalesResultAppService Service { get; } + protected IFlashSaleResultAppService Service { get; } - public ViewModalModel(IFlashSalesResultAppService service) + public ViewModalModel(IFlashSaleResultAppService service) { Service = service; } @@ -26,6 +26,6 @@ public class ViewModalModel : FlashSalesPageModel public virtual async Task OnGetAsync() { var dto = await Service.GetAsync(Id); - ViewModel = ObjectMapper.Map(dto); + ViewModel = ObjectMapper.Map(dto); } } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResult/ViewModels/ViewFlashSaleResultViewModel.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResult/ViewModels/ViewFlashSaleResultViewModel.cs new file mode 100644 index 00000000..49b9aae1 --- /dev/null +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResult/ViewModels/ViewFlashSaleResultViewModel.cs @@ -0,0 +1,26 @@ +using System; +using System.ComponentModel.DataAnnotations; +using EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults; + +namespace EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSaleResults.FlashSaleResult.ViewModels; + +public class ViewFlashSaleResultViewModel +{ + [Display(Name = "FlashSaleResultStoreId")] + public Guid StoreId { get; set; } + + [Display(Name = "FlashSaleResultPlanId")] + public Guid PlanId { get; set; } + + [Display(Name = "FlashSaleResultStatus")] + public FlashSaleResultStatus Status { get; set; } + + [Display(Name = "FlashSaleResultReason")] + public string Reason { get; set; } + + [Display(Name = "FlashSaleResultUserId")] + public Guid UserId { get; set; } + + [Display(Name = "FlashSaleResultOrderId")] + public Guid? OrderId { get; set; } +} diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResult/index.css b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResult/index.css similarity index 100% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResult/index.css rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResult/index.css diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResult/index.js b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResult/index.js similarity index 65% rename from plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResult/index.js rename to plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResult/index.js index bd3bc6dd..aac69835 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResult/index.js +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResult/index.js @@ -2,10 +2,10 @@ $(function () { var l = abp.localization.getResource('EasyAbpEShopPluginsFlashSales'); - var service = easyAbp.eShop.plugins.flashSales.flashSalesResults.flashSalesResult; - var viewModal = new abp.ModalManager(abp.appPath + 'EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResult/ViewModal'); + var service = easyAbp.eShop.plugins.flashSales.flashSaleResults.flashSaleResult; + var viewModal = new abp.ModalManager(abp.appPath + 'EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResult/ViewModal'); - var dataTable = $('#FlashSalesResultTable').DataTable(abp.libs.datatables.normalizeConfiguration({ + var dataTable = $('#FlashSaleResultTable').DataTable(abp.libs.datatables.normalizeConfiguration({ processing: true, serverSide: true, paging: true, @@ -20,7 +20,7 @@ $(function () { items: [ { - text: l('ViewFlashSalesResult'), + text: l('ViewFlashSaleResult'), action: function (data) { viewModal.open({ id: data.record.id }); } @@ -29,34 +29,34 @@ $(function () { } }, { - title: l('FlashSalesResultStoreId'), + title: l('FlashSaleResultStoreId'), data: "storeId" }, { - title: l('FlashSalesResultPlanId'), + title: l('FlashSaleResultPlanId'), data: "planId" }, { - title: l('FlashSalesResultStatus'), + title: l('FlashSaleResultStatus'), data: "status", render: function (data) { - return l('Enum:FlashSalesResultStatus.' + data); + return l('Enum:FlashSaleResultStatus.' + data); } }, { - title: l('FlashSalesResultReason'), + title: l('FlashSaleResultReason'), data: "reason" }, { - title: l('FlashSalesResultUserId'), + title: l('FlashSaleResultUserId'), data: "userId" }, { - title: l('FlashSalesResultOrderId'), + title: l('FlashSaleResultOrderId'), data: "orderId" }, { - title: l('FlashSalesResultCreationTime'), + title: l('FlashSaleResultCreationTime'), data: "creationTime", dataFormat: 'datetime' }, diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan/CreateModal.cshtml.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan/CreateModal.cshtml.cs deleted file mode 100644 index 760d498a..00000000 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan/CreateModal.cshtml.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Threading.Tasks; -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans.Dtos; -using EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSalesPlans.FlashSalesPlan.ViewModels; -using Microsoft.AspNetCore.Mvc; - -namespace EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSalesPlans.FlashSalesPlan; - -public class CreateModalModel : FlashSalesPageModel -{ - [BindProperty] - public CreateFlashSalesPlanViewModel ViewModel { get; set; } - - protected IFlashSalesPlanAppService Service { get; } - - public CreateModalModel(IFlashSalesPlanAppService service) - { - Service = service; - } - - public virtual async Task OnPostAsync() - { - var dto = ObjectMapper.Map(ViewModel); - await Service.CreateAsync(dto); - return NoContent(); - } -} \ No newline at end of file diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan/ViewModels/CreateFlashSalesPlanViewModel.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan/ViewModels/CreateFlashSalesPlanViewModel.cs deleted file mode 100644 index d65ae9bb..00000000 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesPlans/FlashSalesPlan/ViewModels/CreateFlashSalesPlanViewModel.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations; - -namespace EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSalesPlans.FlashSalesPlan.ViewModels; - -public class CreateFlashSalesPlanViewModel -{ - [Display(Name = "FlashSalesPlanStoreId")] - public Guid StoreId { get; set; } - - [Display(Name = "FlashSalesPlanBeginTime")] - public DateTime BeginTime { get; set; } - - [Display(Name = "FlashSalesPlanEndTime")] - public DateTime EndTime { get; set; } - - [Display(Name = "FlashSalesPlanProductId")] - public Guid ProductId { get; set; } - - [Display(Name = "FlashSalesPlanProductSkuId")] - public Guid ProductSkuId { get; set; } - - [Display(Name = "FlashSalesPlanIsPublished")] - public bool IsPublished { get; set; } -} diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResult/ViewModels/ViewFlashSalesResultViewModel.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResult/ViewModels/ViewFlashSalesResultViewModel.cs deleted file mode 100644 index 02a2267c..00000000 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalesResults/FlashSalesResult/ViewModels/ViewFlashSalesResultViewModel.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations; -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults; - -namespace EasyAbp.EShop.Plugins.FlashSales.Web.Pages.EShop.Plugins.FlashSales.FlashSalesResults.FlashSalesResult.ViewModels; - -public class ViewFlashSalesResultViewModel -{ - [Display(Name = "FlashSalesResultStoreId")] - public Guid StoreId { get; set; } - - [Display(Name = "FlashSalesResultPlanId")] - public Guid PlanId { get; set; } - - [Display(Name = "FlashSalesResultStatus")] - public FlashSalesResultStatus Status { get; set; } - - [Display(Name = "FlashSalesResultReason")] - public string Reason { get; set; } - - [Display(Name = "FlashSalesResultUserId")] - public Guid UserId { get; set; } - - [Display(Name = "FlashSalesResultOrderId")] - public Guid? OrderId { get; set; } -} diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Products.Plugins.FlashSales.Application/EasyAbp/EShop/Products/Plugins/FlashSales/EShopProductsPluginsFlashSalesApplicationAutoMapperProfile.cs b/plugins/FlashSales/src/EasyAbp.EShop.Products.Plugins.FlashSales.Application/EasyAbp/EShop/Products/Plugins/FlashSales/EShopProductsPluginsFlashSalesApplicationAutoMapperProfile.cs index 2e2636eb..fbb7050b 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Products.Plugins.FlashSales.Application/EasyAbp/EShop/Products/Plugins/FlashSales/EShopProductsPluginsFlashSalesApplicationAutoMapperProfile.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Products.Plugins.FlashSales.Application/EasyAbp/EShop/Products/Plugins/FlashSales/EShopProductsPluginsFlashSalesApplicationAutoMapperProfile.cs @@ -1,6 +1,6 @@ using System.Linq; using AutoMapper; -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; +using EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; using EasyAbp.EShop.Products.Options; using EasyAbp.EShop.Products.ProductDetails; using EasyAbp.EShop.Products.Products; @@ -15,7 +15,7 @@ public class EShopProductsPluginsFlashSalesApplicationAutoMapperProfile : Profil IAttributeOptionIdsSerializer attributeOptionIdsSerializer, IOptionsMonitor options) { - CreateMap() + CreateMap() .ForMember(x => x.ProductGroupDisplayName, opt => opt.Ignore()) .AfterMap((src, dest) => { @@ -23,15 +23,15 @@ public class EShopProductsPluginsFlashSalesApplicationAutoMapperProfile : Profil dest.ProductGroupDisplayName = dict[src.ProductGroupName].DisplayName; }) .MapExtraProperties(); - CreateMap() + CreateMap() .ForMember(x => x.AttributeOptionIds, opt => opt.Ignore()) .AfterMap(async (src, dest) => dest.AttributeOptionIds = (await attributeOptionIdsSerializer.DeserializeAsync(src.SerializedAttributeOptionIds)).ToList()) .MapExtraProperties(); - CreateMap() + CreateMap() .MapExtraProperties(); - CreateMap() + CreateMap() .MapExtraProperties(); - CreateMap() + CreateMap() .MapExtraProperties(); } } diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Products.Plugins.FlashSales.Application/EasyAbp/EShop/Products/Products/FlashSalesReduceInventoryEventHandler.cs b/plugins/FlashSales/src/EasyAbp.EShop.Products.Plugins.FlashSales.Application/EasyAbp/EShop/Products/Products/FlashSaleReduceInventoryEventHandler.cs similarity index 73% rename from plugins/FlashSales/src/EasyAbp.EShop.Products.Plugins.FlashSales.Application/EasyAbp/EShop/Products/Products/FlashSalesReduceInventoryEventHandler.cs rename to plugins/FlashSales/src/EasyAbp.EShop.Products.Plugins.FlashSales.Application/EasyAbp/EShop/Products/Products/FlashSaleReduceInventoryEventHandler.cs index d5a0375b..0399ce1d 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Products.Plugins.FlashSales.Application/EasyAbp/EShop/Products/Products/FlashSalesReduceInventoryEventHandler.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Products.Plugins.FlashSales.Application/EasyAbp/EShop/Products/Products/FlashSaleReduceInventoryEventHandler.cs @@ -1,7 +1,8 @@ using System.Linq; using System.Threading.Tasks; +using EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans; +using EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults; using EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans; -using EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults; using EasyAbp.EShop.Products.ProductDetails; using Volo.Abp.DependencyInjection; using Volo.Abp.EventBus.Distributed; @@ -10,7 +11,7 @@ using Volo.Abp.Uow; namespace EasyAbp.EShop.Products.Products; -public class FlashSalesReduceInventoryEventHandler : IDistributedEventHandler, ITransientDependency +public class FlashSaleReduceInventoryEventHandler : IDistributedEventHandler, ITransientDependency { protected IProductRepository ProductRepository { get; } @@ -22,35 +23,35 @@ public class FlashSalesReduceInventoryEventHandler : IDistributedEventHandler x.Id == eventData.Plan.ProductSkuId); - var hashToken = await FlashSalesPlanHasher.HashAsync(eventData.Plan.LastModificationTime, product.LastModificationTime, productSku.LastModificationTime); + var hashToken = await FlashSalePlanHasher.HashAsync(eventData.Plan.LastModificationTime, product.LastModificationTime, productSku.LastModificationTime); if (hashToken != eventData.HashToken) { - await DistributedEventBus.PublishAsync(new CreateFlashSalesOrderCompleteEto() + await DistributedEventBus.PublishAsync(new CreateFlashSaleOrderCompleteEto() { TenantId = eventData.TenantId, PlanId = eventData.PlanId, @@ -59,14 +60,14 @@ public class FlashSalesReduceInventoryEventHandler : IDistributedEventHandler(await ProductDetailRepository.GetAsync(productDetailId.Value)) : + ObjectMapper.Map(await ProductDetailRepository.GetAsync(productDetailId.Value)) : null; - var productEto = ObjectMapper.Map(product); + var productEto = ObjectMapper.Map(product); - var createFlashSalesOrderEto = new CreateFlashSalesOrderEto() + var createFlashSalesOrderEto = new CreateFlashSaleOrderEto() { TenantId = eventData.TenantId, PlanId = eventData.PlanId, diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/Migrations/20220626174330_AddedFlashSales.Designer.cs b/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/Migrations/20220706160700_AddedFlashSales.Designer.cs similarity index 99% rename from samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/Migrations/20220626174330_AddedFlashSales.Designer.cs rename to samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/Migrations/20220706160700_AddedFlashSales.Designer.cs index 9463dc56..f80e833e 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/Migrations/20220626174330_AddedFlashSales.Designer.cs +++ b/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/Migrations/20220706160700_AddedFlashSales.Designer.cs @@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore; namespace EShopSample.Migrations { [DbContext(typeof(EShopSampleDbContext))] - [Migration("20220626174330_AddedFlashSales")] + [Migration("20220706160700_AddedFlashSales")] partial class AddedFlashSales { protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -1024,7 +1024,7 @@ namespace EShopSample.Migrations b.ToTable("EasyAbpEShopPluginsCouponsCouponTemplateScopes", (string)null); }); - modelBuilder.Entity("EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans.FlashSalesPlan", b => + modelBuilder.Entity("EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans.FlashSalePlan", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1094,10 +1094,10 @@ namespace EShopSample.Migrations b.HasKey("Id"); - b.ToTable("EasyAbpEShopPluginsFlashSalesPlans", (string)null); + b.ToTable("EasyAbpEShopPluginsFlashSalesFlashSalePlans", (string)null); }); - modelBuilder.Entity("EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults.FlashSalesResult", b => + modelBuilder.Entity("EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults.FlashSaleResult", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1167,7 +1167,7 @@ namespace EShopSample.Migrations b.HasKey("Id"); - b.ToTable("EasyAbpEShopPluginsFlashSalesResults", (string)null); + b.ToTable("EasyAbpEShopPluginsFlashSalesFlashSaleResults", (string)null); }); modelBuilder.Entity("EasyAbp.EShop.Products.Categories.Category", b => diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/Migrations/20220626174330_AddedFlashSales.cs b/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/Migrations/20220706160700_AddedFlashSales.cs similarity index 92% rename from samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/Migrations/20220626174330_AddedFlashSales.cs rename to samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/Migrations/20220706160700_AddedFlashSales.cs index 9174e969..bb11a583 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/Migrations/20220626174330_AddedFlashSales.cs +++ b/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/Migrations/20220706160700_AddedFlashSales.cs @@ -10,7 +10,7 @@ namespace EShopSample.Migrations protected override void Up(MigrationBuilder migrationBuilder) { migrationBuilder.CreateTable( - name: "EasyAbpEShopPluginsFlashSalesPlans", + name: "EasyAbpEShopPluginsFlashSalesFlashSalePlans", columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), @@ -33,11 +33,11 @@ namespace EShopSample.Migrations }, constraints: table => { - table.PrimaryKey("PK_EasyAbpEShopPluginsFlashSalesPlans", x => x.Id); + table.PrimaryKey("PK_EasyAbpEShopPluginsFlashSalesFlashSalePlans", x => x.Id); }); migrationBuilder.CreateTable( - name: "EasyAbpEShopPluginsFlashSalesResults", + name: "EasyAbpEShopPluginsFlashSalesFlashSaleResults", columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), @@ -60,17 +60,17 @@ namespace EShopSample.Migrations }, constraints: table => { - table.PrimaryKey("PK_EasyAbpEShopPluginsFlashSalesResults", x => x.Id); + table.PrimaryKey("PK_EasyAbpEShopPluginsFlashSalesFlashSaleResults", x => x.Id); }); } protected override void Down(MigrationBuilder migrationBuilder) { migrationBuilder.DropTable( - name: "EasyAbpEShopPluginsFlashSalesPlans"); + name: "EasyAbpEShopPluginsFlashSalesFlashSalePlans"); migrationBuilder.DropTable( - name: "EasyAbpEShopPluginsFlashSalesResults"); + name: "EasyAbpEShopPluginsFlashSalesFlashSaleResults"); } } } diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/Migrations/EShopSampleDbContextModelSnapshot.cs b/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/Migrations/EShopSampleDbContextModelSnapshot.cs index 63bee2e4..bc37bd1a 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/Migrations/EShopSampleDbContextModelSnapshot.cs +++ b/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/Migrations/EShopSampleDbContextModelSnapshot.cs @@ -1022,7 +1022,7 @@ namespace EShopSample.Migrations b.ToTable("EasyAbpEShopPluginsCouponsCouponTemplateScopes", (string)null); }); - modelBuilder.Entity("EasyAbp.EShop.Plugins.FlashSales.FlashSalesPlans.FlashSalesPlan", b => + modelBuilder.Entity("EasyAbp.EShop.Plugins.FlashSales.FlashSalePlans.FlashSalePlan", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1092,10 +1092,10 @@ namespace EShopSample.Migrations b.HasKey("Id"); - b.ToTable("EasyAbpEShopPluginsFlashSalesPlans", (string)null); + b.ToTable("EasyAbpEShopPluginsFlashSalesFlashSalePlans", (string)null); }); - modelBuilder.Entity("EasyAbp.EShop.Plugins.FlashSales.FlashSalesResults.FlashSalesResult", b => + modelBuilder.Entity("EasyAbp.EShop.Plugins.FlashSales.FlashSaleResults.FlashSaleResult", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1165,7 +1165,7 @@ namespace EShopSample.Migrations b.HasKey("Id"); - b.ToTable("EasyAbpEShopPluginsFlashSalesResults", (string)null); + b.ToTable("EasyAbpEShopPluginsFlashSalesFlashSaleResults", (string)null); }); modelBuilder.Entity("EasyAbp.EShop.Products.Categories.Category", b =>