@pisell/pisellos 2.2.148 → 2.2.149

package/dist/solution/BookingByStep/index.js

@@ -1497,7 +1497,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           resources.push.apply(resources, _toConsumableArray(dateResources || []));
         } else {
           var dateList = this.store.date.getDateList();
-          dateList.forEach(function (n) {
+          dateList === null || dateList === void 0 || dateList.forEach(function (n) {
             if (n.resource) resources.push.apply(resources, _toConsumableArray(n.resource));
           });
         }
@@ -1815,7 +1815,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 timeSlots: timeSlots,
                 currentCapacity: totalCapacity + (capacity || 0)
               });
-              if (canUseTime && !n.onlyComputed && currentResourceIdleTime > targetResourceTime) {
+              if (canUseTime && !n.onlyComputed && currentResourceIdleTime > targetResourceTime && n.capacity >= (capacity || 0)) {
                 targetResource = n;
                 targetResourceTime = currentResourceIdleTime;
                 return 1; // break
@@ -2059,6 +2059,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getTimeSlotByAllResources",
     value: function getTimeSlotByAllResources(resources_code) {
       var _dateRange,
+        _dateRange2,
         _this12 = this,
         _cartItems$,
         _cartItems$2,
@@ -2114,6 +2115,28 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           }
         });
       }
+      // 检查通过购物车 renderList 加入的资源数据里 times 的正确性，如果不对则需要修正
+      if ((_dateRange2 = dateRange) !== null && _dateRange2 !== void 0 && (_dateRange2 = _dateRange2[0]) !== null && _dateRange2 !== void 0 && _dateRange2.date && resources.length) {
+        var _dateRange3;
+        var currentDate = (_dateRange3 = dateRange) === null || _dateRange3 === void 0 || (_dateRange3 = _dateRange3[0]) === null || _dateRange3 === void 0 ? void 0 : _dateRange3.date;
+        var theDateResources = this.store.date.getResourcesListByDate(currentDate);
+        resources.forEach(function (item) {
+          var noCurrentDateTimes = item.times.some(function (n) {
+            return dayjs(n.start_at).isSame(dayjs(currentDate), 'day');
+          });
+          if (!noCurrentDateTimes) {
+            var _theDateResources$fin;
+            item.times = (theDateResources === null || theDateResources === void 0 || (_theDateResources$fin = theDateResources.find(function (n) {
+              return n.id === item.id;
+            })) === null || _theDateResources$fin === void 0 ? void 0 : _theDateResources$fin.times) || [];
+          }
+        });
+      }
+
+      // 如果依然 resources 空的，则证明他是切换日期了，此时直接从 date 模块里取
+      if (resources.length === 0) {
+        resources.push.apply(resources, _toConsumableArray(this.store.date.getResourcesListByDate(dateRange[0].date) || []));
+      }
       var resourcesMap = getResourcesMap(resources);
       var duration = 0;
       // duration = 不同账号的最长时间
@@ -2186,12 +2209,27 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       }
       // 计算容量的辅助函数
       var calculateCapacityFromCartItems = function calculateCapacityFromCartItems(items) {
-        return items.reduce(function (total, item) {
-          return total + (getCapacityInfoByCartItem(item).currentCapacity || 0);
-        }, 0);
+        var _items$0$_resourceOri;
+        if (items.length === 0) return 0;
+        // 还需要增加一个判断，maxCapacity 必须是我单个人里选择的资源只有同一种的情况下才可以累加，否则单个账号都是 1
+        var firstResource = (_items$0$_resourceOri = items[0]._resourceOrigin) === null || _items$0$_resourceOri === void 0 ? void 0 : _items$0$_resourceOri[0].id;
+        var sameResourceLength = items.filter(function (item) {
+          var _item$_resourceOrigin;
+          return ((_item$_resourceOrigin = item._resourceOrigin) === null || _item$_resourceOrigin === void 0 ? void 0 : _item$_resourceOrigin[0].id) === firstResource;
+        }).length;
+        if (sameResourceLength === items.length) {
+          return 1;
+        }
+        // 找出单个购物车里最大的需求 capacity 即可
+        return Math.max.apply(Math, _toConsumableArray(items.map(function (item) {
+          return getCapacityInfoByCartItem(item).currentCapacity || 1;
+        })));
+        // return items.reduce((total, item) => {
+        //   return total + (getCapacityInfoByCartItem(item).currentCapacity || 0);
+        // }, 0);
       };
 
-      // 如果是多个预约，去要求助几个 holder 下最大的需求容量capacity
+      // 如果是多个人预约，去要求出几个 holder 下最大的商品需求容量capacity
       var maxCapacity = 1;
       if (cartItems !== null && cartItems !== void 0 && cartItems[0].holder_id) {
         accountList.forEach(function (account) {
@@ -2219,13 +2257,258 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       });
       return timeSlots;
     }
