@pisell/pisellos 0.0.329 → 0.0.331

package/dist/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

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

@@ -324,9 +324,18 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         success: boolean;
         minAvailableCount: number;
     };
+    /**
+     * 将 ProductData 转换为 CartItem，但不添加到购物车
+     * 参考 addProductToCart 方法的实现
+     */
+    private convertProductToCartItem;
+    checkMaxDurationCapacityForDetailNums(currentProduct: ProductData): {
+        success: boolean;
+        minAvailableCount: number;
+    };
     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

@@ -30,6 +30,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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 { createModule } from "./types";
+import { formatProductToCartItem, createCartItemOrigin, getUniqueId, handleVariantProduct } from "../../modules/Cart/utils";
 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';
@@ -1194,7 +1195,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       this.addProductCheck({
         date: date
       });
-      this.store.cart.addItem(addItemParams);
+      // 如果 quantity 大于 1，则进入购物车拆散成多条数据
+      if (addItemParams.quantity > 1) {
+        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);
+      }
       return {
         success: true
       };
@@ -3072,6 +3082,402 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         minAvailableCount: minAvailableCount
       };
     }
+
+    /**
+     * 将 ProductData 转换为 CartItem，但不添加到购物车
+     * 参考 addProductToCart 方法的实现
+     */
+  }, {
+    key: "convertProductToCartItem",
+    value: function convertProductToCartItem(product) {
+      var _ref11 = product || {},
+        bundle = _ref11.bundle,
+        options = _ref11.options,
+        origin = _ref11.origin,
+        product_variant_id = _ref11.product_variant_id,
+        _ref11$quantity = _ref11.quantity,
+        quantity = _ref11$quantity === void 0 ? 1 : _ref11$quantity;
+
+      // 处理商品数据，类似 addProductToCart 中的逻辑
+      var productData = _objectSpread(_objectSpread({}, origin), {}, {
+        product_variant_id: product_variant_id
+      });
+
+      // 处理组合商品
+      var processedProduct = handleVariantProduct(productData);
+
+      // 创建基础的 CartItem
+      var cartItem = {
+        _id: getUniqueId('temp_'),
+        _origin: createCartItemOrigin(),
+        _productOrigin: processedProduct,
+        _productInit: product
+      };
+
+      // 获取当前活跃账户
+      var activeAccount = this.getActiveAccount();
+
+      // 使用格式化函数填充 CartItem 数据
+      formatProductToCartItem({
+        cartItem: cartItem,
+        product: processedProduct,
+        bundle: bundle,
+        options: options,
+        product_variant_id: product_variant_id,
+        quantity: quantity
+      });
+      return cartItem;
+    }
+  }, {
+    key: "checkMaxDurationCapacityForDetailNums",
+    value: function checkMaxDurationCapacityForDetailNums(currentProduct) {
+      var _this16 = this;
+      var cartItems = cloneDeep(this.store.cart.getItems());
+
+      // 将 ProductData 转换为 CartItem 但不真正添加到购物车
+      var currentCartItem = this.convertProductToCartItem(currentProduct);
+      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);
+              }
+            });
+          },
+          _ret5;
+        for (var _i3 = 0, _Object$entries3 = Object.entries(itemsByResourceType); _i3 < _Object$entries3.length; _i3++) {
+          _ret5 = _loop5();
+          if (_ret5) return _ret5.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();
+
+          // 获取资源数据
+          var dateRange = _this16.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]);
+              }
+            });
+          });
+
+          // 按资源类型分组检查容量
+          if (!checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, itemsInTimeSlot, allResourcesForTimeSlot)) {
+            // 如果有可用数量记录，返回最小值；否则返回 0
+            var _minAvailableCount2 = availableCountsByResourceType.length > 0 ? Math.min.apply(Math, availableCountsByResourceType) : 0;
+            return {
+              v: {
+                success: false,
+                minAvailableCount: _minAvailableCount2
+              }
+            };
+          }
+        },
+        _ret6;
+      for (var _i4 = 0, _Object$entries4 = Object.entries(cartItemsByTimeSlot); _i4 < _Object$entries4.length; _i4++) {
+        _ret6 = _loop6();
+        if (_ret6 === 0) continue;
+        if (_ret6) return _ret6.v;
+      }
+
+      // 全部通过检测，返回成功和最小可用数量
+      var minAvailableCount = availableCountsByResourceType.length > 0 ? Math.min.apply(Math, availableCountsByResourceType) : 0;
+      return {
+        success: true,
+        minAvailableCount: minAvailableCount
+      };
+    }
   }, {
     key: "setOtherData",
     value: function setOtherData(key, value) {
@@ -3143,7 +3549,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getResourcesByCartItemAndCode",
     value: function getResourcesByCartItemAndCode(cartItemId, resourceCode) {
-      var _cartItem$_productOri13;
+      var _cartItem$_productOri16;
       var dateRange = this.store.date.getDateRange();
       var resources = [];
       if (dateRange !== null && dateRange !== void 0 && dateRange.length) {
@@ -3166,16 +3572,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       });
       if (!cartItem) return [];
       var selectedResources = [];
-      var _getCapacityInfoByCar8 = getCapacityInfoByCartItem(cartItem),
-        currentCapacity = _getCapacityInfoByCar8.currentCapacity,
-        formatCapacity = _getCapacityInfoByCar8.formatCapacity;
+      var _getCapacityInfoByCar9 = getCapacityInfoByCartItem(cartItem),
+        currentCapacity = _getCapacityInfoByCar9.currentCapacity,
+        formatCapacity = _getCapacityInfoByCar9.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$_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 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 targetResource = productResources.find(function (resource) {
         return resource.code === resourceCode;
       });
@@ -3198,7 +3604,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           });
           if (mTimes.length === 0) return false;
           var canUseArr = mTimes.map(function (item) {
-            var _cartItem$_productOri14;
+            var _cartItem$_productOri17;
             var res = getIsUsableByTimeItem({
               timeSlice: {
                 start_time: startTime.format('HH:mm'),
@@ -3210,7 +3616,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               resource: m,
               currentCount: currentCapacity || 0,
               resourcesUseableMap: resourcesUseableMap,
-              cut_off_time: (_cartItem$_productOri14 = cartItem._productOrigin) === null || _cartItem$_productOri14 === void 0 ? void 0 : _cartItem$_productOri14.cut_off_time
+              cut_off_time: (_cartItem$_productOri17 = cartItem._productOrigin) === null || _cartItem$_productOri17 === void 0 ? void 0 : _cartItem$_productOri17.cut_off_time
             });
             if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== 'capacityOnly') {
               resourcesUseableMap[m.id] = res.usable;
@@ -3224,12 +3630,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         });
       } else {
         targetResource.renderList = targetResource.renderList.filter(function (n) {
-          var _cartItem$_productOri15;
+          var _cartItem$_productOri18;
           var recordCount = n.capacity || 0;
           if (n.onlyComputed) return false;
           var timeSlots = getTimeSlicesByResource({
             resource: n,
-            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,
+            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,
             split: 10,
             currentDate: dateRange[0].date
           });
@@ -3247,12 +3653,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getTimeslotsScheduleByDateRange",
     value: (function () {
-      var _getTimeslotsScheduleByDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(_ref11) {
-        var startDate, endDate, scheduleIds, resources, dates, currentDate, end, results, _i3, _dates, date;
+      var _getTimeslotsScheduleByDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(_ref12) {
+        var startDate, endDate, scheduleIds, resources, dates, currentDate, end, results, _i5, _dates, date;
         return _regeneratorRuntime().wrap(function _callee26$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
             case 0:
-              startDate = _ref11.startDate, endDate = _ref11.endDate, scheduleIds = _ref11.scheduleIds, resources = _ref11.resources;
+              startDate = _ref12.startDate, endDate = _ref12.endDate, scheduleIds = _ref12.scheduleIds, resources = _ref12.resources;
               console.log('appoimentBooking-session-date-getTimeslotsScheduleByDateRange', {
                 startDate: startDate,
                 endDate: endDate,
@@ -3269,8 +3675,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }
               // 如果不支持 Web Worker，使用同步方式处理
               results = {};
-              for (_i3 = 0, _dates = dates; _i3 < _dates.length; _i3++) {
-                date = _dates[_i3];
+              for (_i5 = 0, _dates = dates; _i5 < _dates.length; _i5++) {
+                date = _dates[_i5];
                 results[date] = this.getTimeslotBySchedule({
                   date: date,
                   scheduleIds: scheduleIds,
@@ -3311,7 +3717,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           openResources,
           allProductResources,
           targetSchedules,
-          _loop5,
+          _loop7,
           _args28 = arguments;
         return _regeneratorRuntime().wrap(function _callee27$(_context28) {
           while (1) switch (_context28.prev = _context28.next) {
@@ -3388,9 +3794,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               });
               targetSchedules = this.store.schedule.getScheduleListByIds(tempProducts['schedule.ids']);
-              _loop5 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop5() {
+              _loop7 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop7() {
                 var currentDateStr, status, _checkSessionProductL, latestStartDate, earliestEndDate, scheduleByDate, minTimeMaxTime, scheduleTimeSlots, timesSlotCanUse;
-                return _regeneratorRuntime().wrap(function _loop5$(_context27) {
+                return _regeneratorRuntime().wrap(function _loop7$(_context27) {
                   while (1) switch (_context27.prev = _context27.next) {
                     case 0:
                       currentDateStr = currentDate.format('YYYY-MM-DD');
@@ -3493,14 +3899,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                     case "end":
                       return _context27.stop();
                   }
-                }, _loop5);
+                }, _loop7);
               });
             case 28:
               if (!(dayjs(currentDate).isBefore(dayjs(endDate), 'day') || dayjs(currentDate).isSame(dayjs(endDate), 'day'))) {
                 _context28.next = 34;
                 break;
               }
-              return _context28.delegateYield(_loop5(), "t0", 30);
+              return _context28.delegateYield(_loop7(), "t0", 30);
             case 30:
               if (!_context28.t0) {
                 _context28.next = 32;

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

@@ -15,8 +15,9 @@ export declare const formatDefaultCapacitys: ({ capacity, product_bundle, }: any
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getSumCapacity: ({ capacity }: {
+export declare const getSumCapacity: ({ capacity, num }: {
     capacity: CapacityItem[];
+    num: number;
 }) => number;
 /**
  * 给定购物车数据，返回对应的 capacity 信息和套餐 capacity

package/dist/solution/BookingByStep/utils/capacity.js

@@ -60,7 +60,9 @@ export var formatDefaultCapacitys = function formatDefaultCapacitys(_ref) {
  * @Author: zhiwei.Wang
  */
 export var getSumCapacity = function getSumCapacity(_ref2) {
-  var capacity = _ref2.capacity;
+  var capacity = _ref2.capacity,
+    _ref2$num = _ref2.num,
+    num = _ref2$num === void 0 ? 1 : _ref2$num;
   var sum = 0;
   var _iterator = _createForOfIteratorHelper(capacity || []),
     _step;
@@ -74,7 +76,7 @@ export var getSumCapacity = function getSumCapacity(_ref2) {
   } finally {
     _iterator.f();
   }
-  return sum;
+  return sum * num;
 };
 
 /**
@@ -85,13 +87,14 @@ export var getSumCapacity = function getSumCapacity(_ref2) {
  * @return {*} 
  */
 export function getCapacityInfoByCartItem(targetCartItem) {
-  var _targetCartItem$_prod;
+  var _targetCartItem$_prod, _targetCartItem$_orig;
   var formatCapacity = formatDefaultCapacitys({
     capacity: (_targetCartItem$_prod = targetCartItem._productOrigin) === null || _targetCartItem$_prod === void 0 ? void 0 : _targetCartItem$_prod.capacity,
     product_bundle: targetCartItem._origin.product.product_bundle
   });
   var currentCapacity = getSumCapacity({
-    capacity: formatCapacity
+    capacity: formatCapacity,
+    num: (targetCartItem === null || targetCartItem === void 0 || (_targetCartItem$_orig = targetCartItem._origin) === null || _targetCartItem$_orig === void 0 || (_targetCartItem$_orig = _targetCartItem$_orig.product) === null || _targetCartItem$_orig === void 0 ? void 0 : _targetCartItem$_orig.quantity) || 1
   });
   return {
     formatCapacity: formatCapacity,

package/lib/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

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

@@ -324,9 +324,18 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         success: boolean;
         minAvailableCount: number;
     };
+    /**
+     * 将 ProductData 转换为 CartItem，但不添加到购物车
+     * 参考 addProductToCart 方法的实现
+     */
+    private convertProductToCartItem;
+    checkMaxDurationCapacityForDetailNums(currentProduct: ProductData): {
+        success: boolean;
+        minAvailableCount: number;
+    };
     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

@@ -34,16 +34,17 @@ __export(BookingByStep_exports, {
 module.exports = __toCommonJS(BookingByStep_exports);
 var import_BaseModule = require("../../modules/BaseModule");
 var import_types = require("./types");
+var import_utils = require("../../modules/Cart/utils");
 var import_products = require("./utils/products");
 var import_resources = require("./utils/resources");
 var import_dayjs = __toESM(require("dayjs"));
 var import_isSameOrBefore = __toESM(require("dayjs/plugin/isSameOrBefore"));
 var import_isSameOrAfter = __toESM(require("dayjs/plugin/isSameOrAfter"));
-var import_utils = require("../../modules/Resource/utils");
+var import_utils2 = require("../../modules/Resource/utils");
 var import_lodash_es = require("lodash-es");
-var import_utils2 = require("../../modules/Schedule/utils");
-var import_utils3 = require("../../modules/Date/utils");
-var import_utils4 = require("../../modules/Product/utils");
+var import_utils3 = require("../../modules/Schedule/utils");
+var import_utils4 = require("../../modules/Date/utils");
+var import_utils5 = require("../../modules/Product/utils");
 var import_timeslots = require("./utils/timeslots");
 var import_changePrice = require("../../modules/Cart/utils/changePrice");
 var import_capacity = require("./utils/capacity");
@@ -363,7 +364,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       let date = (_b = (_a = this.store.date.getDateRange()) == null ? void 0 : _a[0]) == null ? void 0 : _b.date;
       if (!date) {
         const normalProductCartItem = cartItems.find(
-          (n) => !(0, import_utils4.isNormalProduct)(n._productOrigin)
+          (n) => !(0, import_utils5.isNormalProduct)(n._productOrigin)
         );
         date = (normalProductCartItem == null ? void 0 : normalProductCartItem.start_date) || "";
       }
@@ -473,7 +474,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         let date = (_b = (_a = this.store.date.getDateRange()) == null ? void 0 : _a[0]) == null ? void 0 : _b.date;
         if (!date) {
           const normalProductCartItem = cartItems.find(
-            (n) => !(0, import_utils4.isNormalProduct)(n._productOrigin)
+            (n) => !(0, import_utils5.isNormalProduct)(n._productOrigin)
           );
           date = (normalProductCartItem == null ? void 0 : normalProductCartItem.start_date) || "";
         }
@@ -525,7 +526,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       }
     });
     let type = this.otherParams.isRetailTemplate ? "virtual" : "appointment_booking";
-    if ((0, import_utils4.areAllNormalProducts)(
+    if ((0, import_utils5.areAllNormalProducts)(
       newCartItems.map((n) => n._productOrigin)
     )) {
       type = "virtual";
@@ -635,7 +636,15 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       addItemParams.account = account;
     }
     this.addProductCheck({ date });
-    this.store.cart.addItem(addItemParams);
+    if (addItemParams.quantity > 1) {
+      for (let i = 0; i < addItemParams.quantity; i++) {
+        const newAddItemParams = (0, import_lodash_es.cloneDeep)(addItemParams);
+        newAddItemParams.quantity = 1;
+        this.store.cart.addItem(newAddItemParams);
+      }
+    } else {
+      this.store.cart.addItem(addItemParams);
+    }
     return { success: true };
   }
   /**
@@ -648,7 +657,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     date
   }) {
     if (date) {
-      const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
+      const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils5.isNormalProduct)(n._productOrigin));
       const cartItemsByDate = cartItems.filter(
         (n) => !(0, import_dayjs.default)(n.start_date).isSame((0, import_dayjs.default)(date.startTime), "day")
       );
@@ -810,7 +819,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
    * @returns 不符合条件的购物车商品ID列表
    */
   checkCartItems(type) {
-    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils5.isNormalProduct)(n._productOrigin));
     const errorCartItemIds = [];
     cartItems.forEach((cartItem) => {
       const result = this.store.cart.checkCartItemByType(cartItem, type);
@@ -844,7 +853,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           resources.push(...n.resource);
       });
     }
-    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils5.isNormalProduct)(n._productOrigin));
     if (!resources.length) {
       const firstDateCartItem = cartItems == null ? void 0 : cartItems.find((n) => n.start_date);
       if (firstDateCartItem == null ? void 0 : firstDateCartItem.start_date) {
@@ -860,7 +869,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         });
       }
     }
-    const resourcesMap = (0, import_utils.getResourcesMap)((0, import_lodash_es.cloneDeep)(resources));
+    const resourcesMap = (0, import_utils2.getResourcesMap)((0, import_lodash_es.cloneDeep)(resources));
     const arr = [];
     cartItems.forEach((cartItem) => {
       var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
@@ -989,14 +998,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
    */
   getResourcesListByCartItem(id) {
     var _a, _b;
-    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils5.isNormalProduct)(n._productOrigin));
     const dateRange = this.store.date.getDateRange();
     const resources = [];
     dateRange.forEach((n) => {
       if (n.resource)
         resources.push(...n.resource);
     });
-    const resourcesMap = (0, import_utils.getResourcesMap)(resources);
+    const resourcesMap = (0, import_utils2.getResourcesMap)(resources);
     const targetCartItem = cartItems.find((n) => n._id === id);
     if (!targetCartItem) {
       throw new Error(`没有找到${id}购物车商品`);
@@ -1053,7 +1062,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     capacity
   }) {
     var _a, _b, _c;
-    if ((0, import_utils4.isNormalProduct)(cartItem._productOrigin)) {
+    if ((0, import_utils5.isNormalProduct)(cartItem._productOrigin)) {
       return {};
     }
     const dateRange = this.store.date.getDateRange();
@@ -1088,7 +1097,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         });
       }
     }
-    const resourcesMap = (0, import_utils.getResourcesMap)((0, import_lodash_es.cloneDeep)(AllResources));
+    const resourcesMap = (0, import_utils2.getResourcesMap)((0, import_lodash_es.cloneDeep)(AllResources));
     const allCartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
     const selectedResources = (0, import_resources.getOthersSelectedResources)(
       allCartItems,
@@ -1169,7 +1178,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         selectedResource: targetResource
       };
     } else {
-      const resourcesMap2 = (0, import_utils.getResourcesMap)(resources);
+      const resourcesMap2 = (0, import_utils2.getResourcesMap)(resources);
       const resourceIds = resources.map((n) => n.id);
       const timeSlots2 = (0, import_resources.getTimeSlicesByResources)({
         resourceIds,
@@ -1307,7 +1316,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               currentResourcesRenderList.push(...n.renderList || []);
             }
           });
-          const resourcesMap = (0, import_utils.getResourcesMap)(currentResourcesRenderList);
+          const resourcesMap = (0, import_utils2.getResourcesMap)(currentResourcesRenderList);
           if (item.holder_id) {
             selectedResources = (0, import_resources.getOthersSelectedResources)(
               allCartItems,
@@ -1372,7 +1381,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
       });
     };
-    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils5.isNormalProduct)(n._productOrigin));
     if (cartItems == null ? void 0 : cartItems[0].holder_id) {
       accountList.forEach((account) => {
         const cartItems2 = this.store.cart.getCartByAccount(account.getId());
@@ -1388,7 +1397,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     let dateRange = this.store.date.getDateRange();
     const resources = [];
-    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils5.isNormalProduct)(n._productOrigin));
     const resourceIds = [];
     let resourcesTypeId = void 0;
     let isSingleResource = false;
@@ -1426,7 +1435,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
       });
     }
-    const resourcesMap = (0, import_utils.getResourcesMap)(resources);
+    const resourcesMap = (0, import_utils2.getResourcesMap)(resources);
     let duration = 0;
     const accountList = this.store.accountList.getAccounts();
     const checkDuration = (cartItems2) => {
@@ -1525,7 +1534,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   // 提交时间切片，绑定到对应购物车的商品上，更新购物车---只有 duration 商品
   submitTimeSlot(timeSlots) {
     var _a, _b;
-    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils5.isNormalProduct)(n._productOrigin));
     const allResources = this.store.date.getResourcesListByDate(
       timeSlots.start_at.format("YYYY-MM-DD")
     );
@@ -1603,7 +1612,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   getScheduleDataByIds(scheduleIds) {
     const targetSchedules = this.store.schedule.getScheduleListByIds(scheduleIds);
     const targetSchedulesData = targetSchedules.map((item) => {
-      return (0, import_utils2.calcCalendarDataByScheduleResult)(item);
+      return (0, import_utils3.calcCalendarDataByScheduleResult)(item);
     });
     const newSchedule = {};
     targetSchedulesData.forEach((item) => {
@@ -1675,7 +1684,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const resourcesDates = this.store.date.getDateList();
     const targetResourceDate = resourcesDates.find((n) => n.date === date);
     const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
-    const resourcesMap = (0, import_utils.getResourcesMap)((targetResourceDate == null ? void 0 : targetResourceDate.resource) || []);
+    const resourcesMap = (0, import_utils2.getResourcesMap)((targetResourceDate == null ? void 0 : targetResourceDate.resource) || []);
     const selectedResources = (0, import_resources.getOthersSelectedResources)(
       cartItems,
       "",
@@ -1687,12 +1696,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       selectedResources,
       1
     );
-    const minTimeMaxTime = (0, import_utils2.calcMinTimeMaxTimeBySchedules)(
+    const minTimeMaxTime = (0, import_utils3.calcMinTimeMaxTimeBySchedules)(
       targetSchedules,
       {},
       date
     );
-    const scheduleTimeSlots = (0, import_utils2.getAllSortedDateRanges)(minTimeMaxTime);
+    const scheduleTimeSlots = (0, import_utils3.getAllSortedDateRanges)(minTimeMaxTime);
     let allProductResources = productResources.flatMap((n) => n.renderList);
     allProductResources.sort((a, b) => {
       var _a2, _b2, _c2, _d2;
@@ -1808,7 +1817,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           otherSameTimesCartItems.forEach((m) => {
             var _a2, _b2;
             const productResources2 = (0, import_resources.getResourcesByProduct)(
-              (0, import_utils.getResourcesMap)((targetResourceDate == null ? void 0 : targetResourceDate.resource) || []),
+              (0, import_utils2.getResourcesMap)((targetResourceDate == null ? void 0 : targetResourceDate.resource) || []),
               ((_b2 = (_a2 = m._productOrigin) == null ? void 0 : _a2.product_resource) == null ? void 0 : _b2.resources) || [],
               selectedResources,
               1
@@ -1955,7 +1964,245 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       const targetResourceDate = resourcesDates.find((n) => n.date === dateRange[0].date);
       if (!targetResourceDate)
         return { success: false, minAvailableCount: 0 };
-      const resourcesMap = (0, import_utils.getResourcesMap)(targetResourceDate.resource || []);
+      const resourcesMap = (0, import_utils2.getResourcesMap)(targetResourceDate.resource || []);
+      const resourceCodeToFormIdMap = {};
+      Object.values(itemsByResourceType).flat().forEach((cartItem) => {
+        var _a2, _b2;
+        if ((_b2 = (_a2 = cartItem._productOrigin) == null ? void 0 : _a2.product_resource) == null ? void 0 : _b2.resources) {
+          cartItem._productOrigin.product_resource.resources.forEach((resourceConfig) => {
+            var _a3, _b3;
+            if (resourceConfig.status === 1 && resourceConfig.code) {
+              const formId = ((_a3 = resourceConfig.id) == null ? void 0 : _a3.toString()) || ((_b3 = resourceConfig.resource_type_id) == null ? void 0 : _b3.toString());
+              if (formId) {
+                resourceCodeToFormIdMap[resourceConfig.code] = formId;
+              }
+            }
+          });
+        }
+      });
+      let hasCapacityIssue = false;
+      const resourceCapacityInfo = [];
+      const processedCartItemIds = /* @__PURE__ */ new Set();
+      for (const [resourceCode, items] of Object.entries(itemsByResourceType)) {
+        const targetFormId = resourceCodeToFormIdMap[resourceCode];
+        if (!targetFormId) {
+          console.log(`资源类型 ${resourceCode} 找不到对应的 form_id`);
+          return { success: false, minAvailableCount: 0 };
+        }
+        const resourcesOfThisType = [];
+        items.forEach((cartItem) => {
+          const productResourceIds = (0, import_capacity.getResourcesIdsByProduct)(cartItem._productOrigin);
+          productResourceIds.forEach((resourceId) => {
+            var _a2;
+            const resource = resourcesMap[resourceId];
+            if (resource && ((_a2 = resource.form_id) == null ? void 0 : _a2.toString()) === targetFormId) {
+              if (!resourcesOfThisType.find((r) => r.id === resource.id)) {
+                resourcesOfThisType.push(resource);
+              }
+            }
+          });
+        });
+        if (resourcesOfThisType.length === 0) {
+          console.log(`资源类型 ${resourceCode} 没有找到可用资源`);
+          return { success: false, minAvailableCount: 0 };
+        }
+        let resourceTypeConfig = null;
+        for (const cartItem of items) {
+          if ((_b = (_a = cartItem._productOrigin) == null ? void 0 : _a.product_resource) == null ? void 0 : _b.resources) {
+            resourceTypeConfig = cartItem._productOrigin.product_resource.resources.find(
+              (r) => r.code === resourceCode && r.status === 1
+            );
+            if (resourceTypeConfig)
+              break;
+          }
+        }
+        const isMultipleBooking = (resourceTypeConfig == null ? void 0 : resourceTypeConfig.type) === "multiple";
+        let totalAvailable;
+        let requiredAmount;
+        let availableAmount;
+        if (isMultipleBooking) {
+          totalAvailable = resourcesOfThisType.reduce((sum, resource) => {
+            return sum + (resource.capacity || 0);
+          }, 0);
+          requiredAmount = items.reduce((sum, cartItem) => {
+            const { currentCapacity } = (0, import_capacity.getCapacityInfoByCartItem)(cartItem);
+            return sum + currentCapacity;
+          }, 0);
+          availableAmount = Math.max(0, totalAvailable - requiredAmount);
+        } else {
+          totalAvailable = resourcesOfThisType.length;
+          requiredAmount = items.reduce((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(`资源类型 ${resourceCode} ${isMultipleBooking ? "容量" : "资源数量"}不足: 需要 ${requiredAmount}, 总共 ${totalAvailable}`);
+        }
+        console.log(`资源类型 ${resourceCode} 的资源时间信息:`, resourcesOfThisType.map((r) => ({
+          id: r.id,
+          times: r.times.map((t) => `${t.start_at} - ${t.end_at}`)
+        })));
+        const commonTimeSlots = this.findCommonAvailableTimeSlots(resourcesOfThisType);
+        console.log(`资源类型 ${resourceCode} 的公共时间段:`, commonTimeSlots);
+        if (commonTimeSlots.length === 0) {
+          console.log(`资源类型 ${resourceCode} 没有公共可用时间段`);
+          return { success: false, minAvailableCount: 0 };
+        }
+        const firstCommonSlot = commonTimeSlots[0];
+        console.log(`使用公共时间段: ${firstCommonSlot.startTime} - ${firstCommonSlot.endTime}`);
+        items.forEach((cartItem) => {
+          if (!processedCartItemIds.has(cartItem._id)) {
+            processedCartItemIds.add(cartItem._id);
+            const processedItem = {
+              ...cartItem,
+              start_date: dateRange[0].date,
+              start_time: firstCommonSlot.startTime,
+              end_time: firstCommonSlot.endTime,
+              end_date: dateRange[0].date
+            };
+            processedItemsWithoutTime.push(processedItem);
+          }
+        });
+      }
+      if (hasCapacityIssue) {
+        const overCapacityResources = resourceCapacityInfo.filter((info) => info.required > info.total);
+        if (overCapacityResources.length > 0) {
+          const minTotalCapacity2 = Math.min(...overCapacityResources.map((info) => info.total));
+          return { success: false, minAvailableCount: minTotalCapacity2 };
+        }
+        const minTotalCapacity = Math.min(...resourceCapacityInfo.map((info) => info.total));
+        return { success: false, minAvailableCount: minTotalCapacity };
+      }
+    }
+    const allProcessedItems = [...itemsWithTime, ...processedItemsWithoutTime];
+    const cartItemsByTimeSlot = {};
+    allProcessedItems.forEach((cartItem) => {
+      if (!cartItem.start_time || !cartItem.end_time || !cartItem.start_date)
+        return;
+      const timeSlotKey = `${cartItem.start_date}_${cartItem.start_time}_${cartItem.end_date || cartItem.start_date}_${cartItem.end_time}`;
+      if (!cartItemsByTimeSlot[timeSlotKey]) {
+        cartItemsByTimeSlot[timeSlotKey] = [];
+      }
+      cartItemsByTimeSlot[timeSlotKey].push(cartItem);
+    });
+    for (const [timeSlotKey, itemsInTimeSlot] of Object.entries(cartItemsByTimeSlot)) {
+      const [startDate, startTime, endDate, endTime] = timeSlotKey.split("_");
+      const timeSlotStart = `${startDate} ${startTime}`;
+      const timeSlotEnd = `${endDate} ${endTime}`;
+      const allResourcesForTimeSlot = [];
+      const resourcesIdSet = /* @__PURE__ */ new Set();
+      const dateRange = this.store.date.getDateRange();
+      const resourcesDates = this.store.date.getDateList();
+      const targetResourceDate = resourcesDates.find((n) => n.date === startDate);
+      if (!targetResourceDate)
+        continue;
+      const resourcesMap = (0, import_utils2.getResourcesMap)(targetResourceDate.resource || []);
+      itemsInTimeSlot.forEach((cartItem) => {
+        if (!cartItem._productOrigin)
+          return;
+        const productResourceIds = (0, import_capacity.getResourcesIdsByProduct)(cartItem._productOrigin);
+        productResourceIds.forEach((resourceId) => {
+          if (resourcesMap[resourceId] && !resourcesIdSet.has(resourceId)) {
+            resourcesIdSet.add(resourceId);
+            allResourcesForTimeSlot.push(resourcesMap[resourceId]);
+          }
+        });
+      });
+      if (!(0, import_capacity.checkTimeSlotCapacity)(timeSlotStart, timeSlotEnd, itemsInTimeSlot, allResourcesForTimeSlot)) {
+        const minAvailableCount2 = availableCountsByResourceType.length > 0 ? Math.min(...availableCountsByResourceType) : 0;
+        return { success: false, minAvailableCount: minAvailableCount2 };
+      }
+    }
+    const minAvailableCount = availableCountsByResourceType.length > 0 ? Math.min(...availableCountsByResourceType) : 0;
+    return { success: true, minAvailableCount };
+  }
+  /**
+   * 将 ProductData 转换为 CartItem，但不添加到购物车
+   * 参考 addProductToCart 方法的实现
+   */
+  convertProductToCartItem(product) {
+    const {
+      bundle,
+      options,
+      origin,
+      product_variant_id,
+      quantity = 1
+    } = product || {};
+    const productData = { ...origin, product_variant_id };
+    const processedProduct = (0, import_utils.handleVariantProduct)(productData);
+    const cartItem = {
+      _id: (0, import_utils.getUniqueId)("temp_"),
+      _origin: (0, import_utils.createCartItemOrigin)(),
+      _productOrigin: processedProduct,
+      _productInit: product
+    };
+    const activeAccount = this.getActiveAccount();
+    (0, import_utils.formatProductToCartItem)({
+      cartItem,
+      product: processedProduct,
+      bundle,
+      options,
+      product_variant_id,
+      quantity
+    });
+    return cartItem;
+  }
+  checkMaxDurationCapacityForDetailNums(currentProduct) {
+    var _a, _b;
+    const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
+    const currentCartItem = this.convertProductToCartItem(currentProduct);
+    cartItems.push(currentCartItem);
+    if (cartItems.length === 0)
+      return { success: true, minAvailableCount: 0 };
+    const itemsWithTime = [];
+    const itemsWithoutTime = [];
+    const availableCountsByResourceType = [];
+    cartItems.forEach((cartItem) => {
+      if (cartItem.start_time && cartItem.end_time && cartItem.start_date) {
+        itemsWithTime.push(cartItem);
+      } else {
+        itemsWithoutTime.push(cartItem);
+      }
+    });
+    const processedItemsWithoutTime = [];
+    if (itemsWithoutTime.length > 0) {
+      const itemsByResourceType = {};
+      itemsWithoutTime.forEach((cartItem) => {
+        var _a2;
+        if (!cartItem._productOrigin)
+          return;
+        const resourceTypes = ((_a2 = cartItem._productOrigin.product_resource) == null ? void 0 : _a2.resources) || [];
+        resourceTypes.forEach((resourceType) => {
+          var _a3;
+          if (resourceType.status === 1) {
+            const resourceCode = resourceType.code || ((_a3 = resourceType.id) == null ? void 0 : _a3.toString());
+            if (!itemsByResourceType[resourceCode]) {
+              itemsByResourceType[resourceCode] = [];
+            }
+            if (!itemsByResourceType[resourceCode].find((item) => item._id === cartItem._id)) {
+              itemsByResourceType[resourceCode].push(cartItem);
+            }
+          }
+        });
+      });
+      const dateRange = this.store.date.getDateRange();
+      if (!dateRange || dateRange.length === 0)
+        return { success: false, minAvailableCount: 0 };
+      const resourcesDates = this.store.date.getDateList();
+      const targetResourceDate = resourcesDates.find((n) => n.date === dateRange[0].date);
+      if (!targetResourceDate)
+        return { success: false, minAvailableCount: 0 };
+      const resourcesMap = (0, import_utils2.getResourcesMap)(targetResourceDate.resource || []);
       const resourceCodeToFormIdMap = {};
       Object.values(itemsByResourceType).flat().forEach((cartItem) => {
         var _a2, _b2;
@@ -2097,7 +2344,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       const targetResourceDate = resourcesDates.find((n) => n.date === startDate);
       if (!targetResourceDate)
         continue;
-      const resourcesMap = (0, import_utils.getResourcesMap)(targetResourceDate.resource || []);
+      const resourcesMap = (0, import_utils2.getResourcesMap)(targetResourceDate.resource || []);
       itemsInTimeSlot.forEach((cartItem) => {
         if (!cartItem._productOrigin)
           return;
@@ -2168,8 +2415,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           resources.push(...n.resource);
       });
     }
-    const resourcesMap = (0, import_utils.getResourcesMap)((0, import_lodash_es.cloneDeep)(resources));
-    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
+    const resourcesMap = (0, import_utils2.getResourcesMap)((0, import_lodash_es.cloneDeep)(resources));
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils5.isNormalProduct)(n._productOrigin));
     const cartItem = cartItems.find((item) => item._id === cartItemId);
     if (!cartItem)
       return [];
@@ -2382,12 +2629,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
       }
       if (status === "available") {
-        const minTimeMaxTime = (0, import_utils2.calcMinTimeMaxTimeBySchedules)(
+        const minTimeMaxTime = (0, import_utils3.calcMinTimeMaxTimeBySchedules)(
           targetSchedules,
           {},
           currentDateStr
         );
-        const scheduleTimeSlots = (0, import_utils2.getAllSortedDateRanges)(minTimeMaxTime);
+        const scheduleTimeSlots = (0, import_utils3.getAllSortedDateRanges)(minTimeMaxTime);
         const timesSlotCanUse = scheduleTimeSlots.some((item) => {
           const resourcesUseableMap = {};
           return openResources.every((resource) => {
@@ -2444,7 +2691,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       }
       currentDate = (0, import_dayjs.default)(currentDate).add(1, "day");
     }
-    dates = (0, import_utils3.handleAvailableDateByResource)(res.data, dates);
+    dates = (0, import_utils4.handleAvailableDateByResource)(res.data, dates);
     this.store.date.setDateList(dates);
     if (!this.store.currentProductMeta)
       this.store.currentProductMeta = {};
@@ -2460,11 +2707,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     };
   }
   isCartAllNormalProducts() {
-    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils5.isNormalProduct)(n._productOrigin));
     return !cartItems.length;
   }
   isCartHasDurationProduct() {
-    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils5.isNormalProduct)(n._productOrigin));
     return cartItems.some((n) => {
       var _a;
       return (_a = n._productOrigin) == null ? void 0 : _a.duration;
@@ -2473,11 +2720,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   isTargetNormalProduct(product) {
     if (!product)
       return false;
-    return (0, import_utils4.isNormalProduct)(product);
+    return (0, import_utils5.isNormalProduct)(product);
   }
   isTargetCartIdNormalProduct(id) {
     const cartItem = this.store.cart.getItems().find((n) => n._id === id);
-    return cartItem && (0, import_utils4.isNormalProduct)(cartItem._productOrigin);
+    return cartItem && (0, import_utils5.isNormalProduct)(cartItem._productOrigin);
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -15,8 +15,9 @@ export declare const formatDefaultCapacitys: ({ capacity, product_bundle, }: any
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getSumCapacity: ({ capacity }: {
+export declare const getSumCapacity: ({ capacity, num }: {
     capacity: CapacityItem[];
+    num: number;
 }) => number;
 /**
  * 给定购物车数据，返回对应的 capacity 信息和套餐 capacity

package/lib/solution/BookingByStep/utils/capacity.js

@@ -68,20 +68,20 @@ var formatDefaultCapacitys = ({
   }
   return [{ id: 0, value: 1, name: "" }];
 };
-var getSumCapacity = ({ capacity }) => {
+var getSumCapacity = ({ capacity, num = 1 }) => {
   let sum = 0;
   for (let item of capacity || []) {
     sum += item.value;
   }
-  return sum;
+  return sum * num;
 };
 function getCapacityInfoByCartItem(targetCartItem) {
-  var _a;
+  var _a, _b, _c;
   const formatCapacity = formatDefaultCapacitys({
     capacity: (_a = targetCartItem._productOrigin) == null ? void 0 : _a.capacity,
     product_bundle: targetCartItem._origin.product.product_bundle
   });
-  const currentCapacity = getSumCapacity({ capacity: formatCapacity });
+  const currentCapacity = getSumCapacity({ capacity: formatCapacity, num: ((_c = (_b = targetCartItem == null ? void 0 : targetCartItem._origin) == null ? void 0 : _b.product) == null ? void 0 : _c.quantity) || 1 });
   return {
     formatCapacity,
     currentCapacity

package/package.json

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