@pisell/pisellos 0.0.274 → 0.0.276

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

@@ -316,7 +316,14 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
     }[];
-    checkMaxDurationCapacity(): boolean;
+    /**
+     * 找到多个资源的公共可用时间段
+     */
+    private findCommonAvailableTimeSlots;
+    checkMaxDurationCapacity(): {
+        success: boolean;
+        minAvailableCount: number;
+    };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
     getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;

package/dist/solution/BookingByStep/index.js

@@ -2611,16 +2611,100 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     // 时长类商品关联的资源为多个预约时，在点击进入"选择资源"步骤之前，需要检测当前所有资源的总容量
     // 选择商品数量大于所有资源配置的总容量时，不能进入下一步，需要在"选择商品"这一步时提示。
     // 注意 资源分为多个种类，需要每个种类单独检测，不能一股脑把所有资源的容量加起来检测
+    /**
+     * 找到多个资源的公共可用时间段
+     */
+  }, {
+    key: "findCommonAvailableTimeSlots",
+    value: function findCommonAvailableTimeSlots(resources) {
+      if (resources.length === 0) return [];
+      console.log("\u8BA1\u7B97 ".concat(resources.length, " \u4E2A\u8D44\u6E90\u7684\u516C\u5171\u65F6\u95F4\u6BB5"));
+
+      // 收集所有资源的时间段，转换为统一的时间格式
+      var allTimeSlots = resources.map(function (resource) {
+        return resource.times.map(function (time) {
+          return {
+            start: dayjs(time.start_at),
+            end: dayjs(time.end_at)
+          };
+        });
+      });
+      console.log('所有资源的时间段:', allTimeSlots.map(function (slots) {
+        return slots.map(function (slot) {
+          return "".concat(slot.start.format('HH:mm'), "-").concat(slot.end.format('HH:mm'));
+        });
+      }));
+
+      // 找到公共时间段的交集
+      var commonSlots = allTimeSlots[0]; // 从第一个资源的时间段开始
+      console.log('初始公共时间段:', commonSlots.map(function (slot) {
+        return "".concat(slot.start.format('HH:mm'), "-").concat(slot.end.format('HH:mm'));
+      }));
+
+      // 与其他资源的时间段求交集
+      var _loop2 = function _loop2() {
+          var currentResourceSlots = allTimeSlots[i];
+          var intersections = [];
+
+          // 计算当前公共时间段与下一个资源时间段的交集
+          commonSlots.forEach(function (commonSlot) {
+            currentResourceSlots.forEach(function (currentSlot) {
+              var overlapStart = commonSlot.start.isAfter(currentSlot.start) ? commonSlot.start : currentSlot.start;
+              var overlapEnd = commonSlot.end.isBefore(currentSlot.end) ? commonSlot.end : currentSlot.end;
+
+              // 如果有重叠时间且重叠时间大于0
+              if (overlapStart.isBefore(overlapEnd)) {
+                intersections.push({
+                  start: overlapStart,
+                  end: overlapEnd
+                });
+              }
+            });
+          });
+          commonSlots = intersections;
+          console.log("\u4E0E\u8D44\u6E90".concat(i, "\u6C42\u4EA4\u96C6\u540E\u7684\u516C\u5171\u65F6\u95F4\u6BB5:"), commonSlots.map(function (slot) {
+            return "".concat(slot.start.format('HH:mm'), "-").concat(slot.end.format('HH:mm'));
+          }));
+
+          // 如果没有公共时间段，直接返回
+          if (commonSlots.length === 0) {
+            console.log('没有找到公共时间段');
+            return {
+              v: []
+            };
+          }
+        },
+        _ret2;
+      for (var i = 1; i < allTimeSlots.length; i++) {
+        _ret2 = _loop2();
+        if (_ret2) return _ret2.v;
+      }
+
+      // 格式化返回结果
+      var result = commonSlots.map(function (slot) {
+        return {
+          startTime: slot.start.format('HH:mm'),
+          endTime: slot.end.format('HH:mm')
+        };
+      });
+      console.log('最终公共时间段:', result);
+      return result;
+    }
   }, {
     key: "checkMaxDurationCapacity",
     value: function checkMaxDurationCapacity() {
       var _this15 = this;
       var cartItems = cloneDeep(this.store.cart.getItems());
-      if (cartItems.length === 0) return true;
+      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);
@@ -2655,48 +2739,215 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           });
         });
 
