@pisell/pisellos 0.0.421 → 0.0.423

package/dist/modules/Summary/utils.js

@@ -678,8 +678,10 @@ var getDiscountAmount = function getDiscountAmount(discounts) {
  * 获取主商品加价减价后的总价 (主商品价格 + 子商品加价减价)
  */
 var getMainProductTotal = function getMainProductTotal(item) {
-  var _ref7, _ref8, _item$main_product_se, _item$metadata;
+  var _ref7, _ref8, _item$main_product_se, _item$metadata, _item$_origin3, _item$_originData$pro;
   var total = new Decimal((_ref7 = (_ref8 = (_item$main_product_se = item === null || item === void 0 ? void 0 : item.main_product_selling_price) !== null && _item$main_product_se !== void 0 ? _item$main_product_se : item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.main_product_selling_price) !== null && _ref8 !== void 0 ? _ref8 : item.price) !== null && _ref7 !== void 0 ? _ref7 : 0);
+  var mainProductDiscountAmount = getDiscountAmount((item === null || item === void 0 || (_item$_origin3 = item._origin) === null || _item$_origin3 === void 0 || (_item$_origin3 = _item$_origin3.product) === null || _item$_origin3 === void 0 ? void 0 : _item$_origin3.discount_list) || (item === null || item === void 0 || (_item$_originData$pro = item._originData.product) === null || _item$_originData$pro === void 0 ? void 0 : _item$_originData$pro.discount_list) || []);
+  total = total.minus(mainProductDiscountAmount);
 
   // 单规格
   if (item !== null && item !== void 0 && item.option && Array.isArray(item === null || item === void 0 ? void 0 : item.option)) {

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

@@ -330,7 +330,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: keyof TimeStatusMap;
+        status: "lots_of_space" | "filling_up_fast" | "sold_out";
     }[];
     /**
      * 找到多个资源的公共可用时间段
@@ -395,9 +395,3 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     */
     getContactInfo(params: any): Promise<any>;
 }
-interface TimeStatusMap {
-    lots_of_space: true;
-    filling_up_fast: true;
-    sold_out: true;
-}
-export {};

package/dist/solution/BookingByStep/index.js

@@ -2694,7 +2694,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     value: function getTimeslotBySchedule(_ref11) {
       var _this$store$currentPr2,
         _targetProductData$pr,
-        _targetProductData$pr2,
         _this15 = this;
       var date = _ref11.date,
         scheduleIds = _ref11.scheduleIds,
@@ -2733,29 +2732,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 firstEnabledResourceConfig = targetProductData === null || targetProductData === void 0 || (_targetProductData$pr2 = targetProductData.product_resource) === null || _targetProductData$pr2 === void 0 || (_targetProductData$pr2 = _targetProductData$pr2.resources) === null || _targetProductData$pr2 === void 0 ? void 0 : _targetProductData$pr2.find(function (n) {
-        return n.status === 1 && n.id === firstEnabledResourceId;
-      });
-      var isMultipleBooking = (firstEnabledResourceConfig === null || firstEnabledResourceConfig === void 0 ? void 0 : firstEnabledResourceConfig.type) === 'multiple';
+      })) || [];
+      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 summaryConfigCount = 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的开始结束时间
@@ -2772,6 +2777,18 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           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({
@@ -2790,40 +2807,41 @@ 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) isAllTimeSlicesUsable = false;
+            if (res.usable && !m.onlyComputed) {
+              if (res.remainingCapacity > currentResourceMaxRemainingCapacity) currentResourceMaxRemainingCapacity = res.remainingCapacity;
             }
-            if (res.usable && !m.onlyComputed && res.remainingCapacity >= currentResourcesSummaryCount) {
-              currentResourcesSummaryCount = res.remainingCapacity;
-            }
-            currentResourcesTimeSlotCanUsedArr.push(res.usable);
           });
-          if (m.form_id === firstEnabledResourceId) {
-            // 确认当前资源是单个预约还是多个预约，单个预约则只需要计数，多个预约才添加容量
-            if (isMultipleBooking) {
-              summaryConfigCount += m.capacity;
-            } else {
-              summaryConfigCount += 1;
-            }
-          }
-          // 在已经选定时间的情况下，只要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 = _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、跟我不一样的商品，只需要跟我当前商品有同一种类型的资源的同一时间的，她配置了几个资源的个数+我配置了几个资源的个数，然后购物车里有几个这样的商品，对应的资源做一个去重，不超过这个去重以后的总数
@@ -2834,10 +2852,10 @@ 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) {
@@ -2874,9 +2892,9 @@ 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 {
             // 多个预约的检测规则：
@@ -2892,9 +2910,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);
@@ -2956,45 +2974,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);
 
