@pisell/pisellos 2.1.38 → 2.2.1

package/dist/solution/BookingByStep/index.js

@@ -29,8 +29,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../../modules/BaseModule";
-import { BookingByStepHooks, createModule } from "./types";
-import { formatProductToCartItem, createCartItemOrigin, getUniqueId, handleVariantProduct, formatDateToCartItem, formatAccountToCartItem } from "../../modules/Cart/utils";
+import { createModule } from "./types";
 import { getAvailableProductResources } from "./utils/products";
 import { getResourcesByProduct, getTimeSlicesByResource, getTimeSlicesByResources, getIsUsableByTimeItem, getOthersSelectedResources, getOthersCartSelectedResources, filterScheduleByDateRange, checkSessionProductLeadTime, sortCombinedResources, filterResourcesByFormItem, checkTwoResourcesIntersection, isConflict } from "./utils/resources";
 import dayjs from 'dayjs';
@@ -137,7 +136,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               });
               this.store.schedule.loadAllSchedule();
-              this.core.effects.emit(BookingByStepHooks.onInited, {});
+              this.core.effects.emit("".concat(this.name, ":onInited"), {});
             case 19:
             case "end":
               return _context.stop();
@@ -1195,16 +1194,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       this.addProductCheck({
         date: date
       });
-      // 如果 quantity 大于 1，且是预约商品，则进入购物车拆散成多条数据
-      if (addItemParams.quantity > 1 && !isNormalProduct(productData)) {
-        for (var i = 0; i < addItemParams.quantity; i++) {
-          var newAddItemParams = cloneDeep(addItemParams);
-          newAddItemParams.quantity = 1;
-          this.store.cart.addItem(newAddItemParams);
-        }
-      } else {
-        this.store.cart.addItem(addItemParams);
-      }
+      this.store.cart.addItem(addItemParams);
       return {
         success: true
       };
@@ -3048,11 +3038,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           });
 
           // 按资源类型分组检查容量
-          var _checkTimeSlotCapacit = checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, itemsInTimeSlot, allResourcesForTimeSlot),
-            success = _checkTimeSlotCapacit.success,
-            required = _checkTimeSlotCapacit.required,
-            available = _checkTimeSlotCapacit.available;
-          if (!success) {
+          if (!checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, itemsInTimeSlot, allResourcesForTimeSlot)) {
             // 如果有可用数量记录，返回最小值；否则返回 0
             var _minAvailableCount = availableCountsByResourceType.length > 0 ? Math.min.apply(Math, availableCountsByResourceType) : 0;
             return {
@@ -3077,437 +3063,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         minAvailableCount: minAvailableCount
       };
     }
