@pisell/pisellos 3.0.42 → 3.0.44

package/dist/solution/BookingByStep/index.js

@@ -27,7 +27,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { BaseModule } from "../../modules/BaseModule";
 import { BookingByStepHooks, createModule } from "./types";
 import { getAvailableProductResources } from "./utils/products";
-import { getResourcesByProduct, getTimeSlicesByResource, getTimeSlicesByResources, getIsUsableByTimeItem, getOthersSelectedResources, formatDefaultCapacitys, getSumCapacity, checkSubResourcesCapacity, getOthersCartSelectedResources, filterScheduleByDateRange, checkSessionProductLeadTime, getResourcesIdsByProduct, sortCombinedResources } from "./utils/resources";
+import { getResourcesByProduct, getTimeSlicesByResource, getTimeSlicesByResources, getIsUsableByTimeItem, getOthersSelectedResources, getOthersCartSelectedResources, filterScheduleByDateRange, checkSessionProductLeadTime, getResourcesIdsByProduct, sortCombinedResources, filterResourcesByFormItem, checkTwoResourcesIntersection } from "./utils/resources";
 import dayjs from 'dayjs';
 import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
 import isSameOrAfter from 'dayjs/plugin/isSameOrAfter';
@@ -36,9 +36,11 @@ dayjs.extend(isSameOrAfter);
 import { getResourcesMap } from "../../modules/Resource/utils";
 import { cloneDeep } from 'lodash-es';
 import { calcCalendarDataByScheduleResult, calcMinTimeMaxTimeBySchedules, getAllSortedDateRanges } from "../../modules/Schedule/utils";
-import { disableAllDates, disableDatesBeforeOneDay, generateMonthDates, handleAvailableDateByResource } from "../../modules/Date/utils";
+import { handleAvailableDateByResource } from "../../modules/Date/utils";
 import { areAllNormalProducts, isNormalProduct } from "../../modules/Product/utils";
-import { calculateResourceAvailableTime, findFastestAvailableResource } from "./utils/timeslots";
+import { calculateResourceAvailableTime, filterConditionTimeSlots, findFastestAvailableResource } from "./utils/timeslots";
+import { updateAllCartItemPrice } from "../../modules/Cart/utils/changePrice";
+import { getCapacityInfoByCartItem, checkSubResourcesCapacity, checkResourceCanUseByCapacity } from "./utils/capacity";
 export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   _inherits(BookingByStepImpl, _BaseModule);
   var _super = _createSuper(BookingByStepImpl);
@@ -124,7 +126,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   throw new Error("\u6A21\u5757 ".concat(step, " \u4E0D\u5B58\u5728"));
                 }
               });
-              this.loadAllSchedule();
+              this.store.schedule.loadAllSchedule();
               this.core.effects.emit(BookingByStepHooks.onInited, {});
             case 18:
             case "end":
@@ -205,65 +207,40 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       this.store.step.updateStep(key, step);
     }
 
-    // 获取购物车里 temp.xxx的方法
-    // async getStoreCart(key?: string) {
-    //   return this.store.cart.getTemp(key);
-    // }
-
-    // 加载商品，然后导到商品列表里去
+    /**
+     *
+     * 加载商品，然后导到商品列表里去
+     * @param {({
+     *     category_ids?: number[];
+     *     product_ids?: number[];
+     *     collection?: number | string[];
+     *     schedule_date?: string;
+     *   })} {
+     *     category_ids = [],
+     *     product_ids = [],
+     *     collection = [],
+     *     schedule_date,
+     *   }
+     * @return {*}
+     * @memberof BookingByStepImpl
+     */
   }, {
     key: "loadProducts",
-    value: function () {
+    value: (function () {
       var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref) {
-        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, schedule_date, userPlugin, customer_id, _userPlugin$get, productsData;
+        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, schedule_date;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, schedule_date = _ref.schedule_date;
-              // // 如果 schedule_ids 为空，则需要尝试从 schedule 模块里获取
-              // if (!schedule_ids?.length) {
-              //   const schedule_ids_data = this.store.schedule
-              //     .getScheduleListByIds(schedule_ids)
-              //     .map((n) => n.id);
-              //   if (schedule_ids_data.length) {
-              //     schedule_ids = schedule_ids_data;
-              //   } else if (schedule_date) {
-              //     // 后端说如果 schedule_ids 如果为空，需要给[0]
-              //     schedule_ids = [0];
-              //   }
-              // }
-              userPlugin = this.core.getPlugin('user');
-              customer_id = undefined;
-              try {
-                customer_id = userPlugin === null || userPlugin === void 0 || (_userPlugin$get = userPlugin.get()) === null || _userPlugin$get === void 0 ? void 0 : _userPlugin$get.id;
-              } catch (error) {
-                console.error(error);
-              }
-              // 如果没传schedule_date，则从
-              _context2.next = 6;
-              return 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: customer_id,
+              return _context2.abrupt("return", this.store.products.loadProducts({
                 category_ids: category_ids,
-                ids: product_ids,
+                product_ids: product_ids,
                 collection: collection,
-                front_end_cache_id: this.cacheId,
-                // client_schedule_ids: schedule_ids,
-                schedule_date: schedule_date
-              }, {
-                useCache: true
-              });
-            case 6:
-              productsData = _context2.sent;
-              this.store.products.addProduct(productsData.data.list);
-              return _context2.abrupt("return", productsData.data.list);
-            case 9:
+                schedule_date: schedule_date,
+                cacheId: this.cacheId
+              }));
+            case 2:
             case "end":
               return _context2.stop();
           }
@@ -274,9 +251,25 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       }
       return loadProducts;
     }()
+    /**
+     * 通过 schedule 来读取商品，适用于 session 类商品
+     *
+     * @param {{
+     *     date: string;
+     *     product_ids?: number[];
+     *     category_ids?: number[];
+     *   }} {
+     *     date,
+     *     product_ids = [],
+     *     category_ids = [],
+     *   }
+     * @return {*}
+     * @memberof BookingByStepImpl
+     */
+    )
   }, {
     key: "loadProductByScheduleDate",
-    value: function () {
+    value: (function () {
       var _loadProductByScheduleDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref2) {
         var _schedule$product_ids;
         var date, _ref2$product_ids, product_ids, _ref2$category_ids, category_ids, scheduleList, newProductIds, schedule, otherProductsIds, allProductIds;
@@ -321,7 +314,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               });
               _context3.next = 10;
               return this.loadProducts({
-                // schedule_ids: scheduleIds,
                 product_ids: allProductIds,
                 category_ids: category_ids,
                 schedule_date: date
@@ -339,29 +331,35 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       }
       return loadProductByScheduleDate;
     }()
+    /**
+     * 更新完商品数据、切换日期、或者在较后的流程里登录了，检测当前购物车里是否有商品，如果有，则需要更新购物车里的商品价格
+     *
+     * @param {string} date
+     * @memberof BookingByStepImpl
+     */
+    )
   }, {
     key: "updateQuotationPriceAndCart",
-    value: function () {
+    value: (function () {
       var _updateQuotationPriceAndCart = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(date) {
         var _this3 = this;
-        var cartItems, userPlugin, customer_id, _userPlugin$get2, res, _iterator, _step, _loop;
-        return _regeneratorRuntime().wrap(function _callee4$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+        var cartItems, userPlugin, customer_id, _userPlugin$get, res;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              // 更新完商品数据以后，检测当前购物车里是否有商品，如果有，则需要更新购物车里的商品价格
               cartItems = this.store.cart.getItems();
               if (!cartItems.length) {
-                _context5.next = 25;
+                _context4.next = 11;
                 break;
               }
               userPlugin = this.core.getPlugin('user');
               customer_id = undefined;
               try {
-                customer_id = userPlugin === null || userPlugin === void 0 || (_userPlugin$get2 = userPlugin.get()) === null || _userPlugin$get2 === void 0 ? void 0 : _userPlugin$get2.id;
+                customer_id = userPlugin === null || userPlugin === void 0 || (_userPlugin$get = userPlugin.get()) === null || _userPlugin$get === void 0 ? void 0 : _userPlugin$get.id;
               } catch (error) {
                 console.error(error);
               }
-              _context5.next = 7;
+              _context4.next = 7;
               return this.store.products.loadProductsPrice({
                 ids: cartItems.map(function (n) {
                   return n.id;
@@ -370,280 +368,104 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 customer_id: customer_id
               });
             case 7:
-              res = _context5.sent;
-              _iterator = _createForOfIteratorHelper(cartItems);
-              _context5.prev = 9;
-              _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop() {
-                var _bundle;
-                var item, targetProduct, cartProduct, productInfo, bundle;
-                return _regeneratorRuntime().wrap(function _loop$(_context4) {
-                  while (1) switch (_context4.prev = _context4.next) {
-                    case 0:
-                      item = _step.value;
-                      targetProduct = res.find(function (n) {
-                        return n.id === item.id;
-                      });
-                      _context4.next = 4;
-                      return _this3.store.products.getProduct(item.id);
-                    case 4:
-                      cartProduct = _context4.sent;
-                      productInfo = cartProduct === null || cartProduct === void 0 ? void 0 : cartProduct.getData();
-                      bundle = item._bundleOrigin;
-                      productInfo.price = targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.price;
-                      productInfo.base_price = targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.base_price;
-                      bundle = (_bundle = bundle) === null || _bundle === void 0 ? void 0 : _bundle.map(function (n) {
-                        var _targetProduct$bundle;
-                        // 更新 bundle 的价格
-                        var targetBundle = targetProduct === null || targetProduct === void 0 || (_targetProduct$bundle = targetProduct.bundle_group) === null || _targetProduct$bundle === void 0 ? void 0 : _targetProduct$bundle.find(function (m) {
-                          return m.id === n.group_id;
-                        });
-                        if (targetBundle) {
-                          var targetBundleItem = targetBundle.bundle_item.find(function (m) {
-                            return m.id === n.id;
-                          });
-                          if (targetBundleItem) {
-                            return _objectSpread(_objectSpread({}, n), {}, {
-                              price: targetBundleItem.price,
-                              base_price: targetBundleItem.base_price
-                            });
-                          }
-                        }
-                        return n;
-                      });
-                      _this3.store.cart.updateItem({
-                        _id: item._id,
-                        product: productInfo,
-                        bundle: bundle
-                      });
-                    case 11:
-                    case "end":
-                      return _context4.stop();
-                  }
-                }, _loop);
+              res = _context4.sent;
+              _context4.next = 10;
+              return updateAllCartItemPrice(cartItems, res, function (id) {
+                return _this3.store.products.getProduct(id);
+              }, function (params) {
+                return _this3.store.cart.updateItem(params);
               });
-              _iterator.s();
-            case 12:
-              if ((_step = _iterator.n()).done) {
-                _context5.next = 16;
-                break;
-              }
-              return _context5.delegateYield(_loop(), "t0", 14);
-            case 14:
-              _context5.next = 12;
-              break;
-            case 16:
-              _context5.next = 21;
-              break;
-            case 18:
-              _context5.prev = 18;
-              _context5.t1 = _context5["catch"](9);
-              _iterator.e(_context5.t1);
-            case 21:
-              _context5.prev = 21;
-              _iterator.f();
-              return _context5.finish(21);
-            case 24:
+            case 10:
               this.core.effects.emit("".concat(this.store.cart.name, ":onUpdateQuotationPrice"), {});
-            case 25:
+            case 11:
             case "end":
-              return _context5.stop();
+              return _context4.stop();
           }
-        }, _callee4, this, [[9, 18, 21, 24]]);
+        }, _callee4, this);
       }));
       function updateQuotationPriceAndCart(_x5) {
         return _updateQuotationPriceAndCart.apply(this, arguments);
       }
       return updateQuotationPriceAndCart;
-    }() // 加载当前店铺下所有 schedule
-  }, {
-    key: "loadAllSchedule",
-    value: function () {
-      var _loadAllSchedule = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-        var _scheduleList$data;
-        var scheduleList;
-        return _regeneratorRuntime().wrap(function _callee5$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
-            case 0:
-              _context6.next = 2;
-              return this.request.get("/schedule", {
-                num: 999
-              }, {
-                useCache: true
-              });
-            case 2:
-              scheduleList = _context6.sent;
-              this.store.schedule.setScheduleList(((_scheduleList$data = scheduleList.data) === null || _scheduleList$data === void 0 ? void 0 : _scheduleList$data.list) || []);
-            case 4:
-            case "end":
-              return _context6.stop();
-          }
-        }, _callee5, this);
-      }));
-      function loadAllSchedule() {
-        return _loadAllSchedule.apply(this, arguments);
-      }
-      return loadAllSchedule;
-    }() // ui 层提供日期的起始范围，返回一个起始范围内日期的可用情况
+    }()
+    /**
+     * ui 层提供日期的起始范围，返回一个起始范围内日期的可用情况
+     * 适用于先选日期的流程，确定日期是否可用
+     * 已知问题：如果挂接的商品的资源不可用，后端是不会计算的
+     *
+     * @param {LoadScheduleAvailableDateParams} {
+     *     startDate,
+     *     endDate,
+     *     custom_page_id,
+     *     channel,
+     *   }
+     * @memberof BookingByStepImpl
+     */
+    )
   }, {
     key: "loadScheduleAvailableDate",
-    value: function () {
-      var _loadScheduleAvailableDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref3) {
-        var _res$data$date_list, _res$data$other_produ, _res$data$other_produ2;
-        var startDate, endDate, custom_page_id, channel, dates, res;
-        return _regeneratorRuntime().wrap(function _callee6$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+    value: (function () {
+      var _loadScheduleAvailableDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(_ref3) {
+        var startDate, endDate, custom_page_id, channel;
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
               startDate = _ref3.startDate, endDate = _ref3.endDate, custom_page_id = _ref3.custom_page_id, channel = _ref3.channel;
-              // 前端传递的 startDate，可能是今天之前的，如果 startDate 小于今天，需要把 startDate 置为今天
-              if (dayjs(startDate).isBefore(dayjs(), 'day')) {
-                startDate = dayjs().format('YYYY-MM-DD');
-              }
-              // 1.生成当前月份的所有日期，默认都不可用
-              dates = generateMonthDates(startDate, endDate);
-              dates = disableAllDates(dates);
-              // 如果 endDate 在今天之前，则不用查接口，直接返回 dates
-              if (!dayjs(endDate).isBefore(dayjs(), 'day')) {
-                _context7.next = 6;
-                break;
-              }
-              return _context7.abrupt("return", dates);
-            case 6:
-              _context7.next = 8;
-              return this.request.get("/schedule/product/availability/v2", {
-                start_date: startDate,
-                end_date: endDate,
+              _context5.next = 3;
+              return this.store.schedule.loadScheduleAvailableDate({
+                startDate: startDate,
+                endDate: endDate,
                 custom_page_id: custom_page_id,
                 channel: channel
               });
-            case 8:
-              res = _context7.sent;
-              this.store.schedule.setAvailabilityScheduleDateList(res.data.date_list);
-              this.store.schedule.setOtherProductsIds(res.data.other_product_ids || []);
-              // 如果没有schedule或者结束日期在今天之前，则所有日期均不可用
-              if (!(!((_res$data$date_list = res.data.date_list) !== null && _res$data$date_list !== void 0 && _res$data$date_list.length) && !((_res$data$other_produ = res.data.other_product_ids) !== null && _res$data$other_produ !== void 0 && _res$data$other_produ.length) || dayjs(endDate).isBefore(dayjs(), 'day'))) {
-                _context7.next = 13;
-                break;
-              }
-              return _context7.abrupt("return", dates);
-            case 13:
-              if ((_res$data$other_produ2 = res.data.other_product_ids) !== null && _res$data$other_produ2 !== void 0 && _res$data$other_produ2.length) {
-                // 如果后端有返回 other_product_ids ，意味着有 duration 商品，则今天以及今天以后的日期均可用
-                dates.forEach(function (n) {
-                  n.status = 'available';
-                });
-              } else {
-                res.data.date_list.forEach(function (n) {
-                  var index = dates.findIndex(function (m) {
-                    return m.date === n.date;
-                  });
-                  if (index !== -1) {
-                    dates[index].status = 'available';
-                  }
-                });
-              }
-              dates = disableDatesBeforeOneDay(dates);
-              return _context7.abrupt("return", dates);
-            case 16:
+            case 3:
+              return _context5.abrupt("return", _context5.sent);
+            case 4:
             case "end":
-              return _context7.stop();
+              return _context5.stop();
           }
-        }, _callee6, this);
+        }, _callee5, this);
       }));
       function loadScheduleAvailableDate(_x6) {
         return _loadScheduleAvailableDate.apply(this, arguments);
       }
       return loadScheduleAvailableDate;
