Rename modules

EShop.sln

@@ -383,9 +383,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dev-temp", "dev-temp", "{D0
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.BookingService.Domain.Shared", "..\EasyAbp.BookingService\src\EasyAbp.BookingService.Domain.Shared\EasyAbp.BookingService.Domain.Shared.csproj", "{772637D4-25D2-406D-9A0F-6C0506F9D97A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Orders.Plugins.Booking", "plugins\Booking\src\EasyAbp.EShop.Orders.Plugins.Booking\EasyAbp.EShop.Orders.Plugins.Booking.csproj", "{C0399352-1278-4D91-8D4E-7491FD77C18B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Orders.Booking.Application", "plugins\Booking\src\EasyAbp.EShop.Orders.Booking.Application\EasyAbp.EShop.Orders.Booking.Application.csproj", "{C0399352-1278-4D91-8D4E-7491FD77C18B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Payments.Plugins.Booking", "plugins\Booking\src\EasyAbp.EShop.Payments.Plugins.Booking\EasyAbp.EShop.Payments.Plugins.Booking.csproj", "{4480BFAF-C981-4242-A509-EDA6F572E45C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyAbp.EShop.Payments.Booking.Application", "plugins\Booking\src\EasyAbp.EShop.Payments.Booking.Application\EasyAbp.EShop.Payments.Booking.Application.csproj", "{4480BFAF-C981-4242-A509-EDA6F572E45C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

docs/plugins/booking/README.md

@@ -12,8 +12,8 @@ A booking-business plugin for EShop. It extends EShop to use the [EasyAbp.Bookin
 
 1. Install the following NuGet packages. ([see how](https://github.com/EasyAbp/EasyAbpGuide/blob/master/docs/How-To.md#add-nuget-packages))
 
-    * EasyAbp.EShop.Orders.Plugins.Booking (install at EasyAbp.EShop.Orders.Application location)
-    * (Optional) EasyAbp.EShop.Payments.Plugins.Booking (install at EasyAbp.EShop.Payments.Application location)
+    * EasyAbp.EShop.Orders.Booking.Application (install at EasyAbp.EShop.Orders.Application location)
+    * (Optional) EasyAbp.EShop.Payments.Booking.Application (install at EasyAbp.EShop.Payments.Application location)
     * EasyAbp.EShop.Plugins.Booking.Application
     * EasyAbp.EShop.Plugins.Booking.Application
     * EasyAbp.EShop.Plugins.Booking.Application.Contracts

plugins/Booking/src/EasyAbp.EShop.Orders.Plugins.Booking/EasyAbp.EShop.Orders.Plugins.Booking.csproj → plugins/Booking/src/EasyAbp.EShop.Orders.Booking.Application/EasyAbp.EShop.Orders.Booking.Application.csproj

@@ -9,7 +9,6 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Orders\src\EasyAbp.EShop.Orders.Application\EasyAbp.EShop.Orders.Application.csproj" />
-        <ProjectReference Include="..\EasyAbp.EShop.Orders.Plugins.Booking.Shared\EasyAbp.EShop.Orders.Plugins.Booking.Shared.csproj" />
         <ProjectReference Include="..\EasyAbp.EShop.Plugins.Booking.Application.Contracts\EasyAbp.EShop.Plugins.Booking.Application.Contracts.csproj" />
     </ItemGroup>
 

plugins/Booking/src/EasyAbp.EShop.Orders.Plugins.Booking/EasyAbp/EShop/Orders/Plugins/Booking/Authorization/BookingOrderCreationAuthorizationHandler.cs → plugins/Booking/src/EasyAbp.EShop.Orders.Booking.Application/EasyAbp/EShop/Orders/Booking/Authorization/BookingOrderCreationAuthorizationHandler.cs

@@ -1,12 +1,10 @@
-using System;
-using System.Linq;
+using System.Linq;
 using System.Threading.Tasks;
 using EasyAbp.EShop.Orders.Orders;
 using EasyAbp.EShop.Plugins.Booking.BookingProductGroupDefinitions;
 using Microsoft.AspNetCore.Authorization;
-using Volo.Abp.Data;
 
-namespace EasyAbp.EShop.Orders.Plugins.Booking.Authorization
+namespace EasyAbp.EShop.Orders.Booking.Authorization
 {
     public class BookingOrderCreationAuthorizationHandler : OrderCreationAuthorizationHandler
     {
@@ -49,7 +47,7 @@ namespace EasyAbp.EShop.Orders.Plugins.Booking.Authorization
                     // Todo: Invoke IProductAssetCategoryAppService to check the mapping.
                 }
                 
-                // Todo: Invoke IAssetOccupancyAppService to check the booking info.
+                // Todo: Invoke IAssetOccupancyAppService (in EasyAbp.EShop.Plugins.Booking, not EasyAbp.BookingService) to check the booking info.
             }
         }
     }

plugins/Booking/src/EasyAbp.EShop.Orders.Plugins.Booking/EasyAbp/EShop/Orders/Plugins/Booking/BookingOrderConsts.cs → plugins/Booking/src/EasyAbp.EShop.Orders.Booking.Application/EasyAbp/EShop/Orders/Booking/BookingOrderConsts.cs

@@ -1,4 +1,4 @@
-namespace EasyAbp.EShop.Orders.Plugins.Booking;
+namespace EasyAbp.EShop.Orders.Booking;
 
 public class BookingOrderConsts
 {

plugins/Booking/src/EasyAbp.EShop.Orders.Plugins.Booking/EasyAbp/EShop/Orders/Plugins/Booking/EShopOrdersPluginsBookingModule.cs → plugins/Booking/src/EasyAbp.EShop.Orders.Booking.Application/EasyAbp/EShop/Orders/Booking/EShopOrdersBookingApplicationModule.cs

@@ -1,13 +1,13 @@
-using EasyAbp.EShop.Orders.Plugins.Booking.ObjectExtending;
+using EasyAbp.EShop.Orders.Booking.ObjectExtending;
 using Volo.Abp.Modularity;
 
-namespace EasyAbp.EShop.Orders.Plugins.Booking
+namespace EasyAbp.EShop.Orders.Booking
 {
     [DependsOn(
         typeof(EShopOrdersApplicationModule),
         typeof(EShopOrdersApplicationContractsModule)
     )]
-    public class EShopOrdersPluginsBookingModule : AbpModule
+    public class EShopOrdersBookingApplicationModule : AbpModule
     {
         public override void PreConfigureServices(ServiceConfigurationContext context)
         {

plugins/Booking/src/EasyAbp.EShop.Orders.Plugins.Booking/EasyAbp/EShop/Orders/Plugins/Booking/EventHandlers/BulkAssetOccupancyResultEventHandler.cs → plugins/Booking/src/EasyAbp.EShop.Orders.Booking.Application/EasyAbp/EShop/Orders/Booking/EventHandlers/BulkAssetOccupancyResultEventHandler.cs

@@ -1,13 +1,11 @@
-using System;
 using System.Threading.Tasks;
 using EasyAbp.BookingService.AssetOccupancies;
 using EasyAbp.EShop.Orders.Orders;
-using Volo.Abp.Data;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.EventBus.Distributed;
 using Volo.Abp.Uow;
 
-namespace EasyAbp.EShop.Orders.Plugins.Booking.EventHandlers;
+namespace EasyAbp.EShop.Orders.Booking.EventHandlers;
 
 public class BulkAssetOccupancyResultEventHandler : IDistributedEventHandler<BulkAssetOccupancyResultEto>, ITransientDependency
 {

plugins/Booking/src/EasyAbp.EShop.Orders.Plugins.Booking/EasyAbp/EShop/Orders/Plugins/Booking/ObjectExtending/EShopOrdersPluginsBookingObjectExtensions.cs → plugins/Booking/src/EasyAbp.EShop.Orders.Booking.Application/EasyAbp/EShop/Orders/Booking/ObjectExtending/EShopOrdersPluginsBookingObjectExtensions.cs

@@ -1,11 +1,10 @@
 using System;
 using EasyAbp.EShop.Orders.Orders;
 using EasyAbp.EShop.Orders.Orders.Dtos;
-using EasyAbp.EShop.Plugins.Booking;
 using Volo.Abp.ObjectExtending;
 using Volo.Abp.Threading;
 
-namespace EasyAbp.EShop.Orders.Plugins.Booking.ObjectExtending
+namespace EasyAbp.EShop.Orders.Booking.ObjectExtending
 {
     public static class EShopOrdersPluginsBookingObjectExtensions
     {

plugins/Booking/src/EasyAbp.EShop.Payments.Plugins.Booking/EasyAbp.EShop.Payments.Plugins.Booking.csproj → plugins/Booking/src/EasyAbp.EShop.Payments.Booking.Application/EasyAbp.EShop.Payments.Booking.Application.csproj

@@ -9,7 +9,6 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\..\..\modules\EasyAbp.EShop.Payments\src\EasyAbp.EShop.Payments.Application\EasyAbp.EShop.Payments.Application.csproj" />
-        <ProjectReference Include="..\EasyAbp.EShop.Orders.Plugins.Booking.Shared\EasyAbp.EShop.Orders.Plugins.Booking.Shared.csproj" />
         <ProjectReference Include="..\EasyAbp.EShop.Plugins.Booking.Application.Contracts\EasyAbp.EShop.Plugins.Booking.Application.Contracts.csproj" />
     </ItemGroup>
 

plugins/Booking/src/EasyAbp.EShop.Payments.Plugins.Booking/EasyAbp/EShop/Payments/Plugins/Booking/Authorization/BookingPaymentCreationAuthorizationHandler.cs → plugins/Booking/src/EasyAbp.EShop.Payments.Booking.Application/EasyAbp/EShop/Payments/Booking/Authorization/BookingPaymentCreationAuthorizationHandler.cs

@@ -3,7 +3,7 @@ using EasyAbp.EShop.Orders;
 using EasyAbp.EShop.Payments.Payments;
 using Microsoft.AspNetCore.Authorization;
 
-namespace EasyAbp.EShop.Payments.Plugins.Booking.Authorization
+namespace EasyAbp.EShop.Payments.Booking.Authorization
 {
     public class BookingPaymentCreationAuthorizationHandler : PaymentCreationAuthorizationHandler
     {
@@ -28,7 +28,7 @@ namespace EasyAbp.EShop.Payments.Plugins.Booking.Authorization
                         }
                     }
                 
-                    // Todo: Invoke IAssetOccupancyAppService to check the booking info.
+                    // Todo: Invoke IAssetOccupancyAppService (in EasyAbp.EShop.Plugins.Booking, not EasyAbp.BookingService) to check the booking info.
                 }
             }
         }

plugins/Booking/src/EasyAbp.EShop.Payments.Plugins.Booking/EasyAbp/EShop/Payments/Plugins/Booking/EShopPaymentsPluginsBookingModule.cs → plugins/Booking/src/EasyAbp.EShop.Payments.Booking.Application/EasyAbp/EShop/Payments/Booking/EShopPaymentsBookingApplicationModule.cs

@@ -1,13 +1,13 @@
 using EasyAbp.EShop.Plugins.Booking;
 using Volo.Abp.Modularity;
 
-namespace EasyAbp.EShop.Payments.Plugins.Booking
+namespace EasyAbp.EShop.Payments.Booking
 {
     [DependsOn(
         typeof(EShopPaymentsApplicationModule),
         typeof(EShopPluginsBookingApplicationContractsModule)
     )]
-    public class EShopPaymentsPluginsBookingModule : AbpModule
+    public class EShopPaymentsBookingApplicationModule : AbpModule
     {
     }
 }