@pisell/pisellos 2.1.19 → 2.1.20

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/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": "2.1.19",
+  "version": "2.1.20",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",