-    }()
-  }, {
-    key: "storeProduct",
-    value: function () {
-      var _storeProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(productData) {
-        var activeAccount, _ref4, bundle, options, origin, product_variant_id, _ref4$quantity, quantity, rowKey, cartItems, targetCartItem, product, addCartItem;
-        return _regeneratorRuntime().wrap(function _callee7$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
-            case 0:
-              // 往购物车加商品数据的时候，默认用当前 activeAccount 填充到 product 的 account 里面
-              activeAccount = this.getActiveAccount();
-              _ref4 = productData || {}, bundle = _ref4.bundle, options = _ref4.options, origin = _ref4.origin, product_variant_id = _ref4.product_variant_id, _ref4$quantity = _ref4.quantity, quantity = _ref4$quantity === void 0 ? 1 : _ref4$quantity, rowKey = _ref4.rowKey; // 检查购物车里是否已经存在 rowKey相同的数据，如果是则更新数量
-              cartItems = this.store.cart.getItems();
-              if (!rowKey) {
-                _context8.next = 8;
-                break;
-              }
-              targetCartItem = cartItems.find(function (n) {
-                var _n$_productOrigin;
-                return ((_n$_productOrigin = n._productOrigin) === null || _n$_productOrigin === void 0 ? void 0 : _n$_productOrigin.rowKey) === rowKey;
-              });
-              if (!(targetCartItem && isNormalProduct(targetCartItem._productOrigin))) {
-                _context8.next = 8;
-                break;
-              }
-              this.store.cart.updateItem({
-                _id: targetCartItem._id,
-                product: _objectSpread({}, targetCartItem._productOrigin),
-                quantity: (targetCartItem.num || 1) + quantity
-              });
-              return _context8.abrupt("return");
-            case 8:
-              product = _objectSpread(_objectSpread({}, origin), {}, {
-                product_variant_id: product_variant_id,
-                rowKey: rowKey
-              });
-              addCartItem = {
-                product: product,
-                bundle: bundle,
-                options: options,
-                quantity: quantity
-              };
-              if (activeAccount) {
-                addCartItem.account = activeAccount;
-              }
-              this.store.cart.addItem(addCartItem);
-            case 12:
-            case "end":
-              return _context8.stop();
-          }
-        }, _callee7, this);
-      }));
-      function storeProduct(_x7) {
-        return _storeProduct.apply(this, arguments);
-      }
-      return storeProduct;
     }() // 添加单个账户或者 guest
+    )
   }, {
     key: "addAccount",
     value: function () {
-      var _addAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(account, extra) {
+      var _addAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(account, extra) {
         var accountModules, newAccount;
-        return _regeneratorRuntime().wrap(function _callee8$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
               if (!((extra === null || extra === void 0 ? void 0 : extra.type) === 'holder')) {
-                _context9.next = 5;
+                _context6.next = 5;
                 break;
               }
-              _context9.next = 3;
+              _context6.next = 3;
               return this.store.accountList.addHolderAccounts({
                 holders: [account],
                 customerId: extra.customerId,
                 type: 'unshift'
               });
             case 3:
-              accountModules = _context9.sent;
-              return _context9.abrupt("return", accountModules[0].getAccount());
+              accountModules = _context6.sent;
+              return _context6.abrupt("return", accountModules[0].getAccount());
             case 5:
-              _context9.next = 7;
+              _context6.next = 7;
               return this.store.accountList.addAccount(account);
             case 7:
-              newAccount = _context9.sent;
-              return _context9.abrupt("return", newAccount.getAccount());
+              newAccount = _context6.sent;
+              return _context6.abrupt("return", newAccount.getAccount());
             case 9:
             case "end":
-              return _context9.stop();
+              return _context6.stop();
           }
-        }, _callee8, this);
+        }, _callee6, this);
       }));
-      function addAccount(_x8, _x9) {
+      function addAccount(_x7, _x8) {
         return _addAccount.apply(this, arguments);
       }
       return addAccount;
@@ -651,13 +473,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addAccounts",
     value: function () {
-      var _addAccounts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(accounts, extra) {
-        var res, _iterator2, _step2, account, accountModule, accountData;
-        return _regeneratorRuntime().wrap(function _callee9$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+      var _addAccounts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(accounts, extra) {
+        var res, _iterator, _step, account, accountModule, accountData;
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
               if (!((extra === null || extra === void 0 ? void 0 : extra.type) === 'holder')) {
-                _context10.next = 3;
+                _context7.next = 3;
                 break;
               }
               this.store.accountList.addHolderAccounts({
@@ -665,49 +487,49 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 customerId: extra.customerId,
                 type: 'unshift'
               });
-              return _context10.abrupt("return");
+              return _context7.abrupt("return");
             case 3:
               res = [];
-              _iterator2 = _createForOfIteratorHelper(accounts);
-              _context10.prev = 5;
-              _iterator2.s();
+              _iterator = _createForOfIteratorHelper(accounts);
+              _context7.prev = 5;
+              _iterator.s();
             case 7:
-              if ((_step2 = _iterator2.n()).done) {
-                _context10.next = 16;
+              if ((_step = _iterator.n()).done) {
+                _context7.next = 16;
                 break;
               }
-              account = _step2.value;
-              _context10.next = 11;
+              account = _step.value;
+              _context7.next = 11;
               return this.store.accountList.addAccount(account);
             case 11:
-              accountModule = _context10.sent;
+              accountModule = _context7.sent;
               accountData = accountModule.getAccount();
               if (accountData) {
                 res.push(accountData);
               }
             case 14:
-              _context10.next = 7;
+              _context7.next = 7;
               break;
             case 16:
-              _context10.next = 21;
+              _context7.next = 21;
               break;
             case 18:
-              _context10.prev = 18;
-              _context10.t0 = _context10["catch"](5);
-              _iterator2.e(_context10.t0);
+              _context7.prev = 18;
+              _context7.t0 = _context7["catch"](5);
+              _iterator.e(_context7.t0);
             case 21:
-              _context10.prev = 21;
-              _iterator2.f();
-              return _context10.finish(21);
+              _context7.prev = 21;
+              _iterator.f();
+              return _context7.finish(21);
             case 24:
-              return _context10.abrupt("return", res);
+              return _context7.abrupt("return", res);
             case 25:
             case "end":
-              return _context10.stop();
+              return _context7.stop();
           }
-        }, _callee9, this, [[5, 18, 21, 24]]);
+        }, _callee7, this, [[5, 18, 21, 24]]);
       }));
-      function addAccounts(_x10, _x11) {
+      function addAccounts(_x9, _x10) {
         return _addAccounts.apply(this, arguments);
       }
       return addAccounts;
@@ -715,20 +537,20 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getAccounts",
     value: function () {
-      var _getAccounts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
+      var _getAccounts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
         var accounts;
-        return _regeneratorRuntime().wrap(function _callee10$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
               accounts = this.store.accountList.getAccounts();
-              return _context11.abrupt("return", accounts.map(function (account) {
+              return _context8.abrupt("return", accounts.map(function (account) {
                 return account.getAccount();
               }));
             case 2:
             case "end":
-              return _context11.stop();
+              return _context8.stop();
           }
-        }, _callee10, this);
+        }, _callee8, this);
       }));
       function getAccounts() {
         return _getAccounts.apply(this, arguments);
@@ -752,7 +574,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getActiveAccount",
     value: function getActiveAccount() {
       var activeAccount = this.store.accountList.getActiveAccount();
-      return activeAccount ? activeAccount.getAccount() : null;
+      var account = activeAccount === null || activeAccount === void 0 ? void 0 : activeAccount.getAccount();
+      return account === null ? undefined : account;
     }
   }, {
     key: "removeAccount",
@@ -769,10 +592,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "fetchHolderAccountsAsync",
     value: (function () {
-      var _fetchHolderAccountsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(params) {
+      var _fetchHolderAccountsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(params) {
         var cartItems, _this$store$date$getD, date, normalProductCartItem;
-        return _regeneratorRuntime().wrap(function _callee11$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
               cartItems = this.store.cart.getItems();
               if (cartItems.length) {
@@ -787,14 +610,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
                 this.updateQuotationPriceAndCart(date);
               }
-              return _context12.abrupt("return", this.store.accountList.fetchHolderAccounts(params));
+              return _context9.abrupt("return", this.store.accountList.fetchHolderAccounts(params));
             case 3:
             case "end":
-              return _context12.stop();
+              return _context9.stop();
           }
-        }, _callee11, this);
+        }, _callee9, this);
       }));
-      function fetchHolderAccountsAsync(_x12) {
+      function fetchHolderAccountsAsync(_x11) {
         return _fetchHolderAccountsAsync.apply(this, arguments);
       }
       return fetchHolderAccountsAsync;
@@ -803,9 +626,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setDateRange",
     value: function () {
-      var _setDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(dateRange) {
-        return _regeneratorRuntime().wrap(function _callee12$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+      var _setDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(dateRange) {
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
               this.store.date.setDateRange(dateRange);
               // 日期数据变更后，如果购物车里有数据，需要更新购物车里的报价单的价格
@@ -814,11 +637,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }
             case 2:
             case "end":
-              return _context13.stop();
+              return _context10.stop();
           }
-        }, _callee12, this);
+        }, _callee10, this);
       }));
-      function setDateRange(_x13) {
+      function setDateRange(_x12) {
         return _setDateRange.apply(this, arguments);
       }
       return setDateRange;
@@ -833,16 +656,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getDateRange",
     value: function () {
-      var _getDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
-        return _regeneratorRuntime().wrap(function _callee13$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+      var _getDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
+        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              return _context14.abrupt("return", this.store.date.getDateRange());
+              return _context11.abrupt("return", this.store.date.getDateRange());
             case 1:
             case "end":
-              return _context14.stop();
+              return _context11.stop();
           }
-        }, _callee13, this);
+        }, _callee11, this);
       }));
       function getDateRange() {
         return _getDateRange.apply(this, arguments);
@@ -859,7 +682,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getAvailableDate",
     value: function () {
-      var _getAvailableDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
+      var _getAvailableDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
         var _this4 = this,
           _dateRange$,
           _dateRange$2,
@@ -875,16 +698,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           dateRange,
           tempStartDate,
           tempEndDate,
-          _ref5,
+          _ref4,
           resourceIds,
           rules,
           resourcesMap,
           res,
-          _args15 = arguments;
-        return _regeneratorRuntime().wrap(function _callee14$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+          _args12 = arguments;
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              params = _args15.length > 0 && _args15[0] !== undefined ? _args15[0] : {};
+              params = _args12.length > 0 && _args12[0] !== undefined ? _args12[0] : {};
               // 开始日期如果小于今天，直接以今天当做开始日期
               products = params.products, startDate = params.startDate, endDate = params.endDate, type = params.type, _params$useCache = params.useCache, useCache = _params$useCache === void 0 ? true : _params$useCache; // 前端传递的 startDate，可能是今天之前的，如果 startDate 小于今天 且 endDate 小于或等于今天，需要把 startDate 置为今天
               if (dayjs(startDate).isBefore(dayjs(), 'day') && (dayjs(endDate).isAfter(dayjs(), 'day') || dayjs(endDate).isSame(dayjs(), 'day'))) {
@@ -911,15 +734,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               tempStartDate = startDate || (dateRange === null || dateRange === void 0 || (_dateRange$ = dateRange[0]) === null || _dateRange$ === void 0 ? void 0 : _dateRange$.date);
               tempEndDate = endDate || (dateRange === null || dateRange === void 0 || (_dateRange$2 = dateRange[1]) === null || _dateRange$2 === void 0 ? void 0 : _dateRange$2.date) || (dateRange === null || dateRange === void 0 || (_dateRange$3 = dateRange[0]) === null || _dateRange$3 === void 0 ? void 0 : _dateRange$3.date);
               if (tempProducts.length) {
-                _context15.next = 11;
+                _context12.next = 11;
                 break;
               }
-              return _context15.abrupt("return", []);
+              return _context12.abrupt("return", []);
             case 11:
               // 在这里需要把能收集到的数据都收集上来，拼装好给 date 模块去查询
-              _ref5 = getAvailableProductResources(tempProducts) || {}, resourceIds = _ref5.resourceIds, rules = _ref5.rules, resourcesMap = _ref5.resourcesMap;
+              _ref4 = getAvailableProductResources(tempProducts) || {}, resourceIds = _ref4.resourceIds, rules = _ref4.rules, resourcesMap = _ref4.resourcesMap;
               this.otherParams.currentResourcesMap = resourcesMap;
-              _context15.next = 15;
+              _context12.next = 15;
               return this.store.date.getResourceDates({
                 url: params.url,
                 query: {
@@ -932,13 +755,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 useCache: useCache
               });
             case 15:
-              res = _context15.sent;
-              return _context15.abrupt("return", res);
+              res = _context12.sent;
+              return _context12.abrupt("return", res);
             case 17:
             case "end":
-              return _context15.stop();
+              return _context12.stop();
           }
-        }, _callee14, this);
+        }, _callee12, this);
       }));
       function getAvailableDate() {
         return _getAvailableDate.apply(this, arguments);
@@ -951,22 +774,22 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getSummary",
     value: (function () {
-      var _getSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
+      var _getSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
         var cartItems, summary;
-        return _regeneratorRuntime().wrap(function _callee15$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
               cartItems = this.store.cart.getItems();
-              _context16.next = 3;
+              _context13.next = 3;
               return this.store.summary.getSummary(cartItems);
             case 3:
-              summary = _context16.sent;
-              return _context16.abrupt("return", summary);
+              summary = _context13.sent;
+              return _context13.abrupt("return", summary);
             case 5:
             case "end":
-              return _context16.stop();
+              return _context13.stop();
           }
-        }, _callee15, this);
+        }, _callee13, this);
       }));
       function getSummary() {
         return _getSummary.apply(this, arguments);
@@ -980,18 +803,18 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProtocol",
     value: (function () {
-      var _getProtocol = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(protocolId) {
-        return _regeneratorRuntime().wrap(function _callee16$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+      var _getProtocol = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(protocolId) {
+        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
-              return _context17.abrupt("return", this.store.summary.getProtocol(protocolId));
+              return _context14.abrupt("return", this.store.summary.getProtocol(protocolId));
             case 1:
             case "end":
-              return _context17.stop();
+              return _context14.stop();
           }
-        }, _callee16, this);
+        }, _callee14, this);
       }));
-      function getProtocol(_x14) {
+      function getProtocol(_x13) {
         return _getProtocol.apply(this, arguments);
       }
       return getProtocol;
@@ -1000,16 +823,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProducts",
     value: function () {
-      var _getProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
-        return _regeneratorRuntime().wrap(function _callee17$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+      var _getProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
+        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
-              return _context18.abrupt("return", this.store.products.getProducts());
+              return _context15.abrupt("return", this.store.products.getProducts());
             case 1:
             case "end":
-              return _context18.stop();
+              return _context15.stop();
           }
-        }, _callee17, this);
+        }, _callee15, this);
       }));
       function getProducts() {
         return _getProducts.apply(this, arguments);
@@ -1019,15 +842,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setLoginAccount",
     value: function () {
-      var _setLoginAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(accountId, accountInfo) {
+      var _setLoginAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(accountId, accountInfo) {
         var _this5 = this;
         var account, stateAccountId, cartItems, _this$store$date$getD2, date, normalProductCartItem;
-        return _regeneratorRuntime().wrap(function _callee18$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
               account = this.store.accountList.getAccount(accountId);
               if (!account) {
-                _context19.next = 11;
+                _context16.next = 11;
                 break;
               }
               stateAccountId = account.getId();
@@ -1056,17 +879,17 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
                 this.updateQuotationPriceAndCart(date);
               }
-              _context19.next = 12;
+              _context16.next = 12;
               break;
             case 11:
               throw new Error("\u6CA1\u6709\u627E\u5230".concat(accountId, "\u8D26\u6237"));
             case 12:
             case "end":
-              return _context19.stop();
+              return _context16.stop();
           }
-        }, _callee18, this);
+        }, _callee16, this);
       }));
-      function setLoginAccount(_x15, _x16) {
+      function setLoginAccount(_x14, _x15) {
         return _setLoginAccount.apply(this, arguments);
       }
       return setLoginAccount;
@@ -1074,14 +897,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "generateCartData",
     value: function () {
-      var _generateCartData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
-        return _regeneratorRuntime().wrap(function _callee19$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+      var _generateCartData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
+        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
             case "end":
-              return _context20.stop();
+              return _context17.stop();
           }
-        }, _callee19);
+        }, _callee17);
       }));
       function generateCartData() {
         return _generateCartData.apply(this, arguments);
@@ -1091,23 +914,23 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getFreeProduct",
     value: function () {
-      var _getFreeProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(id) {
+      var _getFreeProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(id) {
         var res;
-        return _regeneratorRuntime().wrap(function _callee20$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
-              _context21.next = 2;
+              _context18.next = 2;
               return this.request.post("/pay/order/free-pay/".concat(id));
             case 2:
-              res = _context21.sent;
-              return _context21.abrupt("return", res);
+              res = _context18.sent;
+              return _context18.abrupt("return", res);
             case 4:
             case "end":
-              return _context21.stop();
+              return _context18.stop();
           }
-        }, _callee20, this);
+        }, _callee18, this);
       }));