+    // 从购物车中获取已经分配好第一步资源的所有时间片，批量版本，用于给日期提供能否高亮的判断
+  }, {
+    key: "getTimeSlotByAllResourcesForDate",
+    value: function () {
+      var _getTimeSlotByAllResourcesForDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(_ref10) {
+        var _this13 = this,
+          _cartItems$5,
+          _cartItems$6,
+          _this$shopStore$get2;
+        var resources_code, startDate, endDate, resources, cartItems, resourceIds, resourcesTypeId, isSingleResource, maxCutOffTime, maxCutOffTimeValue, duration, accountList, checkDuration, resourcesUseableMap, hasFlexibleDuration, operating_day_boundary, maxBlockThreshold, calculateCapacityFromCartItems, maxCapacity, arr, today, _loop2, i;
+        return _regeneratorRuntime().wrap(function _callee24$(_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
+            case 0:
+              resources_code = _ref10.resources_code, startDate = _ref10.startDate, endDate = _ref10.endDate;
+              // 如果 end_date 距离start_date小于 30 天，自动追加 end_date 为今天往后的 30 天
+              if (dayjs(endDate).diff(dayjs(startDate), 'day') < 30) {
+                endDate = dayjs(startDate).add(30, 'day').format('YYYY-MM-DD');
+              }
+              // 预请求资源数据，防止日期超过之前选择的范围
+              _context25.next = 4;
+              return this.getAvailableDate({
+                startDate: startDate,
+                endDate: endDate,
+                useCache: true
+              });
+            case 4:
+              // 取出购物车中所有一已选择的第一步资源
+              resources = [];
+              cartItems = this.store.cart.getItems().filter(function (n) {
+                return !isNormalProduct(n._productOrigin);
+              }); // if (cartItems?.[0].start_date) return [];
+              resourceIds = [];
+              resourcesTypeId = undefined;
+              isSingleResource = false; // 找出购物车里最大的 cut_off_time
+              maxCutOffTime = undefined;
+              maxCutOffTimeValue = dayjs();
+              cartItems.forEach(function (item) {
+                var _item$_productOrigin17, _item$_productOrigin18, _item$_productOrigin19, _item$_productOrigin20;
+                (_item$_productOrigin17 = item._productOrigin) === null || _item$_productOrigin17 === void 0 || (_item$_productOrigin17 = _item$_productOrigin17.product_resource) === null || _item$_productOrigin17 === void 0 || (_item$_productOrigin17 = _item$_productOrigin17.resources) === null || _item$_productOrigin17 === void 0 || _item$_productOrigin17.forEach(function (n) {
+                  // TODO： 少了个 status 的判断
+                  if (n.code === resources_code) {
+                    resources.push.apply(resources, _toConsumableArray(n.renderList || []));
+                    isSingleResource = n.type === 'single';
+                  }
+                });
+                // item._origin.resources?.forEach((n: any) => {
+                //   resourceIds.push(n.relation_id);
+                // });
+                if (item.resource_id && !resourceIds.includes(item.resource_id)) {
+                  resourceIds.push(item.resource_id);
+                }
+                resourcesTypeId = item === null || item === void 0 || (_item$_productOrigin18 = item._productOrigin) === null || _item$_productOrigin18 === void 0 || (_item$_productOrigin18 = _item$_productOrigin18.product_resource) === null || _item$_productOrigin18 === void 0 || (_item$_productOrigin18 = _item$_productOrigin18.resources) === null || _item$_productOrigin18 === void 0 || (_item$_productOrigin18 = _item$_productOrigin18.find(function (n) {
+                  return n.code === resources_code;
+                })) === null || _item$_productOrigin18 === void 0 ? void 0 : _item$_productOrigin18.id;
+                if ((_item$_productOrigin19 = item._productOrigin) !== null && _item$_productOrigin19 !== void 0 && _item$_productOrigin19.cut_off_time && ((_item$_productOrigin20 = item._productOrigin) === null || _item$_productOrigin20 === void 0 ? void 0 : _item$_productOrigin20.cut_off_time.type) === 'advance') {
+                  var currentCutOffTime = dayjs().add(item._productOrigin.cut_off_time.unit, item._productOrigin.cut_off_time.unit_type);
+                  if (currentCutOffTime.isAfter(maxCutOffTimeValue, 'minute')) {
+                    maxCutOffTimeValue = currentCutOffTime;
+                    maxCutOffTime = item._productOrigin.cut_off_time;
+                  }
+                }
+              });
 
-    // 提交时间切片，绑定到对应购物车的商品上，更新购物车---只有 duration 商品
+              // 保护： 如果 resources 为空则直接 return
+              if (resources.length) {
+                _context25.next = 14;
+                break;
+              }
+              return _context25.abrupt("return", []);
+            case 14:
+              duration = 0; // duration = 不同账号的最长时间
+              accountList = this.store.accountList.getAccounts();
+              checkDuration = function checkDuration(cartItems) {
+                var accountDuration = 0;
+                cartItems.forEach(function (item) {
+                  // 单个预约累加账号 多个预约取最大值
+                  if (isSingleResource) {
+                    var _item$_productOrigin21;
+                    accountDuration += ((_item$_productOrigin21 = item._productOrigin) === null || _item$_productOrigin21 === void 0 || (_item$_productOrigin21 = _item$_productOrigin21.duration) === null || _item$_productOrigin21 === void 0 ? void 0 : _item$_productOrigin21.value) || 10;
+                  } else {
+                    var _item$_productOrigin22;
+                    if (accountDuration < (((_item$_productOrigin22 = item._productOrigin) === null || _item$_productOrigin22 === void 0 || (_item$_productOrigin22 = _item$_productOrigin22.duration) === null || _item$_productOrigin22 === void 0 ? void 0 : _item$_productOrigin22.value) || 10)) {
+                      var _item$_productOrigin23;
+                      accountDuration = ((_item$_productOrigin23 = item._productOrigin) === null || _item$_productOrigin23 === void 0 || (_item$_productOrigin23 = _item$_productOrigin23.duration) === null || _item$_productOrigin23 === void 0 ? void 0 : _item$_productOrigin23.value) || 10;
+                    }
+                  }
+                });
+                if (accountDuration > duration) {
+                  duration = accountDuration;
+                }
+              };
+              if (cartItems !== null && cartItems !== void 0 && cartItems[0].holder_id) {
+                accountList.forEach(function (account) {
+                  var cartItems = _this13.store.cart.getCartByAccount(account.getId());
+                  checkDuration(cartItems);
+                });
+              } else {
+                checkDuration(cartItems);
+              }
+              // 如果 cartItem 上既没有时间，也没有资源，认为外部属于异常调用，直接丢一个空数组出去
+              // 同时 session 类商品的流程也不应该调用这个方法
+              if (!(!(cartItems !== null && cartItems !== void 0 && (_cartItems$5 = cartItems[0]) !== null && _cartItems$5 !== void 0 && _cartItems$5.start_date) && !(cartItems !== null && cartItems !== void 0 && (_cartItems$6 = cartItems[0]) !== null && _cartItems$6 !== void 0 && _cartItems$6.resource_id) || !(cartItems !== null && cartItems !== void 0 && cartItems[0].duration))) {
+                _context25.next = 20;
+                break;
+              }
+              return _context25.abrupt("return", []);
+            case 20:
+              resourcesUseableMap = {};
+              hasFlexibleDuration = cartItems.some(function (item) {
+                var _item$_productOrigin24;
+                return ((_item$_productOrigin24 = item._productOrigin) === null || _item$_productOrigin24 === void 0 || (_item$_productOrigin24 = _item$_productOrigin24.duration) === null || _item$_productOrigin24 === void 0 ? void 0 : _item$_productOrigin24.type) === 'flexible';
+              });
+              operating_day_boundary = (_this$shopStore$get2 = this.shopStore.get('core')) === null || _this$shopStore$get2 === void 0 || (_this$shopStore$get2 = _this$shopStore$get2.core) === null || _this$shopStore$get2 === void 0 ? void 0 : _this$shopStore$get2.operating_day_boundary; // 如果有 hasFlexibleDuration，需要把动态时长商品（可能是多个，取最长的那个最低禁止购买时长）的最低禁止购买时长作为 split 的值
+              maxBlockThreshold = 0;
+              if (hasFlexibleDuration) {
+                maxBlockThreshold = cartItems.reduce(function (max, item) {
+                  var _item$_productOrigin25;
+                  // 如果开启了灵活时长商品配置，则取 block_threshold 的值
+                  if ((_item$_productOrigin25 = item._productOrigin) !== null && _item$_productOrigin25 !== void 0 && (_item$_productOrigin25 = _item$_productOrigin25.duration) !== null && _item$_productOrigin25 !== void 0 && (_item$_productOrigin25 = _item$_productOrigin25.flexible_config) !== null && _item$_productOrigin25 !== void 0 && _item$_productOrigin25.is_enable_minimum_duration) {
+                    var _item$_productOrigin26;
+                    return Math.max(max, ((_item$_productOrigin26 = item._productOrigin) === null || _item$_productOrigin26 === void 0 || (_item$_productOrigin26 = _item$_productOrigin26.duration) === null || _item$_productOrigin26 === void 0 || (_item$_productOrigin26 = _item$_productOrigin26.flexible_config) === null || _item$_productOrigin26 === void 0 ? void 0 : _item$_productOrigin26.block_threshold) || 0);
+                  }
+                  return 0;
+                }, 0);
+              }
+              // 计算容量的辅助函数
+              calculateCapacityFromCartItems = function calculateCapacityFromCartItems(items) {
+                var _items$0$_resourceOri2;
+                if (items.length === 0) return 0;
+                // 还需要增加一个判断，maxCapacity 必须是我单个人里选择的资源只有同一种的情况下才可以累加，否则单个账号都是 1
+                var firstResource = (_items$0$_resourceOri2 = items[0]._resourceOrigin) === null || _items$0$_resourceOri2 === void 0 ? void 0 : _items$0$_resourceOri2[0].id;
+                var sameResourceLength = items.filter(function (item) {
+                  var _item$_resourceOrigin2;
+                  return ((_item$_resourceOrigin2 = item._resourceOrigin) === null || _item$_resourceOrigin2 === void 0 ? void 0 : _item$_resourceOrigin2[0].id) === firstResource;
+                }).length;
+                if (sameResourceLength !== items.length) {
+                  return 1;
+                }
+                // 找出单个购物车里最大的需求 capacity 即可
+                return Math.max.apply(Math, _toConsumableArray(items.map(function (item) {
+                  return getCapacityInfoByCartItem(item).currentCapacity || 1;
+                })));
+              }; // 如果是多个预约，去要求出几个 holder 下最大的需求容量capacity
+              maxCapacity = 1;
+              if (cartItems !== null && cartItems !== void 0 && cartItems[0].holder_id) {
+                accountList.forEach(function (account) {
+                  var accountCartItems = _this13.store.cart.getCartByAccount(account.getId());
+                  var currentCapacity = calculateCapacityFromCartItems(accountCartItems);
+                  if (currentCapacity > maxCapacity) {
+                    maxCapacity = currentCapacity;
+                  }
+                });
+              } else {
+                maxCapacity = calculateCapacityFromCartItems(cartItems);
+              }
+              arr = [];
+              today = dayjs().startOf('day'); // 计算 start_date 到 end_date 之间的所有日期，遍历他们并且计算每一天的可用
+              _loop2 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop2() {
+                var currentDate, theDateResources, resourcesMap, timeSlots;
+                return _regeneratorRuntime().wrap(function _loop2$(_context24) {
+                  while (1) switch (_context24.prev = _context24.next) {
+                    case 0:
+                      currentDate = i.format('YYYY-MM-DD');
+                      theDateResources = _this13.store.date.getResourcesListByDate(currentDate);
+                      resources.forEach(function (item) {
+                        var _theDateResources$fin2;
+                        item.times = (theDateResources === null || theDateResources === void 0 || (_theDateResources$fin2 = theDateResources.find(function (n) {
+                          return n.id === item.id;
+                        })) === null || _theDateResources$fin2 === void 0 ? void 0 : _theDateResources$fin2.times) || [];
+                      });
+                      resourcesMap = getResourcesMap(resources); // 如果日期已经过期则直接标记为不可用
+                      if (!i.isBefore(today)) {
+                        _context24.next = 7;
+                        break;
+                      }
+                      arr.push({
+                        date: currentDate,
+                        status: 'unavailable',
+                        week: i.format('ddd'),
+                        weekNum: i.day()
+                      });
+                      return _context24.abrupt("return", 1);
+                    case 7:
+                      timeSlots = getTimeSlicesByResources({
+                        resourceIds: resourceIds,
+                        resourcesMap: resourcesMap,
+                        duration: duration,
+                        currentDate: currentDate,
+                        split: 10,
+                        resourcesUseableMap: resourcesUseableMap,
+                        capacity: maxCapacity,
+                        cut_off_time: maxCutOffTime,
+                        hasFlexibleDuration: hasFlexibleDuration,
+                        operating_day_boundary: operating_day_boundary,
+                        maxBlockThreshold: maxBlockThreshold
+                      });
+                      if (timeSlots.length > 0) {
+                        arr.push({
+                          date: currentDate,
+                          status: 'available',
+                          week: i.format('ddd'),
+                          weekNum: i.day()
+                        });
+                      } else {
+                        arr.push({
+                          date: currentDate,
+                          status: 'unavailable',
+                          week: i.format('ddd'),
+                          weekNum: i.day()
+                        });
+                      }
+                    case 9:
+                    case "end":
+                      return _context24.stop();
+                  }
+                }, _loop2);
+              });
+              i = dayjs(startDate);
+            case 32:
+              if (!i.isBefore(dayjs(endDate))) {
+                _context25.next = 39;
+                break;
+              }
+              return _context25.delegateYield(_loop2(), "t0", 34);
+            case 34:
+              if (!_context25.t0) {
+                _context25.next = 36;
+                break;
+              }
+              return _context25.abrupt("continue", 36);
+            case 36:
+              i = i.add(1, 'day');
+              _context25.next = 32;
+              break;
+            case 39:
+              return _context25.abrupt("return", arr);
+            case 40:
+            case "end":
+              return _context25.stop();
+          }
+        }, _callee24, this);
+      }));
+      function getTimeSlotByAllResourcesForDate(_x19) {
+        return _getTimeSlotByAllResourcesForDate.apply(this, arguments);
+      }
+      return getTimeSlotByAllResourcesForDate;
+    }() // 提交时间切片，绑定到对应购物车的商品上，更新购物车---只有 duration 商品
   }, {
     key: "submitTimeSlot",
     value: function submitTimeSlot(timeSlots) {
-      var _this$shopStore$get2,
-        _this13 = this;
+      var _this$shopStore$get3,
+        _this14 = this;
       // 以账号为维度处理数据。购物车里每一项的 startTime应该是前一个商品的 endTime，如果是第一个商品则用 timeSlots.start_at
       var cartItems = this.store.cart.getItems().filter(function (n) {
         return !isNormalProduct(n._productOrigin);
@@ -2245,7 +2528,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       }, {});
 
       // 店铺营业结束时间
-      var operating_day_boundary = (_this$shopStore$get2 = this.shopStore.get('core')) === null || _this$shopStore$get2 === void 0 || (_this$shopStore$get2 = _this$shopStore$get2.core) === null || _this$shopStore$get2 === void 0 ? void 0 : _this$shopStore$get2.operating_day_boundary;
+      var operating_day_boundary = (_this$shopStore$get3 = this.shopStore.get('core')) === null || _this$shopStore$get3 === void 0 || (_this$shopStore$get3 = _this$shopStore$get3.core) === null || _this$shopStore$get3 === void 0 ? void 0 : _this$shopStore$get3.operating_day_boundary;
 
       // 处理每个账号的商品
       Object.values(itemsByAccount).forEach(function (accountItems) {
@@ -2255,10 +2538,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           var osWarnTips = [];
           var newResources = cloneDeep(item._origin.resources);
           newResources.forEach(function (resource) {
-            var _item$_productOrigin17;
+            var _item$_productOrigin27;
             // 如果商品配置的是灵活时长，开始时间设置为提交的时间，结束时间从资源的可用最晚时间和店铺营业结束时间里取一个最早的
-            if (((_item$_productOrigin17 = item._productOrigin) === null || _item$_productOrigin17 === void 0 || (_item$_productOrigin17 = _item$_productOrigin17.duration) === null || _item$_productOrigin17 === void 0 ? void 0 : _item$_productOrigin17.type) === 'flexible') {
-              var _allResources$find, _item$_productOrigin18, _item$_productOrigin19;
+            if (((_item$_productOrigin27 = item._productOrigin) === null || _item$_productOrigin27 === void 0 || (_item$_productOrigin27 = _item$_productOrigin27.duration) === null || _item$_productOrigin27 === void 0 ? void 0 : _item$_productOrigin27.type) === 'flexible') {
+              var _allResources$find, _item$_productOrigin28, _item$_productOrigin29;
               item.duration = {
                 type: 'minutes',
                 value: 10
@@ -2268,14 +2551,67 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               var targetResourceTimes = allResources === null || allResources === void 0 || (_allResources$find = allResources.find(function (n) {
                 return n.id === resource.id;
               })) === null || _allResources$find === void 0 ? void 0 : _allResources$find.times;
+              // 找到最晚的 end_at 还没用，因为可能存在资源工作时间是 10:00-19:00，但是资源的 times 里有 16:30-19:00 被 block 的情况
+              // 所以还需要排除掉 block 时间
+              function getEarliestBlockedStartTime(_ref11) {
+                var _earliestBlockStart;
+                var currentStartTime = _ref11.currentStartTime,
+                  times = _ref11.times;
+                var currentStart = dayjs(currentStartTime);
+                var earliestBlockStart;
+                var _iterator3 = _createForOfIteratorHelper(times || []),
+                  _step3;
+                try {
+                  for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+                    var _time$event_list;
+                    var time = _step3.value;
+                    var blockedTimes = (_time$event_list = time.event_list) === null || _time$event_list === void 0 ? void 0 : _time$event_list.filter(function (event) {
+                      return event.type !== 'schedule_event';
+                    });
+                    var _iterator4 = _createForOfIteratorHelper(blockedTimes || []),
+                      _step4;
+                    try {
+                      for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+                        var event = _step4.value;
+                        var eventStart = dayjs(event.start_at);
+                        var eventEnd = dayjs(event.end_at);
+                        if (eventStart.isBefore(currentStart) && eventEnd.isAfter(currentStart)) {
+                          return currentStart.format('YYYY-MM-DD HH:mm');
+                        }
+                        if (eventStart.isAfter(currentStart)) {
+                          if (!earliestBlockStart || eventStart.isBefore(earliestBlockStart)) {
+                            earliestBlockStart = eventStart;
+                          }
+                        }
+                      }
+                    } catch (err) {
+                      _iterator4.e(err);
+                    } finally {
+                      _iterator4.f();
+                    }
+                  }
+                } catch (err) {
+                  _iterator3.e(err);
+                } finally {
+                  _iterator3.f();
+                }
+                return (_earliestBlockStart = earliestBlockStart) === null || _earliestBlockStart === void 0 ? void 0 : _earliestBlockStart.format('YYYY-MM-DD HH:mm');
+              }
               var resourcesEndTime = targetResourceTimes.reduce(function (acc, curr) {
                 return dayjs(curr.end_at).isAfter(dayjs(acc.end_at)) ? curr : acc;
               }, targetResourceTimes[0]);
+              var earliestBlockedStartTime = getEarliestBlockedStartTime({
+                currentStartTime: currentStartTime,
+                times: targetResourceTimes
+              });
 
               // 将 operating_day_boundary 转换为与 resourcesEndTime.end_at 相同日期的完整日期时间
               var resourceDate = dayjs(resourcesEndTime.end_at).format('YYYY-MM-DD');
               var operatingBoundaryDateTime = "".concat(resourceDate, " ").concat(operating_day_boundary.type === 'start_time' ? '23:59' : operating_day_boundary.time);
-              var endTime = dayjs(resourcesEndTime.end_at).isBefore(dayjs(operatingBoundaryDateTime)) ? resourcesEndTime.end_at : operatingBoundaryDateTime;
+              var endTimeCandidates = [resourcesEndTime.end_at, operatingBoundaryDateTime].concat(_toConsumableArray(earliestBlockedStartTime ? [earliestBlockedStartTime] : []));
+              var endTime = endTimeCandidates.reduce(function (earliest, value) {
+                return dayjs(value).isBefore(dayjs(earliest)) ? value : earliest;
+              }, endTimeCandidates[0]);
               // 修复：如果 endTime 只是时间格式（如 "17:00"），需要加上日期
               var formattedEndTime;
               if (typeof endTime === 'string' && endTime.includes(':') && !endTime.includes(' ') && !endTime.includes('T')) {
@@ -2288,19 +2624,19 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               resource.endTime = formattedEndTime.format('YYYY-MM-DD HH:mm');
               // 如果是动态时长商品，并且当前选择的时间的结束时间小于了最低提示时长（warningThreshold），则追加一个提示
               // 如果currentStartTime + warningThreshold 大于 currentEndTime,且 osWarnTips 没有pisell2.product.card.closing-soon.warning 这一项，则加入这一项
-              if ((_item$_productOrigin18 = item._productOrigin) !== null && _item$_productOrigin18 !== void 0 && (_item$_productOrigin18 = _item$_productOrigin18.duration) !== null && _item$_productOrigin18 !== void 0 && (_item$_productOrigin18 = _item$_productOrigin18.flexible_config) !== null && _item$_productOrigin18 !== void 0 && _item$_productOrigin18.is_enable_minimum_duration && dayjs(currentStartTime).add(((_item$_productOrigin19 = item._productOrigin) === null || _item$_productOrigin19 === void 0 || (_item$_productOrigin19 = _item$_productOrigin19.duration) === null || _item$_productOrigin19 === void 0 || (_item$_productOrigin19 = _item$_productOrigin19.flexible_config) === null || _item$_productOrigin19 === void 0 ? void 0 : _item$_productOrigin19.warning_threshold) || 0, 'minutes').isAfter(dayjs(formattedEndTime))) {
+              if ((_item$_productOrigin28 = item._productOrigin) !== null && _item$_productOrigin28 !== void 0 && (_item$_productOrigin28 = _item$_productOrigin28.duration) !== null && _item$_productOrigin28 !== void 0 && (_item$_productOrigin28 = _item$_productOrigin28.flexible_config) !== null && _item$_productOrigin28 !== void 0 && _item$_productOrigin28.is_enable_minimum_duration && dayjs(currentStartTime).add(((_item$_productOrigin29 = item._productOrigin) === null || _item$_productOrigin29 === void 0 || (_item$_productOrigin29 = _item$_productOrigin29.duration) === null || _item$_productOrigin29 === void 0 || (_item$_productOrigin29 = _item$_productOrigin29.flexible_config) === null || _item$_productOrigin29 === void 0 ? void 0 : _item$_productOrigin29.warning_threshold) || 0, 'minutes').isAfter(dayjs(formattedEndTime))) {
                 if (!osWarnTips.includes('pisell2.product.card.closing-soon.warning')) {
                   osWarnTips.push('pisell2.product.card.closing-soon.warning');
                 }
               }
             } else {
-              var _item$_productOrigin20;
+              var _item$_productOrigin30;
               resource.startTime = currentStartTime;
-              resource.endTime = dayjs(currentStartTime).add(((_item$_productOrigin20 = item._productOrigin) === null || _item$_productOrigin20 === void 0 || (_item$_productOrigin20 = _item$_productOrigin20.duration) === null || _item$_productOrigin20 === void 0 ? void 0 : _item$_productOrigin20.value) || 10, 'minutes').format('YYYY-MM-DD HH:mm');
+              resource.endTime = dayjs(currentStartTime).add(((_item$_productOrigin30 = item._productOrigin) === null || _item$_productOrigin30 === void 0 || (_item$_productOrigin30 = _item$_productOrigin30.duration) === null || _item$_productOrigin30 === void 0 ? void 0 : _item$_productOrigin30.value) || 10, 'minutes').format('YYYY-MM-DD HH:mm');
             }
             // delete resource.times;
           });
-          _this13.store.cart.updateItem({
+          _this14.store.cart.updateItem({
             _id: item._id,
             resources: newResources,
             osWarnTips: osWarnTips
@@ -2344,42 +2680,42 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "openProductDetail",
     value: function () {
-      var _openProductDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(productId) {
+      var _openProductDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(productId) {
         var targetProductData, newScheduleArr, dateRange;
-        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
+        return _regeneratorRuntime().wrap(function _callee25$(_context26) {
+          while (1) switch (_context26.prev = _context26.next) {
             case 0:
-              _context24.next = 2;
+              _context26.next = 2;
               return this.store.products.getProduct(productId);
             case 2:
-              targetProductData = _context24.sent;
+              targetProductData = _context26.sent;
               if (!targetProductData) {
-                _context24.next = 17;
+                _context26.next = 17;
                 break;
               }
               this.store.currentProduct = targetProductData;
               this.store.currentProductMeta = {};
               // 资源预加载，如果是 duration 类型的商品，且是先选日期的流程，在这里预拉取资源数据
               if (!targetProductData['schedule.ids']) {
-                _context24.next = 12;
+                _context26.next = 12;
                 break;
               }
               newScheduleArr = this.getScheduleDataByIds(targetProductData['schedule.ids']);
               if (!this.store.currentProductMeta) this.store.currentProductMeta = {};
               this.store.currentProductMeta.schedule = newScheduleArr;
-              _context24.next = 17;
+              _context26.next = 17;
               break;
             case 12:
               if (!targetProductData.duration) {
-                _context24.next = 17;
+                _context26.next = 17;
                 break;
               }
               dateRange = this.store.date.getDateRange(); // 如果不是先选日期的流程 duration 商品就啥也不做
               if (dateRange !== null && dateRange !== void 0 && dateRange.length) {
-                _context24.next = 16;
+                _context26.next = 16;
                 break;
               }
-              return _context24.abrupt("return");
+              return _context26.abrupt("return");
             case 16:
               // this.store.date.getResourceDates({
               //   query: {
@@ -2395,11 +2731,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 17:
             case "end":
-              return _context24.stop();
+              return _context26.stop();
           }
-        }, _callee24, this);
+        }, _callee25, this);
       }));
-      function openProductDetail(_x19) {
+      function openProductDetail(_x20) {
         return _openProductDetail.apply(this, arguments);
       }
       return openProductDetail;
@@ -2416,14 +2752,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     // 通过商品和 schedule 来获取视频可用的时间片、时间片内资源可用的数据
   }, {
     key: "getTimeslotBySchedule",
-    value: function getTimeslotBySchedule(_ref10) {
+    value: function getTimeslotBySchedule(_ref12) {
       var _this$store$currentPr2,
         _targetProductData$pr,
-        _this14 = this;
-      var date = _ref10.date,
-        scheduleIds = _ref10.scheduleIds,
-        resources = _ref10.resources,
-        product = _ref10.product;
+        _this15 = this;
+      var date = _ref12.date,
+        scheduleIds = _ref12.scheduleIds,
+        resources = _ref12.resources,
+        product = _ref12.product;
       var targetProduct = this.store.currentProduct;
       // 如果外面传递了product 优先用外面的
       var targetProductData = product || targetProduct;
@@ -2457,25 +2793,35 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         if (!aIsCombined && bIsCombined) return -1;
         return 0;
       });
-
-      // 找到当前商品下第一个启用的资源id
-      var firstEnabledResourceId = targetProductData === null || targetProductData === void 0 || (_targetProductData$pr = targetProductData.product_resource) === null || _targetProductData$pr === void 0 || (_targetProductData$pr = _targetProductData$pr.resources) === null || _targetProductData$pr === void 0 || (_targetProductData$pr = _targetProductData$pr.find(function (n) {
+      var enabledResourceTypeConfigs = (targetProductData === null || targetProductData === void 0 || (_targetProductData$pr = targetProductData.product_resource) === null || _targetProductData$pr === void 0 || (_targetProductData$pr = _targetProductData$pr.resources) === null || _targetProductData$pr === void 0 ? void 0 : _targetProductData$pr.filter(function (n) {
         return n.status === 1;
-      })) === null || _targetProductData$pr === void 0 ? void 0 : _targetProductData$pr.id;
+      })) || [];
+      var resourceTypeConfigById = new Map(enabledResourceTypeConfigs.map(function (n) {
+        return [n.id, n];
+      }));
 
       // 计算每个日程切片下日程可用的资源的容量总和
       var formatScheduleTimeSlots = scheduleTimeSlots.map(function (item) {
         // 用来计算资源的可使用情况，针对单个schedule 时间片
         var resourcesUseableMap = {};
-        var count = 0;
-        var bookingLeft = 0;
-        var summaryCount = 0;
+        var statsByResourceType = {};
+        enabledResourceTypeConfigs.forEach(function (cfg) {
+          statsByResourceType[cfg.id] = {
+            count: 0,
+            left: 0,
+            summaryCount: 0,
+            summaryConfigCount: 0
+          };
+        });
+
         // 遍历所有资源
         allProductResources === null || allProductResources === void 0 || allProductResources.forEach(function (m) {
+          var currentResourceTypeConfig = resourceTypeConfigById.get(m.form_id);
+          if (!currentResourceTypeConfig) return;
+
           // 遍历所有资源的上工时间片
-          var currentResourcesCount = 0;
-          var currentResourcesSummaryCount = 0;
-          var currentResourcesTimeSlotCanUsedArr = [];
+          var currentResourceMaxRemainingCapacity = 0;
+          var isAllTimeSlicesUsable = true;
           // m.times 需要做个过滤，假设 timeSlice.start_at 是 09:30 timeSlice.end_at 是 11:30
           // time 是 time.start_at = 2025-05-26 10:30, time.end_at = 2025-05-26 12:30
           // 需要判断 time 的开始结束时间 是否包含timeSlice的开始结束时间
@@ -2483,14 +2829,27 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           // n.start_at 是 2025-06-30 15:00 end_at 2025-06-30 17:00
           // item.start 是 2025-06-30 16:00 item.end 是 2025-06-30 19:00
           // 需要判断 n.start_at 和 n.end_at 是否在 item.start 和 item.end 之间
-          // 如果 n.start_at 和 n.end_at 在 item.start 和 item.end 有交集，则此时间需要计算
+          // 如果是仅用于计算的资源， n.start_at 和 n.end_at 在 item.start 和 item.end 有交集，则此时间需要计算
+          // https://project.feishu.cn/v2qint/bug/detail/6657165010
           var mTimes = m.times.filter(function (n) {
-            return !dayjs(n.start_at).isAfter(dayjs(item.start), 'minute') && !dayjs(n.end_at).isBefore(dayjs(item.end), 'minute') || dayjs(n.start_at).isBefore(dayjs(item.end), 'minute') && dayjs(n.end_at).isAfter(dayjs(item.start), 'minute');
+            return !dayjs(n.start_at).isAfter(dayjs(item.start), 'minute') && !dayjs(n.end_at).isBefore(dayjs(item.end), 'minute') || m.onlyComputed && dayjs(n.start_at).isBefore(dayjs(item.end), 'minute') && dayjs(n.end_at).isAfter(dayjs(item.start), 'minute');
           });
           // 如果在这个区间的时间一个都没有，可以直接认为这个资源不可用
           if (mTimes.length === 0) {
             return;
           }
+
+          // 统计该资源类型在这个时间片的“配置容量”（无占用），只统计上工的资源
+          if (!m.onlyComputed) {
+            var _currentStats = statsByResourceType[m.form_id] || {
+              count: 0,
+              left: 0,
+              summaryCount: 0,
+              summaryConfigCount: 0
+            };
+            if (currentResourceTypeConfig.type === 'multiple') _currentStats.summaryConfigCount += m.capacity;else _currentStats.summaryConfigCount += 1;
+            statsByResourceType[m.form_id] = _currentStats;
+          }
           mTimes.forEach(function (childTiem) {
             // 挨个去匹配某个工作时间段结合当前日程时间，资源能不能用，有多少容量能用
             var res = getIsUsableByTimeItem({
@@ -2509,32 +2868,43 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== 'capacityOnly') {
               resourcesUseableMap[m.id] = res.usable;
             }
-            if (res.usable && res.remainingCapacity >= count && !m.onlyComputed) {
-              currentResourcesCount = res.remainingCapacity;
-            }
-            if (res.usable && !m.onlyComputed && res.remainingCapacity >= currentResourcesSummaryCount) {
-              currentResourcesSummaryCount = res.remainingCapacity;
+            if (!res.usable) isAllTimeSlicesUsable = false;
+            if (res.usable && !m.onlyComputed) {
+              if (res.remainingCapacity > currentResourceMaxRemainingCapacity) currentResourceMaxRemainingCapacity = res.remainingCapacity;
             }
-            currentResourcesTimeSlotCanUsedArr.push(res.usable);
           });
-          // 在已经选定时间的情况下，只要canUseTime如果有一个 false 那就不可用
-          if (!currentResourcesTimeSlotCanUsedArr.some(function (n) {
-            return n === false;
-          }) &&
-          // 只统计第一种资源的容量和 left
-          m.form_id === firstEnabledResourceId) {
-            if (currentResourcesCount >= count) {
-              count = currentResourcesCount;
-            }
-            if (!m.onlyComputed) {
-              bookingLeft += 1;
-              summaryCount += currentResourcesSummaryCount;
-            }
+          if (!isAllTimeSlicesUsable) return;
+          if (m.onlyComputed) return;
+          var currentStats = statsByResourceType[m.form_id] || {
+            count: 0,
+            left: 0,
+            summaryCount: 0,
+            summaryConfigCount: 0
+          };
+          currentStats.left += 1;
+          if (currentResourceTypeConfig.type === 'multiple') {
+            currentStats.summaryCount += currentResourceMaxRemainingCapacity;
           }
+          if (currentResourceMaxRemainingCapacity > currentStats.count) currentStats.count = currentResourceMaxRemainingCapacity;
+          // else {
+          // 单个预约：一个资源只计 1，不关心剩余容量
+          // currentStats.summaryCount += 1;
+          // if (currentStats.count < 1) currentStats.count = 1;
+          //}
+
+          statsByResourceType[m.form_id] = currentStats;
         });
         // 容量检测
-        var cartItems = _this14.store.cart.getItems();
+        var cartItems = _this15.store.cart.getItems();
         productResources.forEach(function (n) {
+          var currentResourceTypeConfig = resourceTypeConfigById.get(n.id);
+          if (!currentResourceTypeConfig) return;
+          var currentStats = statsByResourceType[n.id] || {
+            count: 0,
+            left: 0,
+            summaryCount: 0
+          };
+
           // 单个预约检测规则：
           // 1、跟我一样的商品同一时间在购物车里不可以超过我最少的那种资源的关联的资源个数
           // 2、跟我不一样的商品，只需要跟我当前商品有同一种类型的资源的同一时间的，她配置了几个资源的个数+我配置了几个资源的个数，然后购物车里有几个这样的商品，对应的资源做一个去重，不超过这个去重以后的总数
@@ -2545,20 +2915,24 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               var _m$_productOrigin, _targetProductData$id;
               return ((_m$_productOrigin = m._productOrigin) === null || _m$_productOrigin === void 0 || (_m$_productOrigin = _m$_productOrigin.id) === null || _m$_productOrigin === void 0 ? void 0 : _m$_productOrigin.toString()) === (targetProductData === null || targetProductData === void 0 || (_targetProductData$id = targetProductData.id) === null || _targetProductData$id === void 0 ? void 0 : _targetProductData$id.toString()) && "".concat(m.start_date, " ").concat(m.start_time) === item.start && "".concat(m.start_date, " ").concat(m.end_time) === item.end;
             });
-            if (sameCartItems.length > 0 && sameCartItems.length >= currentResourcesSet.size || sameCartItems.length > bookingLeft) {
-              bookingLeft = 0;
-              count = 0;
-              summaryCount = 0;
+            if (sameCartItems.length > 0 && sameCartItems.length >= currentResourcesSet.size || sameCartItems.length > currentStats.left) {
+              currentStats.left = 0;
+              currentStats.count = 0;
+              currentStats.summaryCount = 0;
             }
             // 规则 2
             var otherCartItems = cartItems.filter(function (m) {
-              var _m$_productOrigin2, _targetProductData$id2;
-              return ((_m$_productOrigin2 = m._productOrigin) === null || _m$_productOrigin2 === void 0 || (_m$_productOrigin2 = _m$_productOrigin2.id) === null || _m$_productOrigin2 === void 0 ? void 0 : _m$_productOrigin2.toString()) !== (targetProductData === null || targetProductData === void 0 || (_targetProductData$id2 = targetProductData.id) === null || _targetProductData$id2 === void 0 ? void 0 : _targetProductData$id2.toString()) && "".concat(m.start_date, " ").concat(m.start_time) === item.start && "".concat(m.start_date, " ").concat(m.end_time) === item.end;
+              var _m$_productOrigin2, _targetProductData$id2, _m$_productOrigin3;
+              var isTimeMatch = ((_m$_productOrigin2 = m._productOrigin) === null || _m$_productOrigin2 === void 0 || (_m$_productOrigin2 = _m$_productOrigin2.id) === null || _m$_productOrigin2 === void 0 ? void 0 : _m$_productOrigin2.toString()) !== (targetProductData === null || targetProductData === void 0 || (_targetProductData$id2 = targetProductData.id) === null || _targetProductData$id2 === void 0 ? void 0 : _targetProductData$id2.toString()) && "".concat(m.start_date, " ").concat(m.start_time) === item.start && "".concat(m.start_date, " ").concat(m.end_time) === item.end;
+              var isResourceMatch = (_m$_productOrigin3 = m._productOrigin) === null || _m$_productOrigin3 === void 0 || (_m$_productOrigin3 = _m$_productOrigin3.product_resource) === null || _m$_productOrigin3 === void 0 || (_m$_productOrigin3 = _m$_productOrigin3.resources) === null || _m$_productOrigin3 === void 0 ? void 0 : _m$_productOrigin3.find(function (m) {
+                return m.type === n.type && m.status === 1;
+              });
+              return isTimeMatch && isResourceMatch;
             });
             otherCartItems.forEach(function (m) {
-              var _m$_productOrigin3;
-              var sameTypeResources = (_m$_productOrigin3 = m._productOrigin) === null || _m$_productOrigin3 === void 0 || (_m$_productOrigin3 = _m$_productOrigin3.product_resource) === null || _m$_productOrigin3 === void 0 || (_m$_productOrigin3 = _m$_productOrigin3.resources) === null || _m$_productOrigin3 === void 0 ? void 0 : _m$_productOrigin3.find(function (m) {
-                return m.type === n.type;
+              var _m$_productOrigin4;
+              var sameTypeResources = (_m$_productOrigin4 = m._productOrigin) === null || _m$_productOrigin4 === void 0 || (_m$_productOrigin4 = _m$_productOrigin4.product_resource) === null || _m$_productOrigin4 === void 0 || (_m$_productOrigin4 = _m$_productOrigin4.resources) === null || _m$_productOrigin4 === void 0 ? void 0 : _m$_productOrigin4.find(function (m) {
+                return m.type === n.type && m.status === 1;
               });
               var sameTypeResourcesSet = new Set([].concat(_toConsumableArray((sameTypeResources === null || sameTypeResources === void 0 ? void 0 : sameTypeResources.optional_resource) || []), _toConsumableArray((sameTypeResources === null || sameTypeResources === void 0 ? void 0 : sameTypeResources.default_resource) || [])));
               // 把sameTypeResourcesSet 加到currentResourcesSet
@@ -2567,7 +2941,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               });
             });
             // 先确定是否每一个currentResourcesSet在这个时间点的 event_list 都是空的,如果不是空的还需要把他踢出currentResourcesSet
-            var currentDataResources = _this14.store.date.getResourcesListByDate(dayjs(item.start).format('YYYY-MM-DD'));
+            var currentDataResources = _this15.store.date.getResourcesListByDate(dayjs(item.start).format('YYYY-MM-DD'));
             currentDataResources === null || currentDataResources === void 0 || currentDataResources.forEach(function (m) {
               if (currentResourcesSet.has(m.id)) {
                 var mTimes = m.times.filter(function (n) {
@@ -2581,16 +2955,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }
             });
             if (currentResourcesSet.size > 0 && otherCartItems.length + sameCartItems.length >= currentResourcesSet.size) {
-              bookingLeft = 0;
-              count = 0;
-              summaryCount = 0;
+              currentStats.left = 0;
+              currentStats.count = 0;
+              currentStats.summaryCount = 0;
             }
           } else {
             // 多个预约的检测规则：
             // 规则1、跟我一样的商品同一时间在购物车需要的容量总数不可以超过我配置的资源的 capacity 之和
             var _sameCartItems = cartItems.filter(function (m) {
-              var _m$_productOrigin4, _targetProductData$id3;
-              return ((_m$_productOrigin4 = m._productOrigin) === null || _m$_productOrigin4 === void 0 || (_m$_productOrigin4 = _m$_productOrigin4.id) === null || _m$_productOrigin4 === void 0 ? void 0 : _m$_productOrigin4.toString()) === (targetProductData === null || targetProductData === void 0 || (_targetProductData$id3 = targetProductData.id) === null || _targetProductData$id3 === void 0 ? void 0 : _targetProductData$id3.toString()) && "".concat(m.start_date, " ").concat(m.start_time) === item.start && "".concat(m.start_date, " ").concat(m.end_time) === item.end;
+              var _m$_productOrigin5, _targetProductData$id3;
+              return ((_m$_productOrigin5 = m._productOrigin) === null || _m$_productOrigin5 === void 0 || (_m$_productOrigin5 = _m$_productOrigin5.id) === null || _m$_productOrigin5 === void 0 ? void 0 : _m$_productOrigin5.toString()) === (targetProductData === null || targetProductData === void 0 || (_targetProductData$id3 = targetProductData.id) === null || _targetProductData$id3 === void 0 ? void 0 : _targetProductData$id3.toString()) && "".concat(m.start_date, " ").concat(m.start_time) === item.start && "".concat(m.start_date, " ").concat(m.end_time) === item.end;
             });
             var sameCartNeedCapacity = _sameCartItems.reduce(function (acc, curr) {
               return acc + getCapacityInfoByCartItem(curr).currentCapacity;
@@ -2599,9 +2973,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               return !curr.onlyComputed ? acc + curr.capacity || 0 : acc;
             }, 0);
             if (sameCartNeedCapacity >= currentProductResourcesCapacity) {
-              bookingLeft = 0;
-              count = 0;
-              summaryCount = 0;
+              currentStats.left = 0;
+              currentStats.count = 0;
+              currentStats.summaryCount = 0;
             }
             // 规则2、不管是不是跟我一样的商品，只需要跟我当前商品有同一种类型的资源的同一时间的，把所有购物车的 capacity 之和 和 所有当前类型资源的 capacity 之和比较，如果超过了resourcesCapacity，则不可用
             // const otherCartItems = cartItems.filter((m) => m._productOrigin?.id?.toString() !== targetProductData?.id?.toString() && m.start_time === item.start && m.end_time === item.end);
@@ -2615,8 +2989,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               return !m.onlyComputed;
             }));
             otherSameTimesCartItems.forEach(function (m) {
-              var _m$_productOrigin5;
-              var productResources = getResourcesByProduct(getResourcesMap((targetResourceDate === null || targetResourceDate === void 0 ? void 0 : targetResourceDate.resource) || []), ((_m$_productOrigin5 = m._productOrigin) === null || _m$_productOrigin5 === void 0 || (_m$_productOrigin5 = _m$_productOrigin5.product_resource) === null || _m$_productOrigin5 === void 0 ? void 0 : _m$_productOrigin5.resources) || [], selectedResources, 1);
+              var _m$_productOrigin6;
+              var productResources = getResourcesByProduct(getResourcesMap((targetResourceDate === null || targetResourceDate === void 0 ? void 0 : targetResourceDate.resource) || []), ((_m$_productOrigin6 = m._productOrigin) === null || _m$_productOrigin6 === void 0 || (_m$_productOrigin6 = _m$_productOrigin6.product_resource) === null || _m$_productOrigin6 === void 0 ? void 0 : _m$_productOrigin6.resources) || [], selectedResources, 1);
               productResources.forEach(function (m) {
                 if (m.id === n.id) {
                   m.renderList.forEach(function (n) {
@@ -2651,7 +3025,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                     start_at: dayjs(item.start),
                     end_at: dayjs(item.end)
                   })) {
-                    mSet.set(m.id, m.pax || 1);
+                    var _m$pax;
+                    mSet.set(m.id, (_m$pax = m.pax) !== null && _m$pax !== void 0 ? _m$pax : 1);
                   }
                 });
               });
@@ -2662,22 +3037,61 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             }, 0);
             // 如果已使用容量超过了当前类型资源的容量，则不可用
             if (otherCartNeedCapacity + usedCapacity >= currentTypeResourcesCapacity) {
-              bookingLeft = 0;
-              count = 0;
-              summaryCount = 0;
+              currentStats.left = 0;
+              currentStats.count = 0;
+              currentStats.summaryCount = 0;
             }
           }
+          statsByResourceType[n.id] = currentStats;
         });
         var startDayJs = dayjs(item.start);
         var endDayJs = dayjs(item.end);
+
+        // 选择“瓶颈资源类型”：multiple 取 summaryCount 最小，single 取 left 最小
+        var bottleneckResourceTypeId;
+        var bottleneckValue = Infinity;
+        enabledResourceTypeConfigs.forEach(function (cfg) {
+          var stats = statsByResourceType[cfg.id] || {
+            count: 0,
+            left: 0,
+            summaryCount: 0,
+            summaryConfigCount: 0
+          };
+          var value = cfg.type === 'multiple' ? stats.summaryCount : stats.left;
+          if (value < bottleneckValue) {
+            bottleneckValue = value;
+            bottleneckResourceTypeId = cfg.id;
+          }
+        });
+        var bottleneckStats = bottleneckResourceTypeId !== undefined ? statsByResourceType[bottleneckResourceTypeId] || {
+          count: 0,
+          left: 0,
+          summaryCount: 0,
+          summaryConfigCount: 0
+        } : {
+          count: 0,
+          left: 0,
+          summaryCount: 0,
+          summaryConfigCount: 0
+        };
+        var bottleneckConfig = bottleneckResourceTypeId !== undefined ? resourceTypeConfigById.get(bottleneckResourceTypeId) : undefined;
+        var status = 'sold_out';
+        if (bottleneckStats.left === 0) status = 'sold_out';else if (!bottleneckConfig || bottleneckStats.summaryConfigCount === 0) status = 'sold_out';else if (bottleneckConfig.type === 'multiple') {
+          var usageRatio = bottleneckStats.summaryCount / bottleneckStats.summaryConfigCount;
+          if (usageRatio > 0.5) status = 'lots_of_space';else if (bottleneckStats.summaryCount > 0) status = 'filling_up_fast';else status = 'sold_out';
+        } else {
+          var _usageRatio = bottleneckStats.left / bottleneckStats.summaryConfigCount;
+          if (_usageRatio > 0.5) status = 'lots_of_space';else if (bottleneckStats.count > 0) status = 'filling_up_fast';else status = 'sold_out';
+        }
         return {
           start_time: startDayJs.format('HH:mm'),
           end_time: endDayJs.format('HH:mm'),
           start_at: startDayJs,
           end_at: endDayJs,
-          count: count,
-          left: bookingLeft,
-          summaryCount: summaryCount
+          count: bottleneckStats.count,
+          left: bottleneckStats.left,
+          summaryCount: bottleneckStats.summaryCount,
+          status: status
         };
       });
       return formatScheduleTimeSlots;
@@ -2718,7 +3132,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       }));
 
       // 与其他资源的时间段求交集
-      var _loop2 = function _loop2() {
+      var _loop3 = function _loop3() {
         var currentResourceSlots = allTimeSlots[i];
         var intersections = [];
 
@@ -2747,7 +3161,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         }));
       };
       for (var i = 1; i < allTimeSlots.length; i++) {
-        if (_loop2()) continue;
+        if (_loop3()) continue;
       }
 
       // 格式化返回结果
@@ -2763,7 +3177,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "checkMaxDurationCapacity",
     value: function checkMaxDurationCapacity() {
-      var _this15 = this;
+      var _this16 = this;
       var cartItems = this.store.cart.getItems().filter(function (item) {
         return !isNormalProduct(item._productOrigin);
       });
@@ -2802,6 +3216,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 itemsByResourceType[resourceCode] = [];
               }
               // 避免重复添加同一个商品
+              // 如果之前添加过的依赖相同资源的跟我现在是同一个 holder，也不需要重复添加
+              if (itemsByResourceType[resourceCode].find(function (item) {
+                return item.holder_id === cartItem.holder_id;
+              })) {
+                return;
+              }
               if (!itemsByResourceType[resourceCode].find(function (item) {
                 return item._id === cartItem._id;
               })) {
@@ -2853,7 +3273,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         var processedCartItemIds = new Set();
 
         // 先检查所有资源类型，收集可用数量信息
-        var _loop3 = function _loop3() {
+        var _loop4 = function _loop4() {
             var _resourceTypeConfig;
             var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
               resourceCode = _Object$entries$_i[0],
@@ -2900,12 +3320,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             // 检查资源类型（单个预约 vs 多个预约）
             // 从商品配置中获取资源类型信息
             var resourceTypeConfig = null;
-            var _iterator3 = _createForOfIteratorHelper(items),
-              _step3;
+            var _iterator5 = _createForOfIteratorHelper(items),
+              _step5;
             try {
-              for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+              for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
                 var _cartItem$_productOri12;
-                var cartItem = _step3.value;
+                var cartItem = _step5.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;
@@ -2914,9 +3334,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               }
             } catch (err) {
-              _iterator3.e(err);
+              _iterator5.e(err);
             } finally {
-              _iterator3.f();
+              _iterator5.f();
             }
             var isMultipleBooking = ((_resourceTypeConfig = resourceTypeConfig) === null || _resourceTypeConfig === void 0 ? void 0 : _resourceTypeConfig.type) === 'multiple';
             var totalAvailable;
@@ -2969,7 +3389,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             }));
 
             // 找到所有资源都可用的时间段
-            var commonTimeSlots = _this15.findCommonAvailableTimeSlots(resourcesOfThisType);
+            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"));
@@ -3000,7 +3420,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           },
           _ret2;
         for (var _i = 0, _Object$entries = Object.entries(itemsByResourceType); _i < _Object$entries.length; _i++) {
-          _ret2 = _loop3();
+          _ret2 = _loop4();
           if (_ret2) return _ret2.v;
         }
 