-
-    /**
-     * 将 ProductData 转换为 CartItem，但不添加到购物车
-     * 参考 addProductToCart 方法的实现
-     */
-  }, {
-    key: "convertProductToCartItem",
-    value: function convertProductToCartItem(_ref11) {
-      var product = _ref11.product,
-        date = _ref11.date,
-        account = _ref11.account;
-      var _ref12 = product || {},
-        bundle = _ref12.bundle,
-        options = _ref12.options,
-        origin = _ref12.origin,
-        product_variant_id = _ref12.product_variant_id,
-        _ref12$quantity = _ref12.quantity,
-        quantity = _ref12$quantity === void 0 ? 1 : _ref12$quantity;
-
-      // 处理商品数据，类似 addProductToCart 中的逻辑
-      var productData = _objectSpread(_objectSpread({}, origin), {}, {
-        product_variant_id: product_variant_id
-      });
-
-      // 处理组合商品
-      var processedProduct = handleVariantProduct(productData);
-
-      // 如果没有传入账户，获取当前活跃账户
-      if (!account) {
-        var activeAccount = this.getActiveAccount();
-        if (activeAccount) {
-          account = activeAccount;
-        }
-      }
-
-      // 创建基础的 CartItem
-      var cartItem = {
-        _id: getUniqueId('temp_'),
-        _origin: createCartItemOrigin(),
-        _productOrigin: processedProduct,
-        _productInit: product
-      };
-
-      // 使用格式化函数填充 CartItem 数据
-      formatProductToCartItem({
-        cartItem: cartItem,
-        product: processedProduct,
-        bundle: bundle,
-        options: options,
-        product_variant_id: product_variant_id,
-        quantity: quantity
-      });
-
-      // 如果有日期信息，格式化日期到购物车
-      if (date) {
-        formatDateToCartItem({
-          cartItem: cartItem,
-          date: date
-        });
-      }
-
-      // 如果有账户信息，格式化账户到购物车
-      if (account) {
-        formatAccountToCartItem({
-          cartItem: cartItem,
-          account: account
-        });
-      }
-      return cartItem;
-    }
-  }, {
-    key: "checkMaxDurationCapacityForDetailNums",
-    value: function checkMaxDurationCapacityForDetailNums(_ref13) {
-      var _this16 = this;
-      var product = _ref13.product,
-        date = _ref13.date,
-        account = _ref13.account;
-      var cartItems = cloneDeep(this.store.cart.getItems());
-
-      // 将 ProductData 转换为 CartItem 但不真正添加到购物车
-      var currentCartItem = this.convertProductToCartItem({
-        product: product,
-        date: date,
-        account: account
-      });
-      cartItems.push(currentCartItem);
-      if (cartItems.length === 0) return {
-        success: true,
-        minAvailableCount: 0
-      };
-
-      // 将购物车商品分为有时间的和没有时间的
-      var itemsWithTime = [];
-      var itemsWithoutTime = [];
-      // 记录每种资源类型的可用数量
-      var availableCountsByResourceType = [];
-      cartItems.forEach(function (cartItem) {
-        if (cartItem.start_time && cartItem.end_time && cartItem.start_date) {
-          itemsWithTime.push(cartItem);
-        } else {
-          itemsWithoutTime.push(cartItem);
-        }
-      });
-
-      // 处理没有时间的商品，为它们分配公共可用时间的第一个时间片
-      var processedItemsWithoutTime = [];
-      if (itemsWithoutTime.length > 0) {
-        // 按资源类型分组处理没有时间的商品
-        var itemsByResourceType = {};
-        itemsWithoutTime.forEach(function (cartItem) {
-          var _cartItem$_productOri13;
-          if (!cartItem._productOrigin) return;
-          var resourceTypes = ((_cartItem$_productOri13 = cartItem._productOrigin.product_resource) === null || _cartItem$_productOri13 === void 0 ? void 0 : _cartItem$_productOri13.resources) || [];
-          resourceTypes.forEach(function (resourceType) {
-            if (resourceType.status === 1) {
-              var _resourceType$id2;
-              var resourceCode = resourceType.code || ((_resourceType$id2 = resourceType.id) === null || _resourceType$id2 === void 0 ? void 0 : _resourceType$id2.toString());
-              if (!itemsByResourceType[resourceCode]) {
-                itemsByResourceType[resourceCode] = [];
-              }
-              // 避免重复添加同一个商品
-              if (!itemsByResourceType[resourceCode].find(function (item) {
-                return item._id === cartItem._id;
-              })) {
-                itemsByResourceType[resourceCode].push(cartItem);
-              }
-            }
-          });
-        });
-
-        // 为每种资源类型检查容量
-        var dateRange = this.store.date.getDateRange();
-        if (!dateRange || dateRange.length === 0) return {
-          success: false,
-          minAvailableCount: 0
-        };
-        var resourcesDates = this.store.date.getDateList();
-        var targetResourceDate = resourcesDates.find(function (n) {
-          return n.date === dateRange[0].date;
-        });
-        if (!targetResourceDate) return {
-          success: false,
-          minAvailableCount: 0
-        };
-        var resourcesMap = getResourcesMap(targetResourceDate.resource || []);
-
-        // 从购物车商品中获取资源类型配置，建立 resourceCode 到 form_id 的映射关系
-        var resourceCodeToFormIdMap = {};
-
-        // 遍历购物车中的商品，收集所有资源类型配置
-        Object.values(itemsByResourceType).flat().forEach(function (cartItem) {
-          var _cartItem$_productOri14;
-          if ((_cartItem$_productOri14 = cartItem._productOrigin) !== null && _cartItem$_productOri14 !== void 0 && (_cartItem$_productOri14 = _cartItem$_productOri14.product_resource) !== null && _cartItem$_productOri14 !== void 0 && _cartItem$_productOri14.resources) {
-            cartItem._productOrigin.product_resource.resources.forEach(function (resourceConfig) {
-              // 只处理启用的资源类型 (status === 1)
-              if (resourceConfig.status === 1 && resourceConfig.code) {
-                var _resourceConfig$id2, _resourceConfig$resou2;
-                var formId = ((_resourceConfig$id2 = resourceConfig.id) === null || _resourceConfig$id2 === void 0 ? void 0 : _resourceConfig$id2.toString()) || ((_resourceConfig$resou2 = resourceConfig.resource_type_id) === null || _resourceConfig$resou2 === void 0 ? void 0 : _resourceConfig$resou2.toString());
-                if (formId) {
-                  resourceCodeToFormIdMap[resourceConfig.code] = formId;
-                }
-              }
-            });
-          }
-        });
-        var hasCapacityIssue = false;
-        var resourceCapacityInfo = [];
-
-        // 用于跟踪已处理的商品，避免重复添加
-        var processedCartItemIds = new Set();
-
-        // 先检查所有资源类型，收集可用数量信息
-        var _loop5 = function _loop5() {
-            var _resourceTypeConfig2;
-            var _Object$entries3$_i = _slicedToArray(_Object$entries3[_i3], 2),
-              resourceCode = _Object$entries3$_i[0],
-              items = _Object$entries3$_i[1];
-            // 获取该资源类型对应的 form_id
-            var targetFormId = resourceCodeToFormIdMap[resourceCode];
-            if (!targetFormId) {
-              console.log("\u8D44\u6E90\u7C7B\u578B ".concat(resourceCode, " \u627E\u4E0D\u5230\u5BF9\u5E94\u7684 form_id"));
-              return {
-                v: {
-                  success: false,
-                  minAvailableCount: 0
-                }
-              };
-            }
-
-            // 获取该资源类型的所有资源
-            var resourcesOfThisType = [];
-            items.forEach(function (cartItem) {
-              var productResourceIds = getResourcesIdsByProduct(cartItem._productOrigin);
-              productResourceIds.forEach(function (resourceId) {
-                var _resource$form_id2;
-                var resource = resourcesMap[resourceId];
-                if (resource && ((_resource$form_id2 = resource.form_id) === null || _resource$form_id2 === void 0 ? void 0 : _resource$form_id2.toString()) === targetFormId) {
-                  // 避免重复添加同一个资源
-                  if (!resourcesOfThisType.find(function (r) {
-                    return r.id === resource.id;
-                  })) {
-                    resourcesOfThisType.push(resource);
-                  }
-                }
-              });
-            });
-            if (resourcesOfThisType.length === 0) {
-              console.log("\u8D44\u6E90\u7C7B\u578B ".concat(resourceCode, " \u6CA1\u6709\u627E\u5230\u53EF\u7528\u8D44\u6E90"));
-              return {
-                v: {
-                  success: false,
-                  minAvailableCount: 0
-                }
-              };
-            }
-
-            // 检查资源类型（单个预约 vs 多个预约）
-            // 从商品配置中获取资源类型信息
-            var resourceTypeConfig = null;
-            var _iterator4 = _createForOfIteratorHelper(items),
-              _step4;
-            try {
-              for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-                var _cartItem$_productOri15;
-                var cartItem = _step4.value;
-                if ((_cartItem$_productOri15 = cartItem._productOrigin) !== null && _cartItem$_productOri15 !== void 0 && (_cartItem$_productOri15 = _cartItem$_productOri15.product_resource) !== null && _cartItem$_productOri15 !== void 0 && _cartItem$_productOri15.resources) {
-                  resourceTypeConfig = cartItem._productOrigin.product_resource.resources.find(function (r) {
-                    return r.code === resourceCode && r.status === 1;
-                  });
-                  if (resourceTypeConfig) break;
-                }
-              }
-            } catch (err) {
-              _iterator4.e(err);
-            } finally {
-              _iterator4.f();
-            }
-            var isMultipleBooking = ((_resourceTypeConfig2 = resourceTypeConfig) === null || _resourceTypeConfig2 === void 0 ? void 0 : _resourceTypeConfig2.type) === 'multiple';
-            var totalAvailable;
-            var requiredAmount;
-            var availableAmount;
-            if (isMultipleBooking) {
-              // 多个预约：计算容量
-              totalAvailable = resourcesOfThisType.reduce(function (sum, resource) {
-                return sum + (resource.capacity || 0);
-              }, 0);
-              requiredAmount = items.reduce(function (sum, cartItem) {
-                var _getCapacityInfoByCar8 = getCapacityInfoByCartItem(cartItem),
-                  currentCapacity = _getCapacityInfoByCar8.currentCapacity;
-                return sum + currentCapacity;
-              }, 0);
-              availableAmount = Math.max(0, totalAvailable - requiredAmount);
-            } else {
-              // 单个预约：计算资源个数
-              totalAvailable = resourcesOfThisType.length;
-              requiredAmount = items.reduce(function (sum, cartItem) {
-                return sum + (cartItem.num || 1);
-              }, 0);
-              availableAmount = Math.max(0, totalAvailable - requiredAmount);
-            }
-
-            // 记录资源容量信息
-            resourceCapacityInfo.push({
-              code: resourceCode,
-              available: availableAmount,
-              total: totalAvailable,
-              required: requiredAmount,
-              isMultiple: isMultipleBooking
-            });
-            availableCountsByResourceType.push(availableAmount);
-
-            // 检查是否有容量问题
-            if (requiredAmount > totalAvailable) {
-              hasCapacityIssue = true;
-              console.log("\u8D44\u6E90\u7C7B\u578B ".concat(resourceCode, " ").concat(isMultipleBooking ? '容量' : '资源数量', "\u4E0D\u8DB3: \u9700\u8981 ").concat(requiredAmount, ", \u603B\u5171 ").concat(totalAvailable));
-            }
-
-            // 为通过检测的商品分配一个公共可用时间段
-            console.log("\u8D44\u6E90\u7C7B\u578B ".concat(resourceCode, " \u7684\u8D44\u6E90\u65F6\u95F4\u4FE1\u606F:"), resourcesOfThisType.map(function (r) {
-              return {
-                id: r.id,
-                times: r.times.map(function (t) {
-                  return "".concat(t.start_at, " - ").concat(t.end_at);
-                })
-              };
-            }));
-
-            // 找到所有资源都可用的时间段
-            var commonTimeSlots = _this16.findCommonAvailableTimeSlots(resourcesOfThisType);
-            console.log("\u8D44\u6E90\u7C7B\u578B ".concat(resourceCode, " \u7684\u516C\u5171\u65F6\u95F4\u6BB5:"), commonTimeSlots);
-            if (commonTimeSlots.length === 0) {
-              console.log("\u8D44\u6E90\u7C7B\u578B ".concat(resourceCode, " \u6CA1\u6709\u516C\u5171\u53EF\u7528\u65F6\u95F4\u6BB5"));
-              return {
-                v: {
-                  success: false,
-                  minAvailableCount: 0
-                }
-              };
-            }
-
-            // 使用第一个公共可用时间段，但只处理未处理过的商品
-            var firstCommonSlot = commonTimeSlots[0];
-            console.log("\u4F7F\u7528\u516C\u5171\u65F6\u95F4\u6BB5: ".concat(firstCommonSlot.startTime, " - ").concat(firstCommonSlot.endTime));
-            items.forEach(function (cartItem) {
-              // 只处理未处理过的商品，避免重复添加
-              if (!processedCartItemIds.has(cartItem._id)) {
-                processedCartItemIds.add(cartItem._id);
-                var processedItem = _objectSpread(_objectSpread({}, cartItem), {}, {
-                  start_date: dateRange[0].date,
-                  start_time: firstCommonSlot.startTime,
-                  end_time: firstCommonSlot.endTime,
-                  end_date: dateRange[0].date
-                });
-                processedItemsWithoutTime.push(processedItem);
-              }
-            });
-          },
-          _ret4;
-        for (var _i3 = 0, _Object$entries3 = Object.entries(itemsByResourceType); _i3 < _Object$entries3.length; _i3++) {
-          _ret4 = _loop5();
-          if (_ret4) return _ret4.v;
-        }
-
-        // 如果有容量问题，找出限制最严格的资源类型，返回其总容量
-        if (hasCapacityIssue) {
-          // 找出超出容量的资源类型中，总容量最少的那个
-          var overCapacityResources = resourceCapacityInfo.filter(function (info) {
-            return info.required > info.total;
-          });
-          if (overCapacityResources.length > 0) {
-            var _minTotalCapacity2 = Math.min.apply(Math, _toConsumableArray(overCapacityResources.map(function (info) {
-              return info.total;
-            })));
-            return {
-              success: false,
-              minAvailableCount: _minTotalCapacity2
-            };
-          }
-          // 如果没有超出容量的（理论上不应该发生），返回总容量最少的
-          var minTotalCapacity = Math.min.apply(Math, _toConsumableArray(resourceCapacityInfo.map(function (info) {
-            return info.total;
-          })));
-          return {
-            success: false,
-            minAvailableCount: minTotalCapacity
-          };
-        }
-      }
-
-      // 合并所有商品（有时间的 + 处理后的没有时间的）
-      var allProcessedItems = [].concat(itemsWithTime, processedItemsWithoutTime);
-
-      // 按时间段分组检查
-      var cartItemsByTimeSlot = {};
-      allProcessedItems.forEach(function (cartItem) {
-        if (!cartItem.start_time || !cartItem.end_time || !cartItem.start_date) return;
-        var timeSlotKey = "".concat(cartItem.start_date, "_").concat(cartItem.start_time, "_").concat(cartItem.end_date || cartItem.start_date, "_").concat(cartItem.end_time);
-        if (!cartItemsByTimeSlot[timeSlotKey]) {
-          cartItemsByTimeSlot[timeSlotKey] = [];
-        }
-        cartItemsByTimeSlot[timeSlotKey].push(cartItem);
-      });
-      // 检查每个时间段是否有足够的资源容量
-      var _loop6 = function _loop6() {
-          var _Object$entries4$_i = _slicedToArray(_Object$entries4[_i4], 2),
-            timeSlotKey = _Object$entries4$_i[0],
-            itemsInTimeSlot = _Object$entries4$_i[1];
-          var _timeSlotKey$split3 = timeSlotKey.split('_'),
-            _timeSlotKey$split4 = _slicedToArray(_timeSlotKey$split3, 4),
-            startDate = _timeSlotKey$split4[0],
-            startTime = _timeSlotKey$split4[1],
-            endDate = _timeSlotKey$split4[2],
-            endTime = _timeSlotKey$split4[3];
-          var timeSlotStart = "".concat(startDate, " ").concat(startTime);
-          var timeSlotEnd = "".concat(endDate, " ").concat(endTime);
-
-          // 获取这个时间段所有商品涉及的资源
-          var allResourcesForTimeSlot = [];
-          var resourcesIdSet = new Set();
-
-          // 获取资源数据
-          // const dateRange = this.store.date.getDateRange();
-          var resourcesDates = _this16.store.date.getDateList();
-          var targetResourceDate = resourcesDates.find(function (n) {
-            return n.date === startDate;
-          });
-          if (!targetResourceDate) return 0; // continue
-          var resourcesMap = getResourcesMap(targetResourceDate.resource || []);
-          itemsInTimeSlot.forEach(function (cartItem) {
-            if (!cartItem._productOrigin) return;
-
-            // 获取商品的资源配置
-            var productResourceIds = getResourcesIdsByProduct(cartItem._productOrigin);
-            productResourceIds.forEach(function (resourceId) {
-              if (resourcesMap[resourceId] && !resourcesIdSet.has(resourceId)) {
-                resourcesIdSet.add(resourceId);
-                allResourcesForTimeSlot.push(resourcesMap[resourceId]);
-              }
-            });
-          });
-
-          // 按资源类型分组检查容量
-          var _checkTimeSlotCapacit2 = checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, itemsInTimeSlot, allResourcesForTimeSlot),
-            success = _checkTimeSlotCapacit2.success,
-            required = _checkTimeSlotCapacit2.required,
-            available = _checkTimeSlotCapacit2.available;
-          if (!success) {
-            // 如果有可用数量记录，返回最小值；否则返回 0
-            // const minAvailableCount = availableCountsByResourceType.length > 0 ? Math.min(...availableCountsByResourceType) : 0;
-            return {
-              v: {
-                success: false,
-                minAvailableCount: available
-              }
-            };
-          }
-        },
-        _ret5;
-      for (var _i4 = 0, _Object$entries4 = Object.entries(cartItemsByTimeSlot); _i4 < _Object$entries4.length; _i4++) {
-        _ret5 = _loop6();
-        if (_ret5 === 0) continue;
-        if (_ret5) return _ret5.v;
-      }
-
-      // 全部通过检测，返回成功和最小可用数量
-      var minAvailableCount = availableCountsByResourceType.length > 0 ? Math.min.apply(Math, availableCountsByResourceType) : 0;
-      return {
-        success: true,
-        minAvailableCount: minAvailableCount
-      };
-    }
   }, {
     key: "setOtherData",
     value: function setOtherData(key, value) {
@@ -3579,7 +3134,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getResourcesByCartItemAndCode",
     value: function getResourcesByCartItemAndCode(cartItemId, resourceCode) {
-      var _cartItem$_productOri16;
+      var _cartItem$_productOri13;
       var dateRange = this.store.date.getDateRange();
       var resources = [];
       if (dateRange !== null && dateRange !== void 0 && dateRange.length) {
@@ -3602,16 +3157,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       });
       if (!cartItem) return [];
       var selectedResources = [];
-      var _getCapacityInfoByCar9 = getCapacityInfoByCartItem(cartItem),
-        currentCapacity = _getCapacityInfoByCar9.currentCapacity,
-        formatCapacity = _getCapacityInfoByCar9.formatCapacity;
+      var _getCapacityInfoByCar8 = getCapacityInfoByCartItem(cartItem),
+        currentCapacity = _getCapacityInfoByCar8.currentCapacity,
+        formatCapacity = _getCapacityInfoByCar8.formatCapacity;
       cartItem._origin.metadata.capacity = formatCapacity;
       if (cartItem.holder_id) {
         selectedResources = getOthersSelectedResources(cartItems, cartItem.holder_id, resourcesMap);
       } else {
         selectedResources = getOthersCartSelectedResources(cartItems, cartItem._id, resourcesMap);
       }
-      var productResources = getResourcesByProduct(resourcesMap, ((_cartItem$_productOri16 = cartItem._productOrigin) === null || _cartItem$_productOri16 === void 0 || (_cartItem$_productOri16 = _cartItem$_productOri16.product_resource) === null || _cartItem$_productOri16 === void 0 ? void 0 : _cartItem$_productOri16.resources) || [], selectedResources, currentCapacity);
+      var productResources = getResourcesByProduct(resourcesMap, ((_cartItem$_productOri13 = cartItem._productOrigin) === null || _cartItem$_productOri13 === void 0 || (_cartItem$_productOri13 = _cartItem$_productOri13.product_resource) === null || _cartItem$_productOri13 === void 0 ? void 0 : _cartItem$_productOri13.resources) || [], selectedResources, currentCapacity);
       var targetResource = productResources.find(function (resource) {
         return resource.code === resourceCode;
       });
@@ -3634,7 +3189,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           });
           if (mTimes.length === 0) return false;
           var canUseArr = mTimes.map(function (item) {
-            var _cartItem$_productOri17;
+            var _cartItem$_productOri14;
             var res = getIsUsableByTimeItem({
               timeSlice: {
                 start_time: startTime.format('HH:mm'),
@@ -3646,7 +3201,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               resource: m,
               currentCount: currentCapacity || 0,
               resourcesUseableMap: resourcesUseableMap,
-              cut_off_time: (_cartItem$_productOri17 = cartItem._productOrigin) === null || _cartItem$_productOri17 === void 0 ? void 0 : _cartItem$_productOri17.cut_off_time
+              cut_off_time: (_cartItem$_productOri14 = cartItem._productOrigin) === null || _cartItem$_productOri14 === void 0 ? void 0 : _cartItem$_productOri14.cut_off_time
             });
             if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== 'capacityOnly') {
               resourcesUseableMap[m.id] = res.usable;
@@ -3660,12 +3215,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         });
       } else {
         targetResource.renderList = targetResource.renderList.filter(function (n) {
-          var _cartItem$_productOri18;
+          var _cartItem$_productOri15;
           var recordCount = n.capacity || 0;
           if (n.onlyComputed) return false;
           var timeSlots = getTimeSlicesByResource({
             resource: n,
-            duration: ((_cartItem$_productOri18 = cartItem._productOrigin) === null || _cartItem$_productOri18 === void 0 || (_cartItem$_productOri18 = _cartItem$_productOri18.duration) === null || _cartItem$_productOri18 === void 0 ? void 0 : _cartItem$_productOri18.value) || 10,
+            duration: ((_cartItem$_productOri15 = cartItem._productOrigin) === null || _cartItem$_productOri15 === void 0 || (_cartItem$_productOri15 = _cartItem$_productOri15.duration) === null || _cartItem$_productOri15 === void 0 ? void 0 : _cartItem$_productOri15.value) || 10,
             split: 10,
             currentDate: dateRange[0].date
           });
@@ -3683,12 +3238,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getTimeslotsScheduleByDateRange",
     value: (function () {
-      var _getTimeslotsScheduleByDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(_ref14) {
-        var startDate, endDate, scheduleIds, resources, dates, currentDate, end, results, _i5, _dates, date;
+      var _getTimeslotsScheduleByDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(_ref11) {
+        var startDate, endDate, scheduleIds, resources, dates, currentDate, end, results, _i3, _dates, date;
         return _regeneratorRuntime().wrap(function _callee26$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
             case 0:
-              startDate = _ref14.startDate, endDate = _ref14.endDate, scheduleIds = _ref14.scheduleIds, resources = _ref14.resources;
+              startDate = _ref11.startDate, endDate = _ref11.endDate, scheduleIds = _ref11.scheduleIds, resources = _ref11.resources;
               console.log('appoimentBooking-session-date-getTimeslotsScheduleByDateRange', {
                 startDate: startDate,
                 endDate: endDate,
@@ -3705,8 +3260,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }
               // 如果不支持 Web Worker，使用同步方式处理
               results = {};
-              for (_i5 = 0, _dates = dates; _i5 < _dates.length; _i5++) {
-                date = _dates[_i5];
+              for (_i3 = 0, _dates = dates; _i3 < _dates.length; _i3++) {
+                date = _dates[_i3];
                 results[date] = this.getTimeslotBySchedule({
                   date: date,
                   scheduleIds: scheduleIds,
@@ -3747,7 +3302,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           openResources,
           allProductResources,
           targetSchedules,
-          _loop7,
+          _loop5,
           _args28 = arguments;
         return _regeneratorRuntime().wrap(function _callee27$(_context28) {
           while (1) switch (_context28.prev = _context28.next) {
@@ -3824,9 +3379,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               });
               targetSchedules = this.store.schedule.getScheduleListByIds(tempProducts['schedule.ids']);
-              _loop7 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop7() {
+              _loop5 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop5() {
                 var currentDateStr, status, _checkSessionProductL, latestStartDate, earliestEndDate, scheduleByDate, minTimeMaxTime, scheduleTimeSlots, timesSlotCanUse;
-                return _regeneratorRuntime().wrap(function _loop7$(_context27) {
+                return _regeneratorRuntime().wrap(function _loop5$(_context27) {
                   while (1) switch (_context27.prev = _context27.next) {
                     case 0:
                       currentDateStr = currentDate.format('YYYY-MM-DD');
@@ -3929,14 +3484,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                     case "end":
                       return _context27.stop();
                   }
-                }, _loop7);
+                }, _loop5);
               });
             case 28:
               if (!(dayjs(currentDate).isBefore(dayjs(endDate), 'day') || dayjs(currentDate).isSame(dayjs(endDate), 'day'))) {
                 _context28.next = 34;
                 break;
               }
-              return _context28.delegateYield(_loop7(), "t0", 30);
+              return _context28.delegateYield(_loop5(), "t0", 30);
             case 30:
               if (!_context28.t0) {
                 _context28.next = 32;

package/dist/solution/BookingByStep/utils/capacity.d.ts

@@ -15,9 +15,8 @@ export declare const formatDefaultCapacitys: ({ capacity, product_bundle, }: any
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getSumCapacity: ({ capacity, num }: {
+export declare const getSumCapacity: ({ capacity }: {
     capacity: CapacityItem[];
-    num: number;
 }) => number;
 /**
  * 给定购物车数据，返回对应的 capacity 信息和套餐 capacity
@@ -68,8 +67,4 @@ export declare function getResourcesIdsByProduct(product: any): number[];
 /**
  * 检查特定时间段的容量是否足够
  */
-export declare function checkTimeSlotCapacity(timeSlotStart: string, timeSlotEnd: string, cartItems: CartItem[], allResources: ResourceItem[]): {
-    success: boolean;
-    required: number;
-    available: number;
-};
+export declare function checkTimeSlotCapacity(timeSlotStart: string, timeSlotEnd: string, cartItems: CartItem[], allResources: ResourceItem[]): boolean;