-      function getFreeProduct(_x17) {
+      function getFreeProduct(_x16) {
         return _getFreeProduct.apply(this, arguments);
       }
       return getFreeProduct;
@@ -1130,16 +953,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitOrder",
     value: function () {
-      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
+      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
         var cartItems, newCartItems, type;
-        return _regeneratorRuntime().wrap(function _callee21$(_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
+        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
               cartItems = this.store.cart.getItems();
               newCartItems = cloneDeep(cartItems); // 先整个临时的逻辑，把购物车里所有商品的资源给他格式化一下
               newCartItems.forEach(function (item) {
                 if (item._origin.resources && item._origin.resources.length) {
-                  var _item$_productOrigin, _item$_origin;
+                  var _item$_origin;
                   item._origin.resources = item._origin.resources.map(function (n) {
                     var newResourcesItem = cloneDeep(n);
                     delete newResourcesItem.id;
@@ -1147,13 +970,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                     delete newResourcesItem.resourceType;
                     return _objectSpread({}, newResourcesItem);
                   });
-                  var formatCapacity = formatDefaultCapacitys({
-                    capacity: (_item$_productOrigin = item._productOrigin) === null || _item$_productOrigin === void 0 ? void 0 : _item$_productOrigin.capacity,
-                    product_bundle: item._origin.product.product_bundle
-                  });
-                  var currentCapacity = getSumCapacity({
-                    capacity: formatCapacity
-                  });
+                  var _getCapacityInfoByCar = getCapacityInfoByCartItem(item),
+                    currentCapacity = _getCapacityInfoByCar.currentCapacity,
+                    formatCapacity = _getCapacityInfoByCar.formatCapacity;
                   if (!((_item$_origin = item._origin) !== null && _item$_origin !== void 0 && _item$_origin.metadata)) {
                     item._origin.metadata = {};
                   }
@@ -1167,7 +986,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }))) {
                 type = 'virtual';
               }
-              return _context22.abrupt("return", this.store.order.submitOrder({
+              return _context19.abrupt("return", this.store.order.submitOrder({
                 query: {
                   cartItems: newCartItems,
                   type: type
@@ -1175,9 +994,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }));
             case 6:
             case "end":
-              return _context22.stop();
+              return _context19.stop();
           }
-        }, _callee21, this);
+        }, _callee19, this);
       }));
       function submitOrder() {
         return _submitOrder.apply(this, arguments);
@@ -1187,14 +1006,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "pay",
     value: function () {
-      var _pay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22() {
-        return _regeneratorRuntime().wrap(function _callee22$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+      var _pay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20() {
+        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
             case "end":
-              return _context23.stop();
+              return _context20.stop();
           }
-        }, _callee22);
+        }, _callee20);
       }));
       function pay() {
         return _pay.apply(this, arguments);
@@ -1204,14 +1023,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getPayInfo",
     value: function () {
-      var _getPayInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
-        return _regeneratorRuntime().wrap(function _callee23$(_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
+      var _getPayInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
+        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
             case 0:
             case "end":
-              return _context24.stop();
+              return _context21.stop();
           }
-        }, _callee23);
+        }, _callee21);
       }));
       function getPayInfo() {
         return _getPayInfo.apply(this, arguments);
@@ -1221,15 +1040,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setOtherParams",
     value: function () {
-      var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(params) {
-        var _ref6,
-          _ref6$cover,
+      var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(params) {
+        var _ref5,
+          _ref5$cover,
           cover,
-          _args25 = arguments;
-        return _regeneratorRuntime().wrap(function _callee24$(_context25) {
-          while (1) switch (_context25.prev = _context25.next) {
+          _args22 = arguments;
+        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
-              _ref6 = _args25.length > 1 && _args25[1] !== undefined ? _args25[1] : {}, _ref6$cover = _ref6.cover, cover = _ref6$cover === void 0 ? false : _ref6$cover;
+              _ref5 = _args22.length > 1 && _args22[1] !== undefined ? _args22[1] : {}, _ref5$cover = _ref5.cover, cover = _ref5$cover === void 0 ? false : _ref5$cover;
               if (cover) {
                 this.otherParams = params;
               } else {
@@ -1237,11 +1056,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }
             case 2:
             case "end":
-              return _context25.stop();
+              return _context22.stop();
           }
-        }, _callee24, this);
+        }, _callee22, this);
       }));
-      function setOtherParams(_x18) {
+      function setOtherParams(_x17) {
         return _setOtherParams.apply(this, arguments);
       }
       return setOtherParams;
@@ -1249,51 +1068,193 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOtherParams",
     value: function () {
-      var _getOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25() {
-        return _regeneratorRuntime().wrap(function _callee25$(_context26) {
-          while (1) switch (_context26.prev = _context26.next) {
+      var _getOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
+        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
+          while (1) switch (_context23.prev = _context23.next) {
             case 0:
-              return _context26.abrupt("return", this.otherParams);
+              return _context23.abrupt("return", this.otherParams);
             case 1:
             case "end":
-              return _context26.stop();
+              return _context23.stop();
           }
-        }, _callee25, this);
+        }, _callee23, this);
       }));
       function getOtherParams() {
         return _getOtherParams.apply(this, arguments);
       }
       return getOtherParams;
-    }() // 更新购物车
+    }()
+    /**
+     * 往购物车加商品数据(duration 类、普通商品)
+     * 老接口，先不删，怕 UI 有问题，直接桥接到新接口addProductToCart上
+     *
+     * @param {ProductData} productData
+     * @memberof BookingByStepImpl
+     */
   }, {
-    key: "updateCart",
-    value: function updateCart(params) {
-      var _this6 = this;
-      var targetCartItem = this.store.cart.getItem(params._id);
-      if (!targetCartItem) {
-        throw new Error("\u6CA1\u6709\u627E\u5230".concat(params._id, "\u8D2D\u7269\u8F66\u5546\u54C1"));
+    key: "storeProduct",
+    value: (function () {
+      var _storeProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(productData) {
+        var activeAccount;
+        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
+            case 0:
+              // 往购物车加商品数据的时候，默认用当前 activeAccount 填充到 product 的 account 里面
+              activeAccount = this.getActiveAccount(); // 直接调用 addProductToCart，不传递 date 参数以避免日期检查逻辑
+              this.addProductToCart({
+                product: productData,
+                account: activeAccount
+              });
+            case 2:
+            case "end":
+              return _context24.stop();
+          }
+        }, _callee24, this);
+      }));
+      function storeProduct(_x18) {
+        return _storeProduct.apply(this, arguments);
       }
