@pisell/pisellos 2.0.23 → 2.0.25

package/lib/modules/Date/index.js

@@ -65,18 +65,13 @@ var DateModule = class extends import_BaseModule.BaseModule {
   getDateList() {
     return this.store.dateList;
   }
-  async getResourceAvailableTimeList(params) {
-    var _a;
-    const { url, query, rules, type } = params;
+  setDateList(dateList) {
+    this.store.dateList = dateList;
+  }
+  async fetchResourceDates(params) {
+    const { url, query } = params;
     const fetchUrl = url || "/schedule/resource/list";
     const { start_date, end_date, resource_ids } = query || {};
-    if (!start_date || !end_date) {
-      return [];
-    }
-    let dates = (0, import_utils.generateMonthDates)(start_date, end_date, type);
-    if (!(resource_ids == null ? void 0 : resource_ids.length)) {
-      return (0, import_utils.disableAllDates)(dates);
-    }
     try {
       const res = await this.request.get(fetchUrl, {
         start_date,
@@ -86,6 +81,24 @@ var DateModule = class extends import_BaseModule.BaseModule {
       }, {
         useCache: true
       });
+      return res;
+    } catch (error) {
+      console.error(error);
+    }
+  }
+  async getResourceAvailableTimeList(params) {
+    var _a;
+    const { query, rules, type } = params;
+    const { start_date, end_date, resource_ids } = query || {};
+    if (!start_date || !end_date) {
+      return [];
+    }
+    let dates = (0, import_utils.generateMonthDates)(start_date, end_date, type);
+    if (!(resource_ids == null ? void 0 : resource_ids.length)) {
+      return (0, import_utils.disableAllDates)(dates);
+    }
+    try {
+      const res = await this.fetchResourceDates(params);
       if (!((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.length)) {
         return (0, import_utils.disableAllDates)(dates);
       }

package/lib/modules/Rules/index.js

@@ -58,10 +58,10 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         productList
       };
     }
-    const mergedDiscountList = (0, import_utils.uniqueById)([
+    const mergedDiscountList = (0, import_utils.uniqueById)((0, import_utils.uniqueById)([
       ...oldDiscountList,
       ...newDiscountList
-    ]);
+    ]), "product_id");
     const result = this.calcDiscount({
       discountList: mergedDiscountList,
       productList: [...productList]

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

@@ -6,6 +6,7 @@ export interface ScheduleState {
 export type ScheduleAvailabilityDateItem = {
     date: string;
     schedule_id: number[];
+    product_ids: number[];
 };
 export interface ScheduleModuleAPI {
 }

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

@@ -5,7 +5,7 @@ import { BookingByStepState } from './types';
 import { CartItem, IUpdateItemParams, ProductData, ProductResourceItem, ECartItemInfoType, ECartItemCheckType } from '../../modules';
 import { Account } from '../../modules/Account/types';
 import { IStep } from '../../modules/Step/tyeps';
-import { TimeSliceItem } from './utils/resources';
+import { TimeSliceItem, ResourceItem } from './utils/resources';
 import { ITime } from '../../modules/Date/types';
 import dayjs from 'dayjs';
 import { IHolder, IFetchHolderAccountsParams } from '../../modules/AccountList/types';
@@ -153,7 +153,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         id: number | undefined;
         _id: string;
         product: ProductData | undefined;
-        resources: import("./utils/resources").ResourceItem[];
+        resources: ResourceItem[];
         holder_id: string | number | undefined;
         holder_name: string | undefined;
     } | undefined;
@@ -189,7 +189,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     private getScheduleDataByIds;
     openProductDetail(productId: number): Promise<void>;
     closeProductDetail(): void;
-    getTimeslotBySchedule({ date, scheduleIds, resources, product }: {
+    getTimeslotBySchedule({ date, scheduleIds, resources, product, }: {
         date: string;
         scheduleIds?: number[];
         resources?: ProductResourceItem[];
@@ -221,9 +221,30 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * @memberof BookingByStepImpl
      */
     getResourcesByCartItemAndCode(cartItemId: string, resourceCode: string): any;
+    /**
+     * 根据日期范围批量获取时间槽
+     * @param params 参数对象
+     * @returns Promise<Record<string, TimeSliceItem[]>> 返回日期到时间槽的映射
+     */
+    getTimeslotsScheduleByDateRange({ startDate, endDate, scheduleIds, resources, }: {
+        startDate: string;
+        endDate: string;
+        scheduleIds?: number[];
+        resources?: ProductResourceItem[];
+    }): Promise<Record<string, TimeSliceItem[]>>;
     getAvailableDateForSession(params?: {
         startDate?: string;
         endDate?: string;
         type?: 'month';
-    }): Promise<ITime[]>;
+    }): Promise<{
+        dateList: ITime[];
+        firstAvailableDate: ITime | undefined;
+    }>;
+    getAvailableDateForSessionOptimize(params?: {
+        startDate?: string;
+        endDate?: string;
+    }): Promise<{
+        dateList: any;
+        firstAvailableDate: any;
+    }>;
 }

package/lib/solution/BookingByStep/index.js

@@ -37,10 +37,14 @@ var import_types = require("./types");
 var import_products = require("./utils/products");
 var import_resources = require("./utils/resources");
 var import_dayjs = __toESM(require("dayjs"));
+var import_isSameOrBefore = __toESM(require("dayjs/plugin/isSameOrBefore"));
+var import_isSameOrAfter = __toESM(require("dayjs/plugin/isSameOrAfter"));
 var import_utils = require("../../modules/Resource/utils");
 var import_lodash_es = require("lodash-es");
 var import_utils2 = require("../../modules/Schedule/utils");
 var import_utils3 = require("../../modules/Date/utils");
+import_dayjs.default.extend(import_isSameOrBefore.default);
+import_dayjs.default.extend(import_isSameOrAfter.default);
 var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   constructor() {
     super(...arguments);
@@ -211,12 +215,19 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     product_ids,
     category_ids = []
   }) {
+    var _a;
     const scheduleList = this.store.schedule.getAvailabilityScheduleDateList();
     this.setDateRange([
       { date, status: "available", week: "", weekNum: 0 },
       { date, status: "available", week: "", weekNum: 0 }
     ]);
-    const scheduleIds = scheduleList.filter((n) => n.date === date).flatMap((n) => n.schedule_id);
+    const scheduleIds = scheduleList.filter((n) => n.date === date).flatMap((n) => n.schedule_id).filter((n) => n !== null && n !== void 0);
+    if (!(product_ids == null ? void 0 : product_ids.length)) {
+      const schedule = scheduleList.find((n) => n.date === date);
+      if (schedule && ((_a = schedule.product_ids) == null ? void 0 : _a.length)) {
+        product_ids = schedule.product_ids;
+      }
+    }
     return await this.loadProducts({
       schedule_ids: scheduleIds,
       product_ids,
@@ -242,16 +253,22 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       });
       for (const item of cartItems) {
         const targetProduct = res.find((n) => n.id === item.id);
-        const cartProduct = await this.store.products.getProduct(item.id);
+        const cartProduct = await this.store.products.getProduct(
+          item.id
+        );
         const productInfo = cartProduct == null ? void 0 : cartProduct.getData();
         let bundle = item._bundleOrigin;
         productInfo.price = targetProduct == null ? void 0 : targetProduct.price;
         productInfo.base_price = targetProduct == null ? void 0 : targetProduct.base_price;
         bundle = bundle == null ? void 0 : bundle.map((n) => {
           var _a2;
-          const targetBundle = (_a2 = targetProduct == null ? void 0 : targetProduct.bundle_group) == null ? void 0 : _a2.find((m) => m.id === n.group_id);
+          const targetBundle = (_a2 = targetProduct == null ? void 0 : targetProduct.bundle_group) == null ? void 0 : _a2.find(
+            (m) => m.id === n.group_id
+          );
           if (targetBundle) {
-            const targetBundleItem = targetBundle.bundle_item.find((m) => m.id === n.id);
+            const targetBundleItem = targetBundle.bundle_item.find(
+              (m) => m.id === n.id
+            );
             if (targetBundleItem) {
               return {
                 ...n,
@@ -268,13 +285,16 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           bundle
         });
       }
-      ;
     }
   }
   // 加载当前店铺下所有 schedule
   async loadAllSchedule() {
     var _a;
-    const scheduleList = await this.request.get(`/schedule`, { num: 999 }, { useCache: true });
+    const scheduleList = await this.request.get(
+      `/schedule`,
+      { num: 999 },
+      { useCache: true }
+    );
     this.store.schedule.setScheduleList(((_a = scheduleList.data) == null ? void 0 : _a.list) || []);
   }
   // ui 层提供日期的起始范围，返回一个起始范围内日期的可用情况
@@ -627,8 +647,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
                   capacity: (_a3 = item._productOrigin) == null ? void 0 : _a3.capacity,
                   product_bundle: item._origin.product.product_bundle
                 });
-                const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
-                const originResource = allOriginResources.find((n) => n.id === targetRes.id);
+                const currentCapacity = (0, import_resources.getSumCapacity)({
+                  capacity: formatCapacity
+                });
+                const originResource = allOriginResources.find(
+                  (n) => n.id === targetRes.id
+                );
                 if (currentResourcesCapacityMap[targetRes.id] + currentCapacity > (originResource == null ? void 0 : originResource.capacity)) {
                   return true;
                 }
@@ -651,7 +675,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
                   }
                 )))
                   return true;
-                if (((_c = m.metadata.combined_resource) == null ? void 0 : _c.status) === 1 && m.metadata.combined_resource.resource_ids.includes(targetRes.id))
+                if (((_c = m.metadata.combined_resource) == null ? void 0 : _c.status) === 1 && m.metadata.combined_resource.resource_ids.includes(
+                  targetRes.id
+                ))
                   return true;
               }
               return false;
@@ -666,8 +692,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               _id: item._id,
               resources,
               date: {
-                startTime: (0, import_dayjs.default)(`${start_date} ${start_time}`).format("YYYY-MM-DD HH:mm"),
-                endTime: (0, import_dayjs.default)(`${end_date} ${end_time}`).format("YYYY-MM-DD HH:mm")
+                startTime: (0, import_dayjs.default)(`${start_date} ${start_time}`).format(
+                  "YYYY-MM-DD HH:mm"
+                ),
+                endTime: (0, import_dayjs.default)(`${end_date} ${end_time}`).format(
+                  "YYYY-MM-DD HH:mm"
+                )
               }
             });
           } else {
@@ -1147,10 +1177,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         if (mTimes.length === 0) {
           continue;
         }
-        const totalCapacity = (countMap[n.id] || []).reduce((sum, item) => {
-          const hasOverlap = !(0, import_dayjs.default)(item.time.start_at).isAfter((0, import_dayjs.default)(timeSlots.start_at)) && !(0, import_dayjs.default)(item.time.end_at).isBefore((0, import_dayjs.default)(timeSlots.end_at));
-          return hasOverlap ? sum + item.pax : sum;
-        }, 0);
+        const totalCapacity = (countMap[n.id] || []).reduce(
+          (sum, item) => {
+            const hasOverlap = !(0, import_dayjs.default)(item.time.start_at).isAfter((0, import_dayjs.default)(timeSlots.start_at)) && !(0, import_dayjs.default)(item.time.end_at).isBefore((0, import_dayjs.default)(timeSlots.end_at));
+            return hasOverlap ? sum + item.pax : sum;
+          },
+          0
+        );
         const canUseTime = mTimes.find((item) => {
           var _a2;
           const res = (0, import_resources.getIsUsableByTimeItem)({
@@ -1228,7 +1261,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           };
         }
         if (recordTimeSlots) {
-          const currentResourceConfig = (_d = (_c = (_b = item._productOrigin) == null ? void 0 : _b.product_resource) == null ? void 0 : _c.resources) == null ? void 0 : _d.find((n) => n.code === resources_code);
+          const currentResourceConfig = (_d = (_c = (_b = item._productOrigin) == null ? void 0 : _b.product_resource) == null ? void 0 : _c.resources) == null ? void 0 : _d.find(
+            (n) => n.code === resources_code
+          );
           const resourceBookingType = (currentResourceConfig == null ? void 0 : currentResourceConfig.type) || "single";
           if (index !== 0 && recordTimeSlots && resourceBookingType === "single" && ((_e = item._productOrigin) == null ? void 0 : _e.duration)) {
             let start_at = (0, import_dayjs.default)(recordTimeSlots.end_time).add(
@@ -1407,7 +1442,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         (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);
+        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;
@@ -1599,7 +1637,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       date
     );
     const scheduleTimeSlots = (0, import_utils2.getAllSortedDateRanges)(minTimeMaxTime);
-    console.log("scheduleTimeSlots:", scheduleTimeSlots, productResources);
     let allProductResources = productResources.flatMap((n) => n.renderList);
     allProductResources.sort((a, b) => {
       var _a2, _b2, _c2, _d;
@@ -1645,7 +1682,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           }
           currentResourcesTimeSlotCanUsedArr.push(res.usable);
         });
-        if (!currentResourcesTimeSlotCanUsedArr.some((n) => n === false) && currentResourcesCount >= count) {
+        if (!currentResourcesTimeSlotCanUsedArr.some(
+          (n) => n === false
+        ) && currentResourcesCount >= count) {
           count = currentResourcesCount;
         }
       });
@@ -1717,7 +1756,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
    *
    * @param {string} cartItemId
    * @param {string} resourceCode
-   * @return {*} 
+   * @return {*}
    * @memberof BookingByStepImpl
    */
   getResourcesByCartItemAndCode(cartItemId, resourceCode) {
@@ -1768,7 +1807,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       selectedResources,
       currentCapacity
     );
-    const targetResource = productResources.find((resource) => resource.code === resourceCode);
+    const targetResource = productResources.find(
+      (resource) => resource.code === resourceCode
+    );
     if (!targetResource)
       return [];
     if (cartItem._origin.start_time) {
@@ -1779,16 +1820,18 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         `${cartItem._origin.end_date} ${cartItem._origin.end_time}`
       );
       const resourcesUseableMap = {};
-      targetResource.renderList = targetResource.renderList.sort((a, b) => {
-        var _a2, _b2, _c2, _d;
-        const aIsCombined = ((_b2 = (_a2 = a.metadata) == null ? void 0 : _a2.combined_resource) == null ? void 0 : _b2.status) === 1;
-        const bIsCombined = ((_d = (_c2 = b.metadata) == null ? void 0 : _c2.combined_resource) == null ? void 0 : _d.status) === 1;
-        if (aIsCombined && !bIsCombined)
-          return 1;
-        if (!aIsCombined && bIsCombined)
-          return -1;
-        return 0;
-      });
+      targetResource.renderList = targetResource.renderList.sort(
+        (a, b) => {
+          var _a2, _b2, _c2, _d;
+          const aIsCombined = ((_b2 = (_a2 = a.metadata) == null ? void 0 : _a2.combined_resource) == null ? void 0 : _b2.status) === 1;
+          const bIsCombined = ((_d = (_c2 = b.metadata) == null ? void 0 : _c2.combined_resource) == null ? void 0 : _d.status) === 1;
+          if (aIsCombined && !bIsCombined)
+            return 1;
+          if (!aIsCombined && bIsCombined)
+            return -1;
+          return 0;
+        }
+      );
       targetResource.renderList = targetResource.renderList.filter((m) => {
         const mTimes = m.times.filter((n) => {
           return !(0, import_dayjs.default)(n.start_at).isAfter((0, import_dayjs.default)(startTime)) && !(0, import_dayjs.default)(n.end_at).isBefore((0, import_dayjs.default)(endTime));
@@ -1836,6 +1879,38 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
     return targetResource.renderList;
   }
+  /**
+   * 根据日期范围批量获取时间槽
+   * @param params 参数对象
+   * @returns Promise<Record<string, TimeSliceItem[]>> 返回日期到时间槽的映射
+   */
+  async getTimeslotsScheduleByDateRange({
+    startDate,
+    endDate,
+    scheduleIds,
+    resources
+  }) {
+    console.log(
+      "appoimentBooking-session-date-getTimeslotsScheduleByDateRange",
+      { startDate, endDate, scheduleIds, resources }
+    );
+    const dates = [];
+    let currentDate = (0, import_dayjs.default)(startDate);
+    const end = (0, import_dayjs.default)(endDate);
+    while (currentDate.isSameOrBefore(end)) {
+      dates.push(currentDate.format("YYYY-MM-DD"));
+      currentDate = currentDate.add(1, "day");
+    }
+    const results = {};
+    for (const date of dates) {
+      results[date] = this.getTimeslotBySchedule({
+        date,
+        scheduleIds,
+        resources
+      });
+    }
+    return results;
+  }
   async getAvailableDateForSession(params = {}) {
     let { startDate, endDate, type } = params;
     if ((0, import_dayjs.default)(startDate).isBefore((0, import_dayjs.default)(), "day") && ((0, import_dayjs.default)(endDate).isAfter((0, import_dayjs.default)(), "day") || (0, import_dayjs.default)(endDate).isSame((0, import_dayjs.default)(), "day"))) {
@@ -1862,7 +1937,165 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       rules,
       type
     });
-    return res;
+    if (this.store.currentProduct) {
+      const dateListWithTimeSlots = await this.getTimeslotsScheduleByDateRange({
+        startDate: startDate || "",
+        endDate: endDate || ""
+      });
+      res.forEach((n) => {
+        if (!dateListWithTimeSlots[n.date]) {
+          n.status = "unavailable";
+        } else {
+          const allTimeSlotsCanUse = dateListWithTimeSlots[n.date].every(
+            (d) => d.count
+          );
+          if (!allTimeSlotsCanUse) {
+            n.status = "unavailable";
+          }
+        }
+      });
+    }
+    const firstAvailableDate = res.find((n) => n.status === "available");
+    return {
+      dateList: res,
+      firstAvailableDate
+    };
+  }
+  async getAvailableDateForSessionOptimize(params = {}) {
+    var _a, _b, _c, _d, _e, _f;
+    const cache = (_a = this.store.currentProduct) == null ? void 0 : _a.getOtherParams()["timeSlotBySchedule"];
+    if (cache) {
+      if ((0, import_dayjs.default)(params.startDate).isSameOrAfter((0, import_dayjs.default)(cache.startDate), "day") && (0, import_dayjs.default)(params.endDate).isSameOrBefore((0, import_dayjs.default)(cache.endDate), "day")) {
+        return {
+          dateList: cache.dateList,
+          firstAvailableDate: cache.firstAvailableDate
+        };
+      }
+    }
+    let { startDate, endDate } = params;
+    if ((0, import_dayjs.default)(startDate).isBefore((0, import_dayjs.default)(), "day") && ((0, import_dayjs.default)(endDate).isAfter((0, import_dayjs.default)(), "day") || (0, import_dayjs.default)(endDate).isSame((0, import_dayjs.default)(), "day"))) {
+      startDate = (0, import_dayjs.default)().format("YYYY-MM-DD");
+    }
+    endDate = (0, import_dayjs.default)().add(1, "month").format("YYYY-MM-DD");
+    let tempProducts;
+    tempProducts = (_b = this.store.currentProduct) == null ? void 0 : _b.getData();
+    const schedule = (_c = this.store.currentProduct) == null ? void 0 : _c.getOtherParams()["schedule"];
+    const filteredSchedule = (0, import_resources.filterScheduleByDateRange)(
+      schedule,
+      startDate || "",
+      endDate || ""
+    );
+    const tempResourceIds = (0, import_resources.getResourcesIdsByProduct)(tempProducts);
+    const res = await this.store.date.fetchResourceDates({
+      query: {
+        start_date: startDate || "",
+        end_date: endDate || "",
+        resource_ids: tempResourceIds
+      }
+    });
+    let dates = [];
+    let currentDate = (0, import_dayjs.default)(startDate);
+    let firstAvailableDate = "";
+    const openResources = ((_e = (_d = tempProducts == null ? void 0 : tempProducts.product_resource) == null ? void 0 : _d.resources) == null ? void 0 : _e.filter(
+      (m) => m.status === 1
+    )) || [];
+    const allProductResources = (0, import_resources.sortCombinedResources)(res.data);
+    const targetSchedules = this.store.schedule.getScheduleListByIds(
+      tempProducts["schedule.ids"]
+    );
+    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";
+      const { latestStartDate, earliestEndDate } = (0, import_resources.checkSessionProductLeadTime)(tempProducts);
+      if (latestStartDate || earliestEndDate) {
+        if (latestStartDate && (0, import_dayjs.default)(currentDate).isBefore(latestStartDate, "day")) {
+          status = "unavailable";
+        }
+        if (earliestEndDate && (0, import_dayjs.default)(currentDate).isAfter(earliestEndDate, "day")) {
+          status = "unavailable";
+        }
+      }
+      if (status === "available") {
+        const scheduleByDate = filteredSchedule.find(
+          (n) => n.date === currentDateStr
+        );
+        if (!scheduleByDate || (scheduleByDate == null ? void 0 : scheduleByDate.isExcluded)) {
+          status = "unavailable";
+        }
+      }
+      if (status === "available") {
+        const minTimeMaxTime = (0, import_utils2.calcMinTimeMaxTimeBySchedules)(
+          targetSchedules,
+          {},
+          currentDateStr
+        );
+        const scheduleTimeSlots = (0, import_utils2.getAllSortedDateRanges)(minTimeMaxTime);
+        const timesSlotCanUse = scheduleTimeSlots.some((item) => {
+          const resourcesUseableMap = {};
+          return openResources.every((resource) => {
+            const currentResourcesList = allProductResources.filter(
+              (n) => n.form_id === resource.resource_type_id
+            );
+            return currentResourcesList == null ? void 0 : currentResourcesList.some((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) {
+                return;
+              }
+              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;
+                }
+                return res2.usable && !m.onlyComputed;
+              });
+              return targetCanUseTimes;
+            });
+          });
+        });
+        if (!timesSlotCanUse) {
+          status = "unavailable";
+        }
+        if (status === "available" && !firstAvailableDate) {
+          firstAvailableDate = currentDateStr;
+        }
+      }
+      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
+      });
+      if (firstAvailableDate && (0, import_dayjs.default)(currentDate).diff((0, import_dayjs.default)(startDate), "day") > 14) {
+        break;
+      }
+      currentDate = (0, import_dayjs.default)(currentDate).add(1, "day");
+    }
+    dates = (0, import_utils3.handleAvailableDateByResource)(res.data, dates);
+    this.store.date.setDateList(dates);
+    (_f = this.store.currentProduct) == null ? void 0 : _f.setOtherParams("timeSlotBySchedule", {
+      dateList: dates,
+      firstAvailableDate,
+      startDate,
+      endDate
+    });
+    return {
+      dateList: dates,
+      firstAvailableDate
+    };
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/lib/solution/BookingByStep/utils/resources.d.ts