@@ -3044,7 +3464,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         cartItemsByTimeSlot[timeSlotKey].push(cartItem);
       });
       // 检查每个时间段是否有足够的资源容量
-      var _loop4 = function _loop4() {
+      var _loop5 = function _loop5() {
           var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i2], 2),
             timeSlotKey = _Object$entries2$_i[0],
             itemsInTimeSlot = _Object$entries2$_i[1];
@@ -3062,8 +3482,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           var resourcesIdSet = new Set();
 
           // 获取资源数据
-          var dateRange = _this15.store.date.getDateRange();
-          var resourcesDates = _this15.store.date.getDateList();
+          var dateRange = _this16.store.date.getDateRange();
+          var resourcesDates = _this16.store.date.getDateList();
           var targetResourceDate = resourcesDates.find(function (n) {
             return n.date === startDate;
           });
@@ -3100,7 +3520,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         },
         _ret3;
       for (var _i2 = 0, _Object$entries2 = Object.entries(cartItemsByTimeSlot); _i2 < _Object$entries2.length; _i2++) {
-        _ret3 = _loop4();
+        _ret3 = _loop5();
         if (_ret3 === 0) continue;
         if (_ret3) return _ret3.v;
       }
@@ -3119,17 +3539,17 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
      */
   }, {
     key: "convertProductToCartItem",
-    value: function convertProductToCartItem(_ref11) {
-      var product = _ref11.product,
-        date = _ref11.date,
-        account = _ref11.account;
-      var _ref12 = product || {},
-        bundle = _ref12.bundle,
-        options = _ref12.options,
-        origin = _ref12.origin,
-        product_variant_id = _ref12.product_variant_id,
-        _ref12$quantity = _ref12.quantity,
-        quantity = _ref12$quantity === void 0 ? 1 : _ref12$quantity;
+    value: function convertProductToCartItem(_ref13) {
+      var product = _ref13.product,
+        date = _ref13.date,
+        account = _ref13.account;
+      var _ref14 = product || {},
+        bundle = _ref14.bundle,
+        options = _ref14.options,
+        origin = _ref14.origin,
+        product_variant_id = _ref14.product_variant_id,
+        _ref14$quantity = _ref14.quantity,
+        quantity = _ref14$quantity === void 0 ? 1 : _ref14$quantity;
 
       // 处理商品数据，类似 addProductToCart 中的逻辑
       var productData = _objectSpread(_objectSpread({}, origin), {}, {
@@ -3184,11 +3604,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     }
   }, {
     key: "checkMaxDurationCapacityForDetailNums",
-    value: function checkMaxDurationCapacityForDetailNums(_ref13) {
-      var _this16 = this;
-      var product = _ref13.product,
-        date = _ref13.date,
-        account = _ref13.account;
+    value: function checkMaxDurationCapacityForDetailNums(_ref15) {
+      var _this17 = this;
+      var product = _ref15.product,
+        date = _ref15.date,
+        account = _ref15.account;
       var cartItems = this.store.cart.getItems().filter(function (item) {
         return !isNormalProduct(item._productOrigin);
       });
@@ -3286,7 +3706,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         var processedCartItemIds = new Set();
 
         // 先检查所有资源类型，收集可用数量信息
-        var _loop5 = function _loop5() {
+        var _loop6 = function _loop6() {
             var _resourceTypeConfig2;
             var _Object$entries3$_i = _slicedToArray(_Object$entries3[_i3], 2),
               resourceCode = _Object$entries3$_i[0],
@@ -3333,12 +3753,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             // 检查资源类型（单个预约 vs 多个预约）
             // 从商品配置中获取资源类型信息
             var resourceTypeConfig = null;
-            var _iterator4 = _createForOfIteratorHelper(items),
-              _step4;
+            var _iterator6 = _createForOfIteratorHelper(items),
+              _step6;
             try {
-              for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+              for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
                 var _cartItem$_productOri15;
-                var cartItem = _step4.value;
+                var cartItem = _step6.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;
@@ -3347,9 +3767,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               }
             } catch (err) {
-              _iterator4.e(err);
+              _iterator6.e(err);
             } finally {
-              _iterator4.f();
+              _iterator6.f();
             }
             var isMultipleBooking = ((_resourceTypeConfig2 = resourceTypeConfig) === null || _resourceTypeConfig2 === void 0 ? void 0 : _resourceTypeConfig2.type) === 'multiple';
             var totalAvailable;
@@ -3402,7 +3822,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             }));
 
             // 找到所有资源都可用的时间段
-            var commonTimeSlots = _this16.findCommonAvailableTimeSlots(resourcesOfThisType);
+            var commonTimeSlots = _this17.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"));
@@ -3433,7 +3853,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           },
           _ret4;
         for (var _i3 = 0, _Object$entries3 = Object.entries(itemsByResourceType); _i3 < _Object$entries3.length; _i3++) {
-          _ret4 = _loop5();
+          _ret4 = _loop6();
           if (_ret4) return _ret4.v;
         }
 
@@ -3477,7 +3897,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         cartItemsByTimeSlot[timeSlotKey].push(cartItem);
       });
       // 检查每个时间段是否有足够的资源容量
-      var _loop6 = function _loop6() {
+      var _loop7 = function _loop7() {
           var _Object$entries4$_i = _slicedToArray(_Object$entries4[_i4], 2),
             timeSlotKey = _Object$entries4$_i[0],
             itemsInTimeSlot = _Object$entries4$_i[1];
@@ -3496,7 +3916,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
 
           // 获取资源数据
           // const dateRange = this.store.date.getDateRange();
-          var resourcesDates = _this16.store.date.getDateList();
+          var resourcesDates = _this17.store.date.getDateList();
           var targetResourceDate = resourcesDates.find(function (n) {
             return n.date === startDate;
           });
@@ -3533,7 +3953,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         },
         _ret5;
       for (var _i4 = 0, _Object$entries4 = Object.entries(cartItemsByTimeSlot); _i4 < _Object$entries4.length; _i4++) {
-        _ret5 = _loop6();
+        _ret5 = _loop7();
         if (_ret5 === 0) continue;
         if (_ret5) return _ret5.v;
       }
@@ -3566,41 +3986,41 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProductTypeById",
     value: function () {
-      var _getProductTypeById = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(id) {
+      var _getProductTypeById = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(id) {
         var productData, _productData$schedule;
-        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
-          while (1) switch (_context25.prev = _context25.next) {
+        return _regeneratorRuntime().wrap(function _callee26$(_context27) {
+          while (1) switch (_context27.prev = _context27.next) {
             case 0:
-              _context25.next = 2;
+              _context27.next = 2;
               return this.store.products.getProduct(id);
             case 2:
-              productData = _context25.sent;
+              productData = _context27.sent;
               if (!productData) {
-                _context25.next = 9;
+                _context27.next = 9;
                 break;
               }
               if (!productData.duration) {
-                _context25.next = 6;
+                _context27.next = 6;
                 break;
               }
-              return _context25.abrupt("return", 'duration');
+              return _context27.abrupt("return", 'duration');
             case 6:
               if (!((_productData$schedule = productData['schedule.ids']) !== null && _productData$schedule !== void 0 && _productData$schedule.length)) {
-                _context25.next = 8;
+                _context27.next = 8;
                 break;
               }
-              return _context25.abrupt("return", 'session');
+              return _context27.abrupt("return", 'session');
             case 8:
-              return _context25.abrupt("return", 'normal');
+              return _context27.abrupt("return", 'normal');
             case 9:
-              return _context25.abrupt("return", 'normal');
+              return _context27.abrupt("return", 'normal');
             case 10:
             case "end":
-              return _context25.stop();
+              return _context27.stop();
           }
-        }, _callee25, this);
+        }, _callee26, this);
       }));
-      function getProductTypeById(_x20) {
+      function getProductTypeById(_x21) {
         return _getProductTypeById.apply(this, arguments);
       }
       return getProductTypeById;
@@ -3720,12 +4140,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getTimeslotsScheduleByDateRange",
     value: (function () {
-      var _getTimeslotsScheduleByDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(_ref14) {
+      var _getTimeslotsScheduleByDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(_ref16) {
         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) {
+        return _regeneratorRuntime().wrap(function _callee27$(_context28) {
+          while (1) switch (_context28.prev = _context28.next) {
             case 0:
-              startDate = _ref14.startDate, endDate = _ref14.endDate, scheduleIds = _ref14.scheduleIds, resources = _ref14.resources;
+              startDate = _ref16.startDate, endDate = _ref16.endDate, scheduleIds = _ref16.scheduleIds, resources = _ref16.resources;
               console.log('appoimentBooking-session-date-getTimeslotsScheduleByDateRange', {
                 startDate: startDate,
                 endDate: endDate,
@@ -3750,14 +4170,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   resources: resources
                 });
               }
-              return _context26.abrupt("return", results);
+              return _context28.abrupt("return", results);
             case 9:
             case "end":
-              return _context26.stop();
+              return _context28.stop();
           }
-        }, _callee26, this);
+        }, _callee27, this);
       }));
