@pisell/pisellos 2.1.20 → 2.1.21

package/dist/solution/BookingByStep/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/dist/solution/BookingByStep/index.js

@@ -2058,7 +2058,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         // item._origin.resources?.forEach((n: any) => {
         //   resourceIds.push(n.relation_id);
         // });
-        if (item.resource_id) {
+        if (item.resource_id && !resourceIds.includes(item.resource_id)) {
           resourceIds.push(item.resource_id);
         }
         resourcesTypeId = item === null || item === void 0 || (_item$_productOrigin8 = item._productOrigin) === null || _item$_productOrigin8 === void 0 || (_item$_productOrigin8 = _item$_productOrigin8.product_resource) === null || _item$_productOrigin8 === void 0 || (_item$_productOrigin8 = _item$_productOrigin8.resources) === null || _item$_productOrigin8 === void 0 || (_item$_productOrigin8 = _item$_productOrigin8.find(function (n) {
@@ -2153,6 +2153,26 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           return 0;
         }, 0);
       }
+      // 计算容量的辅助函数
+      var calculateCapacityFromCartItems = function calculateCapacityFromCartItems(items) {
+        return items.reduce(function (total, item) {
+          return total + (getCapacityInfoByCartItem(item).currentCapacity || 0);
+        }, 0);
+      };
+
+      // 如果是多个预约，去要求助几个 holder 下最大的需求容量capacity
+      var maxCapacity = 1;
+      if (cartItems !== null && cartItems !== void 0 && cartItems[0].holder_id) {
+        accountList.forEach(function (account) {
+          var accountCartItems = _this12.store.cart.getCartByAccount(account.getId());
+          var currentCapacity = calculateCapacityFromCartItems(accountCartItems);
+          if (currentCapacity > maxCapacity) {
+            maxCapacity = currentCapacity;
+          }
+        });
+      } else {
+        maxCapacity = calculateCapacityFromCartItems(cartItems);
+      }
       var timeSlots = getTimeSlicesByResources({
         resourceIds: resourceIds,
         resourcesMap: resourcesMap,
@@ -2160,6 +2180,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         currentDate: dateRange[0].date,
         split: 10,
         resourcesUseableMap: resourcesUseableMap,
+        capacity: maxCapacity,
         cut_off_time: maxCutOffTime,
         hasFlexibleDuration: hasFlexibleDuration,
         operating_day_boundary: operating_day_boundary,

package/lib/solution/BookingByStep/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/lib/solution/BookingByStep/index.js

@@ -1399,7 +1399,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           isSingleResource = n.type === "single";
         }
       });
-      if (item.resource_id) {
+      if (item.resource_id && !resourceIds.includes(item.resource_id)) {
         resourceIds.push(item.resource_id);
       }
       resourcesTypeId = (_g2 = (_f2 = (_e2 = (_d2 = item == null ? void 0 : item._productOrigin) == null ? void 0 : _d2.product_resource) == null ? void 0 : _e2.resources) == null ? void 0 : _f2.find(
@@ -1487,6 +1487,23 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         return 0;
       }, 0);
     }
+    const calculateCapacityFromCartItems = (items) => {
+      return items.reduce((total, item) => {
+        return total + ((0, import_capacity.getCapacityInfoByCartItem)(item).currentCapacity || 0);
+      }, 0);
+    };
+    let maxCapacity = 1;
+    if (cartItems == null ? void 0 : cartItems[0].holder_id) {
+      accountList.forEach((account) => {
+        const accountCartItems = this.store.cart.getCartByAccount(account.getId());
+        const currentCapacity = calculateCapacityFromCartItems(accountCartItems);
+        if (currentCapacity > maxCapacity) {
+          maxCapacity = currentCapacity;
+        }
+      });
+    } else {
+      maxCapacity = calculateCapacityFromCartItems(cartItems);
+    }
     const timeSlots = (0, import_resources.getTimeSlicesByResources)({
       resourceIds,
       resourcesMap,
@@ -1494,6 +1511,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       currentDate: dateRange[0].date,
       split: 10,
       resourcesUseableMap,
+      capacity: maxCapacity,
       cut_off_time: maxCutOffTime,
       hasFlexibleDuration,
       operating_day_boundary,

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.1.20",
+  "version": "2.1.21",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",