@@ -1,5 +1,5 @@
 import { Dayjs } from 'dayjs';
-import { CartItem } from '../../../modules';
+import { CartItem, ProductData } from '../../../modules';
 /**
  * 1. 获取资源列表
  * 2. 根据当前选择的商品过滤出来对应的资源列表  getResourcesByProduct
@@ -79,7 +79,7 @@ export declare const formatResources: ({ booking, resources, }: {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getTimeSlicesByResource: ({ resource, duration, split, currentDate, capacity, resourcesUseableMap, cut_off_time }: {
+export declare const getTimeSlicesByResource: ({ resource, duration, split, currentDate, capacity, resourcesUseableMap, cut_off_time, }: {
     resource: ResourceItem;
     duration: number;
     split: number;
@@ -133,7 +133,7 @@ export declare const mergeSubResourcesTimeSlices: (resources: ResourceItem[], re
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, duration, currentDate, split, capacity, resourcesUseableMap, cut_off_time }: {
+export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, duration, currentDate, split, capacity, resourcesUseableMap, cut_off_time, }: {
     resourceIds: number[];
     resourcesMap: any;
     duration: number;
@@ -201,4 +201,41 @@ export declare const getSumCapacity: ({ capacity }: {
  * @Author: jinglin.tan
  */
 export declare const checkSubResourcesCapacity: (resource: ResourceItem) => void;
+/**
+ * @title: 根据日期范围过滤日程
+ *
+ * @export
+ * @param {any[]} schedule
+ * @param {string} startDate
+ * @param {string} endDate
+ * @return {*}
+ */
+export declare function filterScheduleByDateRange(schedule: any[], startDate: string, endDate: string): any[];
+/**
+ * 传入商品数据，返回基于商品配置的提前量的最早开始日期和最晚结束日期
+ *
+ * @export
+ * @param {ProductData} product
+ * @return {*}
+ */
+export declare function checkSessionProductLeadTime(product: ProductData): {
+    latestStartDate: string;
+    earliestEndDate: string;
+};
+/**
+ * 基于商品的 resources 配置，返回可选择的资源的 id 列表
+ *
+ * @export
+ * @param {ProductData} product
+ * @return {*}
+ */
+export declare function getResourcesIdsByProduct(product: ProductData): number[];
+/**
+ * 资源排序，把单个资源靠前，组合资源排在后面
+ *
+ * @export
+ * @param {ResourceItem[]} resourcesList
+ * @return {*}
+ */
+export declare function sortCombinedResources(resourcesList: ResourceItem[]): ResourceItem[];
 export {};