@pisell/pisellos 1.0.0 → 1.0.1

package/lib/solution/BookingByStep/index.js

@@ -45,8 +45,6 @@ var import_utils2 = require("../../modules/Schedule/utils");
 var import_utils3 = require("../../modules/Date/utils");
 var import_utils4 = require("../../modules/Product/utils");
 var import_timeslots = require("./utils/timeslots");
-var import_changePrice = require("../../modules/Cart/utils/changePrice");
-var import_capacity = require("./utils/capacity");
 import_dayjs.default.extend(import_isSameOrBefore.default);
 import_dayjs.default.extend(import_isSameOrAfter.default);
 var BookingByStepImpl = class extends import_BaseModule.BaseModule {
@@ -113,7 +111,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         throw new Error(`模块 ${step} 不存在`);
       }
     });
-    this.store.schedule.loadAllSchedule();
+    this.loadAllSchedule();
     this.core.effects.emit(import_types.BookingByStepHooks.onInited, {});
   }
   // 初始化step
@@ -160,52 +158,56 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   updateStep(key, step) {
     this.store.step.updateStep(key, step);
   }
-  /**
-   *
-   * 加载商品，然后导到商品列表里去
-   * @param {({
-   *     category_ids?: number[];
-   *     product_ids?: number[];
-   *     collection?: number | string[];
-   *     schedule_date?: string;
-   *   })} {
-   *     category_ids = [],
-   *     product_ids = [],
-   *     collection = [],
-   *     schedule_date,
-   *   }
-   * @return {*}
-   * @memberof BookingByStepImpl
-   */
+  // 获取购物车里 temp.xxx的方法
+  // async getStoreCart(key?: string) {
+  //   return this.store.cart.getTemp(key);
+  // }
+  // 加载商品，然后导到商品列表里去
   async loadProducts({
     category_ids = [],
     product_ids = [],
     collection = [],
+    // schedule_ids = [],
     schedule_date
   }) {
-    return this.store.products.loadProducts({
-      category_ids,
-      product_ids,
-      collection,
-      schedule_date,
-      cacheId: this.cacheId
-    });
+    var _a;
+    let userPlugin = this.core.getPlugin("user");
+    let customer_id = void 0;
+    try {
+      customer_id = (_a = userPlugin == null ? void 0 : userPlugin.get()) == null ? void 0 : _a.id;
+    } catch (error) {
+      console.error(error);
+    }
+    const productsData = await this.request.post(
+      `/product/query`,
+      {
+        open_quotation: 1,
+        open_bundle: 0,
+        exclude_extension_type: [
+          "product_party",
+          "product_event",
+          "product_series_event",
+          "product_package_ticket",
+          "ticket",
+          "event_item"
+        ],
+        with: ["category", "collection", "resourceRelation"],
+        status: "published",
+        num: 500,
+        skip: 1,
+        customer_id,
+        category_ids,
+        ids: product_ids,
+        collection,
+        front_end_cache_id: this.cacheId,
+        // client_schedule_ids: schedule_ids,
+        schedule_date
+      },
+      { useCache: true }
+    );
+    this.store.products.addProduct(productsData.data.list);
+    return productsData.data.list;
   }
-  /**
-   * 通过 schedule 来读取商品，适用于 session 类商品
-   *
-   * @param {{
-   *     date: string;
-   *     product_ids?: number[];
-   *     category_ids?: number[];
-   *   }} {
-   *     date,
-   *     product_ids = [],
-   *     category_ids = [],
-   *   }
-   * @return {*}
-   * @memberof BookingByStepImpl
-   */
   async loadProductByScheduleDate({
     date,
     product_ids = [],
@@ -226,17 +228,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       (n, index, self) => self.indexOf(n) === index
     );
     return await this.loadProducts({
+      // schedule_ids: scheduleIds,
       product_ids: allProductIds,
       category_ids,
       schedule_date: date
     });
   }
-  /**
-   * 更新完商品数据、切换日期、或者在较后的流程里登录了，检测当前购物车里是否有商品，如果有，则需要更新购物车里的商品价格
-   *
-   * @param {string} date
-   * @memberof BookingByStepImpl
-   */
   async updateQuotationPriceAndCart(date) {
     var _a;
     const cartItems = this.store.cart.getItems();
@@ -253,43 +250,129 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         schedule_date: date,
         customer_id
       });
-      await (0, import_changePrice.updateAllCartItemPrice)(
-        cartItems,
-        res,
-        (id) => this.store.products.getProduct(id),
-        (params) => this.store.cart.updateItem(params)
-      );
-      this.core.effects.emit(
-        `${this.store.cart.name}:onUpdateQuotationPrice`,
-        {}
-      );
+      for (const item of cartItems) {
+        const targetProduct = res.find((n) => n.id === 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
+          );
+          if (targetBundle) {
+            const targetBundleItem = targetBundle.bundle_item.find(
+              (m) => m.id === n.id
+            );
+            if (targetBundleItem) {
+              return {
+                ...n,
+                price: targetBundleItem.price,
+                base_price: targetBundleItem.base_price
+              };
+            }
+          }
+          return n;
+        });
+        this.store.cart.updateItem({
+          _id: item._id,
+          product: productInfo,
+          bundle
+        });
+      }
+      this.core.effects.emit(`${this.store.cart.name}:onUpdateQuotationPrice`, {});
     }
   }