-        // 为每种资源类型获取公共可用时间
-        var _loop2 = function _loop2() {
+        // 为每种资源类型检查容量
+        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$_productOri11;
+          if ((_cartItem$_productOri11 = cartItem._productOrigin) !== null && _cartItem$_productOri11 !== void 0 && (_cartItem$_productOri11 = _cartItem$_productOri11.product_resource) !== null && _cartItem$_productOri11 !== void 0 && _cartItem$_productOri11.resources) {
+            cartItem._productOrigin.product_resource.resources.forEach(function (resourceConfig) {
+              // 只处理启用的资源类型 (status === 1)
+              if (resourceConfig.status === 1 && resourceConfig.code) {
+                var _resourceConfig$id, _resourceConfig$resou;
+                var formId = ((_resourceConfig$id = resourceConfig.id) === null || _resourceConfig$id === void 0 ? void 0 : _resourceConfig$id.toString()) || ((_resourceConfig$resou = resourceConfig.resource_type_id) === null || _resourceConfig$resou === void 0 ? void 0 : _resourceConfig$resou.toString());
+                if (formId) {
+                  resourceCodeToFormIdMap[resourceConfig.code] = formId;
+                }
+              }
+            });
+          }
+        });
+        var hasCapacityIssue = false;
+        var resourceCapacityInfo = [];
+
+        // 先检查所有资源类型，收集可用数量信息
+        var _loop3 = function _loop3() {
+            var _resourceTypeConfig;
             var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
               resourceCode = _Object$entries$_i[0],
               items = _Object$entries$_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_id;
+                var resource = resourcesMap[resourceId];
+                if (resource && ((_resource$form_id = resource.form_id) === null || _resource$form_id === void 0 ? void 0 : _resource$form_id.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 _iterator3 = _createForOfIteratorHelper(items),
+              _step3;
             try {
-              var commonTimeSlots = _this15.getTimeSlotByAllResources(resourceCode);
-              if (commonTimeSlots && commonTimeSlots.length > 0) {
-                // 使用第一个可用时间片
-                var firstTimeSlot = commonTimeSlots[0];
-                var startDate = dayjs(firstTimeSlot.start_at).format('YYYY-MM-DD');
-                var startTime = firstTimeSlot.start_time;
-                var endTime = firstTimeSlot.end_time;
-
-                // 为这些商品设置时间信息（创建副本，不修改原始数据）
-                items.forEach(function (cartItem) {
-                  var processedItem = _objectSpread(_objectSpread({}, cartItem), {}, {
-                    start_date: startDate,
-                    start_time: startTime,
-                    end_time: endTime,
-                    end_date: startDate
+              for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+                var _cartItem$_productOri12;
+                var cartItem = _step3.value;
+                if ((_cartItem$_productOri12 = cartItem._productOrigin) !== null && _cartItem$_productOri12 !== void 0 && (_cartItem$_productOri12 = _cartItem$_productOri12.product_resource) !== null && _cartItem$_productOri12 !== void 0 && _cartItem$_productOri12.resources) {
+                  resourceTypeConfig = cartItem._productOrigin.product_resource.resources.find(function (r) {
+                    return r.code === resourceCode && r.status === 1;
                   });
-                  processedItemsWithoutTime.push(processedItem);
-                });
-              } else {
-                // 如果没有公共可用时间，说明容量不足
-                console.log("\u8D44\u6E90\u7C7B\u578B ".concat(resourceCode, " \u6CA1\u6709\u516C\u5171\u53EF\u7528\u65F6\u95F4"));
-                return {
-                  v: false
-                };
+                  if (resourceTypeConfig) break;
+                }
               }
-            } catch (error) {
-              console.warn("\u83B7\u53D6\u8D44\u6E90\u7C7B\u578B ".concat(resourceCode, " \u7684\u516C\u5171\u53EF\u7528\u65F6\u95F4\u5931\u8D25:"), error);
-              // 如果获取公共时间失败，继续处理其他资源类型
-              return 0; // continue
+            } catch (err) {
+              _iterator3.e(err);
+            } finally {
+              _iterator3.f();
+            }
+            var isMultipleBooking = ((_resourceTypeConfig = resourceTypeConfig) === null || _resourceTypeConfig === void 0 ? void 0 : _resourceTypeConfig.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 _getCapacityInfoByCar7 = getCapacityInfoByCartItem(cartItem),
+                  currentCapacity = _getCapacityInfoByCar7.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 = _this15.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) {
+              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);
+            });
           },
-          _ret2;
+          _ret3;
         for (var _i = 0, _Object$entries = Object.entries(itemsByResourceType); _i < _Object$entries.length; _i++) {
-          _ret2 = _loop2();
-          if (_ret2 === 0) continue;
-          if (_ret2) return _ret2.v;
+          _ret3 = _loop3();
+          if (_ret3) return _ret3.v;
+        }
+
+        // 如果有容量问题，找出限制最严格的资源类型，返回其总容量
+        if (hasCapacityIssue) {
+          // 找出超出容量的资源类型中，总容量最少的那个
+          var overCapacityResources = resourceCapacityInfo.filter(function (info) {
+            return info.required > info.total;
+          });
+          if (overCapacityResources.length > 0) {
+            var _minTotalCapacity = Math.min.apply(Math, _toConsumableArray(overCapacityResources.map(function (info) {
+              return info.total;
+            })));
+            return {
+              success: false,
+              minAvailableCount: _minTotalCapacity
+            };
+          }
+          // 如果没有超出容量的（理论上不应该发生），返回总容量最少的
+          var minTotalCapacity = Math.min.apply(Math, _toConsumableArray(resourceCapacityInfo.map(function (info) {
+            return info.total;
+          })));
+          return {
+            success: false,
+            minAvailableCount: minTotalCapacity
+          };
         }
       }
 
@@ -2715,7 +2966,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       });
 
       // 检查每个时间段是否有足够的资源容量
