Update to use latest BookingService module code

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

@@ -5,6 +5,7 @@ using System.Security.Principal;
 using System.Threading.Tasks;
 using EasyAbp.BookingService.AssetOccupancies;
 using EasyAbp.BookingService.AssetOccupancies.Dtos;
+using EasyAbp.BookingService.AssetOccupancyProviders;
 using EasyAbp.BookingService.PeriodSchemes;
 using EasyAbp.EShop.Orders.Orders;
 using EasyAbp.EShop.Orders.Orders.Dtos;
@@ -58,13 +59,6 @@ namespace EasyAbp.EShop.Orders.Booking.Authorization
                 return;
             }
 
-            // Quantity of order lines for booking should be 1.
-            if (bookingOrderLines.Any(x => x.Quantity != 1))
-            {
-                context.Fail();
-                return;
-            }
-
             var models = new List<OccupyAssetInfoModel>();
             var byCategoryModels = new List<OccupyAssetByCategoryInfoModel>();
 
@@ -126,6 +120,7 @@ namespace EasyAbp.EShop.Orders.Booking.Authorization
         {
             return new OccupyAssetInfoModel(
                 assetId,
+                orderLine.GetBookingVolume(),
                 orderLine.GetBookingDate(),
                 orderLine.GetBookingStartingTime(),
                 orderLine.GetBookingDuration()
@@ -137,6 +132,7 @@ namespace EasyAbp.EShop.Orders.Booking.Authorization
         {
             return new OccupyAssetByCategoryInfoModel(
                 assetCategoryId,
+                orderLine.GetBookingVolume(),
                 orderLine.GetBookingDate(),
                 orderLine.GetBookingStartingTime(),
                 orderLine.GetBookingDuration()

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

@@ -1,5 +1,6 @@
 using System.Threading.Tasks;
 using EasyAbp.BookingService.AssetOccupancies;
+using EasyAbp.BookingService.AssetOccupancyProviders;
 using EasyAbp.EShop.Orders.Orders;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.EventBus.Distributed;

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

@@ -5,6 +5,7 @@ using System.Security.Principal;
 using System.Threading.Tasks;
 using EasyAbp.BookingService.AssetOccupancies;
 using EasyAbp.BookingService.AssetOccupancies.Dtos;
+using EasyAbp.BookingService.AssetOccupancyProviders;
 using EasyAbp.BookingService.PeriodSchemes;
 using EasyAbp.EShop.Orders;
 using EasyAbp.EShop.Orders.Orders.Dtos;
@@ -99,6 +100,7 @@ namespace EasyAbp.EShop.Payments.Booking.Authorization
         {
             return new OccupyAssetInfoModel(
                 assetId,
+                orderLine.GetBookingVolume(),
                 orderLine.GetBookingDate(),
                 orderLine.GetBookingStartingTime(),
                 orderLine.GetBookingDuration()
@@ -110,6 +112,7 @@ namespace EasyAbp.EShop.Payments.Booking.Authorization
         {
             return new OccupyAssetByCategoryInfoModel(
                 assetCategoryId,
+                orderLine.GetBookingVolume(),
                 orderLine.GetBookingDate(),
                 orderLine.GetBookingStartingTime(),
                 orderLine.GetBookingDuration()

plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application.Contracts/EasyAbp/BookingService/AssetOccupancies/BulkAssetOccupancyResultEtoExtensions.cs

@@ -1,4 +1,5 @@
 using System;
+using EasyAbp.BookingService.AssetOccupancyProviders;
 using Volo.Abp.Data;
 
 namespace EasyAbp.BookingService.AssetOccupancies;

plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application.Contracts/EasyAbp/BookingService/AssetOccupancies/BulkOccupyAssetEtoExtensions.cs

@@ -1,4 +1,5 @@
 using System;
+using EasyAbp.BookingService.AssetOccupancyProviders;
 using Volo.Abp.Data;
 
 namespace EasyAbp.BookingService.AssetOccupancies;

plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application.Contracts/EasyAbp/EShop/Orders/BookingOrderProperties.cs

@@ -5,11 +5,13 @@ public class BookingOrderProperties
     public const string OrderLineBookingAssetId = "BookingAssetId";
 
     public const string OrderLineBookingAssetCategoryId = "BookingAssetCategoryId";
-    
+
     public const string OrderLineBookingPeriodSchemeId = "BookingPeriodSchemeId";
-    
+
     public const string OrderLineBookingPeriodId = "BookingPeriodId";
 
+    public const string OrderLineBookingVolume = "BookingVolume";
+
     public const string OrderLineBookingDate = "BookingDate";
 
     public const string OrderLineBookingStartingTime = "BookingStartingTime";

plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application.Contracts/EasyAbp/EShop/Orders/CreateOrderLineDtoExtensions.cs

@@ -51,6 +51,17 @@ public static class CreateOrderLineDtoExtensions
             BookingOrderProperties.OrderLineBookingPeriodId)!.Value;
     }
 
+    public static int? FindBookingVolume(this CreateOrderLineDto orderLine)
+    {
+        return orderLine.Quantity;
+    }
+
+    public static int GetBookingVolume(this CreateOrderLineDto orderLine)
+    {
+        return Check.NotNull(FindBookingVolume(orderLine),
+            BookingOrderProperties.OrderLineBookingVolume)!.Value;
+    }
+
     public static DateTime? FindBookingDate(this CreateOrderLineDto orderLine)
     {
         return orderLine.GetProperty<DateTime?>(BookingOrderProperties.OrderLineBookingDate);

plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application.Contracts/EasyAbp/EShop/Orders/OrderLineExtensions.cs

@@ -50,6 +50,17 @@ public static class OrderLineExtensions
         return Check.NotNull(FindBookingPeriodId(orderLine),
             BookingOrderProperties.OrderLineBookingPeriodId)!.Value;
     }
+    
+    public static int? FindBookingVolume(this IOrderLine orderLine)
+    {
+        return orderLine.Quantity;
+    }
+
+    public static int GetBookingVolume(this IOrderLine orderLine)
+    {
+        return Check.NotNull(FindBookingVolume(orderLine),
+            BookingOrderProperties.OrderLineBookingVolume)!.Value;
+    }
 
     public static DateTime? FindBookingDate(this IOrderLine orderLine)
     {

plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application/EasyAbp/EShop/Plugins/Booking/EventHandlers/BookingOrderPaidEventHandler.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using EasyAbp.BookingService.AssetOccupancies;
+using EasyAbp.BookingService.AssetOccupancyProviders;
 using EasyAbp.EShop.Orders;
 using EasyAbp.EShop.Orders.Orders;
 using Volo.Abp.DependencyInjection;
@@ -26,11 +27,12 @@ public class BookingOrderPaidEventHandler : IDistributedEventHandler<OrderPaidEt
         {
             var assetId = orderLine.FindBookingAssetId();
             var assetCategoryId = orderLine.FindBookingAssetCategoryId();
+            var volume = orderLine.FindBookingVolume();
             var date = orderLine.FindBookingDate();
             var startingTime = orderLine.FindBookingStartingTime();
             var duration = orderLine.FindBookingDuration();
 
-            if (date is null || startingTime is null || duration is null)
+            if (volume is null || date is null || startingTime is null || duration is null)
             {
                 continue;
             }
@@ -39,6 +41,7 @@ public class BookingOrderPaidEventHandler : IDistributedEventHandler<OrderPaidEt
             {
                 occupyModels.Add(new OccupyAssetInfoModel(
                     assetId: assetId.Value,
+                    volume: volume.Value,
                     date: date.Value,
                     startingTime: startingTime.Value,
                     duration: duration.Value
@@ -48,6 +51,7 @@ public class BookingOrderPaidEventHandler : IDistributedEventHandler<OrderPaidEt
             {
                 occupyByCategoryModels.Add(new OccupyAssetByCategoryInfoModel(
                     assetCategoryId: assetCategoryId.Value,
+                    volume: volume.Value,
                     date: date.Value,
                     startingTime: startingTime.Value,
                     duration: duration.Value