-  /**
-   * ui 层提供日期的起始范围，返回一个起始范围内日期的可用情况
-   * 适用于先选日期的流程，确定日期是否可用
-   * 已知问题：如果挂接的商品的资源不可用，后端是不会计算的
-   *
-   * @param {LoadScheduleAvailableDateParams} {
-   *     startDate,
-   *     endDate,
-   *     custom_page_id,
-   *     channel,
-   *   }
-   * @memberof BookingByStepImpl
-   */
+  // 加载当前店铺下所有 schedule
+  async loadAllSchedule() {
+    var _a;
+    const scheduleList = await this.request.get(
+      `/schedule`,
+      { num: 999 },
+      { useCache: true }
+    );
+    this.store.schedule.setScheduleList(((_a = scheduleList.data) == null ? void 0 : _a.list) || []);
+  }
+  // ui 层提供日期的起始范围，返回一个起始范围内日期的可用情况
   async loadScheduleAvailableDate({
     startDate,
     endDate,
     custom_page_id,
     channel
   }) {
-    return await this.store.schedule.loadScheduleAvailableDate({
-      startDate,
-      endDate,
-      custom_page_id,
-      channel
-    });
+    var _a, _b, _c;
+    if ((0, import_dayjs.default)(startDate).isBefore((0, import_dayjs.default)(), "day")) {
+      startDate = (0, import_dayjs.default)().format("YYYY-MM-DD");
+    }
+    let dates = (0, import_utils3.generateMonthDates)(startDate, endDate);
+    dates = (0, import_utils3.disableAllDates)(dates);
+    if ((0, import_dayjs.default)(endDate).isBefore((0, import_dayjs.default)(), "day")) {
+      return dates;
+    }
+    const res = await this.request.get(
+      `/schedule/product/availability/v2`,
+      {
+        start_date: startDate,
+        end_date: endDate,
+        custom_page_id,
+        channel
+      }
+    );
+    this.store.schedule.setAvailabilityScheduleDateList(res.data.date_list);
+    this.store.schedule.setOtherProductsIds(res.data.other_product_ids || []);
+    if (!((_a = res.data.date_list) == null ? void 0 : _a.length) && !((_b = res.data.other_product_ids) == null ? void 0 : _b.length) || (0, import_dayjs.default)(endDate).isBefore((0, import_dayjs.default)(), "day")) {
+      return dates;
+    }
+    if ((_c = res.data.other_product_ids) == null ? void 0 : _c.length) {
+      dates.forEach((n) => {
+        n.status = "available";
+      });
+    } else {
+      res.data.date_list.forEach((n) => {
+        const index = dates.findIndex((m) => m.date === n.date);
+        if (index !== -1) {
+          dates[index].status = "available";
+        }
+      });
+    }
+    dates = (0, import_utils3.disableDatesBeforeOneDay)(dates);
+    return dates;
+  }
+  async storeProduct(productData) {
+    const activeAccount = this.getActiveAccount();
+    const { bundle, options, origin, product_variant_id, quantity = 1, rowKey } = productData || {};
+    const cartItems = this.store.cart.getItems();
+    if (rowKey) {
+      const targetCartItem = cartItems.find((n) => {
+        var _a;
+        return ((_a = n._productOrigin) == null ? void 0 : _a.rowKey) === rowKey;
+      });
+      if (targetCartItem && (0, import_utils4.isNormalProduct)(targetCartItem._productOrigin)) {
+        this.store.cart.updateItem({
+          _id: targetCartItem._id,
+          product: {
+            ...targetCartItem._productOrigin
+          },
+          quantity: (targetCartItem.num || 1) + quantity
+        });
+        return;
+      }
+    }
+    const product = { ...origin, product_variant_id, rowKey };
+    const addCartItem = {
+      product,
+      bundle,
+      options,
+      quantity
+    };
+    if (activeAccount) {
+      addCartItem.account = activeAccount;
+    }
+    this.store.cart.addItem(addCartItem);
   }
   // 添加单个账户或者 guest
   async addAccount(account, extra) {
@@ -342,8 +425,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   getActiveAccount() {
     const activeAccount = this.store.accountList.getActiveAccount();
-    const account = activeAccount == null ? void 0 : activeAccount.getAccount();
-    return account === null ? void 0 : account;
+    return activeAccount ? activeAccount.getAccount() : null;
   }
   removeAccount(id) {
     this.store.accountList.removeAccount(id);
@@ -359,9 +441,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     if (cartItems.length) {
       let date = (_b = (_a = this.store.date.getDateRange()) == null ? void 0 : _a[0]) == null ? void 0 : _b.date;
       if (!date) {
-        const normalProductCartItem = cartItems.find(
-          (n) => !(0, import_utils4.isNormalProduct)(n._productOrigin)
-        );
+        const normalProductCartItem = cartItems.find((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
         date = (normalProductCartItem == null ? void 0 : normalProductCartItem.start_date) || "";
       }
       this.updateQuotationPriceAndCart(date);
@@ -468,9 +548,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       if (cartItems.length) {
         let date = (_b = (_a = this.store.date.getDateRange()) == null ? void 0 : _a[0]) == null ? void 0 : _b.date;
         if (!date) {
-          const normalProductCartItem = cartItems.find(
-            (n) => !(0, import_utils4.isNormalProduct)(n._productOrigin)
-          );
+          const normalProductCartItem = cartItems.find((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
           date = (normalProductCartItem == null ? void 0 : normalProductCartItem.start_date) || "";
         }
         this.updateQuotationPriceAndCart(date);
@@ -503,7 +581,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const cartItems = this.store.cart.getItems();
     const newCartItems = (0, import_lodash_es.cloneDeep)(cartItems);
     newCartItems.forEach((item) => {
-      var _a;
+      var _a, _b;
       if (item._origin.resources && item._origin.resources.length) {
         item._origin.resources = item._origin.resources.map((n) => {
           const newResourcesItem = (0, import_lodash_es.cloneDeep)(n);
@@ -512,8 +590,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           delete newResourcesItem.resourceType;
           return { ...newResourcesItem };
         });
-        const { currentCapacity, formatCapacity } = (0, import_capacity.getCapacityInfoByCartItem)(item);
-        if (!((_a = item._origin) == null ? void 0 : _a.metadata)) {
+        const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
+          capacity: (_a = item._productOrigin) == null ? void 0 : _a.capacity,
+          product_bundle: item._origin.product.product_bundle
+        });
+        const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
+        if (!((_b = item._origin) == null ? void 0 : _b.metadata)) {
           item._origin.metadata = {};
         }
         item._origin.metadata.capacity = formatCapacity;
@@ -521,14 +603,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       }
     });
     let type = this.otherParams.isRetailTemplate ? "virtual" : "appointment_booking";
-    if ((0, import_utils4.areAllNormalProducts)(
-      newCartItems.map((n) => n._productOrigin)
-    )) {
+    if ((0, import_utils4.areAllNormalProducts)(newCartItems.map((n) => n._productOrigin))) {
       type = "virtual";
     }
-    return this.store.order.submitOrder({
-      query: { cartItems: newCartItems, type }
-    });
+    return this.store.order.submitOrder({ query: { cartItems: newCartItems, type } });
   }
   // 拉起支付模块
   async pay() {
@@ -546,136 +624,31 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   async getOtherParams() {
     return this.otherParams;
   }
-  /**
-   * 往购物车加商品数据(duration 类、普通商品)
-   * 老接口，先不删，怕 UI 有问题，直接桥接到新接口addProductToCart上
-   *
-   * @param {ProductData} productData
-   * @memberof BookingByStepImpl
-   */
-  async storeProduct(productData) {
-    const activeAccount = this.getActiveAccount();
-    this.addProductToCart({
-      product: productData,
-      account: activeAccount
-    });
-  }
-  /**
-   * 往购物车加商品数据
-   *
-   * @param {({
-   *     product: ProductData;
-   *     date?: { startTime: string; endTime: string } | null;
-   *     account?: Account | null;
-   *   })} {
-   *     product,
-   *     date,
-   *     account,
-   *   }
-   * @return {*}
-   * @memberof BookingByStepImpl
-   */
-  addProductToCart({
-    product,
-    date,
-    account
-  }) {
-    const {
-      bundle,
-      options,
-      origin,
-      product_variant_id,
-      rowKey,
-      quantity = 1
-    } = product || {};
-    const productData = { ...origin, product_variant_id };
-    if (!account) {
-      const activeAccount = this.getActiveAccount();
-      if (activeAccount) {
-        account = activeAccount;
-      }
-    }
-    const flag = this.store.cart.mergeCartItemByRowKey({
-      rowKey,
-      quantity,
-      account: account || void 0
-    });
-    if (flag) {
-      return;
-    }
-    const addItemParams = {
-      product: productData,
-      bundle,
-      options,
-      quantity
-    };
-    if (date) {
-      addItemParams.date = date;
-    }
-    if (account) {
-      addItemParams.account = account;
-    }
-    this.addProductCheck({ date });
-    this.store.cart.addItem(addItemParams);
-  }
-  /**
-   * 添加完购物车以后做的一些检测，比如日期是否在同一天
-   *
-   * @param {({ date?: { startTime: string; endTime: string } | null })} { date }
-   * @memberof BookingByStepImpl
-   */
-  addProductCheck({
-    date
-  }) {
-    if (date) {
-      const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
-      const cartItemsByDate = cartItems.filter(
-        (n) => !(0, import_dayjs.default)(n.start_date).isSame((0, import_dayjs.default)(date.startTime), "day")
-      );
-      if (cartItemsByDate.length) {
-        cartItemsByDate.forEach((n) => {
-          this.store.cart.removeItem(n._id);
-        });
-      }
+  // 更新购物车
+  updateCart(params) {
+    var _a;
+    const targetCartItem = this.store.cart.getItem(params._id);
+    if (!targetCartItem) {
+      throw new Error(`没有找到${params._id}购物车商品`);
     }
-  }
-  beforeUpdateCart(params, targetCartItem) {
+    let currentResourcesCapacityMap = {};
     if (params.resources) {
-      const { currentCapacity } = (0, import_capacity.getCapacityInfoByCartItem)(targetCartItem);
+      const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
+        capacity: (_a = targetCartItem._productOrigin) == null ? void 0 : _a.capacity,
+        product_bundle: targetCartItem._origin.product.product_bundle
+      });
+      const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
       params.resources = params.resources.map((n) => {
         n.capacity = currentCapacity || 1;
-        (0, import_capacity.checkSubResourcesCapacity)(n);
+        currentResourcesCapacityMap[n.id] = currentCapacity;
+        (0, import_resources.checkSubResourcesCapacity)(n);
         return n;
       });
     }
-  }
-  // 更新购物车
-  updateCart(params) {
-    const targetCartItem = this.store.cart.getItem(params._id);
-    if (!targetCartItem) {
-      throw new Error(`没有找到${params._id}购物车商品`);
-    }
-    this.beforeUpdateCart(params, targetCartItem);
     this.store.cart.updateItem(params);
-    this.updateCartCheck(params, targetCartItem);
-  }
-  /**
-   * 更新购物车以后的一些操作，比如检测资源是否重复，检测资源容量是否足够
-   *
-   * @param {IUpdateItemParams} params
-   * @param {CartItem} targetCartItem
-   * @return {*}
-   * @memberof BookingByStepImpl
-   */
-  updateCartCheck(params, targetCartItem) {
-    var _a;
     if (this.otherParams.isRetailTemplate) {
       return;
     }
-    let currentResourcesCapacityMap = {};
-    (_a = params.resources) == null ? void 0 : _a.forEach((n) => {
-      currentResourcesCapacityMap[n.id] = n.capacity;
-    });
     const allOriginResources = [];
     const dateRange = this.store.date.getDateRange();
     if (dateRange == null ? void 0 : dateRange.length) {
@@ -696,31 +669,50 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       cartItems.forEach((item) => {
         var _a2;
         if (item._id !== targetCartItem._id) {
-          const { currentCapacity } = (0, import_capacity.getCapacityInfoByCartItem)(item);
           const resources = (_a2 = item._origin.resources) == null ? void 0 : _a2.filter((m) => {
-            const sameFormIdResources = (0, import_resources.filterResourcesByFormItem)(
-              targetCartItem._origin.resources,
-              m.form_id
-            );
+            const sameFormIdResources = targetCartItem._origin.resources.filter((n) => n.form_id === m.form_id);
             if (!(sameFormIdResources == null ? void 0 : sameFormIdResources.length)) {
               return true;
             }
             return !sameFormIdResources.some((targetRes) => {
+              var _a3, _b, _c;
               if (targetRes.resourceType !== "single") {
+                const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
+                  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 canUse = (0, import_capacity.checkResourceCanUseByCapacity)(
-                  currentResourcesCapacityMap[m.id],
-                  currentCapacity,
-                  originResource == null ? void 0 : originResource.capacity
-                );
-                if (canUse)
-                  currentResourcesCapacityMap[m.id] += currentCapacity;
-                return !canUse;
+                if (currentResourcesCapacityMap[m.id] + currentCapacity > (originResource == null ? void 0 : originResource.capacity)) {
+                  return true;
+                }
+                currentResourcesCapacityMap[m.id] += currentCapacity;
+                return false;
               }
               if (item.holder_id !== (targetCartItem == null ? void 0 : targetCartItem.holder_id)) {
-                return (0, import_resources.checkTwoResourcesIntersection)(targetRes, m);
+                if (targetRes.id === m.id)
+                  return true;
+                if (((_b = targetRes.metadata.combined_resource) == null ? void 0 : _b.status) === 1 && // 如果现在选择的是组合资源，需要判断
+                // 1、当前其他购物车里是否选了当前组合资源的子资源
+                // 2、如果其他购物车里的商品也是组合资源，出了组合资源本身的 id 需要判断，还需要判断子资源的 id 是否有交集
+                (targetRes.metadata.combined_resource.resource_ids.includes(
+                  m.id
+                ) || targetRes.metadata.combined_resource.resource_ids.some(
+                  (n) => {
+                    return m.metadata.combined_resource.resource_ids.includes(
+                      n
+                    );
+                  }
+                )))
+                  return true;
+                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;
             });
@@ -817,30 +809,29 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const resources = [];
     if (dateRange == null ? void 0 : dateRange.length) {
       dateRange.forEach((n) => {
-        resources.push(...this.store.date.getResourcesListByDate(n.date) || []);
+        if (n.resource)
+          resources.push(...n.resource);
       });
     }
-    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
     if (!resources.length) {
-      const firstDateCartItem = cartItems == null ? void 0 : cartItems.find((n) => n.start_date);
-      if (firstDateCartItem == null ? void 0 : firstDateCartItem.start_date) {
-        const dateResources = this.store.date.getResourcesListByDate(firstDateCartItem.start_date);
-        resources.push(...dateResources || []);
-      } else {
-        const dateList = this.store.date.getDateList();
-        dateList.forEach((n) => {
-          if (n.resource)
-            resources.push(...n.resource);
-        });
-      }
+      const dateList = this.store.date.getDateList();
+      dateList.forEach((n) => {
+        if (n.resource)
+          resources.push(...n.resource);
+      });
     }
     const resourcesMap = (0, import_utils.getResourcesMap)((0, import_lodash_es.cloneDeep)(resources));
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
     const arr = [];
     cartItems.forEach((cartItem) => {
-      var _a, _b, _c, _d, _e, _f;
+      var _a, _b, _c, _d, _e, _f, _g, _h;
       let selectedResources = [];
-      const { currentCapacity, formatCapacity } = (0, import_capacity.getCapacityInfoByCartItem)(cartItem);
+      const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
+        capacity: (_a = cartItem._productOrigin) == null ? void 0 : _a.capacity,
+        product_bundle: cartItem._origin.product.product_bundle
+      });
       cartItem._origin.metadata.capacity = formatCapacity;
+      const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
       if (cartItem.holder_id) {
         selectedResources = (0, import_resources.getOthersSelectedResources)(
           cartItems,
@@ -856,7 +847,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       }
       const productResources = (0, import_resources.getResourcesByProduct)(
         resourcesMap,
-        ((_b = (_a = cartItem._productOrigin) == null ? void 0 : _a.product_resource) == null ? void 0 : _b.resources) || [],
+        ((_c = (_b = cartItem._productOrigin) == null ? void 0 : _b.product_resource) == null ? void 0 : _c.resources) || [],
         selectedResources,
         currentCapacity
       );
@@ -869,13 +860,20 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         );
         const resourcesUseableMap = {};
         productResources.forEach((n) => {
-          n.renderList = (0, import_resources.sortCombinedResources)(n.renderList);
+          n.renderList = n.renderList.sort((a, b) => {
+            var _a2, _b2, _c2, _d2;
+            const aIsCombined = ((_b2 = (_a2 = a.metadata) == null ? void 0 : _a2.combined_resource) == null ? void 0 : _b2.status) === 1;
+            const bIsCombined = ((_d2 = (_c2 = b.metadata) == null ? void 0 : _c2.combined_resource) == null ? void 0 : _d2.status) === 1;
+            if (aIsCombined && !bIsCombined)
+              return 1;
+            if (!aIsCombined && bIsCombined)
+              return -1;
+            return 0;
+          });
           n.renderList = n.renderList.filter((m) => {
-            const mTimes = (0, import_timeslots.filterConditionTimeSlots)(
-              m.times,
-              startTime,
-              endTime
-            );
+            const mTimes = m.times.filter((n2) => {
+              return !(0, import_dayjs.default)(n2.start_at).isAfter((0, import_dayjs.default)(startTime)) && !(0, import_dayjs.default)(n2.end_at).isBefore((0, import_dayjs.default)(endTime));
+            });
             if (mTimes.length === 0) {
               return false;
             }
@@ -905,8 +903,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           });
         });
       } else {
-        const hasFlexibleDuration = ((_d = (_c = cartItem._productOrigin) == null ? void 0 : _c.duration) == null ? void 0 : _d.type) === "flexible";
-        const operating_day_boundary = (_f = (_e = this.shopStore.get("core")) == null ? void 0 : _e.core) == null ? void 0 : _f.operating_day_boundary;
+        const hasFlexibleDuration = ((_e = (_d = cartItem._productOrigin) == null ? void 0 : _d.duration) == null ? void 0 : _e.type) === "flexible";
+        const operating_day_boundary = (_h = (_g = (_f = this.shopStore.get("core")) == null ? void 0 : _f.core) == null ? void 0 : _g.operating_day_boundary) == null ? void 0 : _h.time;
         productResources.forEach((item) => {
           item.renderList = item.renderList.filter((n) => {
             var _a2, _b2, _c2;
@@ -939,28 +937,138 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     });
     return arr;
   }
-  /**
-   * 在日期那边点击下一步的时候，检查这一天购物车里的商品是不是都有资源可以用
-   *
-   * @return {*}
-   * @memberof BookingByStepImpl
-   */
+  // 在日期那边点击下一步的时候，检查这一天购物车里的商品是不是都有资源可以用
   checkResourceListForDate() {
-    const resourcesList = this.getResourcesList();
-    const hasResource = resourcesList.every(
-      (item) => item.resources.every((resource) => resource.renderList.length > 0)
+    const dateRange = this.store.date.getDateRange();
+    const resources = [];
+    if (dateRange == null ? void 0 : dateRange.length) {
+      dateRange.forEach((n) => {
+        if (n.resource)
+          resources.push(...n.resource);
+      });
+    }
+    if (!resources.length) {
+      const dateList = this.store.date.getDateList();
+      dateList.forEach((n) => {
+        if (n.resource)
+          resources.push(...n.resource);
+      });
+    }
+    const resourcesMap = (0, import_utils.getResourcesMap)((0, import_lodash_es.cloneDeep)(resources));
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
+    const arr = [];
+    cartItems.forEach((cartItem) => {
+      var _a, _b, _c;
+      let selectedResources = [];
+      const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
+        capacity: (_a = cartItem._productOrigin) == null ? void 0 : _a.capacity,
+        product_bundle: cartItem._origin.product.product_bundle
+      });
+      cartItem._origin.metadata.capacity = formatCapacity;
+      const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
+      if (cartItem.holder_id) {
+        selectedResources = (0, import_resources.getOthersSelectedResources)(
+          cartItems,
+          cartItem.holder_id,
+          resourcesMap
+        );
+      } else {
+        selectedResources = (0, import_resources.getOthersCartSelectedResources)(
+          cartItems,
+          cartItem._id,
+          resourcesMap
+        );
+      }
+      const productResources = (0, import_resources.getResourcesByProduct)(
+        resourcesMap,
+        ((_c = (_b = cartItem._productOrigin) == null ? void 0 : _b.product_resource) == null ? void 0 : _c.resources) || [],
+        selectedResources,
+        currentCapacity
+      );
+      if (cartItem._origin.start_time) {
+        const startTime = (0, import_dayjs.default)(
+          `${cartItem._origin.start_date} ${cartItem._origin.start_time}`
+        );
+        const endTime = (0, import_dayjs.default)(
+          `${cartItem._origin.end_date} ${cartItem._origin.end_time}`
+        );
+        const resourcesUseableMap = {};
+        productResources.forEach((n) => {
+          n.renderList = n.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;
+          });
+          n.renderList = n.renderList.filter((m) => {
+            const mTimes = m.times.filter((n2) => {
+              return !(0, import_dayjs.default)(n2.start_at).isAfter((0, import_dayjs.default)(startTime)) && !(0, import_dayjs.default)(n2.end_at).isBefore((0, import_dayjs.default)(endTime));
+            });
+            if (mTimes.length === 0) {
+              return false;
+            }
+            const canUseArr = mTimes.map((item) => {
+              var _a2;
+              const res = (0, import_resources.getIsUsableByTimeItem)({
+                timeSlice: {
+                  start_time: startTime.format("HH:mm"),
+                  end_time: endTime.format("HH:mm"),
+                  start_at: startTime,
+                  end_at: endTime
+                },
+                time: item,
+                resource: m,
+                currentCount: currentCapacity || 0,
+                resourcesUseableMap,
+                cut_off_time: (_a2 = cartItem._productOrigin) == null ? void 0 : _a2.cut_off_time
+              });
+              if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== "capacityOnly") {
+                resourcesUseableMap[m.id] = res.usable;
+              }
+              return res.usable;
+            });
+            if (m.onlyComputed)
+              return false;
+            return !canUseArr.some((n2) => n2 === false);
+          });
+        });
+      } else {
+        productResources.forEach((item) => {
+          item.renderList = item.renderList.filter((n) => {
+            var _a2, _b2;
+            const recordCount = n.capacity || 0;
+            if (n.onlyComputed)
+              return false;
+            const timeSlots = (0, import_resources.getTimeSlicesByResource)({
+              resource: n,
+              duration: ((_b2 = (_a2 = cartItem._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) || 10,
+              split: 10,
+              currentDate: dateRange[0].date
+            });
+            return recordCount >= currentCapacity && timeSlots.length > 0;
+          });
+        });
+      }
+      arr.push({
+        id: cartItem.id,
+        // 这里返回的是购物车 id ，后面提交的时候要用的，用这个 id 绑定资源和时间
+        _id: cartItem._id,
+        // 这里返回的是购物车 id ，后面提交的时候要用的，用这个 id 绑定资源和时间
+        productResources
+      });
+    });
+    const hasResource = arr.every(
+      (n) => n.productResources.every((m) => m.renderList.length > 0)
     );
     return hasResource;
   }
-  /**
-   * 给单个购物车里的商品获取资源列表，给 UI 用的
-   *
-   * @param {(string | number)} id
-   * @return {*}
-   * @memberof BookingByStepImpl
-   */
+  // 给单个购物车里的商品获取资源列表
   getResourcesListByCartItem(id) {
-    var _a, _b;
+    var _a, _b, _c;
     const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
     const dateRange = this.store.date.getDateRange();
     const resources = [];
@@ -974,7 +1082,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       throw new Error(`没有找到${id}购物车商品`);
     }
     let selectedResources = [];
-    const { currentCapacity } = (0, import_capacity.getCapacityInfoByCartItem)(targetCartItem);
+    const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
+      capacity: (_a = targetCartItem._productOrigin) == null ? void 0 : _a.capacity,
+      product_bundle: targetCartItem._origin.product.product_bundle
+    });
+    const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
     if (targetCartItem.holder_id) {
       selectedResources = (0, import_resources.getOthersSelectedResources)(
         cartItems,
@@ -990,7 +1102,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
     const productResources = (0, import_resources.getResourcesByProduct)(
       resourcesMap,
-      ((_b = (_a = targetCartItem._productOrigin) == null ? void 0 : _a.product_resource) == null ? void 0 : _b.resources) || [],
+      ((_c = (_b = targetCartItem._productOrigin) == null ? void 0 : _b.product_resource) == null ? void 0 : _c.resources) || [],
       selectedResources,
       currentCapacity
     );
@@ -1015,6 +1127,21 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       };
     }
   }
+  // 通过资源列表和指定的资源 id，获取指定资源的时间切片
+  getResourceTimeSlot({
+    product,
+    resources,
+    currentResourceId
+  }) {
+    const dateRange = this.store.date.getDateRange();
+    const timeSlots = (0, import_resources.getTimeSlicesByResource)({
+      resource: resources.find((n) => n.id === currentResourceId),
+      duration: product.duration.value,
+      split: 10,
+      currentDate: dateRange[0].date
+    });
+    return timeSlots;
+  }
   // 自动分派可用资源-pro 版，ui 传递某个账号，自动给某个账号下所有商品分配第一种资源
   autoSelectAccountResources({
     cartItem,
@@ -1100,9 +1227,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           },
           0
         );
-        if (n.resourceType === "single" && totalCapacity > 0) {
-          continue;
-        }
         const canUseTime = mTimes.find((item) => {
           var _a2;
           const res = (0, import_resources.getIsUsableByTimeItem)({
@@ -1170,15 +1294,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const accountList = this.store.accountList.getAccounts();
     const selectForCartResources = (cartItems2) => {
       let recordTimeSlots = (0, import_lodash_es.cloneDeep)(timeSlots);
-      const hasFlexibleProduct = cartItems2.some(
-        (item) => {
-          var _a2, _b;
-          return ((_b = (_a2 = item._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b.type) === "flexible";
-        }
-      );
       cartItems2.forEach((item, index) => {
-        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
-        const { currentCapacity } = (0, import_capacity.getCapacityInfoByCartItem)(item);
+        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+        const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
+          capacity: (_a2 = item._productOrigin) == null ? void 0 : _a2.capacity,
+          product_bundle: item._origin.product.product_bundle
+        });
+        const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
         if (item._origin.start_time && !(timeSlots == null ? void 0 : timeSlots.start_time)) {
           recordTimeSlots = {
             start_time: item._origin.start_time,
@@ -1188,16 +1310,16 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           };
         }
         if (recordTimeSlots) {
-          const currentResourceConfig = (_c = (_b = (_a2 = item._productOrigin) == null ? void 0 : _a2.product_resource) == null ? void 0 : _b.resources) == null ? void 0 : _c.find(
+          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
           );
-          if (index !== 0 && recordTimeSlots && (currentResourceConfig == null ? void 0 : currentResourceConfig.type) === "single" && ((_d = item._productOrigin) == null ? void 0 : _d.duration) && !hasFlexibleProduct) {
+          if (index !== 0 && recordTimeSlots && (currentResourceConfig == null ? void 0 : currentResourceConfig.type) === "single" && ((_e = item._productOrigin) == null ? void 0 : _e.duration)) {
             let start_at = (0, import_dayjs.default)(recordTimeSlots.end_time).add(
-              ((_f = (_e = item._productOrigin) == null ? void 0 : _e.duration) == null ? void 0 : _f.value) || 10,
+              ((_g = (_f = item._productOrigin) == null ? void 0 : _f.duration) == null ? void 0 : _g.value) || 10,
               "minutes"
             );
             let end_at = start_at.add(
-              ((_h = (_g = item._productOrigin) == null ? void 0 : _g.duration) == null ? void 0 : _h.value) || 10,
+              ((_i = (_h = item._productOrigin) == null ? void 0 : _h.duration) == null ? void 0 : _i.value) || 10,
               "minutes"
             );
             recordTimeSlots = {
@@ -1230,7 +1352,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               });
             }
             res.selectedResource.capacity = currentCapacity;
-            (0, import_capacity.checkSubResourcesCapacity)(res.selectedResource);
+            (0, import_resources.checkSubResourcesCapacity)(res.selectedResource);
             this.store.cart.updateItem({
               _id: item._id,
               // 这里要做去重，避免出现同样类型的资源被塞进同一个商品
@@ -1251,7 +1373,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           const allCartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
           let selectedResources = [];
           const resources2 = (0, import_lodash_es.cloneDeep)(
-            ((_j = (_i = item._productOrigin) == null ? void 0 : _i.product_resource) == null ? void 0 : _j.resources) || []
+            ((_k = (_j = item._productOrigin) == null ? void 0 : _j.product_resource) == null ? void 0 : _k.resources) || []
           );
           const currentResourcesRenderList = [];
           resources2.forEach((n) => {
@@ -1299,11 +1421,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               return recordCount >= currentCapacity;
             });
           });
-          const targetRenderList = (_k = productResources.find(
+          const targetRenderList = (_l = productResources.find(
             (n) => n.code === resources_code
-          )) == null ? void 0 : _k.renderList;
+          )) == null ? void 0 : _l.renderList;
           if (targetRenderList && targetRenderList.length > 0) {
-            if ((_l = item._origin.resources) == null ? void 0 : _l.some(
+            if ((_m = item._origin.resources) == null ? void 0 : _m.some(
               (n) => n.form_id === targetRenderList[0].form_id
             )) {
               return;
@@ -1315,7 +1437,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             });
             const targetResource = fastestResource || targetRenderList[0];
             targetResource.capacity = currentCapacity;
-            (0, import_capacity.checkSubResourcesCapacity)(targetResource);
+            (0, import_resources.checkSubResourcesCapacity)(targetResource);
             if (!selectResourcesMap[targetResource.id]) {
               selectResourcesMap[targetResource.id] = currentCapacity;
             } else {
@@ -1349,7 +1471,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;
     let dateRange = this.store.date.getDateRange();
     const resources = [];
     const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
@@ -1359,7 +1481,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 || []);
@@ -1372,7 +1494,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
@@ -1437,13 +1559,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       ];
     }
     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";
-      }
-    );
-    const operating_day_boundary = (_h = (_g = this.shopStore.get("core")) == null ? void 0 : _g.core) == null ? void 0 : _h.operating_day_boundary;
+    const hasFlexibleDuration = cartItems.some((item) => {
+      var _a2, _b2;
+      return ((_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.type) === "flexible";
+    });
+    const operating_day_boundary = (_i = (_h = (_g = this.shopStore.get("core")) == null ? void 0 : _g.core) == null ? void 0 : _h.operating_day_boundary) == null ? void 0 : _i.time;
     const timeSlots = (0, import_resources.getTimeSlicesByResources)({
       resourceIds,
       resourcesMap,
@@ -1459,11 +1579,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   // 提交时间切片，绑定到对应购物车的商品上，更新购物车---只有 duration 商品
   submitTimeSlot(timeSlots) {
-    var _a, _b;
+    var _a, _b, _c;
     const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
-    const allResources = this.store.date.getResourcesListByDate(
-      timeSlots.start_at.format("YYYY-MM-DD")
-    );
+    const allResources = this.store.date.getResourcesListByDate(timeSlots.start_at.format("YYYY-MM-DD"));
     const itemsByAccount = cartItems.reduce(
       (acc, item) => {
         const holderId = item.holder_id;
@@ -1475,36 +1593,25 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       },
       {}
     );
-    const operating_day_boundary = (_b = (_a = this.shopStore.get("core")) == null ? void 0 : _a.core) == null ? void 0 : _b.operating_day_boundary;
+    const operating_day_boundary = (_c = (_b = (_a = this.shopStore.get("core")) == null ? void 0 : _a.core) == null ? void 0 : _b.operating_day_boundary) == null ? void 0 : _c.time;
     Object.values(itemsByAccount).forEach((accountItems) => {
       let currentStartTime = timeSlots.start_at.format("YYYY-MM-DD HH:mm");
       accountItems.forEach((item, index) => {
         var _a2;
         const newResources = (0, import_lodash_es.cloneDeep)(item._origin.resources);
         newResources.forEach((resource) => {
-          var _a3, _b2, _c, _d, _e;
+          var _a3, _b2, _c2, _d, _e;
           if (((_b2 = (_a3 = item._productOrigin) == null ? void 0 : _a3.duration) == null ? void 0 : _b2.type) === "flexible") {
             item.duration = {
               type: "minutes",
               value: 10
             };
             resource.startTime = timeSlots.start_at.format("YYYY-MM-DD HH:mm");
-            const targetResourceTimes = (_c = allResources == null ? void 0 : allResources.find(
-              (n) => n.id === resource.id
-            )) == null ? void 0 : _c.times;
-            const resourcesEndTime = targetResourceTimes.reduce(
-              (acc, curr) => {
-                return (0, import_dayjs.default)(curr.end_at).isBefore((0, import_dayjs.default)(acc.end_at)) ? curr : acc;
-              },
-              targetResourceTimes[0]
-            );
-            const resourceDate = (0, import_dayjs.default)(resourcesEndTime.end_at).format(
-              "YYYY-MM-DD"
-            );
-            const operatingBoundaryDateTime = `${resourceDate} ${operating_day_boundary.type === "start_time" ? "23:59" : operating_day_boundary.time}`;
-            const endTime = (0, import_dayjs.default)(resourcesEndTime.end_at).isBefore(
-              (0, import_dayjs.default)(operatingBoundaryDateTime)
-            ) ? resourcesEndTime.end_at : operatingBoundaryDateTime;
+            const targetResourceTimes = (_c2 = allResources == null ? void 0 : allResources.find((n) => n.id === resource.id)) == null ? void 0 : _c2.times;
+            const resourcesEndTime = targetResourceTimes.reduce((acc, curr) => {
+              return (0, import_dayjs.default)(curr.end_at).isBefore((0, import_dayjs.default)(acc.end_at)) ? curr : acc;
+            }, targetResourceTimes[0]);
+            const endTime = (0, import_dayjs.default)(resourcesEndTime.end_at).isBefore((0, import_dayjs.default)(operating_day_boundary)) ? resourcesEndTime.end_at : operating_day_boundary;
             let formattedEndTime;
             if (typeof endTime === "string" && endTime.includes(":") && !endTime.includes(" ") && !endTime.includes("T")) {
               const currentDate = timeSlots.start_at.format("YYYY-MM-DD");
@@ -1515,7 +1622,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             resource.endTime = formattedEndTime.format("YYYY-MM-DD HH:mm");
           } else {
             resource.startTime = currentStartTime;
-            resource.endTime = (0, import_dayjs.default)(currentStartTime).add(((_e = (_d = item._productOrigin) == null ? void 0 : _d.duration) == null ? void 0 : _e.value) || 10, "minutes").format("YYYY-MM-DD HH:mm");
+            resource.endTime = (0, import_dayjs.default)(currentStartTime).add(
+              ((_e = (_d = item._productOrigin) == null ? void 0 : _d.duration) == null ? void 0 : _e.value) || 10,
+              "minutes"
+            ).format("YYYY-MM-DD HH:mm");
           }
         });
         this.store.cart.updateItem({
@@ -1561,21 +1671,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     if (targetProduct) {
       const targetProductData = targetProduct.getData();
       this.store.currentProduct = targetProduct;
-      if (targetProductData["schedule.ids"]) {
-        const newScheduleArr = this.getScheduleDataByIds(
-          targetProductData["schedule.ids"]
-        );
-        targetProduct.setOtherParams("schedule", newScheduleArr);
-      } else if (targetProductData.duration) {
-        const dateRange = this.store.date.getDateRange();
-        if (!(dateRange == null ? void 0 : dateRange.length))
-          return;
-        this.getAvailableDate({
-          startDate: dateRange[0].date,
-          endDate: dateRange[dateRange.length - 1].date,
-          products: [targetProductData]
-        });
-      }
+      const newScheduleArr = this.getScheduleDataByIds(
+        targetProductData["schedule.ids"]
+      );
+      targetProduct.setOtherParams("schedule", newScheduleArr);
     }
   }
   closeProductDetail() {
@@ -1632,9 +1731,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         return -1;
       return 0;
     });
-    const firstEnabledResourceId = (_f = (_e = (_d = targetProductData == null ? void 0 : targetProductData.product_resource) == null ? void 0 : _d.resources) == null ? void 0 : _e.find(
-      (n) => n.status === 1
-    )) == null ? void 0 : _f.id;
+    const firstEnabledResourceId = (_f = (_e = (_d = targetProductData == null ? void 0 : targetProductData.product_resource) == null ? void 0 : _d.resources) == null ? void 0 : _e.find((n) => n.status === 1)) == null ? void 0 : _f.id;
     const formatScheduleTimeSlots = scheduleTimeSlots.map((item) => {
       const resourcesUseableMap = {};
       let count = 0;
@@ -1670,10 +1767,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           }
           currentResourcesTimeSlotCanUsedArr.push(res.usable);
         });
-        if (!currentResourcesTimeSlotCanUsedArr.some(
-          (n) => n === false
-        ) && // 只统计第一种资源的容量和 left
-        m.form_id === firstEnabledResourceId) {
+        if (!currentResourcesTimeSlotCanUsedArr.some((n) => n === false) && m.form_id === firstEnabledResourceId) {
           if (currentResourcesCount >= count) {
             count = currentResourcesCount;
           }
@@ -1695,6 +1789,56 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     });
     return formatScheduleTimeSlots;
   }
+  addProductToCart({
+    product,
+    date,
+    account
+  }) {
+    const { bundle, options, origin, product_variant_id, rowKey, quantity = 1 } = product || {};
+    const productData = { ...origin, product_variant_id };
+    if (!account) {
+      const activeAccount = this.getActiveAccount();
+      if (activeAccount) {
+        account = activeAccount;
+      }
+    }
+    if (rowKey) {
+      const cartItems = this.store.cart.getItems();
+      const targetCartItem = cartItems.find((n) => {
+        var _a;
+        return ((_a = n._productOrigin) == null ? void 0 : _a.rowKey) === rowKey;
+      });
+      if (targetCartItem && (0, import_utils4.isNormalProduct)(targetCartItem._productOrigin)) {
+        this.store.cart.updateItem({
+          _id: targetCartItem._id,
+          product: {
+            ...targetCartItem._productOrigin,
+            quantity: (targetCartItem.num || 1) + quantity
+          }
+        });
+        return;
+      }
+    }
+    this.store.cart.addItem({
+      product: productData,
+      date,
+      account,
+      bundle,
+      options,
+      quantity
+    });
+    if (date) {
+      const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
+      const cartItemsByDate = cartItems.filter(
+        (n) => !(0, import_dayjs.default)(n.start_date).isSame((0, import_dayjs.default)(date.startTime), "day")
+      );
+      if (cartItemsByDate.length) {
+        cartItemsByDate.forEach((n) => {
+          this.store.cart.removeItem(n._id);
+        });
+      }
+    }
+  }
   setOtherData(key, value) {
     this.otherData[key] = value;
     this.checkSaveCache({
@@ -1723,7 +1867,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
    * @memberof BookingByStepImpl
    */
   getResourcesByCartItemAndCode(cartItemId, resourceCode) {
-    var _a, _b;
+    var _a, _b, _c;
     const dateRange = this.store.date.getDateRange();
     const resources = [];
     if (dateRange == null ? void 0 : dateRange.length) {
@@ -1745,8 +1889,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     if (!cartItem)
       return [];
     let selectedResources = [];
-    const { currentCapacity, formatCapacity } = (0, import_capacity.getCapacityInfoByCartItem)(cartItem);
+    const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
+      capacity: (_a = cartItem._productOrigin) == null ? void 0 : _a.capacity,
+      product_bundle: cartItem._origin.product.product_bundle
+    });
     cartItem._origin.metadata.capacity = formatCapacity;
+    const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
     if (cartItem.holder_id) {
       selectedResources = (0, import_resources.getOthersSelectedResources)(
         cartItems,
@@ -1762,7 +1910,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
     const productResources = (0, import_resources.getResourcesByProduct)(
       resourcesMap,
-      ((_b = (_a = cartItem._productOrigin) == null ? void 0 : _a.product_resource) == null ? void 0 : _b.resources) || [],
+      ((_c = (_b = cartItem._productOrigin) == null ? void 0 : _b.product_resource) == null ? void 0 : _c.resources) || [],
       selectedResources,
       currentCapacity
     );
@@ -1781,9 +1929,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       const resourcesUseableMap = {};
       targetResource.renderList = targetResource.renderList.sort(
         (a, b) => {
-          var _a2, _b2, _c, _d;
+          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 = (_c = b.metadata) == null ? void 0 : _c.combined_resource) == null ? void 0 : _d.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)
@@ -1870,6 +2018,56 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
     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"))) {
+      startDate = (0, import_dayjs.default)().format("YYYY-MM-DD");
+    }
+    endDate = (0, import_dayjs.default)().add(1, "month").format("YYYY-MM-DD");
+    let tempProducts = [];
+    if (this.store.currentProduct) {
+      tempProducts = [
+        {
+          ...this.store.currentProduct.getData(),
+          _schedule: this.store.currentProduct.getOtherParams()["schedule"]
+        }
+      ];
+    }
+    const { resourceIds, rules, resourcesMap } = (0, import_products.getAvailableProductResources)(tempProducts) || {};
+    this.otherParams.currentResourcesMap = resourcesMap;
+    const res = await this.store.date.getResourceDates({
+      query: {
+        start_date: startDate || "",
+        end_date: endDate || "",
+        resource_ids: resourceIds
+      },
+      rules,
+      type
+    });
+    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;
     let { startDate, endDate } = params;
@@ -1877,29 +2075,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       startDate = (0, import_dayjs.default)().format("YYYY-MM-DD");
     }
     const endDateAfterMonth = (0, import_dayjs.default)().add(1, "month").format("YYYY-MM-DD");
-    let tempEndDate = endDateAfterMonth;
     if ((0, import_dayjs.default)(startDate).add(7, "day").isAfter((0, import_dayjs.default)(endDateAfterMonth), "day")) {
-      tempEndDate = (0, import_dayjs.default)(startDate).add(7, "day").format("YYYY-MM-DD");
+      endDate = (0, import_dayjs.default)(startDate).add(7, "day").format("YYYY-MM-DD");
     } else {
-      tempEndDate = endDateAfterMonth;
-    }
-    if ((0, import_dayjs.default)(tempEndDate).isBefore((0, import_dayjs.default)(endDate), "day")) {
-      tempEndDate = endDate || "";
-    }
-    endDate = tempEndDate;
-    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")) {
-        this.store.date.setDateList(cache.dateList);
-        return {
-          dateList: cache.dateList,
-          firstAvailableDate: cache.firstAvailableDate
-        };
-      }
+      endDate = endDateAfterMonth;
     }
     let tempProducts;
-    tempProducts = (_b = this.store.currentProduct) == null ? void 0 : _b.getData();
-    const schedule = (_c = this.store.currentProduct) == null ? void 0 : _c.getOtherParams()["schedule"];
+    tempProducts = (_a = this.store.currentProduct) == null ? void 0 : _a.getData();
+    const schedule = (_b = this.store.currentProduct) == null ? void 0 : _b.getOtherParams()["schedule"];
     const filteredSchedule = (0, import_resources.filterScheduleByDateRange)(
       schedule,
       startDate || "",
@@ -1913,6 +2096,16 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         resource_ids: tempResourceIds
       }
     });
+    const cache = (_c = this.store.currentProduct) == null ? void 0 : _c.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")) {
+        this.store.date.setDateList(cache.dateList);
+        return {
+          dateList: cache.dateList,
+          firstAvailableDate: cache.firstAvailableDate
+        };
+      }
+    }
     let dates = [];
     let currentDate = (0, import_dayjs.default)(startDate);
     let firstAvailableDate = "";
@@ -1972,27 +2165,25 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               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;
+              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;
             });
           });
@@ -2040,8 +2231,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     });
   }
   isTargetNormalProduct(product) {
-    if (!product)
-      return false;
     return (0, import_utils4.isNormalProduct)(product);
   }
   isTargetCartIdNormalProduct(id) {