-      var _loop3 = function _loop3() {
+      var _loop4 = function _loop4() {
           var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i2], 2),
             timeSlotKey = _Object$entries2$_i[0],
             itemsInTimeSlot = _Object$entries2$_i[1];
@@ -2755,18 +3006,29 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
 
           // 按资源类型分组检查容量
           if (!checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, itemsInTimeSlot, allResourcesForTimeSlot)) {
+            // 如果有可用数量记录，返回最小值；否则返回 0
+            var _minAvailableCount = availableCountsByResourceType.length > 0 ? Math.min.apply(Math, availableCountsByResourceType) : 0;
             return {
-              v: false
+              v: {
+                success: false,
+                minAvailableCount: _minAvailableCount
+              }
             };
           }
         },
-        _ret3;
+        _ret4;
       for (var _i2 = 0, _Object$entries2 = Object.entries(cartItemsByTimeSlot); _i2 < _Object$entries2.length; _i2++) {
-        _ret3 = _loop3();
-        if (_ret3 === 0) continue;
-        if (_ret3) return _ret3.v;
+        _ret4 = _loop4();
+        if (_ret4 === 0) continue;
+        if (_ret4) return _ret4.v;
       }
-      return true;
+
+      // 全部通过检测，返回成功和最小可用数量
+      var minAvailableCount = availableCountsByResourceType.length > 0 ? Math.min.apply(Math, availableCountsByResourceType) : 0;
+      return {
+        success: true,
+        minAvailableCount: minAvailableCount
+      };
     }
   }, {
     key: "setOtherData",
@@ -2839,7 +3101,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getResourcesByCartItemAndCode",
     value: function getResourcesByCartItemAndCode(cartItemId, resourceCode) {
-      var _cartItem$_productOri11;
+      var _cartItem$_productOri13;
       var dateRange = this.store.date.getDateRange();
       var resources = [];
       if (dateRange !== null && dateRange !== void 0 && dateRange.length) {
@@ -2862,16 +3124,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       });
       if (!cartItem) return [];
       var selectedResources = [];
-      var _getCapacityInfoByCar7 = getCapacityInfoByCartItem(cartItem),
-        currentCapacity = _getCapacityInfoByCar7.currentCapacity,
-        formatCapacity = _getCapacityInfoByCar7.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$_productOri11 = cartItem._productOrigin) === null || _cartItem$_productOri11 === void 0 || (_cartItem$_productOri11 = _cartItem$_productOri11.product_resource) === null || _cartItem$_productOri11 === void 0 ? void 0 : _cartItem$_productOri11.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;
       });
