@pisell/pisellos 2.1.71 → 2.1.73

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

@@ -444,6 +444,10 @@ export var getTimeSlicesByResource = function getTimeSlicesByResource(_ref5) {
     // 解析开始和结束时间
     var startTime = dayjs("".concat(time.start_at));
     var endTime = dayjs("".concat(time.end_at));
+    // 结束时间要做修复，如果time.end_at 是超过了 currentDate 的那一天，则把 end_at 设置为 currentDate 那一天的 23:59:59
+    if (endTime.isAfter(dayjs(currentDate).endOf('day'))) {
+      endTime = dayjs(currentDate).endOf('day');
+    }
 
     // 当前切片的开始时间
     var currentStart = startTime;

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

@@ -299,6 +299,16 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         errorList: any[];
     };
     getTimeSlotByAllResources(resources_code: string): any[];
+    getTimeSlotByAllResourcesForDate({ resources_code, startDate, endDate }: {
+        resources_code: string;
+        startDate: string;
+        endDate: string;
+    }): Promise<{
+        date: string;
+        status: string;
+        week: string;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+    }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
     openProductDetail(productId: number): Promise<void>;
@@ -316,7 +326,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";
     }[];
     /**
      * 找到多个资源的公共可用时间段
@@ -381,9 +391,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

@@ -1405,7 +1405,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   // 从购物车中获取已经分配好第一步资源的所有时间片
   getTimeSlotByAllResources(resources_code) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     let dateRange = this.store.date.getDateRange();
     const resources = [];
     const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils5.isNormalProduct)(n._productOrigin));
@@ -1415,7 +1415,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     let maxCutOffTime = void 0;
     let maxCutOffTimeValue = (0, import_dayjs.default)();
     cartItems.forEach((item) => {
-      var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i;
+      var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2;
       (_c2 = (_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.product_resource) == null ? void 0 : _b2.resources) == null ? void 0 : _c2.forEach((n) => {
         if (n.code === resources_code) {
           resources.push(...n.renderList || []);
@@ -1428,7 +1428,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       resourcesTypeId = (_g2 = (_f2 = (_e2 = (_d2 = item == null ? void 0 : item._productOrigin) == null ? void 0 : _d2.product_resource) == null ? void 0 : _e2.resources) == null ? void 0 : _f2.find(
         (n) => n.code === resources_code
       )) == null ? void 0 : _g2.id;
-      if (((_h2 = item._productOrigin) == null ? void 0 : _h2.cut_off_time) && ((_i = item._productOrigin) == null ? void 0 : _i.cut_off_time.type) === "advance") {
+      if (((_h2 = item._productOrigin) == null ? void 0 : _h2.cut_off_time) && ((_i2 = item._productOrigin) == null ? void 0 : _i2.cut_off_time.type) === "advance") {
         const currentCutOffTime = (0, import_dayjs.default)().add(
           item._productOrigin.cut_off_time.unit,
           item._productOrigin.cut_off_time.unit_type
@@ -1446,6 +1446,19 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
       });
     }
+    if (((_c = dateRange == null ? void 0 : dateRange[0]) == null ? void 0 : _c.date) && resources.length) {
+      const currentDate = (_d = dateRange == null ? void 0 : dateRange[0]) == null ? void 0 : _d.date;
+      const theDateResources = this.store.date.getResourcesListByDate(currentDate);
+      resources.forEach((item) => {
+        var _a2;
+        const noCurrentDateTimes = item.times.some((n) => {
+          return (0, import_dayjs.default)(n.start_at).isSame((0, import_dayjs.default)(currentDate), "day");
+        });
+        if (!noCurrentDateTimes) {
+          item.times = ((_a2 = theDateResources == null ? void 0 : theDateResources.find((n) => n.id === item.id)) == null ? void 0 : _a2.times) || [];
+        }
+      });
+    }
     const resourcesMap = (0, import_utils2.getResourcesMap)(resources);
     let duration = 0;
     const accountList = this.store.accountList.getAccounts();
@@ -1473,7 +1486,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     } else {
       checkDuration(cartItems);
     }
-    if (!((_c = cartItems == null ? void 0 : cartItems[0]) == null ? void 0 : _c.start_date) && !((_d = cartItems == null ? void 0 : cartItems[0]) == null ? void 0 : _d.resource_id) || !(cartItems == null ? void 0 : cartItems[0].duration)) {
+    if (!((_e = cartItems == null ? void 0 : cartItems[0]) == null ? void 0 : _e.start_date) && !((_f = cartItems == null ? void 0 : cartItems[0]) == null ? void 0 : _f.resource_id) || !(cartItems == null ? void 0 : cartItems[0].duration)) {
       return [];
     }
     if ((cartItems == null ? void 0 : cartItems[0].start_date) && !dateRange) {
@@ -1485,7 +1498,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           weekNum: 0
         },
         {
-          date: ((_e = cartItems == null ? void 0 : cartItems[0]) == null ? void 0 : _e.end_date) || ((_f = cartItems == null ? void 0 : cartItems[0]) == null ? void 0 : _f.start_date) || "",
+          date: ((_g = cartItems == null ? void 0 : cartItems[0]) == null ? void 0 : _g.end_date) || ((_h = cartItems == null ? void 0 : cartItems[0]) == null ? void 0 : _h.start_date) || "",
           status: "available",
           week: "",
           weekNum: 0
@@ -1499,18 +1512,30 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         return ((_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.type) === "flexible";
       }
     );
-    let operating_day_boundary = (_h = (_g = this.shopStore.get("core")) == null ? void 0 : _g.core) == null ? void 0 : _h.operating_day_boundary;
+    let operating_day_boundary = (_j = (_i = this.shopStore.get("core")) == null ? void 0 : _i.core) == null ? void 0 : _j.operating_day_boundary;
     let maxBlockThreshold = 0;
     if (hasFlexibleDuration) {
       maxBlockThreshold = cartItems.reduce((max, item) => {
         var _a2, _b2, _c2, _d2, _e2, _f2;
         if ((_c2 = (_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.flexible_config) == null ? void 0 : _c2.is_enable_minimum_duration) {
-          return Math.max(max, ((_f2 = (_e2 = (_d2 = item._productOrigin) == null ? void 0 : _d2.duration) == null ? void 0 : _e2.flexible_config) == null ? void 0 : _f2.block_threshold) || 0);
+          return Math.max(
+            max,
+            ((_f2 = (_e2 = (_d2 = item._productOrigin) == null ? void 0 : _d2.duration) == null ? void 0 : _e2.flexible_config) == null ? void 0 : _f2.block_threshold) || 0
+          );
         }
         return 0;
       }, 0);
     }
     const calculateCapacityFromCartItems = (items) => {
+      var _a2;
+      const firstResource = (_a2 = items[0]._resourceOrigin) == null ? void 0 : _a2[0].id;
+      const sameResourceLength = items.filter((item) => {
+        var _a3;
+        return ((_a3 = item._resourceOrigin) == null ? void 0 : _a3[0].id) === firstResource;
+      }).length;
+      if (sameResourceLength !== items.length) {
+        return 1;
+      }
       return items.reduce((total, item) => {
         return total + ((0, import_capacity.getCapacityInfoByCartItem)(item).currentCapacity || 0);
       }, 0);
@@ -1518,7 +1543,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     let maxCapacity = 1;
     if (cartItems == null ? void 0 : cartItems[0].holder_id) {
       accountList.forEach((account) => {
-        const accountCartItems = this.store.cart.getCartByAccount(account.getId());
+        const accountCartItems = this.store.cart.getCartByAccount(
+          account.getId()
+        );
         const currentCapacity = calculateCapacityFromCartItems(accountCartItems);
         if (currentCapacity > maxCapacity) {
           maxCapacity = currentCapacity;
@@ -1542,6 +1569,174 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     });
     return timeSlots;
   }
+  // 从购物车中获取已经分配好第一步资源的所有时间片，批量版本，用于给日期提供能否高亮的判断
+  async getTimeSlotByAllResourcesForDate({ resources_code, startDate, endDate }) {
+    var _a, _b, _c, _d;
+    if ((0, import_dayjs.default)(endDate).diff((0, import_dayjs.default)(startDate), "day") < 30) {
+      endDate = (0, import_dayjs.default)(startDate).add(30, "day").format("YYYY-MM-DD");
+    }
+    await this.getAvailableDate({
+      startDate,
+      endDate,
+      useCache: true
+    });
+    const resources = [];
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils5.isNormalProduct)(n._productOrigin));
+    const resourceIds = [];
+    let resourcesTypeId = void 0;
+    let isSingleResource = false;
+    let maxCutOffTime = void 0;
+    let maxCutOffTimeValue = (0, import_dayjs.default)();
+    cartItems.forEach((item) => {
+      var _a2, _b2, _c2, _d2, _e, _f, _g, _h, _i;
+      (_c2 = (_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.product_resource) == null ? void 0 : _b2.resources) == null ? void 0 : _c2.forEach((n) => {
+        if (n.code === resources_code) {
+          resources.push(...n.renderList || []);
+          isSingleResource = n.type === "single";
+        }
+      });
+      if (item.resource_id && !resourceIds.includes(item.resource_id)) {
+        resourceIds.push(item.resource_id);
+      }
+      resourcesTypeId = (_g = (_f = (_e = (_d2 = item == null ? void 0 : item._productOrigin) == null ? void 0 : _d2.product_resource) == null ? void 0 : _e.resources) == null ? void 0 : _f.find(
+        (n) => n.code === resources_code
+      )) == null ? void 0 : _g.id;
+      if (((_h = item._productOrigin) == null ? void 0 : _h.cut_off_time) && ((_i = item._productOrigin) == null ? void 0 : _i.cut_off_time.type) === "advance") {
+        const currentCutOffTime = (0, import_dayjs.default)().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;
+        }
+      }
+    });
+    if (!resources.length)
+      return [];
+    let duration = 0;
+    const accountList = this.store.accountList.getAccounts();
+    const checkDuration = (cartItems2) => {
+      let accountDuration = 0;
+      cartItems2.forEach((item) => {
+        var _a2, _b2, _c2, _d2, _e, _f;
+        if (isSingleResource) {
+          accountDuration += ((_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) || 10;
+        } else {
+          if (accountDuration < (((_d2 = (_c2 = item._productOrigin) == null ? void 0 : _c2.duration) == null ? void 0 : _d2.value) || 10)) {
+            accountDuration = ((_f = (_e = item._productOrigin) == null ? void 0 : _e.duration) == null ? void 0 : _f.value) || 10;
+          }
+        }
+      });
+      if (accountDuration > duration) {
+        duration = accountDuration;
+      }
+    };
+    if (cartItems == null ? void 0 : cartItems[0].holder_id) {
+      accountList.forEach((account) => {
+        const cartItems2 = this.store.cart.getCartByAccount(account.getId());
+        checkDuration(cartItems2);
+      });
+    } else {
+      checkDuration(cartItems);
+    }
+    if (!((_a = cartItems == null ? void 0 : cartItems[0]) == null ? void 0 : _a.start_date) && !((_b = cartItems == null ? void 0 : cartItems[0]) == null ? void 0 : _b.resource_id) || !(cartItems == null ? void 0 : cartItems[0].duration)) {
+      return [];
+    }
+    const resourcesUseableMap = {};
+    const hasFlexibleDuration = cartItems.some(
+      (item) => {
+        var _a2, _b2;
+        return ((_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.type) === "flexible";
+      }
+    );
+    let operating_day_boundary = (_d = (_c = this.shopStore.get("core")) == null ? void 0 : _c.core) == null ? void 0 : _d.operating_day_boundary;
+    let maxBlockThreshold = 0;
+    if (hasFlexibleDuration) {
+      maxBlockThreshold = cartItems.reduce((max, item) => {
+        var _a2, _b2, _c2, _d2, _e, _f;
+        if ((_c2 = (_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.flexible_config) == null ? void 0 : _c2.is_enable_minimum_duration) {
+          return Math.max(max, ((_f = (_e = (_d2 = item._productOrigin) == null ? void 0 : _d2.duration) == null ? void 0 : _e.flexible_config) == null ? void 0 : _f.block_threshold) || 0);
+        }
+        return 0;
+      }, 0);
+    }
+    const calculateCapacityFromCartItems = (items) => {
+      var _a2;
+      const firstResource = (_a2 = items[0]._resourceOrigin) == null ? void 0 : _a2[0].id;
+      const sameResourceLength = items.filter((item) => {
+        var _a3;
+        return ((_a3 = item._resourceOrigin) == null ? void 0 : _a3[0].id) === firstResource;
+      }).length;
+      if (sameResourceLength !== items.length) {
+        return 1;
+      }
+      return items.reduce((total, item) => {
+        return total + ((0, import_capacity.getCapacityInfoByCartItem)(item).currentCapacity || 0);
+      }, 0);
+    };
+    let maxCapacity = 1;
+    if (cartItems == null ? void 0 : cartItems[0].holder_id) {
+      accountList.forEach((account) => {
+        const accountCartItems = this.store.cart.getCartByAccount(account.getId());
+        const currentCapacity = calculateCapacityFromCartItems(accountCartItems);
+        if (currentCapacity > maxCapacity) {
+          maxCapacity = currentCapacity;
+        }
+      });
+    } else {
+      maxCapacity = calculateCapacityFromCartItems(cartItems);
+    }
+    const arr = [];
+    const today = (0, import_dayjs.default)().startOf("day");
+    for (let i = (0, import_dayjs.default)(startDate); i.isBefore((0, import_dayjs.default)(endDate)); i = i.add(1, "day")) {
+      const currentDate = i.format("YYYY-MM-DD");
+      const theDateResources = this.store.date.getResourcesListByDate(currentDate);
+      resources.forEach((item) => {
+        var _a2;
+        item.times = ((_a2 = theDateResources == null ? void 0 : theDateResources.find((n) => n.id === item.id)) == null ? void 0 : _a2.times) || [];
+      });
+      const resourcesMap = (0, import_utils2.getResourcesMap)(resources);
+      if (i.isBefore(today)) {
+        arr.push({
+          date: currentDate,
+          status: "unavailable",
+          week: i.format("ddd"),
+          weekNum: i.day()
+        });
+        continue;
+      }
+      const timeSlots = (0, import_resources.getTimeSlicesByResources)({
+        resourceIds,
+        resourcesMap,
+        duration,
+        currentDate,
+        split: 10,
+        resourcesUseableMap,
+        capacity: maxCapacity,
+        cut_off_time: maxCutOffTime,
+        hasFlexibleDuration,
+        operating_day_boundary,
+        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()
+        });
+      }
+    }
+    return arr;
+  }
   // 提交时间切片，绑定到对应购物车的商品上，更新购物车---只有 duration 商品
   submitTimeSlot(timeSlots) {
     var _a, _b;
@@ -1685,7 +1880,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 = [];
@@ -1728,29 +1923,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: {
@@ -1768,54 +1982,67 @@ 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)
+            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;
-          }
-        }
-        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;
           }
-          const otherCartItems = 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;
-          });
+          let otherCartItems = cartItems2.filter(
+            (m) => {
+              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 = (_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;
+            }
+          );
           otherCartItems.forEach((m) => {
             var _a2, _b2, _c2;
-            const sameTypeResources = (_c2 = (_b2 = (_a2 = m._productOrigin) == null ? void 0 : _a2.product_resource) == null ? void 0 : _b2.resources) == null ? void 0 : _c2.find((m2) => m2.type === n.type);
+            const sameTypeResources = (_c2 = (_b2 = (_a2 = m._productOrigin) == null ? void 0 : _a2.product_resource) == null ? void 0 : _b2.resources) == null ? void 0 : _c2.find((m2) => m2.type === n.type && m2.status === 1);
             const sameTypeResourcesSet = /* @__PURE__ */ new Set([...(sameTypeResources == null ? void 0 : sameTypeResources.optional_resource) || [], ...(sameTypeResources == null ? void 0 : sameTypeResources.default_resource) || []]);
             sameTypeResourcesSet.forEach((resource) => currentResourcesSet.add(resource));
           });
@@ -1831,9 +2058,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) => {
@@ -1843,9 +2070,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);
@@ -1888,51 +2115,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/lib/solution/BookingByStep/utils/resources.js

@@ -353,7 +353,10 @@ var getTimeSlicesByResource = ({
   });
   times.forEach((time) => {
     const startTime = (0, import_dayjs.default)(`${time.start_at}`);
-    const endTime = (0, import_dayjs.default)(`${time.end_at}`);
+    let endTime = (0, import_dayjs.default)(`${time.end_at}`);
+    if (endTime.isAfter((0, import_dayjs.default)(currentDate).endOf("day"))) {
+      endTime = (0, import_dayjs.default)(currentDate).endOf("day");
+    }
     let currentStart = startTime;
     while (true) {
       const currentEnd = currentStart.add(duration, "minute");

package/package.json

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