@pisell/pisellos 2.1.68 → 2.1.72

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

@@ -320,7 +320,7 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
         resourcesInType.forEach(function (resource) {
           // 过滤出在时间段内的资源时间片
           var availableTimes = resource.times.filter(function (time) {
-            return !dayjs(time.start_at).isAfter(dayjs(timeSlotStart), 'minute') && !dayjs(time.end_at).isBefore(dayjs(timeSlotEnd), 'minute') || dayjs(time.start_at).isBefore(dayjs(timeSlotEnd), 'minute') && dayjs(time.end_at).isAfter(dayjs(timeSlotStart), 'minute');
+            return !dayjs(time.start_at).isAfter(dayjs(timeSlotStart), 'minute') && !dayjs(time.end_at).isBefore(dayjs(timeSlotEnd), 'minute') || resource.onlyComputed && dayjs(time.start_at).isBefore(dayjs(timeSlotEnd), 'minute') && dayjs(time.end_at).isAfter(dayjs(timeSlotStart), 'minute');
           });
           if (availableTimes.length > 0) {
             // 简化逻辑：如果资源在时间段内有可用时间，就计算其容量

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/dist/solution/BookingTicket/index.d.ts

@@ -115,7 +115,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/modules/Date/types.d.ts

@@ -20,7 +20,9 @@ export interface ITime {
     date: string;
     week: string;
     weekNum: number;
-    status: 'unavailable' | 'available';
+    status: 'unavailable' | 'available' | 'lots_of_space' | 'filling_up_fast' | 'sold_out';
+    summaryCount?: number;
+    availableCount?: number;
     resource?: any[];
     color?: string[];
 }

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

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

package/lib/modules/Rules/index.js

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

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,6 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
+        status: keyof TimeStatusMap;
     }[];
     /**
      * 找到多个资源的公共可用时间段
@@ -343,7 +354,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *
@@ -380,3 +391,9 @@ 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;
+    var _a, _b, _c, _d, _e, _f, _g;
     const targetProduct = this.store.currentProduct;
     const targetProductData = product || targetProduct;
     let targetSchedules = [];
@@ -1731,17 +1926,22 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const firstEnabledResourceId = (_e = (_d = (_c = targetProductData == null ? void 0 : targetProductData.product_resource) == null ? void 0 : _c.resources) == null ? void 0 : _d.find(
       (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 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;
       allProductResources == null ? void 0 : allProductResources.forEach((m) => {
         let currentResourcesCount = 0;
         let currentResourcesSummaryCount = 0;
         const currentResourcesTimeSlotCanUsedArr = [];
         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") || (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");
+          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;
@@ -1771,6 +1971,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           }
           currentResourcesTimeSlotCanUsedArr.push(res.usable);
         });
+        if (m.form_id === firstEnabledResourceId) {
+          if (isMultipleBooking) {
+            summaryConfigCount += m.capacity;
+          } else {
+            summaryConfigCount += 1;
+          }
+        }
         if (!currentResourcesTimeSlotCanUsedArr.some(
           (n) => n === false
         ) && // 只统计第一种资源的容量和 left
@@ -1797,13 +2004,17 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             count = 0;
             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, _e2, _f2;
+              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);
+              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));
           });
@@ -1884,6 +2095,34 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       });
       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";
+        }
+      } 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";
+        }
+      }
       return {
         start_time: startDayJs.format("HH:mm"),
         end_time: endDayJs.format("HH:mm"),
@@ -1891,7 +2130,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         end_at: endDayJs,
         count,
         left: bookingLeft,
-        summaryCount
+        summaryCount,
+        status: timeStatus
       };
     });
     return formatScheduleTimeSlots;
@@ -2662,6 +2902,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     while ((0, import_dayjs.default)(currentDate).isBefore((0, import_dayjs.default)(endDate), "day") || (0, import_dayjs.default)(currentDate).isSame((0, import_dayjs.default)(endDate), "day")) {
       const currentDateStr = currentDate.format("YYYY-MM-DD");
       let status = "available";
+      let summaryCount = 0;
+      let availableCount = 0;
       const { latestStartDate, earliestEndDate } = (0, import_resources.checkSessionProductLeadTime)(tempProducts);
       if (latestStartDate || earliestEndDate) {
         if (latestStartDate && (0, import_dayjs.default)(currentDate).isBefore(latestStartDate, "day")) {
@@ -2686,43 +2928,64 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           currentDateStr
         );
         const scheduleTimeSlots = (0, import_utils3.getAllSortedDateRanges)(minTimeMaxTime);
-        const timesSlotCanUse = scheduleTimeSlots.some((item) => {
+        let timesSlotCanUse = false;
+        scheduleTimeSlots.forEach((item) => {
           const resourcesUseableMap = {};
-          return openResources.every((resource) => {
+          let isAllResourceTypesUseable = true;
+          openResources.forEach((resource) => {
             const currentResourcesList = allProductResources.filter(
               (n) => n.form_id === resource.resource_type_id
             );
-            return currentResourcesList == null ? void 0 : currentResourcesList.some((m) => {
+            let isAnyResourceUseableInType = false;
+            currentResourcesList == null ? void 0 : currentResourcesList.forEach((m) => {
               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");
               });
-              if (mTimes.length === 0) {
+              if (mTimes.length === 0)
                 return;
+              if (resource.type === "multiple") {
+                summaryCount += m.capacity;
+              } else {
+                summaryCount += 1;
               }
-              const targetCanUseTimes = mTimes.some(
-                (childTiem) => {
-                  const res2 = (0, import_resources.getIsUsableByTimeItem)({
-                    timeSlice: {
-                      start_time: item.start,
-                      end_time: item.end,
-                      start_at: (0, import_dayjs.default)(item.start),
-                      end_at: (0, import_dayjs.default)(item.end)
-                    },
-                    time: childTiem,
-                    resource: m,
-                    currentCount: 1,
-                    resourcesUseableMap,
-                    cut_off_time: tempProducts == null ? void 0 : tempProducts.cut_off_time
-                  });
-                  if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[m.id]) !== false && res2.reason !== "capacityOnly") {
-                    resourcesUseableMap[m.id] = res2.usable;
+              let isAnyTimeSliceUseable = false;
+              mTimes.forEach((childTiem) => {
+                if (isAnyTimeSliceUseable)
+                  return;
+                const res2 = (0, import_resources.getIsUsableByTimeItem)({
+                  timeSlice: {
+                    start_time: item.start,
+                    end_time: item.end,
+                    start_at: (0, import_dayjs.default)(item.start),
+                    end_at: (0, import_dayjs.default)(item.end)
+                  },
+                  time: childTiem,
+                  resource: m,
+                  currentCount: 1,
+                  resourcesUseableMap,
+                  cut_off_time: tempProducts == null ? void 0 : tempProducts.cut_off_time
+                });
+                if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[m.id]) !== false && res2.reason !== "capacityOnly") {
+                  resourcesUseableMap[m.id] = res2.usable;
+                }
+                if (res2.usable && !m.onlyComputed) {
+                  isAnyTimeSliceUseable = true;
+                  if (resource.type === "multiple") {
+                    availableCount += res2.remainingCapacity;
+                  } else {
+                    availableCount += 1;
                   }
-                  return res2.usable && !m.onlyComputed;
                 }
-              );
-              return targetCanUseTimes;
+                ;
+              });
+              if (isAnyTimeSliceUseable)
+                isAnyResourceUseableInType = true;
             });
+            if (!isAnyResourceUseableInType)
+              isAllResourceTypesUseable = false;
           });
+          if (isAllResourceTypesUseable)
+            timesSlotCanUse = true;
         });
         if (!timesSlotCanUse) {
           status = "unavailable";
@@ -2731,11 +2994,26 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           firstAvailableDate = currentDateStr;
         }
       }
+      let dateStatus;
+      if (status === "unavailable") {
+        if (availableCount === 0 && summaryCount > 0)
+          dateStatus = "sold_out";
+        else
+          dateStatus = "unavailable";
+      } else {
+        const usageRatio = availableCount / summaryCount;
+        if (usageRatio > 0.5)
+          dateStatus = "lots_of_space";
+        else
+          dateStatus = "filling_up_fast";
+      }
       dates.push({
         date: (0, import_dayjs.default)(currentDate).format("YYYY-MM-DD"),
         week: (0, import_dayjs.default)(currentDate).format("ddd"),
         weekNum: (0, import_dayjs.default)(currentDate).day(),
-        status
+        summaryCount,
+        availableCount,
+        status: dateStatus
       });
       if (firstAvailableDate && (0, import_dayjs.default)(currentDate).diff((0, import_dayjs.default)(startDate), "day") > 31) {
         break;

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

@@ -230,7 +230,7 @@ function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, allResourc
       let totalAvailableCapacity = 0;
       resourcesInType.forEach((resource) => {
         const availableTimes = resource.times.filter((time) => {
-          return !(0, import_dayjs.default)(time.start_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute") && !(0, import_dayjs.default)(time.end_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") || (0, import_dayjs.default)(time.start_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") && (0, import_dayjs.default)(time.end_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute");
+          return !(0, import_dayjs.default)(time.start_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute") && !(0, import_dayjs.default)(time.end_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") || resource.onlyComputed && (0, import_dayjs.default)(time.start_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") && (0, import_dayjs.default)(time.end_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute");
         });
         if (availableTimes.length > 0) {
           totalAvailableCapacity += resource.capacity || 0;

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");