@@ -2894,7 +3156,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           });
           if (mTimes.length === 0) return false;
           var canUseArr = mTimes.map(function (item) {
-            var _cartItem$_productOri12;
+            var _cartItem$_productOri14;
             var res = getIsUsableByTimeItem({
               timeSlice: {
                 start_time: startTime.format('HH:mm'),
@@ -2906,7 +3168,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               resource: m,
               currentCount: currentCapacity || 0,
               resourcesUseableMap: resourcesUseableMap,
-              cut_off_time: (_cartItem$_productOri12 = cartItem._productOrigin) === null || _cartItem$_productOri12 === void 0 ? void 0 : _cartItem$_productOri12.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;
@@ -2920,12 +3182,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         });
       } else {
         targetResource.renderList = targetResource.renderList.filter(function (n) {
-          var _cartItem$_productOri13;
+          var _cartItem$_productOri15;
           var recordCount = n.capacity || 0;
           if (n.onlyComputed) return false;
           var timeSlots = getTimeSlicesByResource({
             resource: n,
-            duration: ((_cartItem$_productOri13 = cartItem._productOrigin) === null || _cartItem$_productOri13 === void 0 || (_cartItem$_productOri13 = _cartItem$_productOri13.duration) === null || _cartItem$_productOri13 === void 0 ? void 0 : _cartItem$_productOri13.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
           });
@@ -3007,7 +3269,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           openResources,
           allProductResources,
           targetSchedules,
-          _loop4,
+          _loop5,
           _args28 = arguments;
         return _regeneratorRuntime().wrap(function _callee27$(_context28) {
           while (1) switch (_context28.prev = _context28.next) {
@@ -3084,9 +3346,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               });
               targetSchedules = this.store.schedule.getScheduleListByIds(tempProducts['schedule.ids']);
-              _loop4 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop4() {
+              _loop5 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop5() {
                 var currentDateStr, status, _checkSessionProductL, latestStartDate, earliestEndDate, scheduleByDate, minTimeMaxTime, scheduleTimeSlots, timesSlotCanUse;
-                return _regeneratorRuntime().wrap(function _loop4$(_context27) {
+                return _regeneratorRuntime().wrap(function _loop5$(_context27) {
                   while (1) switch (_context27.prev = _context27.next) {
                     case 0:
                       currentDateStr = currentDate.format('YYYY-MM-DD');
@@ -3189,14 +3451,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                     case "end":
                       return _context27.stop();
                   }
-                }, _loop4);
+                }, _loop5);
               });
             case 28:
               if (!(dayjs(currentDate).isBefore(dayjs(endDate), 'day') || dayjs(currentDate).isSame(dayjs(endDate), 'day'))) {
                 _context28.next = 34;
                 break;
               }
-              return _context28.delegateYield(_loop4(), "t0", 30);
+              return _context28.delegateYield(_loop5(), "t0", 30);
             case 30:
               if (!_context28.t0) {
                 _context28.next = 32;

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

@@ -262,15 +262,43 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
 
   // 检查每种资源类型是否有足够的容量
   var _loop = function _loop() {
+      var _resourceTypeConfig, _resourceTypeConfig2;
       var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
         formId = _Object$entries$_i[0],
         requiredCapacity = _Object$entries$_i[1];
       var resourcesInType = resourceTypeMap[formId];
       if (resourcesInType.length === 0) return 0; // continue
 
-      // 确定这种资源类型的预约类型
-      var firstResource = resourcesInType[0];
-      var isMultipleBooking = firstResource.resourceType === 'multiple';
+      // 从购物车商品中获取正确的资源类型配置
+      var resourceTypeConfig = null;
+      var _iterator2 = _createForOfIteratorHelper(cartItems),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var _cartItem$_productOri;
+          var cartItem = _step2.value;
+          if ((_cartItem$_productOri = cartItem._productOrigin) !== null && _cartItem$_productOri !== void 0 && (_cartItem$_productOri = _cartItem$_productOri.product_resource) !== null && _cartItem$_productOri !== void 0 && _cartItem$_productOri.resources) {
+            resourceTypeConfig = cartItem._productOrigin.product_resource.resources.find(function (r) {
+              var _r$id;
+              return ((_r$id = r.id) === null || _r$id === void 0 ? void 0 : _r$id.toString()) === formId && r.status === 1;
+            });
+            if (resourceTypeConfig) break;
+          }
+        }
+
+        // 确定这种资源类型的预约类型
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+      var isMultipleBooking = ((_resourceTypeConfig = resourceTypeConfig) === null || _resourceTypeConfig === void 0 ? void 0 : _resourceTypeConfig.type) === 'multiple';
+      console.log("capacity.ts - \u8D44\u6E90\u7C7B\u578B ".concat(formId, " \u914D\u7F6E:"), {
+        resourceTypeConfig: resourceTypeConfig,
+        type: (_resourceTypeConfig2 = resourceTypeConfig) === null || _resourceTypeConfig2 === void 0 ? void 0 : _resourceTypeConfig2.type,
+        isMultipleBooking: isMultipleBooking,
+        requiredCapacity: requiredCapacity
+      });
       if (isMultipleBooking) {
         // 多个预约：计算总可用容量
         var totalAvailableCapacity = 0;
@@ -284,6 +312,7 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
             totalAvailableCapacity += resource.capacity || 0;
           }
         });
+        console.log("capacity.ts - \u8D44\u6E90\u7C7B\u578B ".concat(formId, " \u591A\u4E2A\u9884\u7EA6\u68C0\u67E5: \u603B\u5BB9\u91CF ").concat(totalAvailableCapacity, ", \u9700\u6C42 ").concat(requiredCapacity));
         if (totalAvailableCapacity < requiredCapacity) {
           console.log("\u8D44\u6E90\u7C7B\u578B ".concat(formId, " \u5BB9\u91CF\u4E0D\u8DB3: \u9700\u8981 ").concat(requiredCapacity, ", \u53EF\u7528 ").concat(totalAvailableCapacity));
           return {
@@ -302,6 +331,7 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
             availableResourceCount++;
           }
         });
+        console.log("capacity.ts - \u8D44\u6E90\u7C7B\u578B ".concat(formId, " \u5355\u4E2A\u9884\u7EA6\u68C0\u67E5: \u53EF\u7528\u8D44\u6E90\u6570 ").concat(availableResourceCount, ", \u9700\u6C42 ").concat(requiredCapacity));
         if (availableResourceCount < requiredCapacity) {
           console.log("\u8D44\u6E90\u7C7B\u578B ".concat(formId, " \u6570\u91CF\u4E0D\u8DB3: \u9700\u8981 ").concat(requiredCapacity, ", \u53EF\u7528 ").concat(availableResourceCount));
           return {

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

@@ -316,7 +316,14 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
     }[];
-    checkMaxDurationCapacity(): boolean;
+    /**
+     * 找到多个资源的公共可用时间段
+     */
+    private findCommonAvailableTimeSlots;
+    checkMaxDurationCapacity(): {
+        success: boolean;
+        minAvailableCount: number;
+    };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
     getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;

package/lib/solution/BookingByStep/index.js

@@ -1839,12 +1839,61 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   // 时长类商品关联的资源为多个预约时，在点击进入"选择资源"步骤之前，需要检测当前所有资源的总容量
   // 选择商品数量大于所有资源配置的总容量时，不能进入下一步，需要在"选择商品"这一步时提示。
   // 注意 资源分为多个种类，需要每个种类单独检测，不能一股脑把所有资源的容量加起来检测
+  /**
+   * 找到多个资源的公共可用时间段
+   */
+  findCommonAvailableTimeSlots(resources) {
+    if (resources.length === 0)
+      return [];
+    console.log(`计算 ${resources.length} 个资源的公共时间段`);
+    const allTimeSlots = resources.map(
+      (resource) => resource.times.map((time) => ({
+        start: (0, import_dayjs.default)(time.start_at),
+        end: (0, import_dayjs.default)(time.end_at)
+      }))
+    );
+    console.log("所有资源的时间段:", allTimeSlots.map(
+      (slots) => slots.map((slot) => `${slot.start.format("HH:mm")}-${slot.end.format("HH:mm")}`)
+    ));
+    let commonSlots = allTimeSlots[0];
+    console.log("初始公共时间段:", commonSlots.map((slot) => `${slot.start.format("HH:mm")}-${slot.end.format("HH:mm")}`));
+    for (let i = 1; i < allTimeSlots.length; i++) {
+      const currentResourceSlots = allTimeSlots[i];
+      const intersections = [];
+      commonSlots.forEach((commonSlot) => {
+        currentResourceSlots.forEach((currentSlot) => {
+          const overlapStart = commonSlot.start.isAfter(currentSlot.start) ? commonSlot.start : currentSlot.start;
+          const overlapEnd = commonSlot.end.isBefore(currentSlot.end) ? commonSlot.end : currentSlot.end;
+          if (overlapStart.isBefore(overlapEnd)) {
+            intersections.push({
+              start: overlapStart,
+              end: overlapEnd
+            });
+          }
+        });
+      });
+      commonSlots = intersections;
+      console.log(`与资源${i}求交集后的公共时间段:`, commonSlots.map((slot) => `${slot.start.format("HH:mm")}-${slot.end.format("HH:mm")}`));
+      if (commonSlots.length === 0) {
+        console.log("没有找到公共时间段");
+        return [];
+      }
+    }
+    const result = commonSlots.map((slot) => ({
+      startTime: slot.start.format("HH:mm"),
+      endTime: slot.end.format("HH:mm")
+    }));
+    console.log("最终公共时间段:", result);
+    return result;
+  }
   checkMaxDurationCapacity() {
+    var _a, _b;
     const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
     if (cartItems.length === 0)
-      return true;
+      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);
@@ -1856,14 +1905,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     if (itemsWithoutTime.length > 0) {
       const itemsByResourceType = {};
       itemsWithoutTime.forEach((cartItem) => {
-        var _a;
+        var _a2;
         if (!cartItem._productOrigin)
           return;
-        const resourceTypes = ((_a = cartItem._productOrigin.product_resource) == null ? void 0 : _a.resources) || [];
+        const resourceTypes = ((_a2 = cartItem._productOrigin.product_resource) == null ? void 0 : _a2.resources) || [];
         resourceTypes.forEach((resourceType) => {
-          var _a2;
+          var _a3;
           if (resourceType.status === 1) {
-            const resourceCode = resourceType.code || ((_a2 = resourceType.id) == null ? void 0 : _a2.toString());
+            const resourceCode = resourceType.code || ((_a3 = resourceType.id) == null ? void 0 : _a3.toString());
             if (!itemsByResourceType[resourceCode]) {
               itemsByResourceType[resourceCode] = [];
             }
@@ -1873,32 +1922,127 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           }
         });
       });
+      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_utils.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 = [];
       for (const [resourceCode, items] of Object.entries(itemsByResourceType)) {
-        try {
-          const commonTimeSlots = this.getTimeSlotByAllResources(resourceCode);
-          if (commonTimeSlots && commonTimeSlots.length > 0) {
-            const firstTimeSlot = commonTimeSlots[0];
-            const startDate = (0, import_dayjs.default)(firstTimeSlot.start_at).format("YYYY-MM-DD");
-            const startTime = firstTimeSlot.start_time;
-            const endTime = firstTimeSlot.end_time;
-            items.forEach((cartItem) => {
-              const processedItem = {
-                ...cartItem,
-                start_date: startDate,
-                start_time: startTime,
-                end_time: endTime,
-                end_date: startDate
-              };
-              processedItemsWithoutTime.push(processedItem);
-            });
-          } else {
-            console.log(`资源类型 ${resourceCode} 没有公共可用时间`);
-            return false;
+        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;
           }
-        } catch (error) {
-          console.warn(`获取资源类型 ${resourceCode} 的公共可用时间失败:`, error);
-          continue;
         }
+        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) => {
+          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];
@@ -1936,10 +2080,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         });
       });
       if (!(0, import_capacity.checkTimeSlotCapacity)(timeSlotStart, timeSlotEnd, itemsInTimeSlot, allResourcesForTimeSlot)) {
-        return false;
+        const minAvailableCount2 = availableCountsByResourceType.length > 0 ? Math.min(...availableCountsByResourceType) : 0;
+        return { success: false, minAvailableCount: minAvailableCount2 };
       }
     }
-    return true;
+    const minAvailableCount = availableCountsByResourceType.length > 0 ? Math.min(...availableCountsByResourceType) : 0;
+    return { success: true, minAvailableCount };
   }
   setOtherData(key, value) {
     this.otherData[key] = value;

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

@@ -167,10 +167,11 @@ function getResourcesIdsByProduct(product) {
   return tempResourceIds;
 }
 function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, allResources) {
+  var _a, _b;
   const resourceTypeMap = {};
   allResources.forEach((resource) => {
-    var _a;
-    const formId = ((_a = resource.form_id) == null ? void 0 : _a.toString()) || "default";
+    var _a2;
+    const formId = ((_a2 = resource.form_id) == null ? void 0 : _a2.toString()) || "default";
     if (!resourceTypeMap[formId]) {
       resourceTypeMap[formId] = [];
     }
@@ -195,8 +196,26 @@ function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, allResourc
     const resourcesInType = resourceTypeMap[formId];
     if (resourcesInType.length === 0)
       continue;
-    const firstResource = resourcesInType[0];
-    const isMultipleBooking = firstResource.resourceType === "multiple";
+    let resourceTypeConfig = null;
+    for (const cartItem of cartItems) {
+      if ((_b = (_a = cartItem._productOrigin) == null ? void 0 : _a.product_resource) == null ? void 0 : _b.resources) {
+        resourceTypeConfig = cartItem._productOrigin.product_resource.resources.find(
+          (r) => {
+            var _a2;
+            return ((_a2 = r.id) == null ? void 0 : _a2.toString()) === formId && r.status === 1;
+          }
+        );
+        if (resourceTypeConfig)
+          break;
+      }
+    }
+    const isMultipleBooking = (resourceTypeConfig == null ? void 0 : resourceTypeConfig.type) === "multiple";
+    console.log(`capacity.ts - 资源类型 ${formId} 配置:`, {
+      resourceTypeConfig,
+      type: resourceTypeConfig == null ? void 0 : resourceTypeConfig.type,
+      isMultipleBooking,
+      requiredCapacity
+    });
     if (isMultipleBooking) {
       let totalAvailableCapacity = 0;
       resourcesInType.forEach((resource) => {
@@ -207,6 +226,7 @@ function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, allResourc
           totalAvailableCapacity += resource.capacity || 0;
         }
       });
+      console.log(`capacity.ts - 资源类型 ${formId} 多个预约检查: 总容量 ${totalAvailableCapacity}, 需求 ${requiredCapacity}`);
       if (totalAvailableCapacity < requiredCapacity) {
         console.log(`资源类型 ${formId} 容量不足: 需要 ${requiredCapacity}, 可用 ${totalAvailableCapacity}`);
         return false;
@@ -221,6 +241,7 @@ function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, allResourc
           availableResourceCount++;
         }
       });
+      console.log(`capacity.ts - 资源类型 ${formId} 单个预约检查: 可用资源数 ${availableResourceCount}, 需求 ${requiredCapacity}`);
       if (availableResourceCount < requiredCapacity) {
         console.log(`资源类型 ${formId} 数量不足: 需要 ${requiredCapacity}, 可用 ${availableResourceCount}`);
         return false;

package/package.json

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