-      var currentResourcesCapacityMap = {};
-      if (params.resources) {
-        var _targetCartItem$_prod;
-        var formatCapacity = formatDefaultCapacitys({
-          capacity: (_targetCartItem$_prod = targetCartItem._productOrigin) === null || _targetCartItem$_prod === void 0 ? void 0 : _targetCartItem$_prod.capacity,
-          product_bundle: targetCartItem._origin.product.product_bundle
+      return storeProduct;
+    }()
+    /**
+     * 往购物车加商品数据
+     *
+     * @param {({
+     *     product: ProductData;
+     *     date?: { startTime: string; endTime: string } | null;
+     *     account?: Account | null;
+     *   })} {
+     *     product,
+     *     date,
+     *     account,
+     *   }
+     * @return {*}
+     * @memberof BookingByStepImpl
+     */
+    )
+  }, {
+    key: "addProductToCart",
+    value: function addProductToCart(_ref6) {
+      var product = _ref6.product,
+        date = _ref6.date,
+        account = _ref6.account;
+      var _ref7 = product || {},
+        bundle = _ref7.bundle,
+        options = _ref7.options,
+        origin = _ref7.origin,
+        product_variant_id = _ref7.product_variant_id,
+        rowKey = _ref7.rowKey,
+        _ref7$quantity = _ref7.quantity,
+        quantity = _ref7$quantity === void 0 ? 1 : _ref7$quantity;
+      var productData = _objectSpread(_objectSpread({}, origin), {}, {
+        product_variant_id: product_variant_id
+      });
+      if (!account) {
+        var activeAccount = this.getActiveAccount();
+        if (activeAccount) {
+          account = activeAccount;
+        }
+      }
+      var flag = this.store.cart.mergeCartItemByRowKey({
+        rowKey: rowKey,
+        quantity: quantity,
+        account: account || undefined
+      });
+      if (flag) {
+        return;
+      }
+      var addItemParams = {
+        product: productData,
+        bundle: bundle,
+        options: options,
+        quantity: quantity
+      };
+      if (date) {
+        addItemParams.date = date;
+      }
+      if (account) {
+        addItemParams.account = account;
+      }
+      this.addProductCheck({
+        date: date
+      });
+      this.store.cart.addItem(addItemParams);
+    }
+
+    /**
+     * 添加完购物车以后做的一些检测，比如日期是否在同一天
+     *
+     * @param {({ date?: { startTime: string; endTime: string } | null })} { date }
+     * @memberof BookingByStepImpl
+     */
+  }, {
+    key: "addProductCheck",
+    value: function addProductCheck(_ref8) {
+      var _this6 = this;
+      var date = _ref8.date;
+      // 检测，有传递 date，检查购物车里其他商品的 date 是否在同一天，如果不在，清空那些不在同一天的商品
+      if (date) {
+        var cartItems = this.store.cart.getItems().filter(function (n) {
+          return !isNormalProduct(n._productOrigin);
         });
-        var currentCapacity = getSumCapacity({
-          capacity: formatCapacity
+        var cartItemsByDate = cartItems.filter(function (n) {
+          return !dayjs(n.start_date).isSame(dayjs(date.startTime), 'day');
         });
+        if (cartItemsByDate.length) {
+          cartItemsByDate.forEach(function (n) {
+            _this6.store.cart.removeItem(n._id);
+          });
+        }
+      }
+    }
+  }, {
+    key: "beforeUpdateCart",
+    value: function beforeUpdateCart(params, targetCartItem) {
+      if (params.resources) {
+        var _getCapacityInfoByCar2 = getCapacityInfoByCartItem(targetCartItem),
+          currentCapacity = _getCapacityInfoByCar2.currentCapacity;
         params.resources = params.resources.map(function (n) {
           n.capacity = currentCapacity || 1;
-          currentResourcesCapacityMap[n.id] = currentCapacity;
           checkSubResourcesCapacity(n);
           return n;
         });
       }
+    }
+
+    // 更新购物车
+  }, {
+    key: "updateCart",
+    value: function updateCart(params) {
+      var targetCartItem = this.store.cart.getItem(params._id);
+      if (!targetCartItem) {
+        throw new Error("\u6CA1\u6709\u627E\u5230".concat(params._id, "\u8D2D\u7269\u8F66\u5546\u54C1"));
+      }
+      this.beforeUpdateCart(params, targetCartItem);
       this.store.cart.updateItem(params);
+      this.updateCartCheck(params, targetCartItem);
+    }
+
+    /**
+     * 更新购物车以后的一些操作，比如检测资源是否重复，检测资源容量是否足够
+     *
+     * @param {IUpdateItemParams} params
+     * @param {CartItem} targetCartItem
+     * @return {*}
+     * @memberof BookingByStepImpl
+     */
+  }, {
+    key: "updateCartCheck",
+    value: function updateCartCheck(params, targetCartItem) {
+      var _params$resources,
+        _this7 = this;
+      // 零售模板不需要检测
       if (this.otherParams.isRetailTemplate) {
         return;
       }
+      var currentResourcesCapacityMap = {};
+      (_params$resources = params.resources) === null || _params$resources === void 0 || _params$resources.forEach(function (n) {
+        currentResourcesCapacityMap[n.id] = n.capacity;
+      });
       var allOriginResources = [];
       var dateRange = this.store.date.getDateRange();
       if (dateRange !== null && dateRange !== void 0 && dateRange.length) {
@@ -1315,48 +1276,27 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         cartItems.forEach(function (item) {
           if (item._id !== targetCartItem._id) {
             var _item$_origin$resourc;
+            var _getCapacityInfoByCar3 = getCapacityInfoByCartItem(item),
+              currentCapacity = _getCapacityInfoByCar3.currentCapacity;
             var resources = (_item$_origin$resourc = item._origin.resources) === null || _item$_origin$resourc === void 0 ? void 0 : _item$_origin$resourc.filter(function (m) {
               // 检查当前资源是否与目标资源的任何资源匹配
               // 目标资源，应该只取跟当前 m.form_id 相同的资源
-              var sameFormIdResources = targetCartItem._origin.resources.filter(function (n) {
-                return n.form_id === m.form_id;
-              });
+              var sameFormIdResources = filterResourcesByFormItem(targetCartItem._origin.resources, m.form_id);
               if (!(sameFormIdResources !== null && sameFormIdResources !== void 0 && sameFormIdResources.length)) {
                 return true;
               }
               return !sameFormIdResources.some(function (targetRes) {
                 // 如果新更新进来的资源不是单个预约，其实就不需要检测了资源重叠了，但是需要检测资源 capacity 是否足够
                 if (targetRes.resourceType !== 'single') {
-                  var _item$_productOrigin2;
-                  var _formatCapacity = formatDefaultCapacitys({
-                    capacity: (_item$_productOrigin2 = item._productOrigin) === null || _item$_productOrigin2 === void 0 ? void 0 : _item$_productOrigin2.capacity,
-                    product_bundle: item._origin.product.product_bundle
-                  });
-                  var _currentCapacity = getSumCapacity({
-                    capacity: _formatCapacity
-                  });
                   var originResource = allOriginResources.find(function (n) {
                     return n.id === targetRes.id;
                   });
-                  if (currentResourcesCapacityMap[m.id] + _currentCapacity > (originResource === null || originResource === void 0 ? void 0 : originResource.capacity)) {
-                    return true;
-                  }
-                  currentResourcesCapacityMap[m.id] += _currentCapacity;
-                  return false;
+                  var canUse = checkResourceCanUseByCapacity(currentResourcesCapacityMap[m.id] || 0, currentCapacity, originResource === null || originResource === void 0 ? void 0 : originResource.capacity);
+                  if (canUse) currentResourcesCapacityMap[m.id] += currentCapacity;
+                  return !canUse;
                 }
                 if (item.holder_id !== (targetCartItem === null || targetCartItem === void 0 ? void 0 : targetCartItem.holder_id)) {
-                  var _targetRes$metadata$c, _m$metadata$combined_;
-                  // 检查主资源ID是否匹配
-                  if (targetRes.id === m.id) return true;
-                  // 检查组合资源的情况
-                  if (((_targetRes$metadata$c = targetRes.metadata.combined_resource) === null || _targetRes$metadata$c === void 0 ? void 0 : _targetRes$metadata$c.status) === 1 && (
-                  // 如果现在选择的是组合资源，需要判断
-                  // 1、当前其他购物车里是否选了当前组合资源的子资源
-                  // 2、如果其他购物车里的商品也是组合资源，出了组合资源本身的 id 需要判断，还需要判断子资源的 id 是否有交集
-                  targetRes.metadata.combined_resource.resource_ids.includes(m.id) || targetRes.metadata.combined_resource.resource_ids.some(function (n) {
-                    return m.metadata.combined_resource.resource_ids.includes(n);
-                  }))) return true;
-                  if (((_m$metadata$combined_ = m.metadata.combined_resource) === null || _m$metadata$combined_ === void 0 ? void 0 : _m$metadata$combined_.status) === 1 && m.metadata.combined_resource.resource_ids.includes(targetRes.id)) return true;
+                  return checkTwoResourcesIntersection(targetRes, m);
                 }
                 return false;
               });
@@ -1367,7 +1307,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               var end_time = item.end_time;
               var start_date = item.start_date;
               var end_date = item.end_date;
-              _this6.store.cart.updateItem({
+              _this7.store.cart.updateItem({
                 _id: item._id,
                 resources: resources,
                 date: {
@@ -1376,7 +1316,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               });
             } else {
-              _this6.store.cart.updateItem({
+              _this7.store.cart.updateItem({
                 _id: item._id,
                 resources: resources
               });
@@ -1413,10 +1353,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "batchUpdateCart",
     value: function batchUpdateCart(paramsList) {
-      var _this7 = this;
+      var _this8 = this;
       var cartItems = [];
       paramsList.forEach(function (params) {
-        var cartItem = _this7.store.cart.formatCartItem(params);
+        var cartItem = _this8.store.cart.formatCartItem(params);
         cartItems.push(cartItem);
       });
       this.store.cart.batchSetItems(cartItems);
@@ -1444,172 +1384,39 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "checkCartItems",
     value: function checkCartItems(type) {
-      var _this8 = this;
-      // 预约流程中普通商品无需检测这些东西
-      var cartItems = this.store.cart.getItems().filter(function (n) {
-        return !isNormalProduct(n._productOrigin);
-      });
-      var errorCartItemIds = [];
-      cartItems.forEach(function (cartItem) {
-        var result = _this8.store.cart.checkCartItemByType(cartItem, type);
-        if (!result) {
-          errorCartItemIds.push(cartItem._id);
-        }
-      });
-      return errorCartItemIds;
-    }
-  }, {
-    key: "destroy",
-    value: function destroy() {
-      var _this$store$cart, _this$store$step, _this$store$products, _this$store$guests, _this$store$date, _this$store$accountLi;
-      (_this$store$cart = this.store.cart) === null || _this$store$cart === void 0 || _this$store$cart.destroy();
-      (_this$store$step = this.store.step) === null || _this$store$step === void 0 || _this$store$step.destroy();
-      (_this$store$products = this.store.products) === null || _this$store$products === void 0 || _this$store$products.destroy();
-      (_this$store$guests = this.store.guests) === null || _this$store$guests === void 0 || _this$store$guests.destroy();
-      (_this$store$date = this.store.date) === null || _this$store$date === void 0 || _this$store$date.destroy();
-      (_this$store$accountLi = this.store.accountList) === null || _this$store$accountLi === void 0 || _this$store$accountLi.destroy();
-      this.core.effects.offByModuleDestroy(this.name);
-      this.core.unregisterModule(this);
-    }
-
-    // 获取当前购物车内所有关联的资源列表，拼装数据格式
-  }, {
-    key: "getResourcesList",
-    value: function getResourcesList() {
       var _this9 = this;
-      var dateRange = this.store.date.getDateRange();
-      var resources = [];
-      if (dateRange !== null && dateRange !== void 0 && dateRange.length) {
-        dateRange.forEach(function (n) {
-          if (n.resource) resources.push.apply(resources, _toConsumableArray(n.resource));
-        });
-      }
-      // 如果此时 resources 为空，视作购物车里已经有了 dateRange 数据，此时 dateList 里明确就是那一天的数据
-      if (!resources.length) {
-        var dateList = this.store.date.getDateList();
-        dateList.forEach(function (n) {
-          if (n.resource) resources.push.apply(resources, _toConsumableArray(n.resource));
-        });
-      }
-      var resourcesMap = getResourcesMap(cloneDeep(resources));
-      var cartItems = this.store.cart.getItems().filter(function (n) {
-        return !isNormalProduct(n._productOrigin);
-      });
-      var arr = [];
-      cartItems.forEach(function (cartItem) {
-        var _cartItem$_productOri, _cartItem$_productOri2;
-        var selectedResources = [];
-        var formatCapacity = formatDefaultCapacitys({
-          capacity: (_cartItem$_productOri = cartItem._productOrigin) === null || _cartItem$_productOri === void 0 ? void 0 : _cartItem$_productOri.capacity,
-          product_bundle: cartItem._origin.product.product_bundle
-        });
-        cartItem._origin.metadata.capacity = formatCapacity;
-        var currentCapacity = getSumCapacity({
-          capacity: formatCapacity
-        });
-        if (cartItem.holder_id) {
-          selectedResources = getOthersSelectedResources(cartItems, cartItem.holder_id, resourcesMap);
-        } else {
-          selectedResources = getOthersCartSelectedResources(cartItems, cartItem._id, resourcesMap);
-        }
-        var productResources = getResourcesByProduct(resourcesMap, ((_cartItem$_productOri2 = cartItem._productOrigin) === null || _cartItem$_productOri2 === void 0 || (_cartItem$_productOri2 = _cartItem$_productOri2.product_resource) === null || _cartItem$_productOri2 === void 0 ? void 0 : _cartItem$_productOri2.resources) || [], selectedResources, currentCapacity);
-        // 如果购物车里已经有了时间片，则需要按照时间片过滤
-        if (cartItem._origin.start_time) {
-          var startTime = dayjs("".concat(cartItem._origin.start_date, " ").concat(cartItem._origin.start_time));
-          var endTime = dayjs("".concat(cartItem._origin.end_date, " ").concat(cartItem._origin.end_time));
-          var resourcesUseableMap = {};
-          productResources.forEach(function (n) {
-            // 资源排下序，把单个资源靠前，组合资源排在后面
-            n.renderList = n.renderList.sort(function (a, b) {
-              var _a$metadata, _b$metadata;
-              var aIsCombined = ((_a$metadata = a.metadata) === null || _a$metadata === void 0 || (_a$metadata = _a$metadata.combined_resource) === null || _a$metadata === void 0 ? void 0 : _a$metadata.status) === 1;
-              var bIsCombined = ((_b$metadata = b.metadata) === null || _b$metadata === void 0 || (_b$metadata = _b$metadata.combined_resource) === null || _b$metadata === void 0 ? void 0 : _b$metadata.status) === 1;
-              if (aIsCombined && !bIsCombined) return 1;
-              if (!aIsCombined && bIsCombined) return -1;
-              return 0;
-            });
-            n.renderList = n.renderList.filter(function (m) {
-              // m.times 需要做个过滤，假设 timeSlice.start_at 是 09:30 timeSlice.end_at 是 11:30
-              // time 是 time.start_at = 2025-05-26 10:30, time.end_at = 2025-05-26 12:30
-              // 需要判断 time 的开始结束时间 是否包含timeSlice的开始结束时间
-              var mTimes = m.times.filter(function (n) {
-                return !dayjs(n.start_at).isAfter(dayjs(startTime)) && !dayjs(n.end_at).isBefore(dayjs(endTime));
-              });
-              // 如果在这个区间的时间一个都没有，可以直接认为这个资源不可用
-              if (mTimes.length === 0) {
-                return false;
-              }
-              var canUseArr = mTimes.map(function (item) {
-                var _cartItem$_productOri3;
-                var res = 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: resourcesUseableMap,
-                  cut_off_time: (_cartItem$_productOri3 = cartItem._productOrigin) === null || _cartItem$_productOri3 === void 0 ? void 0 : _cartItem$_productOri3.cut_off_time
-                });
-                // 如果仅仅是因为子资源容量不够，不应该标记子资源是被占用的情况
-                if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== 'capacityOnly') {
-                  resourcesUseableMap[m.id] = res.usable;
-                }
-                return res.usable;
-              });
-              if (m.onlyComputed) return false;
-              // 在已经选定时间的情况下，只要canUseTime 里有一个 false，那就代表不可用
-              return !canUseArr.some(function (n) {
-                return n === false;
-              });
-            });
-          });
-        } else {
-          var _cartItem$_productOri4, _this9$shopStore$get;
-          var hasFlexibleDuration = ((_cartItem$_productOri4 = cartItem._productOrigin) === null || _cartItem$_productOri4 === void 0 || (_cartItem$_productOri4 = _cartItem$_productOri4.duration) === null || _cartItem$_productOri4 === void 0 ? void 0 : _cartItem$_productOri4.type) === 'flexible';
-          var operating_day_boundary = (_this9$shopStore$get = _this9.shopStore.get('core')) === null || _this9$shopStore$get === void 0 || (_this9$shopStore$get = _this9$shopStore$get.core) === null || _this9$shopStore$get === void 0 ? void 0 : _this9$shopStore$get.operating_day_boundary;
-          productResources.forEach(function (item) {
-            // 如果资源的 capacity 已经小于了当前需要的 capacity ，则需要把资源给过滤掉
-            // 同时，在这一步尝试去拉一下时间片，基于商品的时长，看每个资源是否还有空余时间能对这个商品做服务，如果没有则过滤
-            item.renderList = item.renderList.filter(function (n) {
-              var _cartItem$_productOri5, _cartItem$_productOri6;
-              var recordCount = n.capacity || 0;
-              if (n.onlyComputed) return false;
-              // 查一下这个资源基于商品的可用时间片
-              var timeSlots = getTimeSlicesByResource({
-                resource: n,
-                duration: ((_cartItem$_productOri5 = cartItem._productOrigin) === null || _cartItem$_productOri5 === void 0 || (_cartItem$_productOri5 = _cartItem$_productOri5.duration) === null || _cartItem$_productOri5 === void 0 ? void 0 : _cartItem$_productOri5.value) || 10,
-                split: 10,
-                currentDate: dateRange[0].date,
-                hasFlexibleDuration: hasFlexibleDuration,
-                cut_off_time: (_cartItem$_productOri6 = cartItem._productOrigin) === null || _cartItem$_productOri6 === void 0 ? void 0 : _cartItem$_productOri6.cut_off_time,
-                operating_day_boundary: operating_day_boundary
-              });
-              return recordCount >= currentCapacity && timeSlots.length > 0;
-            });
-          });
+      // 预约流程中普通商品无需检测这些东西
+      var cartItems = this.store.cart.getItems().filter(function (n) {
+        return !isNormalProduct(n._productOrigin);
+      });
+      var errorCartItemIds = [];
+      cartItems.forEach(function (cartItem) {
+        var result = _this9.store.cart.checkCartItemByType(cartItem, type);
+        if (!result) {
+          errorCartItemIds.push(cartItem._id);
         }
-        arr.push({
-          id: cartItem.id,
-          // 这里返回的是购物车 id ，后面提交的时候要用的，用这个 id 绑定资源和时间
-          _id: cartItem._id,
-          // 这里返回的是购物车 id ，后面提交的时候要用的，用这个 id 绑定资源和时间
-          product: cartItem._productOrigin,
-          resources: productResources,
-          holder_id: cartItem.holder_id,
-          holder_name: cartItem.holder_title
-        });
       });
-      return arr;
+      return errorCartItemIds;
+    }
+  }, {
+    key: "destroy",
+    value: function destroy() {
+      var _this$store$cart, _this$store$step, _this$store$products, _this$store$guests, _this$store$date, _this$store$accountLi;
+      (_this$store$cart = this.store.cart) === null || _this$store$cart === void 0 || _this$store$cart.destroy();
+      (_this$store$step = this.store.step) === null || _this$store$step === void 0 || _this$store$step.destroy();
+      (_this$store$products = this.store.products) === null || _this$store$products === void 0 || _this$store$products.destroy();
+      (_this$store$guests = this.store.guests) === null || _this$store$guests === void 0 || _this$store$guests.destroy();
+      (_this$store$date = this.store.date) === null || _this$store$date === void 0 || _this$store$date.destroy();
+      (_this$store$accountLi = this.store.accountList) === null || _this$store$accountLi === void 0 || _this$store$accountLi.destroy();
+      this.core.effects.offByModuleDestroy(this.name);
+      this.core.unregisterModule(this);
     }
 
-    // 在日期那边点击下一步的时候，检查这一天购物车里的商品是不是都有资源可以用
+    // 获取当前购物车内所有关联的资源列表，拼装数据格式
   }, {
-    key: "checkResourceListForDate",
-    value: function checkResourceListForDate() {
+    key: "getResourcesList",
+    value: function getResourcesList() {
+      var _this10 = this;
       var dateRange = this.store.date.getDateRange();
       var resources = [];
       if (dateRange !== null && dateRange !== void 0 && dateRange.length) {
@@ -1617,35 +1424,42 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           if (n.resource) resources.push.apply(resources, _toConsumableArray(n.resource));
         });
       }
+      var cartItems = this.store.cart.getItems().filter(function (n) {
+        return !isNormalProduct(n._productOrigin);
+      });
+
       // 如果此时 resources 为空，视作购物车里已经有了 dateRange 数据，此时 dateList 里明确就是那一天的数据
       if (!resources.length) {
-        var dateList = this.store.date.getDateList();
-        dateList.forEach(function (n) {
-          if (n.resource) resources.push.apply(resources, _toConsumableArray(n.resource));
+        // 如果此时购物车里已经有了开始时间，则直接取那天的数据即可
+        var firstDateCartItem = cartItems === null || cartItems === void 0 ? void 0 : cartItems.find(function (n) {
+          return n.start_date;
         });
+        if (firstDateCartItem !== null && firstDateCartItem !== void 0 && firstDateCartItem.start_date) {
+          var dateResources = this.store.date.getResourcesListByDate(firstDateCartItem.start_date);
+          resources.push.apply(resources, _toConsumableArray(dateResources || []));
+        } else {
+          var dateList = this.store.date.getDateList();
+          dateList.forEach(function (n) {
+            if (n.resource) resources.push.apply(resources, _toConsumableArray(n.resource));
+          });
+        }
       }
       var resourcesMap = getResourcesMap(cloneDeep(resources));
-      var cartItems = this.store.cart.getItems().filter(function (n) {
-        return !isNormalProduct(n._productOrigin);
-      });
       var arr = [];
       cartItems.forEach(function (cartItem) {
-        var _cartItem$_productOri7, _cartItem$_productOri8;
+        var _cartItem$_productOri;
         var selectedResources = [];
-        var formatCapacity = formatDefaultCapacitys({
-          capacity: (_cartItem$_productOri7 = cartItem._productOrigin) === null || _cartItem$_productOri7 === void 0 ? void 0 : _cartItem$_productOri7.capacity,
-          product_bundle: cartItem._origin.product.product_bundle
-        });
+        var _getCapacityInfoByCar4 = getCapacityInfoByCartItem(cartItem),
+          currentCapacity = _getCapacityInfoByCar4.currentCapacity,
+          formatCapacity = _getCapacityInfoByCar4.formatCapacity;
         cartItem._origin.metadata.capacity = formatCapacity;
-        var currentCapacity = getSumCapacity({
-          capacity: formatCapacity
-        });
         if (cartItem.holder_id) {
           selectedResources = getOthersSelectedResources(cartItems, cartItem.holder_id, resourcesMap);
         } else {
           selectedResources = getOthersCartSelectedResources(cartItems, cartItem._id, resourcesMap);
         }
-        var productResources = getResourcesByProduct(resourcesMap, ((_cartItem$_productOri8 = cartItem._productOrigin) === null || _cartItem$_productOri8 === void 0 || (_cartItem$_productOri8 = _cartItem$_productOri8.product_resource) === null || _cartItem$_productOri8 === void 0 ? void 0 : _cartItem$_productOri8.resources) || [], selectedResources, currentCapacity);
+        // TODO:下面这一坨要放到 resources 模块去
+        var productResources = getResourcesByProduct(resourcesMap, ((_cartItem$_productOri = cartItem._productOrigin) === null || _cartItem$_productOri === void 0 || (_cartItem$_productOri = _cartItem$_productOri.product_resource) === null || _cartItem$_productOri === void 0 ? void 0 : _cartItem$_productOri.resources) || [], selectedResources, currentCapacity);
         // 如果购物车里已经有了时间片，则需要按照时间片过滤
         if (cartItem._origin.start_time) {
           var startTime = dayjs("".concat(cartItem._origin.start_date, " ").concat(cartItem._origin.start_time));
@@ -1653,27 +1467,18 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           var resourcesUseableMap = {};
           productResources.forEach(function (n) {
             // 资源排下序，把单个资源靠前，组合资源排在后面
-            n.renderList = n.renderList.sort(function (a, b) {
-              var _a$metadata2, _b$metadata2;
-              var aIsCombined = ((_a$metadata2 = a.metadata) === null || _a$metadata2 === void 0 || (_a$metadata2 = _a$metadata2.combined_resource) === null || _a$metadata2 === void 0 ? void 0 : _a$metadata2.status) === 1;
-              var bIsCombined = ((_b$metadata2 = b.metadata) === null || _b$metadata2 === void 0 || (_b$metadata2 = _b$metadata2.combined_resource) === null || _b$metadata2 === void 0 ? void 0 : _b$metadata2.status) === 1;
-              if (aIsCombined && !bIsCombined) return 1;
-              if (!aIsCombined && bIsCombined) return -1;
-              return 0;
-            });
+            n.renderList = sortCombinedResources(n.renderList);
             n.renderList = n.renderList.filter(function (m) {
               // m.times 需要做个过滤，假设 timeSlice.start_at 是 09:30 timeSlice.end_at 是 11:30
               // time 是 time.start_at = 2025-05-26 10:30, time.end_at = 2025-05-26 12:30
               // 需要判断 time 的开始结束时间 是否包含timeSlice的开始结束时间
-              var mTimes = m.times.filter(function (n) {
-                return !dayjs(n.start_at).isAfter(dayjs(startTime)) && !dayjs(n.end_at).isBefore(dayjs(endTime));
-              });
+              var mTimes = filterConditionTimeSlots(m.times, startTime, endTime);
               // 如果在这个区间的时间一个都没有，可以直接认为这个资源不可用
               if (mTimes.length === 0) {
                 return false;
               }
               var canUseArr = mTimes.map(function (item) {
-                var _cartItem$_productOri9;
+                var _cartItem$_productOri2;
                 var res = getIsUsableByTimeItem({
                   timeSlice: {
                     start_time: startTime.format('HH:mm'),
@@ -1685,9 +1490,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   resource: m,
                   currentCount: currentCapacity || 0,
                   resourcesUseableMap: resourcesUseableMap,
-                  cut_off_time: (_cartItem$_productOri9 = cartItem._productOrigin) === null || _cartItem$_productOri9 === void 0 ? void 0 : _cartItem$_productOri9.cut_off_time
+                  cut_off_time: (_cartItem$_productOri2 = cartItem._productOrigin) === null || _cartItem$_productOri2 === void 0 ? void 0 : _cartItem$_productOri2.cut_off_time
                 });
-                // 如果仅仅是因为子资源容量不够，不应该标记子资源是被占用的情况
+                // 如果仅仅是因为子资源容量不够，不应该标记子资源是被占用的情况(因为组合资源还需要判断子资源够不够)
                 if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== 'capacityOnly') {
                   resourcesUseableMap[m.id] = res.usable;
                 }
@@ -1701,19 +1506,25 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             });
           });
         } else {
+          var _cartItem$_productOri3, _this10$shopStore$get;
+          var hasFlexibleDuration = ((_cartItem$_productOri3 = cartItem._productOrigin) === null || _cartItem$_productOri3 === void 0 || (_cartItem$_productOri3 = _cartItem$_productOri3.duration) === null || _cartItem$_productOri3 === void 0 ? void 0 : _cartItem$_productOri3.type) === 'flexible';
+          var operating_day_boundary = (_this10$shopStore$get = _this10.shopStore.get('core')) === null || _this10$shopStore$get === void 0 || (_this10$shopStore$get = _this10$shopStore$get.core) === null || _this10$shopStore$get === void 0 ? void 0 : _this10$shopStore$get.operating_day_boundary;
           productResources.forEach(function (item) {
             // 如果资源的 capacity 已经小于了当前需要的 capacity ，则需要把资源给过滤掉
             // 同时，在这一步尝试去拉一下时间片，基于商品的时长，看每个资源是否还有空余时间能对这个商品做服务，如果没有则过滤
             item.renderList = item.renderList.filter(function (n) {
-              var _cartItem$_productOri10;
+              var _cartItem$_productOri4, _cartItem$_productOri5;
               var recordCount = n.capacity || 0;
               if (n.onlyComputed) return false;
               // 查一下这个资源基于商品的可用时间片
               var timeSlots = getTimeSlicesByResource({
                 resource: n,
-                duration: ((_cartItem$_productOri10 = cartItem._productOrigin) === null || _cartItem$_productOri10 === void 0 || (_cartItem$_productOri10 = _cartItem$_productOri10.duration) === null || _cartItem$_productOri10 === void 0 ? void 0 : _cartItem$_productOri10.value) || 10,
+                duration: ((_cartItem$_productOri4 = cartItem._productOrigin) === null || _cartItem$_productOri4 === void 0 || (_cartItem$_productOri4 = _cartItem$_productOri4.duration) === null || _cartItem$_productOri4 === void 0 ? void 0 : _cartItem$_productOri4.value) || 10,
                 split: 10,
-                currentDate: dateRange[0].date
+                currentDate: dateRange[0].date,
+                hasFlexibleDuration: hasFlexibleDuration,
+                cut_off_time: (_cartItem$_productOri5 = cartItem._productOrigin) === null || _cartItem$_productOri5 === void 0 ? void 0 : _cartItem$_productOri5.cut_off_time,
+                operating_day_boundary: operating_day_boundary
               });
               return recordCount >= currentCapacity && timeSlots.length > 0;
             });
@@ -1724,23 +1535,46 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           // 这里返回的是购物车 id ，后面提交的时候要用的，用这个 id 绑定资源和时间
           _id: cartItem._id,
           // 这里返回的是购物车 id ，后面提交的时候要用的，用这个 id 绑定资源和时间
-          productResources: productResources
+          product: cartItem._productOrigin,
+          resources: productResources,
+          holder_id: cartItem.holder_id,
+          holder_name: cartItem.holder_title
         });
       });
-      // 检查 productResources里是不是每一项资源的 renderList 里都有数据
-      var hasResource = arr.every(function (n) {
-        return n.productResources.every(function (m) {
-          return m.renderList.length > 0;
+      return arr;
+    }
+
+    /**
+     * 在日期那边点击下一步的时候，检查这一天购物车里的商品是不是都有资源可以用
+     *
+     * @return {*}
+     * @memberof BookingByStepImpl
+     */
+  }, {
+    key: "checkResourceListForDate",
+    value: function checkResourceListForDate() {
+      var resourcesList = this.getResourcesList();
+
+      // 检查每一项资源的 renderList 里是否都有数据
+      var hasResource = resourcesList.every(function (item) {
+        return item.resources.every(function (resource) {
+          return resource.renderList.length > 0;
         });
       });
       return hasResource;
     }
 
-    // 给单个购物车里的商品获取资源列表
+    /**
+     * 给单个购物车里的商品获取资源列表，给 UI 用的
+     *
+     * @param {(string | number)} id
+     * @return {*}
+     * @memberof BookingByStepImpl
+     */
   }, {
     key: "getResourcesListByCartItem",
     value: function getResourcesListByCartItem(id) {
-      var _targetCartItem$_prod2, _targetCartItem$_prod3;
+      var _targetCartItem$_prod;
       var cartItems = this.store.cart.getItems().filter(function (n) {
         return !isNormalProduct(n._productOrigin);
       });
@@ -1758,19 +1592,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         throw new Error("\u6CA1\u6709\u627E\u5230".concat(id, "\u8D2D\u7269\u8F66\u5546\u54C1"));
       }
       var selectedResources = [];
-      var formatCapacity = formatDefaultCapacitys({
-        capacity: (_targetCartItem$_prod2 = targetCartItem._productOrigin) === null || _targetCartItem$_prod2 === void 0 ? void 0 : _targetCartItem$_prod2.capacity,
-        product_bundle: targetCartItem._origin.product.product_bundle
-      });
-      var currentCapacity = getSumCapacity({
-        capacity: formatCapacity
-      });
+      var _getCapacityInfoByCar5 = getCapacityInfoByCartItem(targetCartItem),
+        currentCapacity = _getCapacityInfoByCar5.currentCapacity;
       if (targetCartItem.holder_id) {
         selectedResources = getOthersSelectedResources(cartItems, targetCartItem.holder_id, resourcesMap);
       } else {
         selectedResources = getOthersCartSelectedResources(cartItems, targetCartItem._id, resourcesMap);
       }
-      var productResources = getResourcesByProduct(resourcesMap, ((_targetCartItem$_prod3 = targetCartItem._productOrigin) === null || _targetCartItem$_prod3 === void 0 || (_targetCartItem$_prod3 = _targetCartItem$_prod3.product_resource) === null || _targetCartItem$_prod3 === void 0 ? void 0 : _targetCartItem$_prod3.resources) || [], selectedResources, currentCapacity);
+      var productResources = getResourcesByProduct(resourcesMap, ((_targetCartItem$_prod = targetCartItem._productOrigin) === null || _targetCartItem$_prod === void 0 || (_targetCartItem$_prod = _targetCartItem$_prod.product_resource) === null || _targetCartItem$_prod === void 0 ? void 0 : _targetCartItem$_prod.resources) || [], selectedResources, currentCapacity);
       productResources.forEach(function (item) {
         item.renderList = item.renderList.filter(function (n) {
           var recordCount = n.capacity || 0;
@@ -1792,36 +1621,17 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       }
     }
 
-    // 通过资源列表和指定的资源 id，获取指定资源的时间切片
-  }, {
-    key: "getResourceTimeSlot",
-    value: function getResourceTimeSlot(_ref7) {
-      var product = _ref7.product,
-        resources = _ref7.resources,
-        currentResourceId = _ref7.currentResourceId;
-      var dateRange = this.store.date.getDateRange();
-      var timeSlots = getTimeSlicesByResource({
-        resource: resources.find(function (n) {
-          return n.id === currentResourceId;
-        }),
-        duration: product.duration.value,
-        split: 10,
-        currentDate: dateRange[0].date
-      });
-      return timeSlots;
-    }
-
     // 自动分派可用资源-pro 版，ui 传递某个账号，自动给某个账号下所有商品分配第一种资源
   }, {
     key: "autoSelectAccountResources",
-    value: function autoSelectAccountResources(_ref8) {
-      var _cartItem$_productOri11, _allProductResources$;
-      var cartItem = _ref8.cartItem,
-        holder_id = _ref8.holder_id,
-        resources_code = _ref8.resources_code,
-        timeSlots = _ref8.timeSlots,
-        countMap = _ref8.countMap,
-        capacity = _ref8.capacity;
+    value: function autoSelectAccountResources(_ref9) {
+      var _cartItem$_productOri6, _allProductResources$;
+      var cartItem = _ref9.cartItem,
+        holder_id = _ref9.holder_id,
+        resources_code = _ref9.resources_code,
+        timeSlots = _ref9.timeSlots,
+        countMap = _ref9.countMap,
+        capacity = _ref9.capacity;
       if (isNormalProduct(cartItem._productOrigin)) {
         return {};
       }
@@ -1835,10 +1645,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       if (!accountCartItems.length) {
         accountCartItems = cartItems;
       }
-      // duration=所有商品时间的集合
+      // duration=所有商品时间的集合，如果是灵活时长，当做占用 10 分钟处理
       var duration = accountCartItems.reduce(function (acc, n) {
-        var _n$_productOrigin2;
-        return acc + (((_n$_productOrigin2 = n._productOrigin) === null || _n$_productOrigin2 === void 0 || (_n$_productOrigin2 = _n$_productOrigin2.duration) === null || _n$_productOrigin2 === void 0 ? void 0 : _n$_productOrigin2.value) || 10);
+        var _n$_productOrigin;
+        return acc + (((_n$_productOrigin = n._productOrigin) === null || _n$_productOrigin === void 0 || (_n$_productOrigin = _n$_productOrigin.duration) === null || _n$_productOrigin === void 0 ? void 0 : _n$_productOrigin.value) || 10);
       }, 0);
       var AllResources = [];
       if (dateRange !== null && dateRange !== void 0 && dateRange.length) {
@@ -1848,23 +1658,31 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       }
       // 如果此时 resources 为空，视作购物车里已经有了 dateRange 数据，此时 dateList 里明确就是那一天的数据
       if (!AllResources.length) {
-        var dateList = this.store.date.getDateList();
-        dateList.forEach(function (n) {
-          if (n.resource) AllResources.push.apply(AllResources, _toConsumableArray(n.resource));
+        var firstDateCartItem = cartItems === null || cartItems === void 0 ? void 0 : cartItems.find(function (n) {
+          return n.start_date;
         });
+        if (firstDateCartItem !== null && firstDateCartItem !== void 0 && firstDateCartItem.start_date) {
+          var dateResources = this.store.date.getResourcesListByDate(firstDateCartItem.start_date);
+          AllResources.push.apply(AllResources, _toConsumableArray(dateResources || []));
+        } else {
+          var dateList = this.store.date.getDateList();
+          dateList.forEach(function (n) {
+            if (n.resource) AllResources.push.apply(AllResources, _toConsumableArray(n.resource));
+          });
+        }
       }
       var resourcesMap = getResourcesMap(cloneDeep(AllResources));
       var allCartItems = cloneDeep(this.store.cart.getItems());
       var selectedResources = getOthersSelectedResources(allCartItems, holder_id, resourcesMap);
-      var allProductResources = getResourcesByProduct(resourcesMap, ((_cartItem$_productOri11 = cartItem._productOrigin) === null || _cartItem$_productOri11 === void 0 || (_cartItem$_productOri11 = _cartItem$_productOri11.product_resource) === null || _cartItem$_productOri11 === void 0 ? void 0 : _cartItem$_productOri11.resources) || [], selectedResources, 1);
+      var allProductResources = getResourcesByProduct(resourcesMap, ((_cartItem$_productOri6 = cartItem._productOrigin) === null || _cartItem$_productOri6 === void 0 || (_cartItem$_productOri6 = _cartItem$_productOri6.product_resource) === null || _cartItem$_productOri6 === void 0 ? void 0 : _cartItem$_productOri6.resources) || [], selectedResources, 1);
       var resources = ((_allProductResources$ = allProductResources.find(function (n) {
         return n.code === resources_code;
       })) === null || _allProductResources$ === void 0 ? void 0 : _allProductResources$.renderList) || [];
       // 资源排下序，把单个资源靠前，组合资源排在后面
       resources.sort(function (a, b) {
-        var _a$metadata3, _b$metadata3;
-        var aIsCombined = ((_a$metadata3 = a.metadata) === null || _a$metadata3 === void 0 || (_a$metadata3 = _a$metadata3.combined_resource) === null || _a$metadata3 === void 0 ? void 0 : _a$metadata3.status) === 1;
-        var bIsCombined = ((_b$metadata3 = b.metadata) === null || _b$metadata3 === void 0 || (_b$metadata3 = _b$metadata3.combined_resource) === null || _b$metadata3 === void 0 ? void 0 : _b$metadata3.status) === 1;
+        var _a$metadata, _b$metadata;
+        var aIsCombined = ((_a$metadata = a.metadata) === null || _a$metadata === void 0 || (_a$metadata = _a$metadata.combined_resource) === null || _a$metadata === void 0 ? void 0 : _a$metadata.status) === 1;
+        var bIsCombined = ((_b$metadata = b.metadata) === null || _b$metadata === void 0 || (_b$metadata = _b$metadata.combined_resource) === null || _b$metadata === void 0 ? void 0 : _b$metadata.status) === 1;
         if (aIsCombined && !bIsCombined) return 1;
         if (!aIsCombined && bIsCombined) return -1;
         return 0;
@@ -1885,11 +1703,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         // 根据 start_time 和 end_time 去匹配资源
         var targetResource = null;
         var targetResourceTime = 0;
-        var _iterator3 = _createForOfIteratorHelper(resources),
-          _step3;
+        var _iterator2 = _createForOfIteratorHelper(resources),
+          _step2;
         try {
-          var _loop2 = function _loop2() {
-              var n = _step3.value;
+          var _loop = function _loop() {
+              var n = _step2.value;
               // 如果资源是独占的，并且 countMap 里选择过这个资源，则直接跳过
               // if (n.resourceType === 'single' && countMap[n.id]) {
               //   resourcesUseableMap[n.id] = false;
@@ -1917,14 +1735,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 return 0; // continue
               }
               var canUseTime = mTimes.find(function (item) {
-                var _cartItem$_productOri12;
+                var _cartItem$_productOri7;
                 var res = getIsUsableByTimeItem({
                   timeSlice: timeSlots,
                   time: item,
                   resource: n,
                   currentCount: totalCapacity + (capacity || 0),
                   resourcesUseableMap: resourcesUseableMap,
-                  cut_off_time: (_cartItem$_productOri12 = cartItem._productOrigin) === null || _cartItem$_productOri12 === void 0 ? void 0 : _cartItem$_productOri12.cut_off_time
+                  cut_off_time: (_cartItem$_productOri7 = cartItem._productOrigin) === null || _cartItem$_productOri7 === void 0 ? void 0 : _cartItem$_productOri7.cut_off_time
                 });
                 // 如果只是因为子资源容量不够，而不是子资源被预约导致没时间片，不应该标记子资源为不可用，从而影响组合资源的情况
                 if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[n.id]) !== false && res.reason !== 'capacityOnly') {
@@ -1944,15 +1762,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }
             },
             _ret;
-          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-            _ret = _loop2();
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            _ret = _loop();
             if (_ret === 0) continue;
             if (_ret === 1) break;
           }
         } catch (err) {
-          _iterator3.e(err);
+          _iterator2.e(err);
         } finally {
-          _iterator3.f();
+          _iterator2.f();
         }
         return {
           selectedResource: targetResource
@@ -1987,7 +1805,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "autoSelectAllProductResources",
     value: function autoSelectAllProductResources(resources_code, timeSlots) {
       var _dateRange$4,
-        _this10 = this;
+        _this11 = this;
       var dateRange = this.store.date.getDateRange();
       var resources = [];
       if (dateRange !== null && dateRange !== void 0 && (_dateRange$4 = dateRange[0]) !== null && _dateRange$4 !== void 0 && _dateRange$4.date) {
@@ -1995,10 +1813,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           if (n.resource) resources.push.apply(resources, _toConsumableArray(n.resource));
         });
       }
-      // const resourcesMap = getResourcesMap(cloneDeep(resources));
       // 一个账号一个账号处理
       var errorList = [];
+      // 资源使用情况-单个预约
       var selectResourcesMap = {};
+      // 资源使用情况-多个预约
       var selectResourcesWithTimeSlots = {};
       var accountList = this.store.accountList.getAccounts();
       var selectForCartResources = function selectForCartResources(cartItems) {
@@ -2008,18 +1827,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         // 第一个商品分配完以后，第二个商品分配的start_time应该是第一个商品的 end_time ,然后 end_time 应该是 start_time+duration
         // 判断购物车里是否有 flexible 类型的商品，如果有则不累加时间
         var hasFlexibleProduct = cartItems.some(function (item) {
-          var _item$_productOrigin3;
-          return ((_item$_productOrigin3 = item._productOrigin) === null || _item$_productOrigin3 === void 0 || (_item$_productOrigin3 = _item$_productOrigin3.duration) === null || _item$_productOrigin3 === void 0 ? void 0 : _item$_productOrigin3.type) === 'flexible';
+          var _item$_productOrigin;
+          return ((_item$_productOrigin = item._productOrigin) === null || _item$_productOrigin === void 0 || (_item$_productOrigin = _item$_productOrigin.duration) === null || _item$_productOrigin === void 0 ? void 0 : _item$_productOrigin.type) === 'flexible';
         });
         cartItems.forEach(function (item, index) {
-          var _item$_productOrigin4;
-          var formatCapacity = formatDefaultCapacitys({
-            capacity: (_item$_productOrigin4 = item._productOrigin) === null || _item$_productOrigin4 === void 0 ? void 0 : _item$_productOrigin4.capacity,
-            product_bundle: item._origin.product.product_bundle
-          });
-          var currentCapacity = getSumCapacity({
-            capacity: formatCapacity
-          });
+          var _getCapacityInfoByCar6 = getCapacityInfoByCartItem(item),
+            currentCapacity = _getCapacityInfoByCar6.currentCapacity;
           // 如果商品已经有时间数据了，意味着是通过先选日期再选商品流程进来的，相当于时间切片已经选中了
           if (item._origin.start_time && !(timeSlots !== null && timeSlots !== void 0 && timeSlots.start_time)) {
             recordTimeSlots = {
@@ -2030,17 +1843,17 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             };
           }
           if (recordTimeSlots) {
-            var _item$_productOrigin5, _item$_productOrigin6;
+            var _item$_productOrigin2, _item$_productOrigin3;
             // 同一账号下，如果当前商品不是第一个，则需要根据上一个商品的 end_time 和 duration 计算出当前商品的 start_time 和 end_time
             // 前提：当前资源是单个预约才需要这么做
-            var currentResourceConfig = (_item$_productOrigin5 = item._productOrigin) === null || _item$_productOrigin5 === void 0 || (_item$_productOrigin5 = _item$_productOrigin5.product_resource) === null || _item$_productOrigin5 === void 0 || (_item$_productOrigin5 = _item$_productOrigin5.resources) === null || _item$_productOrigin5 === void 0 ? void 0 : _item$_productOrigin5.find(function (n) {
+            var currentResourceConfig = (_item$_productOrigin2 = item._productOrigin) === null || _item$_productOrigin2 === void 0 || (_item$_productOrigin2 = _item$_productOrigin2.product_resource) === null || _item$_productOrigin2 === void 0 || (_item$_productOrigin2 = _item$_productOrigin2.resources) === null || _item$_productOrigin2 === void 0 ? void 0 : _item$_productOrigin2.find(function (n) {
               return n.code === resources_code;
             });
-            // 只有 duration 类商品需要这个操作
-            if (index !== 0 && recordTimeSlots && (currentResourceConfig === null || currentResourceConfig === void 0 ? void 0 : currentResourceConfig.type) === 'single' && (_item$_productOrigin6 = item._productOrigin) !== null && _item$_productOrigin6 !== void 0 && _item$_productOrigin6.duration && !hasFlexibleProduct) {
-              var _item$_productOrigin7, _item$_productOrigin8;
-              var start_at = dayjs(recordTimeSlots.end_time).add(((_item$_productOrigin7 = item._productOrigin) === null || _item$_productOrigin7 === void 0 || (_item$_productOrigin7 = _item$_productOrigin7.duration) === null || _item$_productOrigin7 === void 0 ? void 0 : _item$_productOrigin7.value) || 10, 'minutes');
-              var end_at = start_at.add(((_item$_productOrigin8 = item._productOrigin) === null || _item$_productOrigin8 === void 0 || (_item$_productOrigin8 = _item$_productOrigin8.duration) === null || _item$_productOrigin8 === void 0 ? void 0 : _item$_productOrigin8.value) || 10, 'minutes');
+            // 只有 duration 类商品且不含有灵活时间的商品需要这个操作
+            if (index !== 0 && recordTimeSlots && (currentResourceConfig === null || currentResourceConfig === void 0 ? void 0 : currentResourceConfig.type) === 'single' && (_item$_productOrigin3 = item._productOrigin) !== null && _item$_productOrigin3 !== void 0 && _item$_productOrigin3.duration && !hasFlexibleProduct) {
+              var _item$_productOrigin4, _item$_productOrigin5;
+              var start_at = dayjs(recordTimeSlots.end_time).add(((_item$_productOrigin4 = item._productOrigin) === null || _item$_productOrigin4 === void 0 || (_item$_productOrigin4 = _item$_productOrigin4.duration) === null || _item$_productOrigin4 === void 0 ? void 0 : _item$_productOrigin4.value) || 10, 'minutes');
+              var end_at = start_at.add(((_item$_productOrigin5 = item._productOrigin) === null || _item$_productOrigin5 === void 0 || (_item$_productOrigin5 = _item$_productOrigin5.duration) === null || _item$_productOrigin5 === void 0 ? void 0 : _item$_productOrigin5.value) || 10, 'minutes');
               recordTimeSlots = {
                 start_time: start_at.format('HH:mm'),
                 end_time: end_at.format('HH:mm'),
@@ -2049,7 +1862,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               };
             }
             // 如果传递了 timeSlots，代表是第二种资源，则直接拿 timeSlots 去匹配
-            var res = _this10.autoSelectAccountResources({
+            var res = _this11.autoSelectAccountResources({
               cartItem: item,
               holder_id: item.holder_id,
               resources_code: resources_code,
@@ -2057,10 +1870,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               countMap: selectResourcesWithTimeSlots,
               capacity: currentCapacity
             });
-            // // 如果购物车里已经有同类型的 form_id 的资源了，则不处理
-            // if (item._origin.resources?.some((n: any) => n.form_id === res?.selectedResource?.form_id)) {
-            //   return
-            // }
             if (res !== null && res !== void 0 && res.selectedResource) {
               if (!selectResourcesWithTimeSlots[res.selectedResource.id]) {
                 selectResourcesWithTimeSlots[res.selectedResource.id] = [{
@@ -2075,7 +1884,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }
               res.selectedResource.capacity = currentCapacity;
               checkSubResourcesCapacity(res.selectedResource);
-              _this10.store.cart.updateItem({
+              _this11.store.cart.updateItem({
                 _id: item._id,
                 // 这里要做去重，避免出现同样类型的资源被塞进同一个商品
                 resources: [].concat(_toConsumableArray((item._origin.resources || []).filter(function (existingRes) {
@@ -2088,12 +1897,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               errorList.push(item._id);
             }
           } else {
-            var _item$_productOrigin9, _productResources$fin;
+            var _item$_productOrigin6, _productResources$fin;
             // 这里必须每次循环重新读，避免前一次循环操作了购物车，导致数据变更
-            var allCartItems = cloneDeep(_this10.store.cart.getItems());
+            // 能进到这种逻辑，说明是 duration 类商品或者灵活时长商品，且是第一种资源，还没有确定时间
+            var allCartItems = cloneDeep(_this11.store.cart.getItems());
             // 如果没有传递 timeSlots，代表是第一种资源，则直接拿商品的 duration，到资源列表里找一个公共可用的
             var selectedResources = [];
-            var _resources = cloneDeep(((_item$_productOrigin9 = item._productOrigin) === null || _item$_productOrigin9 === void 0 || (_item$_productOrigin9 = _item$_productOrigin9.product_resource) === null || _item$_productOrigin9 === void 0 ? void 0 : _item$_productOrigin9.resources) || []);
+            var _resources = cloneDeep(((_item$_productOrigin6 = item._productOrigin) === null || _item$_productOrigin6 === void 0 || (_item$_productOrigin6 = _item$_productOrigin6.product_resource) === null || _item$_productOrigin6 === void 0 ? void 0 : _item$_productOrigin6.resources) || []);
             var currentResourcesRenderList = [];
             _resources.forEach(function (n) {
               var _n$renderList;
@@ -2154,7 +1964,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               } else {
                 selectResourcesMap[targetResource.id] += currentCapacity;
               }
-              _this10.store.cart.updateItem({
+              _this11.store.cart.updateItem({
                 _id: item._id,
                 resources: [].concat(_toConsumableArray((item._origin.resources || []).filter(function (existingRes) {
                   return existingRes.resourceType !== targetRenderList[0].resourceType;
@@ -2174,7 +1984,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       // 如果购物车里没有 holderid数据，证明不按 holder 类流程预约走，给所有购物车一次性分派即可，不做账号下资源互斥逻辑
       if (cartItems !== null && cartItems !== void 0 && cartItems[0].holder_id) {
         accountList.forEach(function (account) {
-          var cartItems = _this10.store.cart.getCartByAccount(account.getId());
+          var cartItems = _this11.store.cart.getCartByAccount(account.getId());
           selectForCartResources(cartItems);
         });
       } else {
@@ -2189,7 +1999,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getTimeSlotByAllResources",
     value: function getTimeSlotByAllResources(resources_code) {
       var _dateRange,
-        _this11 = this,
+        _this12 = this,
         _cartItems$,
         _cartItems$2,
         _this$shopStore$get;
@@ -2208,8 +2018,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var maxCutOffTime = undefined;
       var maxCutOffTimeValue = dayjs();
       cartItems.forEach(function (item) {
-        var _item$_productOrigin10, _item$_productOrigin11, _item$_productOrigin12, _item$_productOrigin13;
-        (_item$_productOrigin10 = item._productOrigin) === null || _item$_productOrigin10 === void 0 || (_item$_productOrigin10 = _item$_productOrigin10.product_resource) === null || _item$_productOrigin10 === void 0 || (_item$_productOrigin10 = _item$_productOrigin10.resources) === null || _item$_productOrigin10 === void 0 || _item$_productOrigin10.forEach(function (n) {
+        var _item$_productOrigin7, _item$_productOrigin8, _item$_productOrigin9, _item$_productOrigin10;
+        (_item$_productOrigin7 = item._productOrigin) === null || _item$_productOrigin7 === void 0 || (_item$_productOrigin7 = _item$_productOrigin7.product_resource) === null || _item$_productOrigin7 === void 0 || (_item$_productOrigin7 = _item$_productOrigin7.resources) === null || _item$_productOrigin7 === void 0 || _item$_productOrigin7.forEach(function (n) {
           // TODO： 少了个 status 的判断
           if (n.code === resources_code) {
             resources.push.apply(resources, _toConsumableArray(n.renderList || []));
@@ -2222,10 +2032,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         if (item.resource_id) {
           resourceIds.push(item.resource_id);
         }
-        resourcesTypeId = item === null || item === void 0 || (_item$_productOrigin11 = item._productOrigin) === null || _item$_productOrigin11 === void 0 || (_item$_productOrigin11 = _item$_productOrigin11.product_resource) === null || _item$_productOrigin11 === void 0 || (_item$_productOrigin11 = _item$_productOrigin11.resources) === null || _item$_productOrigin11 === void 0 || (_item$_productOrigin11 = _item$_productOrigin11.find(function (n) {
+        resourcesTypeId = item === null || item === void 0 || (_item$_productOrigin8 = item._productOrigin) === null || _item$_productOrigin8 === void 0 || (_item$_productOrigin8 = _item$_productOrigin8.product_resource) === null || _item$_productOrigin8 === void 0 || (_item$_productOrigin8 = _item$_productOrigin8.resources) === null || _item$_productOrigin8 === void 0 || (_item$_productOrigin8 = _item$_productOrigin8.find(function (n) {
           return n.code === resources_code;
-        })) === null || _item$_productOrigin11 === void 0 ? void 0 : _item$_productOrigin11.id;
-        if ((_item$_productOrigin12 = item._productOrigin) !== null && _item$_productOrigin12 !== void 0 && _item$_productOrigin12.cut_off_time && ((_item$_productOrigin13 = item._productOrigin) === null || _item$_productOrigin13 === void 0 ? void 0 : _item$_productOrigin13.cut_off_time.type) === 'advance') {
+        })) === null || _item$_productOrigin8 === void 0 ? void 0 : _item$_productOrigin8.id;
+        if ((_item$_productOrigin9 = item._productOrigin) !== null && _item$_productOrigin9 !== void 0 && _item$_productOrigin9.cut_off_time && ((_item$_productOrigin10 = item._productOrigin) === null || _item$_productOrigin10 === void 0 ? void 0 : _item$_productOrigin10.cut_off_time.type) === 'advance') {
           var currentCutOffTime = dayjs().add(item._productOrigin.cut_off_time.unit, item._productOrigin.cut_off_time.unit_type);
           if (currentCutOffTime.isAfter(maxCutOffTimeValue, 'minute')) {
             maxCutOffTimeValue = currentCutOffTime;
@@ -2253,13 +2063,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         cartItems.forEach(function (item) {
           // 单个预约累加账号 多个预约取最大值
           if (isSingleResource) {
-            var _item$_productOrigin14;
-            accountDuration += ((_item$_productOrigin14 = item._productOrigin) === null || _item$_productOrigin14 === void 0 || (_item$_productOrigin14 = _item$_productOrigin14.duration) === null || _item$_productOrigin14 === void 0 ? void 0 : _item$_productOrigin14.value) || 10;
+            var _item$_productOrigin11;
+            accountDuration += ((_item$_productOrigin11 = item._productOrigin) === null || _item$_productOrigin11 === void 0 || (_item$_productOrigin11 = _item$_productOrigin11.duration) === null || _item$_productOrigin11 === void 0 ? void 0 : _item$_productOrigin11.value) || 10;
           } else {
-            var _item$_productOrigin15;
-            if (accountDuration < (((_item$_productOrigin15 = item._productOrigin) === null || _item$_productOrigin15 === void 0 || (_item$_productOrigin15 = _item$_productOrigin15.duration) === null || _item$_productOrigin15 === void 0 ? void 0 : _item$_productOrigin15.value) || 10)) {
-              var _item$_productOrigin16;
-              accountDuration = ((_item$_productOrigin16 = item._productOrigin) === null || _item$_productOrigin16 === void 0 || (_item$_productOrigin16 = _item$_productOrigin16.duration) === null || _item$_productOrigin16 === void 0 ? void 0 : _item$_productOrigin16.value) || 10;
+            var _item$_productOrigin12;
+            if (accountDuration < (((_item$_productOrigin12 = item._productOrigin) === null || _item$_productOrigin12 === void 0 || (_item$_productOrigin12 = _item$_productOrigin12.duration) === null || _item$_productOrigin12 === void 0 ? void 0 : _item$_productOrigin12.value) || 10)) {
+              var _item$_productOrigin13;
+              accountDuration = ((_item$_productOrigin13 = item._productOrigin) === null || _item$_productOrigin13 === void 0 || (_item$_productOrigin13 = _item$_productOrigin13.duration) === null || _item$_productOrigin13 === void 0 ? void 0 : _item$_productOrigin13.value) || 10;
             }
           }
         });
@@ -2269,7 +2079,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       };
       if (cartItems !== null && cartItems !== void 0 && cartItems[0].holder_id) {
         accountList.forEach(function (account) {
-          var cartItems = _this11.store.cart.getCartByAccount(account.getId());
+          var cartItems = _this12.store.cart.getCartByAccount(account.getId());
           checkDuration(cartItems);
         });
       } else {
@@ -2296,8 +2106,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       }
       var resourcesUseableMap = {};
       var hasFlexibleDuration = cartItems.some(function (item) {
-        var _item$_productOrigin17;
-        return ((_item$_productOrigin17 = item._productOrigin) === null || _item$_productOrigin17 === void 0 || (_item$_productOrigin17 = _item$_productOrigin17.duration) === null || _item$_productOrigin17 === void 0 ? void 0 : _item$_productOrigin17.type) === 'flexible';
+        var _item$_productOrigin14;
+        return ((_item$_productOrigin14 = item._productOrigin) === null || _item$_productOrigin14 === void 0 || (_item$_productOrigin14 = _item$_productOrigin14.duration) === null || _item$_productOrigin14 === void 0 ? void 0 : _item$_productOrigin14.type) === 'flexible';
       });
       var operating_day_boundary = (_this$shopStore$get = this.shopStore.get('core')) === null || _this$shopStore$get === void 0 || (_this$shopStore$get = _this$shopStore$get.core) === null || _this$shopStore$get === void 0 ? void 0 : _this$shopStore$get.operating_day_boundary;
       var timeSlots = getTimeSlicesByResources({
@@ -2319,7 +2129,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "submitTimeSlot",
     value: function submitTimeSlot(timeSlots) {
       var _this$shopStore$get2,
-        _this12 = this;
+        _this13 = this;
       // 以账号为维度处理数据。购物车里每一项的 startTime应该是前一个商品的 endTime，如果是第一个商品则用 timeSlots.start_at
       var cartItems = this.store.cart.getItems().filter(function (n) {
         return !isNormalProduct(n._productOrigin);
@@ -2348,26 +2158,26 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           var _newResources$;
           var newResources = cloneDeep(item._origin.resources);
           newResources.forEach(function (resource) {
-            var _item$_productOrigin18;
+            var _item$_productOrigin15;
             // 如果商品配置的是灵活时长，开始时间设置为提交的时间，结束时间从资源的可用最晚时间和店铺营业结束时间里取一个最早的
-            if (((_item$_productOrigin18 = item._productOrigin) === null || _item$_productOrigin18 === void 0 || (_item$_productOrigin18 = _item$_productOrigin18.duration) === null || _item$_productOrigin18 === void 0 ? void 0 : _item$_productOrigin18.type) === 'flexible') {
+            if (((_item$_productOrigin15 = item._productOrigin) === null || _item$_productOrigin15 === void 0 || (_item$_productOrigin15 = _item$_productOrigin15.duration) === null || _item$_productOrigin15 === void 0 ? void 0 : _item$_productOrigin15.type) === 'flexible') {
               var _allResources$find;
               item.duration = {
                 type: 'minutes',
                 value: 10
               };
               resource.startTime = timeSlots.start_at.format('YYYY-MM-DD HH:mm');
-              // 找到resource.times里最早的end_at
+              // 找到resource.times里最晚的end_at
               var targetResourceTimes = allResources === null || allResources === void 0 || (_allResources$find = allResources.find(function (n) {
                 return n.id === resource.id;
               })) === null || _allResources$find === void 0 ? void 0 : _allResources$find.times;
               var resourcesEndTime = targetResourceTimes.reduce(function (acc, curr) {
-                return dayjs(curr.end_at).isBefore(dayjs(acc.end_at)) ? curr : acc;
+                return dayjs(curr.end_at).isAfter(dayjs(acc.end_at)) ? curr : acc;
               }, targetResourceTimes[0]);
 
               // 将 operating_day_boundary 转换为与 resourcesEndTime.end_at 相同日期的完整日期时间
               var resourceDate = dayjs(resourcesEndTime.end_at).format('YYYY-MM-DD');
-              var operatingBoundaryDateTime = "".concat(resourceDate, " ").concat(operating_day_boundary.type === 'start_time' ? "23:59" : operating_day_boundary.time);
+              var operatingBoundaryDateTime = "".concat(resourceDate, " ").concat(operating_day_boundary.type === 'start_time' ? '23:59' : operating_day_boundary.time);
               var endTime = dayjs(resourcesEndTime.end_at).isBefore(dayjs(operatingBoundaryDateTime)) ? resourcesEndTime.end_at : operatingBoundaryDateTime;
               // 修复：如果 endTime 只是时间格式（如 "17:00"），需要加上日期
               var formattedEndTime;
@@ -2380,13 +2190,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }
               resource.endTime = formattedEndTime.format('YYYY-MM-DD HH:mm');
             } else {
-              var _item$_productOrigin19;
+              var _item$_productOrigin16;
               resource.startTime = currentStartTime;
-              resource.endTime = dayjs(currentStartTime).add(((_item$_productOrigin19 = item._productOrigin) === null || _item$_productOrigin19 === void 0 || (_item$_productOrigin19 = _item$_productOrigin19.duration) === null || _item$_productOrigin19 === void 0 ? void 0 : _item$_productOrigin19.value) || 10, 'minutes').format('YYYY-MM-DD HH:mm');
+              resource.endTime = dayjs(currentStartTime).add(((_item$_productOrigin16 = item._productOrigin) === null || _item$_productOrigin16 === void 0 || (_item$_productOrigin16 = _item$_productOrigin16.duration) === null || _item$_productOrigin16 === void 0 ? void 0 : _item$_productOrigin16.value) || 10, 'minutes').format('YYYY-MM-DD HH:mm');
             }
             // delete resource.times;
           });
-          _this12.store.cart.updateItem({
+          _this13.store.cart.updateItem({
             _id: item._id,
             resources: newResources
           });
@@ -2434,26 +2244,59 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "openProductDetail",
     value: function () {
-      var _openProductDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(productId) {
-        var targetProduct, targetProductData, newScheduleArr;
-        return _regeneratorRuntime().wrap(function _callee26$(_context27) {
-          while (1) switch (_context27.prev = _context27.next) {
+      var _openProductDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(productId) {
+        var targetProduct, targetProductData, newScheduleArr, dateRange;
+        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
             case 0:
-              _context27.next = 2;
+              _context25.next = 2;
               return this.store.products.getProduct(productId);
             case 2:
-              targetProduct = _context27.sent;
-              if (targetProduct) {
-                targetProductData = targetProduct.getData();
-                this.store.currentProduct = targetProduct;
-                newScheduleArr = this.getScheduleDataByIds(targetProductData['schedule.ids']);
-                targetProduct.setOtherParams('schedule', newScheduleArr);
+              targetProduct = _context25.sent;
+              if (!targetProduct) {
+                _context25.next = 16;
+                break;
               }
-            case 4:
+              targetProductData = targetProduct.getData();
+              this.store.currentProduct = targetProduct;
+              // 资源预加载，如果是 duration 类型的商品，且是先选日期的流程，在这里预拉取资源数据
+              if (!targetProductData['schedule.ids']) {
+                _context25.next = 11;
+                break;
+              }
+              newScheduleArr = this.getScheduleDataByIds(targetProductData['schedule.ids']);
+              targetProduct.setOtherParams('schedule', newScheduleArr);
+              _context25.next = 16;
+              break;
+            case 11:
+              if (!targetProductData.duration) {
+                _context25.next = 16;
+                break;
+              }
+              dateRange = this.store.date.getDateRange(); // 如果不是先选日期的流程 duration 商品就啥也不做
+              if (dateRange !== null && dateRange !== void 0 && dateRange.length) {
+                _context25.next = 15;
+                break;
+              }
+              return _context25.abrupt("return");
+            case 15:
+              // this.store.date.getResourceDates({
+              //   query: {
+              //     start_date: dateRange[0].date,
+              //     end_date: dateRange[dateRange.length - 1].date,
+              //     resource_ids: targetProductData.product_resource?.resources?.map((n: any) => n.id),
+              //   },
+              // });
+              this.getAvailableDate({
+                startDate: dateRange[0].date,
+                endDate: dateRange[dateRange.length - 1].date,
+                products: [targetProductData]
+              });
+            case 16:
             case "end":
-              return _context27.stop();
+              return _context25.stop();
           }
-        }, _callee26, this);
+        }, _callee25, this);
       }));
       function openProductDetail(_x19) {
         return _openProductDetail.apply(this, arguments);
@@ -2469,12 +2312,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     }
   }, {
     key: "getTimeslotBySchedule",
-    value: function getTimeslotBySchedule(_ref9) {
+    value: function getTimeslotBySchedule(_ref10) {
       var _this$store$currentPr2, _targetProductData$pr;
-      var date = _ref9.date,
-        scheduleIds = _ref9.scheduleIds,
-        resources = _ref9.resources,
-        product = _ref9.product;
+      var date = _ref10.date,
+        scheduleIds = _ref10.scheduleIds,
+        resources = _ref10.resources,
+        product = _ref10.product;
       var targetProduct = this.store.currentProduct;
       // 如果外面传递了product 优先用外面的
       var targetProductData = product || (targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.getData());
@@ -2501,9 +2344,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       });
       // 资源排下序，把单个资源靠前，组合资源排在后面
       allProductResources.sort(function (a, b) {
-        var _a$metadata4, _b$metadata4;
-        var aIsCombined = ((_a$metadata4 = a.metadata) === null || _a$metadata4 === void 0 || (_a$metadata4 = _a$metadata4.combined_resource) === null || _a$metadata4 === void 0 ? void 0 : _a$metadata4.status) === 1;
-        var bIsCombined = ((_b$metadata4 = b.metadata) === null || _b$metadata4 === void 0 || (_b$metadata4 = _b$metadata4.combined_resource) === null || _b$metadata4 === void 0 ? void 0 : _b$metadata4.status) === 1;
+        var _a$metadata2, _b$metadata2;
+        var aIsCombined = ((_a$metadata2 = a.metadata) === null || _a$metadata2 === void 0 || (_a$metadata2 = _a$metadata2.combined_resource) === null || _a$metadata2 === void 0 ? void 0 : _a$metadata2.status) === 1;
+        var bIsCombined = ((_b$metadata2 = b.metadata) === null || _b$metadata2 === void 0 || (_b$metadata2 = _b$metadata2.combined_resource) === null || _b$metadata2 === void 0 ? void 0 : _b$metadata2.status) === 1;
         if (aIsCombined && !bIsCombined) return 1;
         if (!aIsCombined && bIsCombined) return -1;
         return 0;
@@ -2566,9 +2409,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           // 在已经选定时间的情况下，只要canUseTime如果有一个 false 那就不可用
           if (!currentResourcesTimeSlotCanUsedArr.some(function (n) {
             return n === false;
-          })
+          }) &&
           // 只统计第一种资源的容量和 left
-          && m.form_id === firstEnabledResourceId) {
+          m.form_id === firstEnabledResourceId) {
             if (currentResourcesCount >= count) {
               count = currentResourcesCount;
             }
@@ -2590,84 +2433,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       });
       return formatScheduleTimeSlots;
     }
-  }, {
-    key: "addProductToCart",
-    value: function addProductToCart(_ref10) {
-      var _this13 = this;
-      var product = _ref10.product,
-        date = _ref10.date,
-        account = _ref10.account;
-      var _ref11 = product || {},
-        bundle = _ref11.bundle,
-        options = _ref11.options,
-        origin = _ref11.origin,
-        product_variant_id = _ref11.product_variant_id,
-        rowKey = _ref11.rowKey,
-        _ref11$quantity = _ref11.quantity,
-        quantity = _ref11$quantity === void 0 ? 1 : _ref11$quantity;
-      var productData = _objectSpread(_objectSpread({}, origin), {}, {
-        product_variant_id: product_variant_id
-      });
-      if (!account) {
-        var activeAccount = this.getActiveAccount();
-        if (activeAccount) {
-          account = activeAccount;
-        }
-      }
-      if (rowKey) {
-        var cartItems = this.store.cart.getItems();
-        var targetCartItem = cartItems.find(function (n) {
-          var _n$_productOrigin3;
-          return ((_n$_productOrigin3 = n._productOrigin) === null || _n$_productOrigin3 === void 0 ? void 0 : _n$_productOrigin3.rowKey) === rowKey;
-        });
-        if (targetCartItem && isNormalProduct(targetCartItem._productOrigin)) {
-          this.store.cart.updateItem({
-            _id: targetCartItem._id,
-            product: _objectSpread(_objectSpread({}, targetCartItem._productOrigin), {}, {
-              quantity: (targetCartItem.num || 1) + quantity
-            })
-          });
-          return;
-        }
-      }
-      this.store.cart.addItem({
-        product: productData,
-        date: date,
-        account: account,
-        bundle: bundle,
-        options: options,
-        quantity: quantity
-      });
-      // 检测，有传递 date，检查购物车里其他商品的 date 是否在同一天，如果不在，清空那些不在同一天的商品
-      if (date) {
-        var _cartItems = this.store.cart.getItems().filter(function (n) {
-          return !isNormalProduct(n._productOrigin);
-        });
-        var cartItemsByDate = _cartItems.filter(function (n) {
-          return !dayjs(n.start_date).isSame(dayjs(date.startTime), 'day');
-        });
-        if (cartItemsByDate.length) {
-          cartItemsByDate.forEach(function (n) {
-            _this13.store.cart.removeItem(n._id);
-          });
-        }
-        // 如果 date.startTime 和 dateRange 里的 startTime 不一样，需要修正 dateRange
-        var dateRange = this.store.date.getDateRange();
-        if (dateRange !== null && dateRange !== void 0 && dateRange[0] && !dayjs(dateRange[0].date).isSame(dayjs(date.startTime), 'day')) {
-          this.setDateRange([{
-            date: dayjs(date.startTime).format('YYYY-MM-DD'),
-            status: 'available',
-            week: '',
-            weekNum: 0
-          }, {
-            date: dayjs(date.endTime).format('YYYY-MM-DD'),
-            status: 'available',
-            week: '',
-            weekNum: 0
-          }]);
-        }
-      }
-    }
   }, {
     key: "setOtherData",
     value: function setOtherData(key, value) {
@@ -2689,27 +2454,27 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProductTypeById",
     value: function () {
-      var _getProductTypeById = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(id) {
+      var _getProductTypeById = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(id) {
         var product;
-        return _regeneratorRuntime().wrap(function _callee27$(_context28) {
-          while (1) switch (_context28.prev = _context28.next) {
+        return _regeneratorRuntime().wrap(function _callee26$(_context26) {
+          while (1) switch (_context26.prev = _context26.next) {
             case 0:
-              _context28.next = 2;
+              _context26.next = 2;
               return this.store.products.getProduct(id);
             case 2:
-              product = _context28.sent;
+              product = _context26.sent;
               if (!product) {
-                _context28.next = 5;
+                _context26.next = 5;
                 break;
               }
-              return _context28.abrupt("return", product.getProductType());
+              return _context26.abrupt("return", product.getProductType());
             case 5:
-              return _context28.abrupt("return", 'normal');
+              return _context26.abrupt("return", 'normal');
             case 6:
             case "end":
-              return _context28.stop();
+              return _context26.stop();
           }
-        }, _callee27, this);
+        }, _callee26, this);
       }));
       function getProductTypeById(_x20) {
         return _getProductTypeById.apply(this, arguments);
@@ -2727,7 +2492,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getResourcesByCartItemAndCode",
     value: function getResourcesByCartItemAndCode(cartItemId, resourceCode) {
-      var _cartItem$_productOri13, _cartItem$_productOri14;
+      var _cartItem$_productOri8;
       var dateRange = this.store.date.getDateRange();
       var resources = [];
       if (dateRange !== null && dateRange !== void 0 && dateRange.length) {
@@ -2750,20 +2515,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       });
       if (!cartItem) return [];
       var selectedResources = [];
-      var formatCapacity = formatDefaultCapacitys({
-        capacity: (_cartItem$_productOri13 = cartItem._productOrigin) === null || _cartItem$_productOri13 === void 0 ? void 0 : _cartItem$_productOri13.capacity,
-        product_bundle: cartItem._origin.product.product_bundle
-      });
+      var _getCapacityInfoByCar7 = getCapacityInfoByCartItem(cartItem),
+        currentCapacity = _getCapacityInfoByCar7.currentCapacity,
+        formatCapacity = _getCapacityInfoByCar7.formatCapacity;
       cartItem._origin.metadata.capacity = formatCapacity;
-      var currentCapacity = getSumCapacity({
-        capacity: formatCapacity
-      });
       if (cartItem.holder_id) {
         selectedResources = getOthersSelectedResources(cartItems, cartItem.holder_id, resourcesMap);
       } else {
         selectedResources = getOthersCartSelectedResources(cartItems, cartItem._id, resourcesMap);
       }
-      var productResources = getResourcesByProduct(resourcesMap, ((_cartItem$_productOri14 = cartItem._productOrigin) === null || _cartItem$_productOri14 === void 0 || (_cartItem$_productOri14 = _cartItem$_productOri14.product_resource) === null || _cartItem$_productOri14 === void 0 ? void 0 : _cartItem$_productOri14.resources) || [], selectedResources, currentCapacity);
+      var productResources = getResourcesByProduct(resourcesMap, ((_cartItem$_productOri8 = cartItem._productOrigin) === null || _cartItem$_productOri8 === void 0 || (_cartItem$_productOri8 = _cartItem$_productOri8.product_resource) === null || _cartItem$_productOri8 === void 0 ? void 0 : _cartItem$_productOri8.resources) || [], selectedResources, currentCapacity);
       var targetResource = productResources.find(function (resource) {
         return resource.code === resourceCode;
       });
@@ -2773,9 +2534,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         var endTime = dayjs("".concat(cartItem._origin.end_date, " ").concat(cartItem._origin.end_time));
         var resourcesUseableMap = {};
         targetResource.renderList = targetResource.renderList.sort(function (a, b) {
-          var _a$metadata5, _b$metadata5;
-          var aIsCombined = ((_a$metadata5 = a.metadata) === null || _a$metadata5 === void 0 || (_a$metadata5 = _a$metadata5.combined_resource) === null || _a$metadata5 === void 0 ? void 0 : _a$metadata5.status) === 1;
-          var bIsCombined = ((_b$metadata5 = b.metadata) === null || _b$metadata5 === void 0 || (_b$metadata5 = _b$metadata5.combined_resource) === null || _b$metadata5 === void 0 ? void 0 : _b$metadata5.status) === 1;
+          var _a$metadata3, _b$metadata3;
+          var aIsCombined = ((_a$metadata3 = a.metadata) === null || _a$metadata3 === void 0 || (_a$metadata3 = _a$metadata3.combined_resource) === null || _a$metadata3 === void 0 ? void 0 : _a$metadata3.status) === 1;
+          var bIsCombined = ((_b$metadata3 = b.metadata) === null || _b$metadata3 === void 0 || (_b$metadata3 = _b$metadata3.combined_resource) === null || _b$metadata3 === void 0 ? void 0 : _b$metadata3.status) === 1;
           if (aIsCombined && !bIsCombined) return 1;
           if (!aIsCombined && bIsCombined) return -1;
           return 0;
@@ -2786,7 +2547,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           });
           if (mTimes.length === 0) return false;
           var canUseArr = mTimes.map(function (item) {
-            var _cartItem$_productOri15;
+            var _cartItem$_productOri9;
             var res = getIsUsableByTimeItem({
               timeSlice: {
                 start_time: startTime.format('HH:mm'),
@@ -2798,7 +2559,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               resource: m,
               currentCount: currentCapacity || 0,
               resourcesUseableMap: resourcesUseableMap,
-              cut_off_time: (_cartItem$_productOri15 = cartItem._productOrigin) === null || _cartItem$_productOri15 === void 0 ? void 0 : _cartItem$_productOri15.cut_off_time
+              cut_off_time: (_cartItem$_productOri9 = cartItem._productOrigin) === null || _cartItem$_productOri9 === void 0 ? void 0 : _cartItem$_productOri9.cut_off_time
             });
             if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== 'capacityOnly') {
               resourcesUseableMap[m.id] = res.usable;
@@ -2812,12 +2573,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         });
       } else {
         targetResource.renderList = targetResource.renderList.filter(function (n) {
-          var _cartItem$_productOri16;
+          var _cartItem$_productOri10;
           var recordCount = n.capacity || 0;
           if (n.onlyComputed) return false;
           var timeSlots = getTimeSlicesByResource({
             resource: n,
-            duration: ((_cartItem$_productOri16 = cartItem._productOrigin) === null || _cartItem$_productOri16 === void 0 || (_cartItem$_productOri16 = _cartItem$_productOri16.duration) === null || _cartItem$_productOri16 === void 0 ? void 0 : _cartItem$_productOri16.value) || 10,
+            duration: ((_cartItem$_productOri10 = cartItem._productOrigin) === null || _cartItem$_productOri10 === void 0 || (_cartItem$_productOri10 = _cartItem$_productOri10.duration) === null || _cartItem$_productOri10 === void 0 ? void 0 : _cartItem$_productOri10.value) || 10,
             split: 10,
             currentDate: dateRange[0].date
           });
@@ -2835,12 +2596,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getTimeslotsScheduleByDateRange",
     value: (function () {
-      var _getTimeslotsScheduleByDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(_ref12) {
+      var _getTimeslotsScheduleByDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(_ref11) {
         var startDate, endDate, scheduleIds, resources, dates, currentDate, end, results, _i, _dates, date;
-        return _regeneratorRuntime().wrap(function _callee28$(_context29) {
-          while (1) switch (_context29.prev = _context29.next) {
+        return _regeneratorRuntime().wrap(function _callee27$(_context27) {
+          while (1) switch (_context27.prev = _context27.next) {
             case 0:
-              startDate = _ref12.startDate, endDate = _ref12.endDate, scheduleIds = _ref12.scheduleIds, resources = _ref12.resources;
+              startDate = _ref11.startDate, endDate = _ref11.endDate, scheduleIds = _ref11.scheduleIds, resources = _ref11.resources;
               console.log('appoimentBooking-session-date-getTimeslotsScheduleByDateRange', {
                 startDate: startDate,
                 endDate: endDate,
@@ -2865,137 +2626,46 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   resources: resources
                 });
               }
-              return _context29.abrupt("return", results);
+              return _context27.abrupt("return", results);
             case 9:
             case "end":
-              return _context29.stop();
+              return _context27.stop();
           }
-        }, _callee28, this);
+        }, _callee27, this);
       }));
       function getTimeslotsScheduleByDateRange(_x21) {
         return _getTimeslotsScheduleByDateRange.apply(this, arguments);
       }
       return getTimeslotsScheduleByDateRange;
     }())
-  }, {
-    key: "getAvailableDateForSession",
-    value: function () {
-      var _getAvailableDateForSession = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29() {
-        var params,
-          startDate,
-          endDate,
-          type,
-          tempProducts,
-          _ref13,
-          resourceIds,
-          rules,
-          resourcesMap,
-          res,
-          dateListWithTimeSlots,
-          firstAvailableDate,
-          _args30 = arguments;
-        return _regeneratorRuntime().wrap(function _callee29$(_context30) {
-          while (1) switch (_context30.prev = _context30.next) {
-            case 0:
-              params = _args30.length > 0 && _args30[0] !== undefined ? _args30[0] : {};
-              // 开始日期如果小于今天，直接以今天当做开始日期
-              startDate = params.startDate, endDate = params.endDate, type = params.type; // 前端传递的 startDate，可能是今天之前的，如果 startDate 小于今天 且 endDate 小于或等于今天，需要把 startDate 置为今天
-              if (dayjs(startDate).isBefore(dayjs(), 'day') && (dayjs(endDate).isAfter(dayjs(), 'day') || dayjs(endDate).isSame(dayjs(), 'day'))) {
-                startDate = dayjs().format('YYYY-MM-DD');
-              }
-              // 不管前端传什么 endDate 默认查一个月的，以今天为开始日期。用于找到一个月内最近可用的日期
-              endDate = dayjs().add(1, 'month').format('YYYY-MM-DD');
-              tempProducts = []; // 如果当前打开了某个的商品详情弹窗，则应该默认用这个商品
-              if (this.store.currentProduct) {
-                tempProducts = [_objectSpread(_objectSpread({}, this.store.currentProduct.getData()), {}, {
-                  _schedule: this.store.currentProduct.getOtherParams()['schedule']
-                })];
-              }
-              // 在这里需要把能收集到的数据都收集上来，拼装好给 date 模块去查询
-              _ref13 = getAvailableProductResources(tempProducts) || {}, resourceIds = _ref13.resourceIds, rules = _ref13.rules, resourcesMap = _ref13.resourcesMap;
-              this.otherParams.currentResourcesMap = resourcesMap;
-              _context30.next = 10;
-              return this.store.date.getResourceDates({
-                query: {
-                  start_date: startDate || '',
-                  end_date: endDate || '',
-                  resource_ids: resourceIds
-                },
-                rules: rules,
-                type: type
-              });
-            case 10:
-              res = _context30.sent;
-              if (!this.store.currentProduct) {
-                _context30.next = 16;
-                break;
-              }
-              _context30.next = 14;
-              return this.getTimeslotsScheduleByDateRange({
-                startDate: startDate || '',
-                endDate: endDate || ''
-              });
-            case 14:
-              dateListWithTimeSlots = _context30.sent;
-              res.forEach(function (n) {
-                if (!dateListWithTimeSlots[n.date]) {
-                  n.status = 'unavailable';
-                } else {
-                  var allTimeSlotsCanUse = dateListWithTimeSlots[n.date].every(function (d) {
-                    return d.count;
-                  });
-                  if (!allTimeSlotsCanUse) {
-                    n.status = 'unavailable';
-                  }
-                }
-              });
-            case 16:
-              // 找到第一个可用的日期返回给 UI
-              firstAvailableDate = res.find(function (n) {
-                return n.status === 'available';
-              });
-              return _context30.abrupt("return", {
-                dateList: res,
-                firstAvailableDate: firstAvailableDate
-              });
-            case 18:
-            case "end":
-              return _context30.stop();
-          }
-        }, _callee29, this);
-      }));
-      function getAvailableDateForSession() {
-        return _getAvailableDateForSession.apply(this, arguments);
-      }
-      return getAvailableDateForSession;
-    }()
   }, {
     key: "getAvailableDateForSessionOptimize",
     value: function () {
-      var _getAvailableDateForSessionOptimize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30() {
+      var _getAvailableDateForSessionOptimize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28() {
         var _this$store$currentPr3, _this$store$currentPr4, _this$store$currentPr5, _tempProducts, _this$store$currentPr6;
         var params,
           startDate,
           endDate,
           endDateAfterMonth,
+          tempEndDate,
+          cache,
           tempProducts,
           schedule,
           filteredSchedule,
           tempResourceIds,
           res,
-          cache,
           dates,
           currentDate,
           firstAvailableDate,
           openResources,
           allProductResources,
           targetSchedules,
-          _loop3,
-          _args32 = arguments;
-        return _regeneratorRuntime().wrap(function _callee30$(_context32) {
-          while (1) switch (_context32.prev = _context32.next) {
+          _loop2,
+          _args29 = arguments;
+        return _regeneratorRuntime().wrap(function _callee28$(_context29) {
+          while (1) switch (_context29.prev = _context29.next) {
             case 0:
-              params = _args32.length > 0 && _args32[0] !== undefined ? _args32[0] : {};
+              params = _args29.length > 0 && _args29[0] !== undefined ? _args29[0] : {};
               // 开始日期如果小于今天，直接以今天当做开始日期
               startDate = params.startDate, endDate = params.endDate; // 前端传递的 startDate，可能是今天之前的，如果 startDate 小于今天 且 endDate 小于或等于今天，需要把 startDate 置为今天
               if (dayjs(startDate).isBefore(dayjs(), 'day') && (dayjs(endDate).isAfter(dayjs(), 'day') || dayjs(endDate).isSame(dayjs(), 'day'))) {
@@ -3005,43 +2675,49 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               // 优化策略：
               // 在 endDate 添加完一个月以后，如果 endDate 还小于 startDate + 7 天，则还需要 endDate+7 天
               endDateAfterMonth = dayjs().add(1, 'month').format('YYYY-MM-DD');
+              tempEndDate = endDateAfterMonth;
               if (dayjs(startDate).add(7, 'day').isAfter(dayjs(endDateAfterMonth), 'day')) {
-                endDate = dayjs(startDate).add(7, 'day').format('YYYY-MM-DD');
+                tempEndDate = dayjs(startDate).add(7, 'day').format('YYYY-MM-DD');
               } else {
-                endDate = endDateAfterMonth;
+                tempEndDate = endDateAfterMonth;
               }
-              // 如果当前打开了某个的商品详情弹窗，则应该默认用这个商品
-              tempProducts = (_this$store$currentPr3 = this.store.currentProduct) === null || _this$store$currentPr3 === void 0 ? void 0 : _this$store$currentPr3.getData();
-              schedule = (_this$store$currentPr4 = this.store.currentProduct) === null || _this$store$currentPr4 === void 0 ? void 0 : _this$store$currentPr4.getOtherParams()['schedule'];
-              filteredSchedule = filterScheduleByDateRange(schedule, startDate || '', endDate || ''); // 1.后端返回的数据，确定资源在每一天的可用和使用情况
-              tempResourceIds = getResourcesIdsByProduct(tempProducts);
-              _context32.next = 11;
-              return this.store.date.fetchResourceDates({
-                query: {
-                  start_date: startDate || '',
-                  end_date: endDate || '',
-                  resource_ids: tempResourceIds
-                }
-              });
-            case 11:
-              res = _context32.sent;
+              // 如果这么算出来的 tempEndDate 还小于 endDate，则需要把 endDate 置为 tempEndDate
+              if (dayjs(tempEndDate).isBefore(dayjs(endDate), 'day')) {
+                tempEndDate = endDate || '';
+              }
+              endDate = tempEndDate;
+
               // 先去读缓存结果，因为正常 UI 调用的是 7 天，而下面我会直接计算 30 天（最少也是 14 天），所以先去读缓存结果，如果缓存结果存在，则直接返回
-              // TODO 优化关于为什么要放在接口后，因为在获取时间切片的时候还需要读一次接口数据，其实可以直接从这个结果里拿了，需要优化
-              cache = (_this$store$currentPr5 = this.store.currentProduct) === null || _this$store$currentPr5 === void 0 ? void 0 : _this$store$currentPr5.getOtherParams()['timeSlotBySchedule'];
+              cache = (_this$store$currentPr3 = this.store.currentProduct) === null || _this$store$currentPr3 === void 0 ? void 0 : _this$store$currentPr3.getOtherParams()['timeSlotBySchedule'];
               if (!cache) {
-                _context32.next = 17;
+                _context29.next = 13;
                 break;
               }
               if (!(dayjs(params.startDate).isSameOrAfter(dayjs(cache.startDate), 'day') && dayjs(params.endDate).isSameOrBefore(dayjs(cache.endDate), 'day'))) {
-                _context32.next = 17;
+                _context29.next = 13;
                 break;
               }
               this.store.date.setDateList(cache.dateList);
-              return _context32.abrupt("return", {
+              return _context29.abrupt("return", {
                 dateList: cache.dateList,
                 firstAvailableDate: cache.firstAvailableDate
               });
-            case 17:
+            case 13:
+              // 如果当前打开了某个的商品详情弹窗，则应该默认用这个商品
+              tempProducts = (_this$store$currentPr4 = this.store.currentProduct) === null || _this$store$currentPr4 === void 0 ? void 0 : _this$store$currentPr4.getData();
+              schedule = (_this$store$currentPr5 = this.store.currentProduct) === null || _this$store$currentPr5 === void 0 ? void 0 : _this$store$currentPr5.getOtherParams()['schedule'];
+              filteredSchedule = filterScheduleByDateRange(schedule, startDate || '', endDate || ''); // 1.后端返回的数据，确定资源在每一天的可用和使用情况
+              tempResourceIds = getResourcesIdsByProduct(tempProducts);
+              _context29.next = 19;
+              return this.store.date.fetchResourceDates({
+                query: {
+                  start_date: startDate || '',
+                  end_date: endDate || '',
+                  resource_ids: tempResourceIds
+                }
+              });
+            case 19:
+              res = _context29.sent;
               // 2. 商品 schedule 数据，确定日程在每一天的时间片
               // 3. 把后端返回的和 schedule 的数据进行合并，确定每一天的可用和使用情况
               dates = [];
@@ -3061,10 +2737,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               });
               targetSchedules = this.store.schedule.getScheduleListByIds(tempProducts['schedule.ids']);
-              _loop3 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop3() {
+              _loop2 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop2() {
                 var currentDateStr, status, _checkSessionProductL, latestStartDate, earliestEndDate, scheduleByDate, minTimeMaxTime, scheduleTimeSlots, timesSlotCanUse;
-                return _regeneratorRuntime().wrap(function _loop3$(_context31) {
-                  while (1) switch (_context31.prev = _context31.next) {
+                return _regeneratorRuntime().wrap(function _loop2$(_context28) {
+                  while (1) switch (_context28.prev = _context28.next) {
                     case 0:
                       currentDateStr = currentDate.format('YYYY-MM-DD');
                       status = 'available'; // 1. 检查商品的提前量等情况是否满足
@@ -3156,34 +2832,34 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
 
                       // 如果 firstAvailableDate 距离 startDate 大于 14 天了，则后面就不需要再找了，也是一种性能保护
                       if (!(firstAvailableDate && dayjs(currentDate).diff(dayjs(startDate), 'day') > 31)) {
-                        _context31.next = 9;
+                        _context28.next = 9;
                         break;
                       }
-                      return _context31.abrupt("return", 1);
+                      return _context28.abrupt("return", 1);
                     case 9:
                       currentDate = dayjs(currentDate).add(1, 'day');
                     case 10:
                     case "end":
-                      return _context31.stop();
+                      return _context28.stop();
                   }
-                }, _loop3);
+                }, _loop2);
               });
-            case 25:
+            case 28:
               if (!(dayjs(currentDate).isBefore(dayjs(endDate), 'day') || dayjs(currentDate).isSame(dayjs(endDate), 'day'))) {
-                _context32.next = 31;
+                _context29.next = 34;
                 break;
               }
-              return _context32.delegateYield(_loop3(), "t0", 27);
-            case 27:
-              if (!_context32.t0) {
-                _context32.next = 29;
+              return _context29.delegateYield(_loop2(), "t0", 30);
+            case 30:
+              if (!_context29.t0) {
+                _context29.next = 32;
                 break;
               }
-              return _context32.abrupt("break", 31);
-            case 29:
-              _context32.next = 25;
+              return _context29.abrupt("break", 34);
+            case 32:
+              _context29.next = 28;
               break;
-            case 31:
+            case 34:
               // 最终把资源数据也加到日期内
               dates = handleAvailableDateByResource(res.data, dates);
               this.store.date.setDateList(dates);
@@ -3195,15 +2871,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 startDate: startDate,
                 endDate: dayjs(currentDate).format('YYYY-MM-DD')
               });
-              return _context32.abrupt("return", {
+              return _context29.abrupt("return", {
                 dateList: dates,
                 firstAvailableDate: firstAvailableDate
               });
-            case 35:
+            case 38:
             case "end":
-              return _context32.stop();
+              return _context29.stop();
           }
-        }, _callee30, this);
+        }, _callee28, this);
       }));
       function getAvailableDateForSessionOptimize() {
         return _getAvailableDateForSessionOptimize.apply(this, arguments);
@@ -3225,13 +2901,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         return !isNormalProduct(n._productOrigin);
       });
       return cartItems.some(function (n) {
-        var _n$_productOrigin4;
-        return (_n$_productOrigin4 = n._productOrigin) === null || _n$_productOrigin4 === void 0 ? void 0 : _n$_productOrigin4.duration;
+        var _n$_productOrigin2;
+        return (_n$_productOrigin2 = n._productOrigin) === null || _n$_productOrigin2 === void 0 ? void 0 : _n$_productOrigin2.duration;
       });
     }
   }, {
     key: "isTargetNormalProduct",
     value: function isTargetNormalProduct(product) {
+      if (!product) return false;
       return isNormalProduct(product);
     }
   }, {