-        // 状态
-        // 如果是isMultipleBooking
-        // lots_of_space: summaryCount / summaryConfigCount > 0.5
-        // filling_up_fast: summaryCount / summaryConfigCount <= 0.5 && summaryCount > 0
-        // sold_out: bookingLeft = 0
-        // 如果不是isMultipleBooking
-        // lots_of_space: bookingLeft / summaryConfigCount > 0.5
-        // filling_up_fast: bookingLeft / summaryConfigCount <= 0.5 && count > 0
-        // sold_out: bookingLeft = 0
-        var timeStatus = 'sold_out';
-        if (bookingLeft === 0) timeStatus = 'sold_out';else if (isMultipleBooking) {
-          if (summaryConfigCount === 0) timeStatus = 'sold_out';else {
-            var usageRatio = summaryCount / summaryConfigCount;
-            if (usageRatio > 0.5) timeStatus = 'lots_of_space';else if (summaryCount > 0) timeStatus = 'filling_up_fast';else timeStatus = 'sold_out';
+        // 选择“瓶颈资源类型”：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 {
-          if (summaryConfigCount === 0) timeStatus = 'sold_out';else {
-            var _usageRatio = bookingLeft / summaryConfigCount;
-            if (_usageRatio > 0.5) timeStatus = 'lots_of_space';else if (count > 0) timeStatus = 'filling_up_fast';else timeStatus = 'sold_out';
-          }
+          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,
-          status: timeStatus
+          count: bottleneckStats.count,
+          left: bottleneckStats.left,
+          summaryCount: bottleneckStats.summaryCount,
+          status: status
         };
       });
       return formatScheduleTimeSlots;

package/lib/modules/Rules/index.js

@@ -105,7 +105,10 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     const filteredOldDiscountList = oldDiscountList.filter(
       (discount) => !discount.isEditMode && (discount.tag !== "good_pass" || discount.isScan)
     );
-    const mergedDiscountList = (0, import_utils.uniqueById)([...filteredOldDiscountList, ...newDiscountList]);
+    const mergedDiscountList = (0, import_utils.uniqueById)([
+      ...filteredOldDiscountList,
+      ...newDiscountList
+    ]);
     const result = this.calcDiscount(
       {
         discountList: mergedDiscountList,

package/lib/modules/Summary/utils.js

@@ -409,8 +409,10 @@ var getDiscountAmount = (discounts) => {
   }, new import_decimal.default(0)).toNumber();
 };
 var getMainProductTotal = (item) => {
-  var _a;
+  var _a, _b, _c, _d;
   let total = new import_decimal.default((item == null ? void 0 : item.main_product_selling_price) ?? ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.main_product_selling_price) ?? item.price ?? 0);
+  const mainProductDiscountAmount = getDiscountAmount(((_c = (_b = item == null ? void 0 : item._origin) == null ? void 0 : _b.product) == null ? void 0 : _c.discount_list) || ((_d = item == null ? void 0 : item._originData.product) == null ? void 0 : _d.discount_list) || []);
+  total = total.minus(mainProductDiscountAmount);
   if ((item == null ? void 0 : item.option) && Array.isArray(item == null ? void 0 : item.option)) {
     total = total.add(item == null ? void 0 : item.option.reduce((t, option) => {
       return t.add(new import_decimal.default(option.price || 0).mul(option.num || 1));

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

@@ -330,7 +330,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: keyof TimeStatusMap;
+        status: "lots_of_space" | "filling_up_fast" | "sold_out";
     }[];
     /**
      * 找到多个资源的公共可用时间段
@@ -395,9 +395,3 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     */
     getContactInfo(params: any): Promise<any>;
 }
-interface TimeStatusMap {
-    lots_of_space: true;
-    filling_up_fast: true;
-    sold_out: true;
-}
-export {};

package/lib/solution/BookingByStep/index.js

@@ -1883,7 +1883,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     resources,
     product
   }) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d;
     const targetProduct = this.store.currentProduct;
     const targetProductData = product || targetProduct;
     let targetSchedules = [];
@@ -1926,29 +1926,48 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         return -1;
       return 0;
     });
