@pisell/pisellos 0.0.286 → 0.0.288

package/dist/modules/Rules/index.js

@@ -536,7 +536,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           } else {
             arr.push(_this3.hooks.setProduct(originProduct, {
               discount_list: [discountDetail],
-              _id: product._id.split('___')[0] + "___" + _selectedDiscount.id + index,
+              _id: product._id.split('___')[0] + "___" + _selectedDiscount.id + "___" + index,
               price: _selectedDiscount.tag === 'good_pass' ? 0 : product.price,
               quantity: isNeedSplit ? 1 : product.quantity,
               total: targetProductTotal,

package/dist/solution/BookingByStep/index.js

@@ -2061,7 +2061,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) {
@@ -2156,6 +2156,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,
@@ -2163,6 +2183,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/dist/solution/BookingByStep/utils/capacity.js

@@ -245,17 +245,28 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
     var _getCapacityInfoByCar2 = getCapacityInfoByCartItem(cartItem),
       currentCapacity = _getCapacityInfoByCar2.currentCapacity;
     Object.keys(resourceTypeMap).forEach(function (formId) {
+      var _cartItem$_productOri;
       var resourcesInType = resourceTypeMap[formId];
       var resourceIdsInType = resourcesInType.map(function (r) {
         return r.id;
       });
+      var selectType = (_cartItem$_productOri = cartItem._productOrigin) === null || _cartItem$_productOri === void 0 || (_cartItem$_productOri = _cartItem$_productOri.product_resource) === null || _cartItem$_productOri === void 0 || (_cartItem$_productOri = _cartItem$_productOri.resources) === null || _cartItem$_productOri === void 0 || (_cartItem$_productOri = _cartItem$_productOri.find(function (r) {
+        var _r$id;
+        return ((_r$id = r.id) === null || _r$id === void 0 ? void 0 : _r$id.toString()) === formId;
+      })) === null || _cartItem$_productOri === void 0 ? void 0 : _cartItem$_productOri.type;
 
       // 检查该商品是否需要这种类型的资源
       var needsThisResourceType = productResourceIds.some(function (id) {
         return resourceIdsInType.includes(id);
       });
       if (needsThisResourceType) {
-        requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + currentCapacity;
+        // 需要判断是单个预约还是多个预约，如果是单个预约，不用加 capacity，只用+1
+        if (selectType === 'single') {
+          requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + 1;
+        } else {
+          requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + currentCapacity;
+        }
+        // requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + currentCapacity;
       }
     });
   });
@@ -275,12 +286,12 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
         _step2;
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var _cartItem$_productOri;
+          var _cartItem$_productOri2;
           var cartItem = _step2.value;
-          if ((_cartItem$_productOri = cartItem._productOrigin) !== null && _cartItem$_productOri !== void 0 && (_cartItem$_productOri = _cartItem$_productOri.product_resource) !== null && _cartItem$_productOri !== void 0 && _cartItem$_productOri.resources) {
+          if ((_cartItem$_productOri2 = cartItem._productOrigin) !== null && _cartItem$_productOri2 !== void 0 && (_cartItem$_productOri2 = _cartItem$_productOri2.product_resource) !== null && _cartItem$_productOri2 !== void 0 && _cartItem$_productOri2.resources) {
             resourceTypeConfig = cartItem._productOrigin.product_resource.resources.find(function (r) {
-              var _r$id;
-              return ((_r$id = r.id) === null || _r$id === void 0 ? void 0 : _r$id.toString()) === formId && r.status === 1;
+              var _r$id2;
+              return ((_r$id2 = r.id) === null || _r$id2 === void 0 ? void 0 : _r$id2.toString()) === formId && r.status === 1;
             });
             if (resourceTypeConfig) break;
           }

package/lib/modules/Rules/index.js

@@ -379,7 +379,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         } else {
           arr.push(this.hooks.setProduct(originProduct, {
             discount_list: [discountDetail],
-            _id: product._id.split("___")[0] + "___" + selectedDiscount2.id + index,
+            _id: product._id.split("___")[0] + "___" + selectedDiscount2.id + "___" + index,
             price: selectedDiscount2.tag === "good_pass" ? 0 : product.price,
             quantity: isNeedSplit ? 1 : product.quantity,
             total: targetProductTotal,

package/lib/solution/BookingByStep/index.js

@@ -1402,7 +1402,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(
@@ -1490,6 +1490,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,
@@ -1497,6 +1514,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/lib/solution/BookingByStep/utils/capacity.js

@@ -182,13 +182,22 @@ function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, allResourc
     const productResourceIds = getResourcesIdsByProduct(cartItem._productOrigin);
     const { currentCapacity } = getCapacityInfoByCartItem(cartItem);
     Object.keys(resourceTypeMap).forEach((formId) => {
+      var _a2, _b2, _c, _d;
       const resourcesInType = resourceTypeMap[formId];
       const resourceIdsInType = resourcesInType.map((r) => r.id);
+      const selectType = (_d = (_c = (_b2 = (_a2 = cartItem._productOrigin) == null ? void 0 : _a2.product_resource) == null ? void 0 : _b2.resources) == null ? void 0 : _c.find((r) => {
+        var _a3;
+        return ((_a3 = r.id) == null ? void 0 : _a3.toString()) === formId;
+      })) == null ? void 0 : _d.type;
       const needsThisResourceType = productResourceIds.some(
         (id) => resourceIdsInType.includes(id)
       );
       if (needsThisResourceType) {
-        requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + currentCapacity;
+        if (selectType === "single") {
+          requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + 1;
+        } else {
+          requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + currentCapacity;
+        }
       }
     });
   });

package/package.json

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