-      function getTimeslotsScheduleByDateRange(_x21) {
+      function getTimeslotsScheduleByDateRange(_x22) {
         return _getTimeslotsScheduleByDateRange.apply(this, arguments);
       }
       return getTimeslotsScheduleByDateRange;
@@ -3765,7 +4185,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getAvailableDateForSessionOptimize",
     value: function () {
-      var _getAvailableDateForSessionOptimize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27() {
+      var _getAvailableDateForSessionOptimize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28() {
         var _this$store$currentPr3, _this$store$currentPr4, _tempProducts;
         var params,
           startDate,
@@ -3784,12 +4204,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           openResources,
           allProductResources,
           targetSchedules,
-          _loop7,
-          _args28 = arguments;
-        return _regeneratorRuntime().wrap(function _callee27$(_context28) {
-          while (1) switch (_context28.prev = _context28.next) {
+          _loop8,
+          _args30 = arguments;
+        return _regeneratorRuntime().wrap(function _callee28$(_context30) {
+          while (1) switch (_context30.prev = _context30.next) {
             case 0:
-              params = _args28.length > 0 && _args28[0] !== undefined ? _args28[0] : {};
+              params = _args30.length > 0 && _args30[0] !== undefined ? _args30[0] : {};
               // 开始日期如果小于今天，直接以今天当做开始日期
               startDate = params.startDate, endDate = params.endDate; // 前端传递的 startDate，可能是今天之前的，如果 startDate 小于今天 且 endDate 小于或等于今天，需要把 startDate 置为今天
               if (dayjs(startDate).isBefore(dayjs(), 'day') && (dayjs(endDate).isAfter(dayjs(), 'day') || dayjs(endDate).isSame(dayjs(), 'day'))) {
@@ -3814,15 +4234,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               // 先去读缓存结果，因为正常 UI 调用的是 7 天，而下面我会直接计算 30 天（最少也是 14 天），所以先去读缓存结果，如果缓存结果存在，则直接返回
               cache = (_this$store$currentPr3 = this.store.currentProductMeta) === null || _this$store$currentPr3 === void 0 ? void 0 : _this$store$currentPr3['timeSlotBySchedule'];
               if (!cache) {
-                _context28.next = 13;
+                _context30.next = 13;
                 break;
               }
               if (!(dayjs(params.startDate).isSameOrAfter(dayjs(cache.startDate), 'day') && dayjs(params.endDate).isSameOrBefore(dayjs(cache.endDate), 'day'))) {
-                _context28.next = 13;
+                _context30.next = 13;
                 break;
               }
               this.store.date.setDateList(cache.dateList);
-              return _context28.abrupt("return", {
+              return _context30.abrupt("return", {
                 dateList: cache.dateList,
                 firstAvailableDate: cache.firstAvailableDate
               });
@@ -3832,7 +4252,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               schedule = (_this$store$currentPr4 = this.store.currentProductMeta) === null || _this$store$currentPr4 === void 0 ? void 0 : _this$store$currentPr4['schedule'];
               filteredSchedule = filterScheduleByDateRange(schedule, startDate || '', endDate || ''); // 1.后端返回的数据，确定资源在每一天的可用和使用情况
               tempResourceIds = getResourcesIdsByProduct(tempProducts);
-              _context28.next = 19;
+              _context30.next = 19;
               return this.store.date.fetchResourceDates({
                 query: {
                   start_date: startDate || '',
@@ -3841,7 +4261,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               });
             case 19:
-              res = _context28.sent;
+              res = _context30.sent;
               // 2. 商品 schedule 数据，确定日程在每一天的时间片
               // 3. 把后端返回的和 schedule 的数据进行合并，确定每一天的可用和使用情况
               dates = [];
@@ -3850,7 +4270,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               openResources = ((_tempProducts = tempProducts) === null || _tempProducts === void 0 || (_tempProducts = _tempProducts.product_resource) === null || _tempProducts === void 0 || (_tempProducts = _tempProducts.resources) === null || _tempProducts === void 0 ? void 0 : _tempProducts.filter(function (m) {
                 return m.status === 1;
               })) || []; // res.data 返回的一定是启用商品的资源列表，不需要再过滤了
-              allProductResources = sortCombinedResources(res.data); // allProductResources 需要根据商品里的资源的单个预约多个预约补充resourceType
+              allProductResources = cloneDeep(sortCombinedResources(res.data) || []); // allProductResources 需要根据商品里的资源的单个预约多个预约补充resourceType
               allProductResources.forEach(function (m) {
                 var _tempProducts2;
                 var resource = (_tempProducts2 = tempProducts) === null || _tempProducts2 === void 0 || (_tempProducts2 = _tempProducts2.product_resource) === null || _tempProducts2 === void 0 || (_tempProducts2 = _tempProducts2.resources) === null || _tempProducts2 === void 0 ? void 0 : _tempProducts2.find(function (n) {
@@ -3861,13 +4281,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               });
               targetSchedules = this.store.schedule.getScheduleListByIds(tempProducts['schedule.ids']);
-              _loop7 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop7() {
-                var currentDateStr, status, _checkSessionProductL, latestStartDate, earliestEndDate, scheduleByDate, minTimeMaxTime, scheduleTimeSlots, timesSlotCanUse;
-                return _regeneratorRuntime().wrap(function _loop7$(_context27) {
-                  while (1) switch (_context27.prev = _context27.next) {
+              _loop8 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop8() {
+                var currentDateStr, status, summaryCount, availableCount, _checkSessionProductL, latestStartDate, earliestEndDate, scheduleByDate, minTimeMaxTime, scheduleTimeSlots, timesSlotCanUse, dateStatus, usageRatio;
+                return _regeneratorRuntime().wrap(function _loop8$(_context29) {
+                  while (1) switch (_context29.prev = _context29.next) {
                     case 0:
                       currentDateStr = currentDate.format('YYYY-MM-DD');
-                      status = 'available'; // 1. 检查商品的提前量等情况是否满足
+                      status = 'available';
+                      summaryCount = 0;
+                      availableCount = 0; // 1. 检查商品的提前量等情况是否满足
                       _checkSessionProductL = checkSessionProductLeadTime(tempProducts), latestStartDate = _checkSessionProductL.latestStartDate, earliestEndDate = _checkSessionProductL.earliestEndDate;
                       if (latestStartDate || earliestEndDate) {
                         // 如果时间在最早开始时间之前，则设置为不可用
@@ -3893,17 +4315,48 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                       if (status === 'available') {
                         minTimeMaxTime = calcMinTimeMaxTimeBySchedules(targetSchedules, {}, currentDateStr);
                         scheduleTimeSlots = getAllSortedDateRanges(minTimeMaxTime); // 同一天内多个时间片下 只要有一个可用则视为可用
-                        timesSlotCanUse = scheduleTimeSlots.some(function (item) {
+                        timesSlotCanUse = false;
+                        scheduleTimeSlots.forEach(function (item) {
                           // 用来计算资源的可使用情况，针对单个schedule 时间片
                           var resourcesUseableMap = {};
                           // 遍历产品下启用的资源
                           // 必须要保证每种类型的资源都至少有一个能够在对应时间点被选择
-                          return openResources.every(function (resource) {
+                          // 求出第一个资源的剩余量和总量
+                          // 剩余量=每个资源在每个时间片内剩余之和
+                          // 总量=每个资源在每个时间片内资源总量之和
+                          var isAllResourceTypesUseable = true;
+                          openResources.forEach(function (resource) {
+                            var _resource$renderList;
+                            // if (!isAllResourceTypesUseable) return;
+
                             // 获取当前资源类型的资源列表
                             var currentResourcesList = allProductResources.filter(function (n) {
                               return n.form_id === resource.resource_type_id;
                             });
-                            return currentResourcesList === null || currentResourcesList === void 0 ? void 0 : currentResourcesList.some(function (m) {
+                            // 如果resource.renderList里含有 onlyComputed 的数据，需要把 currentResourcesList 的数据也修正回来
+                            (_resource$renderList = resource.renderList) === null || _resource$renderList === void 0 || _resource$renderList.forEach(function (item) {
+                              if (item.onlyComputed) {
+                                var targetIndex = currentResourcesList.findIndex(function (n) {
+                                  return n.id === item.id;
+                                });
+                                if (targetIndex && targetIndex !== -1) {
+                                  currentResourcesList[targetIndex].onlyComputed = true;
+                                }
+                              }
+                            });
+                            // 可能存在 renderList 没有的情况，则需要判断 resource.optional_resource 和 resource.default_resource 是否存在那个资源，如果不存在也打上 onlyComputed 的标记
+                            currentResourcesList.forEach(function (item) {
+                              var _resource$optional_re, _resource$default_res;
+                              if (!((_resource$optional_re = resource.optional_resource) !== null && _resource$optional_re !== void 0 && _resource$optional_re.includes(item.id)) && !((_resource$default_res = resource.default_resource) !== null && _resource$default_res !== void 0 && _resource$default_res.includes(item.id))) {
+                                item.onlyComputed = true;
+                              }
+                            });
+                            // currentResourcesList 排序，onlyComputed 的资源排在前面先计算
+                            currentResourcesList.sort(function (a, b) {
+                              return a.onlyComputed ? -1 : 1;
+                            });
+                            var isAnyResourceUseableInType = false;
+                            currentResourcesList === null || currentResourcesList === void 0 || currentResourcesList.forEach(function (m) {
                               // 遍历所有资源的上工时间片
                               // m.times 需要做个过滤，假设 timeSlice.start_at 是 09:30 timeSlice.end_at 是 11:30
                               // time 是 time.start_at = 2025-05-26 10:30, time.end_at = 2025-05-26 12:30
@@ -3911,12 +4364,22 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                               var mTimes = m.times.filter(function (n) {
                                 return !dayjs(n.start_at).isAfter(dayjs(item.start), 'minute') && !dayjs(n.end_at).isBefore(dayjs(item.end), 'minute');
                               });
+
                               // 如果在这个区间的时间一个都没有，可以直接认为这个资源不可用
-                              if (mTimes.length === 0) {
-                                return;
+                              if (mTimes.length === 0) return;
+                              // 如果资源可用则把他的容量纳入总计
+                              if (!m.onlyComputed) {
+                                if (resource.type === 'multiple') {
+                                  summaryCount += m.capacity;
+                                } else {
+                                  summaryCount += 1;
+                                }
                               }
-                              var targetCanUseTimes = mTimes.some(function (childTiem) {
+                              var isAnyTimeSliceUseable = false;
+                              mTimes.forEach(function (childTiem) {
                                 var _tempProducts3;
+                                if (isAnyTimeSliceUseable) return;
+
                                 // 挨个去匹配某个工作时间段结合当前日程时间，资源能不能用，有多少容量能用
                                 var res = getIsUsableByTimeItem({
                                   timeSlice: {
@@ -3934,11 +4397,21 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                                 if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== 'capacityOnly') {
                                   resourcesUseableMap[m.id] = res.usable;
                                 }
-                                return res.usable && !m.onlyComputed;
+                                if (res.usable && !m.onlyComputed) {
+                                  isAnyTimeSliceUseable = true;
+                                  if (resource.type === 'multiple') {
+                                    availableCount += res.remainingCapacity;
+                                  } else {
+                                    availableCount += 1;
+                                  }
+                                }
+                                ;
                               });
-                              return targetCanUseTimes;
+                              if (isAnyTimeSliceUseable) isAnyResourceUseableInType = true;
                             });
+                            if (!isAnyResourceUseableInType) isAllResourceTypesUseable = false;
                           });
+                          if (isAllResourceTypesUseable) timesSlotCanUse = true;
                         });
                         if (!timesSlotCanUse) {
                           status = 'unavailable';
@@ -3947,41 +4420,55 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                           firstAvailableDate = currentDateStr;
                         }
                       }
+                      // 状态： lots_of_space: availableCount / summaryCount > 0.5
+                      // filling_up_fast: availableCount / summaryCount <= 0.5 && availableCount > 0
+                      // sold_out: summaryCount = 0
+                      // unavailable: summaryCount > 0 && availableCount = 0
+
+                      if (status === 'unavailable') {
+                        // dateStatus = 'unavailable'
+                        if (availableCount === 0 && summaryCount > 0) dateStatus = 'sold_out';else dateStatus = 'unavailable';
+                      } else {
+                        usageRatio = availableCount / summaryCount;
+                        if (usageRatio > 0.5) dateStatus = 'lots_of_space';else dateStatus = 'filling_up_fast';
+                      }
                       dates.push({
                         date: dayjs(currentDate).format('YYYY-MM-DD'),
                         week: dayjs(currentDate).format('ddd'),
                         weekNum: dayjs(currentDate).day(),
-                        status: status
+                        summaryCount: summaryCount,
+                        availableCount: availableCount,
+                        status: dateStatus
                       });
 
                       // 如果 firstAvailableDate 距离 startDate 大于 14 天了，则后面就不需要再找了，也是一种性能保护
                       if (!(firstAvailableDate && dayjs(currentDate).diff(dayjs(startDate), 'day') > 31)) {
-                        _context27.next = 9;
+                        _context29.next = 12;
                         break;
                       }
-                      return _context27.abrupt("return", 1);
-                    case 9:
+                      return _context29.abrupt("return", 1);
+                    case 12:
                       currentDate = dayjs(currentDate).add(1, 'day');
-                    case 10:
+                    case 13:
                     case "end":
-                      return _context27.stop();
+                      return _context29.stop();
                   }
-                }, _loop7);
+                }, _loop8);
               });
             case 28:
               if (!(dayjs(currentDate).isBefore(dayjs(endDate), 'day') || dayjs(currentDate).isSame(dayjs(endDate), 'day'))) {
-                _context28.next = 34;
+                _context30.next = 34;
                 break;
               }
-              return _context28.delegateYield(_loop7(), "t0", 30);
+              return _context30.delegateYield(_loop8(), "t0", 30);
             case 30:
-              if (!_context28.t0) {
-                _context28.next = 32;
+              if (!_context30.t0) {
+                _context30.next = 32;
                 break;
               }
-              return _context28.abrupt("break", 34);
+              return _context30.abrupt("break", 34);
             case 32:
-              _context28.next = 28;
+              _context30.next = 28;
               break;
             case 34:
               // 最终把资源数据也加到日期内
@@ -3996,15 +4483,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 startDate: startDate,
                 endDate: dayjs(currentDate).format('YYYY-MM-DD')
               };
-              return _context28.abrupt("return", {
+              return _context30.abrupt("return", {
                 dateList: dates,
                 firstAvailableDate: firstAvailableDate
               });
             case 39:
             case "end":
-              return _context28.stop();
+              return _context30.stop();
           }
-        }, _callee27, this);
+        }, _callee28, this);
       }));
       function getAvailableDateForSessionOptimize() {
         return _getAvailableDateForSessionOptimize.apply(this, arguments);
@@ -4051,18 +4538,18 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getContactInfo",
     value: (function () {
-      var _getContactInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(params) {
-        return _regeneratorRuntime().wrap(function _callee28$(_context29) {
-          while (1) switch (_context29.prev = _context29.next) {
+      var _getContactInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(params) {
+        return _regeneratorRuntime().wrap(function _callee29$(_context31) {
+          while (1) switch (_context31.prev = _context31.next) {
             case 0:
-              return _context29.abrupt("return", this.request.get('/customer/metadata', params));
+              return _context31.abrupt("return", this.request.get('/customer/metadata', params));
             case 1:
             case "end":
-              return _context29.stop();
+              return _context31.stop();
           }
-        }, _callee28, this);
+        }, _callee29, this);
       }));
-      function getContactInfo(_x22) {
+      function getContactInfo(_x23) {
         return _getContactInfo.apply(this, arguments);
       }
       return getContactInfo;