-    const firstEnabledResourceId = (_e = (_d = (_c = targetProductData == null ? void 0 : targetProductData.product_resource) == null ? void 0 : _c.resources) == null ? void 0 : _d.find(
+    const enabledResourceTypeConfigs = ((_d = (_c = targetProductData == null ? void 0 : targetProductData.product_resource) == null ? void 0 : _c.resources) == null ? void 0 : _d.filter(
       (n) => n.status === 1
-    )) == null ? void 0 : _e.id;
-    const firstEnabledResourceConfig = (_g = (_f = targetProductData == null ? void 0 : targetProductData.product_resource) == null ? void 0 : _f.resources) == null ? void 0 : _g.find(
-      (n) => n.status === 1 && n.id === firstEnabledResourceId
+    )) || [];
+    const resourceTypeConfigById = new Map(
+      enabledResourceTypeConfigs.map((n) => [n.id, n])
     );
-    const isMultipleBooking = (firstEnabledResourceConfig == null ? void 0 : firstEnabledResourceConfig.type) === "multiple";
     const formatScheduleTimeSlots = scheduleTimeSlots.map((item) => {
       const resourcesUseableMap = {};
-      let count = 0;
-      let bookingLeft = 0;
-      let summaryCount = 0;
-      let summaryConfigCount = 0;
+      const statsByResourceType = {};
+      enabledResourceTypeConfigs.forEach((cfg) => {
+        statsByResourceType[cfg.id] = {
+          count: 0,
+          left: 0,
+          summaryCount: 0,
+          summaryConfigCount: 0
+        };
+      });
       allProductResources == null ? void 0 : allProductResources.forEach((m) => {
-        let currentResourcesCount = 0;
-        let currentResourcesSummaryCount = 0;
-        const currentResourcesTimeSlotCanUsedArr = [];
+        const currentResourceTypeConfig = resourceTypeConfigById.get(m.form_id);
+        if (!currentResourceTypeConfig)
+          return;
+        let currentResourceMaxRemainingCapacity = 0;
+        let isAllTimeSlicesUsable = true;
         const mTimes = m.times.filter((n) => {
           return !(0, import_dayjs.default)(n.start_at).isAfter((0, import_dayjs.default)(item.start), "minute") && !(0, import_dayjs.default)(n.end_at).isBefore((0, import_dayjs.default)(item.end), "minute") || m.onlyComputed && (0, import_dayjs.default)(n.start_at).isBefore((0, import_dayjs.default)(item.end), "minute") && (0, import_dayjs.default)(n.end_at).isAfter((0, import_dayjs.default)(item.start), "minute");
         });
         if (mTimes.length === 0) {
           return;
         }
+        if (!m.onlyComputed) {
+          const currentStats2 = statsByResourceType[m.form_id] || {
+            count: 0,
+            left: 0,
+            summaryCount: 0,
+            summaryConfigCount: 0
+          };
+          if (currentResourceTypeConfig.type === "multiple")
+            currentStats2.summaryConfigCount += m.capacity;
+          else
+            currentStats2.summaryConfigCount += 1;
+          statsByResourceType[m.form_id] = currentStats2;
+        }
         mTimes.forEach((childTiem) => {
           const res = (0, import_resources.getIsUsableByTimeItem)({
             timeSlice: {
@@ -1966,52 +1985,61 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           if ((resourcesUseableMap == null ? 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);
         });
-        if (m.form_id === firstEnabledResourceId) {
-          if (isMultipleBooking) {
-            summaryConfigCount += m.capacity;
-          } else {
-            summaryConfigCount += 1;
-          }
-        }
-        if (!currentResourcesTimeSlotCanUsedArr.some(
-          (n) => 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;
+        const 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 {
+          currentStats.summaryCount += 1;
+          if (currentStats.count < 1)
+            currentStats.count = 1;
         }
+        statsByResourceType[m.form_id] = currentStats;
       });
       const cartItems2 = this.store.cart.getItems();
       productResources.forEach((n) => {
+        const currentResourceTypeConfig = resourceTypeConfigById.get(n.id);
+        if (!currentResourceTypeConfig)
+          return;
+        const currentStats = statsByResourceType[n.id] || {
+          count: 0,
+          left: 0,
+          summaryCount: 0
+        };
         if (n.type === "single") {
           const currentResourcesSet = /* @__PURE__ */ new Set([...n.optional_resource, ...n.default_resource]);
           const sameCartItems = cartItems2.filter((m) => {
             var _a2, _b2, _c2;
             return ((_b2 = (_a2 = m._productOrigin) == null ? void 0 : _a2.id) == null ? void 0 : _b2.toString()) === ((_c2 = targetProductData == null ? void 0 : targetProductData.id) == null ? void 0 : _c2.toString()) && `${m.start_date} ${m.start_time}` === item.start && `${m.start_date} ${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;
           }
           let otherCartItems = cartItems2.filter(
             (m) => {
-              var _a2, _b2, _c2, _d2, _e2, _f2;
+              var _a2, _b2, _c2, _d2, _e, _f;
               const isTimeMatch = ((_b2 = (_a2 = m._productOrigin) == null ? void 0 : _a2.id) == null ? void 0 : _b2.toString()) !== ((_c2 = targetProductData == null ? void 0 : targetProductData.id) == null ? void 0 : _c2.toString()) && `${m.start_date} ${m.start_time}` === item.start && `${m.start_date} ${m.end_time}` === item.end;
-              const isResourceMatch = (_f2 = (_e2 = (_d2 = m._productOrigin) == null ? void 0 : _d2.product_resource) == null ? void 0 : _e2.resources) == null ? void 0 : _f2.find((m2) => m2.type === n.type && m2.status === 1);
+              const isResourceMatch = (_f = (_e = (_d2 = m._productOrigin) == null ? void 0 : _d2.product_resource) == null ? void 0 : _e.resources) == null ? void 0 : _f.find((m2) => m2.type === n.type && m2.status === 1);
               return isTimeMatch && isResourceMatch;
             }
           );
@@ -2033,9 +2061,9 @@ var BookingByStepImpl = class extends import_BaseModule.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 {
           const sameCartItems = cartItems2.filter((m) => {
@@ -2045,9 +2073,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           const sameCartNeedCapacity = sameCartItems.reduce((acc, curr) => acc + (0, import_capacity.getCapacityInfoByCartItem)(curr).currentCapacity, 0);
           const currentProductResourcesCapacity = n.renderList.reduce((acc, curr) => !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;
           }
           const otherSameTimesCartItems = cartItems2.filter((m) => `${m.start_date} ${m.start_time}` === item.start && `${m.start_date} ${m.end_time}` === item.end);
           const otherCartNeedCapacity = otherSameTimesCartItems.reduce((acc, curr) => acc + (0, import_capacity.getCapacityInfoByCartItem)(curr).currentCapacity, 0);
@@ -2090,51 +2118,68 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             return acc;
           }, 0);
           if (otherCartNeedCapacity + usedCapacity >= currentTypeResourcesCapacity) {
-            bookingLeft = 0;
-            count = 0;
-            summaryCount = 0;
+            currentStats.left = 0;
+            currentStats.count = 0;
+            currentStats.summaryCount = 0;
           }
         }
+        statsByResourceType[n.id] = currentStats;
       });
       const startDayJs = (0, import_dayjs.default)(item.start);
       const endDayJs = (0, import_dayjs.default)(item.end);
-      let timeStatus = "sold_out";
-      if (bookingLeft === 0)
-        timeStatus = "sold_out";
-      else if (isMultipleBooking) {
-        if (summaryConfigCount === 0)
-          timeStatus = "sold_out";
-        else {
-          const usageRatio = summaryCount / summaryConfigCount;
-          if (usageRatio > 0.5)
-            timeStatus = "lots_of_space";
-          else if (summaryCount > 0)
-            timeStatus = "filling_up_fast";
-          else
-            timeStatus = "sold_out";
+      let bottleneckResourceTypeId;
+      let bottleneckValue = Infinity;
+      enabledResourceTypeConfigs.forEach((cfg) => {
+        const stats = statsByResourceType[cfg.id] || {
+          count: 0,
+          left: 0,
+          summaryCount: 0,
+          summaryConfigCount: 0
+        };
+        const value = cfg.type === "multiple" ? stats.summaryCount : stats.left;
+        if (value < bottleneckValue) {
+          bottleneckValue = value;
+          bottleneckResourceTypeId = cfg.id;
         }
+      });
+      const bottleneckStats = bottleneckResourceTypeId !== void 0 ? statsByResourceType[bottleneckResourceTypeId] || {
+        count: 0,
+        left: 0,
+        summaryCount: 0,
+        summaryConfigCount: 0
+      } : { count: 0, left: 0, summaryCount: 0, summaryConfigCount: 0 };
+      const bottleneckConfig = bottleneckResourceTypeId !== void 0 ? resourceTypeConfigById.get(bottleneckResourceTypeId) : void 0;
+      let status = "sold_out";
+      if (bottleneckStats.left === 0)
+        status = "sold_out";
+      else if (!bottleneckConfig || bottleneckStats.summaryConfigCount === 0)
+        status = "sold_out";
+      else if (bottleneckConfig.type === "multiple") {
+        const 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 {
-        if (summaryConfigCount === 0)
-          timeStatus = "sold_out";
-        else {
-          const usageRatio = bookingLeft / summaryConfigCount;
-          if (usageRatio > 0.5)
-            timeStatus = "lots_of_space";
-          else if (count > 0)
-            timeStatus = "filling_up_fast";
-          else
-            timeStatus = "sold_out";
-        }
+        const 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,
-        left: bookingLeft,
-        summaryCount,
-        status: timeStatus
+        count: bottleneckStats.count,
+        left: bottleneckStats.left,
+        summaryCount: bottleneckStats.summaryCount,
+        status
       };
     });
     return formatScheduleTimeSlots;

package/package.json

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