@pisell/pisellos 0.0.43 → 0.0.45

package/dist/solution/BookingByStep/index.js

@@ -28,9 +28,11 @@ import { BaseModule } from "../../modules/BaseModule";
 import { BookingByStepHooks, createModule } from "./types";
 import { getAvailableProductResources } from "./utils/products";
 import { getResourcesByProduct, getTimeSlicesByResource, getTimeSlicesByResources, getIsUsableByTimeItem, getOthersSelectedResources, formatDefaultCapacitys, getSumCapacity, checkSubResourcesCapacity } from "./utils/resources";
-import dayjs from "dayjs";
+import dayjs from 'dayjs';
 import { getResourcesMap } from "../../modules/Resource/utils";
-import { cloneDeep } from "lodash-es";
+import { cloneDeep } from 'lodash-es';
+import { calcCalendarDataByScheduleResult, calcMinTimeMaxTimeBySchedules, getAllSortedDateRanges } from "../../modules/Schedule/utils";
+import { disableAllDates, disableDatesBeforeOneDay, generateMonthDates } from "../../modules/Date/utils";
 export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   _inherits(BookingByStepImpl, _BaseModule);
   var _super = _createSuper(BookingByStepImpl);
@@ -41,8 +43,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       args[_key] = arguments[_key];
     }
     _this = _super.call.apply(_super, [this].concat(args));
-    _defineProperty(_assertThisInitialized(_this), "defaultName", "bookingByStep");
-    _defineProperty(_assertThisInitialized(_this), "defaultVersion", "1.0.0");
+    _defineProperty(_assertThisInitialized(_this), "defaultName", 'bookingByStep');
+    _defineProperty(_assertThisInitialized(_this), "defaultVersion", '1.0.0');
     _defineProperty(_assertThisInitialized(_this), "isSolution", true);
     _defineProperty(_assertThisInitialized(_this), "request", void 0);
     _defineProperty(_assertThisInitialized(_this), "window", void 0);
@@ -50,32 +52,34 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
     _defineProperty(_assertThisInitialized(_this), "otherParams", {});
     _defineProperty(_assertThisInitialized(_this), "cacheId", void 0);
+    _defineProperty(_assertThisInitialized(_this), "otherData", {});
     return _this;
   }
   _createClass(BookingByStepImpl, [{
     key: "initialize",
-    value: function () {
+    value: // 提供给 UI 层的临时数据存储，会进缓存
+    function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
         var _this$otherParams,
           _this$otherParams2,
           _this2 = this;
-        var targetCacheData, sessionData, data, moduleArr;
+        var targetCacheData, sessionData, _data$this$otherParam, data, moduleArr;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               this.core = core;
               this.store = options.store || {};
               this.otherParams = options.otherParams || {};
-              console.log("[BookingByStep] 初始化完成");
+              console.log('[BookingByStep] 初始化完成');
               // 获取依赖的插件
-              this.request = core.getPlugin("request");
-              this.window = core.getPlugin("window");
-              this.shopStore = core.getPlugin("shopStore");
+              this.request = core.getPlugin('request');
+              this.window = core.getPlugin('window');
+              this.shopStore = core.getPlugin('shopStore');
               if (this.request) {
                 _context.next = 9;
                 break;
               }
-              throw new Error("bookingByStep解决方案需要 request 插件支持");
+              throw new Error('bookingByStep解决方案需要 request 插件支持');
             case 9:
               // 如果有传 cacheid，默认需要收集上面这些模块里用户操作选中的数据
               // 并且在上面 registerModule 的时候，读取 sessionStroage 里的数据，塞进默认值
@@ -87,9 +91,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   data = JSON.parse(sessionData); // 匹配 cacheid，如果匹配不到，直接把 sessionData 清掉即可
                   // 如果匹配到了，则把 sessionData 里的数据按模块塞到 store 里去
                   targetCacheData = data[this.otherParams.cacheId];
+                  this.otherData = ((_data$this$otherParam = data[this.otherParams.cacheId]) === null || _data$this$otherParam === void 0 || (_data$this$otherParam = _data$this$otherParam[this.name]) === null || _data$this$otherParam === void 0 ? void 0 : _data$this$otherParam['otherData']) || {};
                 }
               }
-              moduleArr = ["accountList", "cart", "schedule", "summary", "step", "products", "date", "order", "payment"];
+              moduleArr = ['accountList', 'cart', 'schedule', 'summary', 'step', 'products', 'date', 'order', 'payment'];
               moduleArr.forEach(function (step) {
                 var targetModule = createModule(step, _this2.name);
                 if (targetModule) {
@@ -161,6 +166,23 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       return this.store.step.getStepList();
     }
 
+    /**
+     * 添加step
+     */
+  }, {
+    key: "addStep",
+    value: function addStep(step, key) {
+      this.store.step.addStep(step, key);
+    }
+
+    /**
+     * 删除step
+     */
+  }, {
+    key: "removeStep",
+    value: function removeStep(key) {
+      this.store.step.removeStep(key);
+    }
     // 获取购物车里 temp.xxx的方法
     // async getStoreCart(key?: string) {
     //   return this.store.cart.getTemp(key);
@@ -180,9 +202,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               return this.request.post("/product/query", {
                 open_quotation: 1,
                 open_bundle: 1,
-                extension_type: ["product_appointment", "appointment_ticket", "session_product"],
-                with: ["category", "collection"],
-                status: "published",
+                extension_type: ['product_appointment', 'appointment_ticket', 'session_product', 'session_ticket'],
+                with: ['category', 'collection', 'resourceRelation'],
+                status: 'published',
                 num: 500,
                 skip: 1,
                 category_ids: category_ids,
@@ -210,37 +232,55 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     }()
   }, {
     key: "loadProductByScheduleDate",
-    value: function loadProductByScheduleDate(date) {
-      var scheduleList = this.store.schedule.getAvailabilityDateList();
-      var scheduleIds = scheduleList.filter(function (n) {
-        return n.date === date;
-      }).flatMap(function (n) {
-        return n.schedule_id;
-      });
-      this.loadProducts({
-        schedule_ids: scheduleIds
-      });
-    }
-
-    // 加载当前店铺下所有 schedule
+    value: function () {
+      var _loadProductByScheduleDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(date) {
+        var scheduleList, scheduleIds;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              scheduleList = this.store.schedule.getAvailabilityScheduleDateList();
+              scheduleIds = scheduleList.filter(function (n) {
+                return n.date === date;
+              }).flatMap(function (n) {
+                return n.schedule_id;
+              }); // 换了日期就清空购物车，不能购物车里的商品不在同一天
+              this.store.cart.clear();
+              _context3.next = 5;
+              return this.loadProducts({
+                schedule_ids: scheduleIds
+              });
+            case 5:
+              return _context3.abrupt("return", _context3.sent);
+            case 6:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3, this);
+      }));
+      function loadProductByScheduleDate(_x4) {
+        return _loadProductByScheduleDate.apply(this, arguments);
+      }
+      return loadProductByScheduleDate;
+    }() // 加载当前店铺下所有 schedule
   }, {
     key: "loadAllSchedule",
     value: function () {
-      var _loadAllSchedule = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+      var _loadAllSchedule = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+        var _scheduleList$data;
         var scheduleList;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _context3.next = 2;
+              _context4.next = 2;
               return this.request.get("/schedule");
             case 2:
-              scheduleList = _context3.sent;
-              this.store.schedule.setScheduleList(scheduleList.data);
+              scheduleList = _context4.sent;
+              this.store.schedule.setScheduleList(((_scheduleList$data = scheduleList.data) === null || _scheduleList$data === void 0 ? void 0 : _scheduleList$data.list) || []);
             case 4:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3, this);
+        }, _callee4, this);
       }));
       function loadAllSchedule() {
         return _loadAllSchedule.apply(this, arguments);
@@ -248,49 +288,83 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       return loadAllSchedule;
     }() // ui 层提供日期的起始范围，返回一个起始范围内日期的可用情况
   }, {
-    key: "loadAvailableDate",
+    key: "loadScheduleAvailableDate",
     value: function () {
-      var _loadAvailableDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref2) {
-        var startDate, endDate, custom_page_id, res;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+      var _loadScheduleAvailableDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(_ref2) {
+        var _res$data$date_list;
+        var startDate, endDate, custom_page_id, dates, res;
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
               startDate = _ref2.startDate, endDate = _ref2.endDate, custom_page_id = _ref2.custom_page_id;
-              _context4.next = 3;
+              // 前端传递的 startDate，可能是今天之前的，如果 startDate 小于今天，需要把 startDate 置为今天
+              if (dayjs(startDate).isBefore(dayjs())) {
+                startDate = dayjs().format('YYYY-MM-DD');
+              }
+              // 1.生成当前月份的所有日期，默认都不可用
+              dates = generateMonthDates(startDate, endDate);
+              dates = disableAllDates(dates);
+              // 如果 endDate 在今天之前，则不用查接口，直接返回 dates
+              if (!dayjs(endDate).isBefore(dayjs())) {
+                _context5.next = 6;
+                break;
+              }
+              return _context5.abrupt("return", dates);
+            case 6:
+              _context5.next = 8;
               return this.request.get("/schedule/product/availability", {
                 start_date: startDate,
                 end_date: endDate,
                 custom_page_id: custom_page_id
               });
-            case 3:
-              res = _context4.sent;
-              this.store.schedule.setAvailabilityDateList(res.data.date_list);
-            case 5:
+            case 8:
+              res = _context5.sent;
+              this.store.schedule.setAvailabilityScheduleDateList(res.data.date_list);
+              // 如果没有schedule或者结束日期在今天之前，则所有日期均不可用
+              if (!(!((_res$data$date_list = res.data.date_list) !== null && _res$data$date_list !== void 0 && _res$data$date_list.length) || dayjs(endDate).isBefore(dayjs()))) {
+                _context5.next = 12;
+                break;
+              }
+              return _context5.abrupt("return", dates);
+            case 12:
+              res.data.date_list.forEach(function (n) {
+                if (n.schedule_id && n.schedule_id.length) {
+                  var index = dates.findIndex(function (m) {
+                    return m.date === n.date;
+                  });
+                  if (index !== -1) {
+                    dates[index].status = 'available';
+                  }
+                }
+              });
+              dates = disableDatesBeforeOneDay(dates);
+              return _context5.abrupt("return", dates);
+            case 15:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, this);
+        }, _callee5, this);
       }));
-      function loadAvailableDate(_x4) {
-        return _loadAvailableDate.apply(this, arguments);
+      function loadScheduleAvailableDate(_x5) {
+        return _loadScheduleAvailableDate.apply(this, arguments);
       }
-      return loadAvailableDate;
+      return loadScheduleAvailableDate;
     }()
   }, {
     key: "storeProduct",
     value: function () {
-      var _storeProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(productData) {
+      var _storeProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(productData) {
         var activeAccount, _ref3, bundle, options, origin, product_variant_id, product;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
               // 往购物车加商品数据的时候，默认用当前 activeAccount 填充到 product 的 account 里面
               activeAccount = this.getActiveAccount();
               if (activeAccount) {
-                _context5.next = 3;
+                _context6.next = 3;
                 break;
               }
-              throw new Error("没有找到当前账户");
+              throw new Error('没有找到当前账户');
             case 3:
               _ref3 = productData || {}, bundle = _ref3.bundle, options = _ref3.options, origin = _ref3.origin, product_variant_id = _ref3.product_variant_id;
               product = _objectSpread(_objectSpread({}, origin), {}, {
@@ -304,11 +378,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 6:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
-        }, _callee5, this);
+        }, _callee6, this);
       }));
-      function storeProduct(_x5) {
+      function storeProduct(_x6) {
         return _storeProduct.apply(this, arguments);
       }
       return storeProduct;
@@ -316,21 +390,28 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addAccount",
     value: function () {
-      var _addAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(accounts) {
+      var _addAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(accounts, extra) {
         var _this3 = this;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+        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')) {
+                _context7.next = 3;
+                break;
+              }
+              this.store.accountList.addHolderAccounts(accounts, extra.customerId);
+              return _context7.abrupt("return");
+            case 3:
               accounts.forEach(function (account) {
                 _this3.store.accountList.addAccount(account);
               });
-            case 1:
+            case 4:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
-        }, _callee6);
+        }, _callee7, this);
       }));
-      function addAccount(_x6) {
+      function addAccount(_x7, _x8) {
         return _addAccount.apply(this, arguments);
       }
       return addAccount;
@@ -338,20 +419,20 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getAccounts",
     value: function () {
-      var _getAccounts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+      var _getAccounts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
         var accounts;
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
               accounts = this.store.accountList.getAccounts();
-              return _context7.abrupt("return", accounts.map(function (account) {
+              return _context8.abrupt("return", accounts.map(function (account) {
                 return account.getAccount();
               }));
             case 2:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
-        }, _callee7, this);
+        }, _callee8, this);
       }));
       function getAccounts() {
         return _getAccounts.apply(this, arguments);
@@ -385,22 +466,45 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       this.clearCartByAccount(id);
     }
 
-    // 设置日期范围,注入到日期模块中
+    /**
+     * 获取holder类型账户列表
+     * @param params
+     */
+  }, {
+    key: "fetchHolderAccountsAsync",
+    value: (function () {
+      var _fetchHolderAccountsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(params) {
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
+            case 0:
+              return _context9.abrupt("return", this.store.accountList.fetchHolderAccounts(params));
+            case 1:
+            case "end":
+              return _context9.stop();
+          }
+        }, _callee9, this);
+      }));
+      function fetchHolderAccountsAsync(_x9) {
+        return _fetchHolderAccountsAsync.apply(this, arguments);
+      }
+      return fetchHolderAccountsAsync;
+    }() // 设置日期范围,注入到日期模块中
+    )
   }, {
     key: "setDateRange",
     value: function () {
-      var _setDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(dateRange) {
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.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);
             case 1:
             case "end":
-              return _context8.stop();
+              return _context10.stop();
           }
-        }, _callee8, this);
+        }, _callee10, this);
       }));
-      function setDateRange(_x7) {
+      function setDateRange(_x10) {
         return _setDateRange.apply(this, arguments);
       }
       return setDateRange;
@@ -415,16 +519,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getDateRange",
     value: function () {
-      var _getDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.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 _context9.abrupt("return", this.store.date.getDateRange());
+              return _context11.abrupt("return", this.store.date.getDateRange());
             case 1:
             case "end":
-              return _context9.stop();
+              return _context11.stop();
           }
-        }, _callee9, this);
+        }, _callee11, this);
       }));
       function getDateRange() {
         return _getDateRange.apply(this, arguments);
@@ -441,12 +545,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getAvailableDate",
     value: function () {
-      var _getAvailableDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
-        var _this$otherParams3, _this$otherParams4;
+      var _getAvailableDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
+        var _this4 = this,
+          _this$otherParams3,
+          _this$otherParams4;
         var params,
           products,
           startDate,
           endDate,
+          type,
           tempProducts,
           tempStartDate,
           tempEndDate,
@@ -455,45 +562,62 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           rules,
           resourcesMap,
           res,
-          _args10 = arguments;
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+          _args12 = arguments;
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              params = _args10.length > 0 && _args10[0] !== undefined ? _args10[0] : {};
+              params = _args12.length > 0 && _args12[0] !== undefined ? _args12[0] : {};
               // 开始日期如果小于今天，直接以今天当做开始日期
-              products = params.products, startDate = params.startDate, endDate = params.endDate;
+              products = params.products, startDate = params.startDate, endDate = params.endDate, type = params.type; // 前端传递的 startDate，可能是今天之前的，如果 startDate 小于今天 且 endDate 小于或等于今天，需要把 startDate 置为今天
+              if (dayjs(startDate).isBefore(dayjs()) && (dayjs(endDate).isAfter(dayjs()) || dayjs(endDate).isSame(dayjs()))) {
+                startDate = dayjs().format('YYYY-MM-DD');
+              }
               tempProducts = products || this.store.cart.getItems().map(function (p) {
                 return p._productOrigin;
               });
+              if (tempProducts.length) {
+                tempProducts.forEach(function (p) {
+                  if (p !== null && p !== void 0 && p['schedule.ids']) {
+                    var scheduleData = _this4.getScheduleDataByIds(p['schedule.ids']);
+                    p['_schedule'] = scheduleData;
+                  }
+                });
+              }
+              // 如果当前打开了某个的商品详情弹窗，则应该默认用这个商品
+              if (this.store.currentProduct) {
+                tempProducts = [_objectSpread(_objectSpread({}, this.store.currentProduct.getData()), {}, {
+                  _schedule: this.store.currentProduct.getOtherParams()['schedule']
+                })];
+              }
               tempStartDate = startDate || ((_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 || (_this$otherParams3 = _this$otherParams3.dateRange) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3[0]);
               tempEndDate = endDate || ((_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 || (_this$otherParams4 = _this$otherParams4.dateRange) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4[1]);
               if (tempProducts.length) {
-                _context10.next = 7;
+                _context12.next = 10;
                 break;
               }
-              return _context10.abrupt("return", []);
-            case 7:
+              return _context12.abrupt("return", []);
+            case 10:
               // 在这里需要把能收集到的数据都收集上来，拼装好给 date 模块去查询
               _ref4 = getAvailableProductResources(tempProducts) || {}, resourceIds = _ref4.resourceIds, rules = _ref4.rules, resourcesMap = _ref4.resourcesMap;
-              console.log("resourceIds", tempProducts);
               this.otherParams.currentResourcesMap = resourcesMap;
-              _context10.next = 12;
-              return this.store.date.getMonthDates({
+              _context12.next = 14;
+              return this.store.date.getResourceDates({
                 query: {
                   start_date: tempStartDate,
                   end_date: tempEndDate,
                   resource_ids: resourceIds
                 },
-                rules: rules
+                rules: rules,
+                type: type
               });
-            case 12:
-              res = _context10.sent;
-              return _context10.abrupt("return", res);
             case 14:
+              res = _context12.sent;
+              return _context12.abrupt("return", res);
+            case 16:
             case "end":
-              return _context10.stop();
+              return _context12.stop();
           }
-        }, _callee10, this);
+        }, _callee12, this);
       }));
       function getAvailableDate() {
         return _getAvailableDate.apply(this, arguments);
@@ -506,22 +630,22 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getSummary",
     value: (function () {
-      var _getSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
+      var _getSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
         var cartItems, summary;
-        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
               cartItems = this.store.cart.getItems();
-              _context11.next = 3;
+              _context13.next = 3;
               return this.store.summary.getSummary(cartItems);
             case 3:
-              summary = _context11.sent;
-              return _context11.abrupt("return", summary);
+              summary = _context13.sent;
+              return _context13.abrupt("return", summary);
             case 5:
             case "end":
-              return _context11.stop();
+              return _context13.stop();
           }
-        }, _callee11, this);
+        }, _callee13, this);
       }));
       function getSummary() {
         return _getSummary.apply(this, arguments);
@@ -535,18 +659,18 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProtocol",
     value: (function () {
-      var _getProtocol = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(protocolId) {
-        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.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 _context12.abrupt("return", this.store.summary.getProtocol(protocolId));
+              return _context14.abrupt("return", this.store.summary.getProtocol(protocolId));
             case 1:
             case "end":
-              return _context12.stop();
+              return _context14.stop();
           }
-        }, _callee12, this);
+        }, _callee14, this);
       }));
-      function getProtocol(_x8) {
+      function getProtocol(_x11) {
         return _getProtocol.apply(this, arguments);
       }
       return getProtocol;
@@ -555,16 +679,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProducts",
     value: function () {
-      var _getProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
-        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.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 _context13.abrupt("return", this.store.products.getProducts());
+              return _context15.abrupt("return", this.store.products.getProducts());
             case 1:
             case "end":
-              return _context13.stop();
+              return _context15.stop();
           }
-        }, _callee13, this);
+        }, _callee15, this);
       }));
       function getProducts() {
         return _getProducts.apply(this, arguments);
@@ -574,15 +698,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setLoginAccount",
     value: function () {
-      var _setLoginAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(accountId, accountInfo) {
-        var _this4 = this;
+      var _setLoginAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(accountId, accountInfo) {
+        var _this5 = this;
         var account, stateAccountId, cartItems;
-        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
               account = this.store.accountList.getAccount(accountId);
               if (!account) {
-                _context14.next = 9;
+                _context16.next = 9;
                 break;
               }
               stateAccountId = account.getId();
@@ -591,24 +715,24 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               cartItems = this.store.cart.getItems();
               cartItems.forEach(function (item) {
                 if (item.holder_id === accountId) {
-                  _this4.store.cart.updateItem({
+                  _this5.store.cart.updateItem({
                     _id: item._id,
                     account: accountInfo
                   });
                 }
               });
               this.store.accountList.updateAccountListById(stateAccountId, accountInfo);
-              _context14.next = 10;
+              _context16.next = 10;
               break;
             case 9:
               throw new Error("\u6CA1\u6709\u627E\u5230".concat(accountId, "\u8D26\u6237"));
             case 10:
             case "end":
-              return _context14.stop();
+              return _context16.stop();
           }
-        }, _callee14, this);
+        }, _callee16, this);
       }));
-      function setLoginAccount(_x9, _x10) {
+      function setLoginAccount(_x12, _x13) {
         return _setLoginAccount.apply(this, arguments);
       }
       return setLoginAccount;
@@ -616,14 +740,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "generateCartData",
     value: function () {
-      var _generateCartData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
-        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.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 _context15.stop();
+              return _context17.stop();
           }
-        }, _callee15);
+        }, _callee17);
       }));
       function generateCartData() {
         return _generateCartData.apply(this, arguments);
@@ -633,34 +757,49 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getFreeProduct",
     value: function () {
-      var _getFreeProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(id) {
+      var _getFreeProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(id) {
         var res;
-        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
-              _context16.next = 2;
+              _context18.next = 2;
               return this.request.post("/pay/order/free-pay/".concat(id));
             case 2:
-              res = _context16.sent;
-              return _context16.abrupt("return", res);
+              res = _context18.sent;
+              return _context18.abrupt("return", res);
             case 4:
             case "end":
-              return _context16.stop();
+              return _context18.stop();
           }
-        }, _callee16, this);
+        }, _callee18, this);
       }));
-      function getFreeProduct(_x11) {
+      function getFreeProduct(_x14) {
         return _getFreeProduct.apply(this, arguments);
       }
       return getFreeProduct;
-    }() // 购物车提交订单
+    }()
+    /**
+     * 检查购物车提交订单前是否符合条件
+     * @param type 类型 "holder" | "account"
+     * @returns boolean
+     */
+  }, {
+    key: "checkBeforeSubmitOrder",
+    value: function checkBeforeSubmitOrder(type) {
+      return this.store.order.checkBeforeSubmitOrder({
+        type: type,
+        cartItems: this.store.cart.getItems()
+      });
+    }
+
+    // 购物车提交订单
   }, {
     key: "submitOrder",
     value: function () {
-      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
+      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
         var cartItems, newCartItems;
-        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
               cartItems = this.store.cart.getItems();
               newCartItems = cloneDeep(cartItems); // 先整个临时的逻辑，把购物车里所有商品的资源给他格式化一下
@@ -673,16 +812,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   return _objectSpread({}, newResourcesItem);
                 });
               });
-              return _context17.abrupt("return", this.store.order.commitOrder({
+              return _context19.abrupt("return", this.store.order.submitOrder({
                 query: {
                   cartItems: newCartItems
                 }
               }));
             case 4:
             case "end":
-              return _context17.stop();
+              return _context19.stop();
           }
-        }, _callee17, this);
+        }, _callee19, this);
       }));
       function submitOrder() {
         return _submitOrder.apply(this, arguments);
@@ -692,14 +831,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "pay",
     value: function () {
-      var _pay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
-        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
-          while (1) switch (_context18.prev = _context18.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 _context18.stop();
+              return _context20.stop();
           }
-        }, _callee18);
+        }, _callee20);
       }));
       function pay() {
         return _pay.apply(this, arguments);
@@ -709,14 +848,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getPayInfo",
     value: function () {
-      var _getPayInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
-        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
-          while (1) switch (_context19.prev = _context19.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 _context19.stop();
+              return _context21.stop();
           }
-        }, _callee19);
+        }, _callee21);
       }));
       function getPayInfo() {
         return _getPayInfo.apply(this, arguments);
@@ -726,15 +865,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setOtherParams",
     value: function () {
-      var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(params) {
+      var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(params) {
         var _ref5,
           _ref5$cover,
           cover,
-          _args20 = arguments;
-        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+          _args22 = arguments;
+        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
-              _ref5 = _args20.length > 1 && _args20[1] !== undefined ? _args20[1] : {}, _ref5$cover = _ref5.cover, cover = _ref5$cover === void 0 ? false : _ref5$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 {
@@ -742,11 +881,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }
             case 2:
             case "end":
-              return _context20.stop();
+              return _context22.stop();
           }
-        }, _callee20, this);
+        }, _callee22, this);
       }));
-      function setOtherParams(_x12) {
+      function setOtherParams(_x15) {
         return _setOtherParams.apply(this, arguments);
       }
       return setOtherParams;
@@ -754,16 +893,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOtherParams",
     value: function () {
-      var _getOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
-        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
-          while (1) switch (_context21.prev = _context21.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 _context21.abrupt("return", this.otherParams);
+              return _context23.abrupt("return", this.otherParams);
             case 1:
             case "end":
-              return _context21.stop();
+              return _context23.stop();
           }
-        }, _callee21, this);
+        }, _callee23, this);
       }));
       function getOtherParams() {
         return _getOtherParams.apply(this, arguments);
@@ -773,12 +912,19 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateCart",
     value: function updateCart(params) {
-      var _this5 = this;
-      this.store.cart.updateItem(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"));
       }
+      if (params.resources) {
+        params.resources = params.resources.map(function (n) {
+          n.capacity = targetCartItem.num || 1;
+          checkSubResourcesCapacity(n);
+          return n;
+        });
+      }
+      this.store.cart.updateItem(params);
       // 更新购物车后，需要判定购物车里是否存在多个账号选择了相同资源的情况，如果是，则要把选择了相同资源的 product._origin.resources 给去除
       var cartItems = this.store.cart.getItems();
       cartItems.forEach(function (item) {
@@ -796,7 +942,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               return false;
             });
           });
-          _this5.store.cart.updateItem({
+          _this6.store.cart.updateItem({
             _id: item._id,
             resources: resources
           });
@@ -831,10 +977,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "batchUpdateCart",
     value: function batchUpdateCart(paramsList) {
-      var _this6 = this;
+      var _this7 = this;
       var cartItems = [];
       paramsList.forEach(function (params) {
-        var cartItem = _this6.store.cart.formatCartItem(params);
+        var cartItem = _this7.store.cart.formatCartItem(params);
         cartItems.push(cartItem);
       });
       this.store.cart.batchSetItems(cartItems);
@@ -868,17 +1014,27 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     value: function getResourcesList() {
       var dateRange = this.store.date.getDateRange();
       var resources = [];
-      dateRange.forEach(function (n) {
-        if (n.resource) resources.push.apply(resources, _toConsumableArray(n.resource));
-      });
+      if (dateRange !== null && dateRange !== void 0 && dateRange.length) {
+        dateRange.forEach(function (n) {
+          if (n.resource) resources.push.apply(resources, _toConsumableArray(n.resource));
+        });
+      } else {
+        // 如果没有 dateRange，视作购物车里已经有了 dateRange 数据，此时 dateList 里明确就是那一天的数据
+        var dateList = this.store.date.getDateList();
+        dateList.forEach(function (n) {
+          if (n.resource) resources.push.apply(resources, _toConsumableArray(n.resource));
+        });
+      }
       var resourcesMap = getResourcesMap(resources);
       var cartItems = this.store.cart.getItems();
       var arr = [];
+      var capacityMap = {};
       cartItems.forEach(function (cartItem) {
         var _cartItem$_productOri, _cartItem$_productOri2;
-        // TODO:应该要优化下，理论上流程里不应该有holder_id 为空的购物车数据
-        if (!cartItem.holder_id) return;
-        var selectedResources = getOthersSelectedResources(cartItems, cartItem.holder_id, resourcesMap);
+        var selectedResources = [];
+        if (cartItem.holder_id) {
+          selectedResources = getOthersSelectedResources(cartItems, cartItem.holder_id, resourcesMap);
+        }
         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
@@ -887,6 +1043,31 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           capacity: formatCapacity
         });
         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));
+          productResources.forEach(function (n) {
+            n.renderList = n.renderList.filter(function (m) {
+              var recordCount = capacityMap[m.id] || 0;
+              var canUseTime = m.times.find(function (item) {
+                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: recordCount + (currentCapacity || 0)
+                });
+                return res.usable;
+              });
+              return canUseTime;
+            });
+          });
+        }
         arr.push({
           id: cartItem.id,
           // 这里返回的是购物车 id ，后面提交的时候要用的，用这个 id 绑定资源和时间
@@ -1141,7 +1322,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "autoSelectAllProductResources",
     value: function autoSelectAllProductResources(resources_code, timeSlots) {
-      var _this7 = this;
+      var _this8 = this;
       var dateRange = this.store.date.getDateRange();
       var resources = [];
       dateRange.forEach(function (n) {
@@ -1152,7 +1333,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var errorList = [];
       var selectResourcesMap = {};
       this.store.accountList.getAccounts().forEach(function (account) {
-        var cartItems = _this7.store.cart.getCartByAccount(account.getId());
+        var cartItems = _this8.store.cart.getCartByAccount(account.getId());
         var recordTimeSlots = cloneDeep(timeSlots);
         // timeSlots 传进来的只是用户选中的时间片，但是实际上需要根据多个商品时间进行累加
         // 假设 timeSlots.start_time 是15:40 duration 是 30min
@@ -1170,17 +1351,17 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           if (timeSlots) {
             if (index !== 0 && recordTimeSlots) {
               var _item$_productOrigin$, _item$_productOrigin3, _ref9, _item$_productOrigin4, _item$_productOrigin$2, _item$_productOrigin5, _ref10, _item$_productOrigin6;
-              var start_at = dayjs(recordTimeSlots.end_time).add((_item$_productOrigin$ = (_item$_productOrigin3 = item._productOrigin) === null || _item$_productOrigin3 === void 0 || (_item$_productOrigin3 = _item$_productOrigin3.duration) === null || _item$_productOrigin3 === void 0 ? void 0 : _item$_productOrigin3.value) !== null && _item$_productOrigin$ !== void 0 ? _item$_productOrigin$ : 0, (_ref9 = (_item$_productOrigin4 = item._productOrigin) === null || _item$_productOrigin4 === void 0 || (_item$_productOrigin4 = _item$_productOrigin4.duration) === null || _item$_productOrigin4 === void 0 ? void 0 : _item$_productOrigin4.type) !== null && _ref9 !== void 0 ? _ref9 : "minutes");
-              var end_at = start_at.add((_item$_productOrigin$2 = (_item$_productOrigin5 = item._productOrigin) === null || _item$_productOrigin5 === void 0 || (_item$_productOrigin5 = _item$_productOrigin5.duration) === null || _item$_productOrigin5 === void 0 ? void 0 : _item$_productOrigin5.value) !== null && _item$_productOrigin$2 !== void 0 ? _item$_productOrigin$2 : 0, (_ref10 = (_item$_productOrigin6 = item._productOrigin) === null || _item$_productOrigin6 === void 0 || (_item$_productOrigin6 = _item$_productOrigin6.duration) === null || _item$_productOrigin6 === void 0 ? void 0 : _item$_productOrigin6.type) !== null && _ref10 !== void 0 ? _ref10 : "minutes");
+              var start_at = dayjs(recordTimeSlots.end_time).add((_item$_productOrigin$ = (_item$_productOrigin3 = item._productOrigin) === null || _item$_productOrigin3 === void 0 || (_item$_productOrigin3 = _item$_productOrigin3.duration) === null || _item$_productOrigin3 === void 0 ? void 0 : _item$_productOrigin3.value) !== null && _item$_productOrigin$ !== void 0 ? _item$_productOrigin$ : 0, (_ref9 = (_item$_productOrigin4 = item._productOrigin) === null || _item$_productOrigin4 === void 0 || (_item$_productOrigin4 = _item$_productOrigin4.duration) === null || _item$_productOrigin4 === void 0 ? void 0 : _item$_productOrigin4.type) !== null && _ref9 !== void 0 ? _ref9 : 'minutes');
+              var end_at = start_at.add((_item$_productOrigin$2 = (_item$_productOrigin5 = item._productOrigin) === null || _item$_productOrigin5 === void 0 || (_item$_productOrigin5 = _item$_productOrigin5.duration) === null || _item$_productOrigin5 === void 0 ? void 0 : _item$_productOrigin5.value) !== null && _item$_productOrigin$2 !== void 0 ? _item$_productOrigin$2 : 0, (_ref10 = (_item$_productOrigin6 = item._productOrigin) === null || _item$_productOrigin6 === void 0 || (_item$_productOrigin6 = _item$_productOrigin6.duration) === null || _item$_productOrigin6 === void 0 ? void 0 : _item$_productOrigin6.type) !== null && _ref10 !== void 0 ? _ref10 : 'minutes');
               recordTimeSlots = {
-                start_time: start_at.format("HH:mm"),
-                end_time: end_at.format("HH:mm"),
+                start_time: start_at.format('HH:mm'),
+                end_time: end_at.format('HH:mm'),
                 start_at: start_at,
                 end_at: end_at
               };
             }
             // 如果传递了 timeSlots，代表是第二种资源，则直接拿 timeSlots 去匹配
-            var res = _this7.autoSelectAccountResources({
+            var res = _this8.autoSelectAccountResources({
               holder_id: item.holder_id,
               resources_code: resources_code,
               timeSlots: recordTimeSlots,
@@ -1199,7 +1380,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }
               res.selectedResource.capacity = currentCapacity;
               checkSubResourcesCapacity(res.selectedResource);
-              _this7.store.cart.updateItem({
+              _this8.store.cart.updateItem({
                 _id: item._id,
                 // 这里要做去重，避免出现同样类型的资源被塞进同一个商品
                 resources: [].concat(_toConsumableArray((item._origin.resources || []).filter(function (existingRes) {
@@ -1213,7 +1394,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           } else {
             var _item$_productOrigin7, _productResources$fin;
             // 这里必须每次循环重新读，避免前一次循环操作了购物车，导致数据变更
-            var allCartItems = _this7.store.cart.getItems();
+            var allCartItems = _this8.store.cart.getItems();
             // 如果没有传递 timeSlots，代表是第一种资源，则直接拿商品的 duration，到资源列表里找一个公共可用的
             if (!item.holder_id) return;
             var selectedResources = getOthersSelectedResources(allCartItems, item.holder_id, resourcesMap);
@@ -1234,7 +1415,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               targetResource.capacity = currentCapacity;
               // 在这里处理 children 的数据
               checkSubResourcesCapacity(targetResource);
-              _this7.store.cart.updateItem({
+              _this8.store.cart.updateItem({
                 _id: item._id,
                 resources: [].concat(_toConsumableArray((item._origin.resources || []).filter(function (existingRes) {
                   return existingRes.resourceType !== targetRenderList[0].resourceType;
@@ -1256,7 +1437,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getTimeSlotByAllResources",
     value: function getTimeSlotByAllResources(resources_code) {
-      var _this8 = this;
+      var _this9 = this;
       var dateRange = this.store.date.getDateRange();
       // 取出购物车中所有一已选择的第一步资源
       var resources = [];
@@ -1281,7 +1462,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       // duration = 不同账号的最长时间
       this.store.accountList.getAccounts().forEach(function (account) {
         var accountDuration = 0;
-        var cartItems = _this8.store.cart.getCartByAccount(account.getId());
+        var cartItems = _this9.store.cart.getCartByAccount(account.getId());
         cartItems.forEach(function (item) {
           var _item$_productOrigin$3, _item$_productOrigin9;
           accountDuration += (_item$_productOrigin$3 = (_item$_productOrigin9 = item._productOrigin) === null || _item$_productOrigin9 === void 0 || (_item$_productOrigin9 = _item$_productOrigin9.duration) === null || _item$_productOrigin9 === void 0 ? void 0 : _item$_productOrigin9.value) !== null && _item$_productOrigin$3 !== void 0 ? _item$_productOrigin$3 : 0;
@@ -1304,7 +1485,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitTimeSlot",
     value: function submitTimeSlot(timeSlots) {
-      var _this9 = this;
+      var _this10 = this;
       // 以账号为维度处理数据。购物车里每一项的 startTime应该是前一个商品的 endTime，如果是第一个商品则用 timeSlots.start_at
       var cartItems = this.store.cart.getItems();
 
@@ -1320,16 +1501,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
 
       // 处理每个账号的商品
       Object.values(itemsByAccount).forEach(function (accountItems) {
-        var currentStartTime = timeSlots.start_at.format("YYYY-MM-DD HH:mm");
+        var currentStartTime = timeSlots.start_at.format('YYYY-MM-DD HH:mm');
         accountItems.forEach(function (item, index) {
           var newResources = cloneDeep(item._origin.resources);
           newResources.forEach(function (resource) {
             var _item$_productOrigin$4, _item$_productOrigin10, _ref11, _item$_productOrigin11;
             resource.startTime = currentStartTime;
-            resource.endTime = dayjs(currentStartTime).add((_item$_productOrigin$4 = (_item$_productOrigin10 = item._productOrigin) === null || _item$_productOrigin10 === void 0 || (_item$_productOrigin10 = _item$_productOrigin10.duration) === null || _item$_productOrigin10 === void 0 ? void 0 : _item$_productOrigin10.value) !== null && _item$_productOrigin$4 !== void 0 ? _item$_productOrigin$4 : 0, (_ref11 = (_item$_productOrigin11 = item._productOrigin) === null || _item$_productOrigin11 === void 0 || (_item$_productOrigin11 = _item$_productOrigin11.duration) === null || _item$_productOrigin11 === void 0 ? void 0 : _item$_productOrigin11.type) !== null && _ref11 !== void 0 ? _ref11 : "minutes").format("YYYY-MM-DD HH:mm");
+            resource.endTime = dayjs(currentStartTime).add((_item$_productOrigin$4 = (_item$_productOrigin10 = item._productOrigin) === null || _item$_productOrigin10 === void 0 || (_item$_productOrigin10 = _item$_productOrigin10.duration) === null || _item$_productOrigin10 === void 0 ? void 0 : _item$_productOrigin10.value) !== null && _item$_productOrigin$4 !== void 0 ? _item$_productOrigin$4 : 0, (_ref11 = (_item$_productOrigin11 = item._productOrigin) === null || _item$_productOrigin11 === void 0 || (_item$_productOrigin11 = _item$_productOrigin11.duration) === null || _item$_productOrigin11 === void 0 ? void 0 : _item$_productOrigin11.type) !== null && _ref11 !== void 0 ? _ref11 : 'minutes').format('YYYY-MM-DD HH:mm');
             delete resource.times;
           });
-          _this9.store.cart.updateItem({
+          _this10.store.cart.updateItem({
             _id: item._id,
             resources: newResources
           });
@@ -1347,32 +1528,188 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "clearCacheByModule",
     value: function clearCacheByModule(module) {}
+  }, {
+    key: "getScheduleDataByIds",
+    value: function getScheduleDataByIds(scheduleIds) {
+      var targetSchedules = this.store.schedule.getScheduleListByIds(scheduleIds);
+      var targetSchedulesData = targetSchedules.map(function (item) {
+        return calcCalendarDataByScheduleResult(item);
+      });
+      var newSchedule = {};
+      targetSchedulesData.forEach(function (item) {
+        item.forEach(function (n) {
+          if (!newSchedule[n.date]) {
+            newSchedule[n.date] = n;
+          } else {
+            if (!n.isExcluded) {
+              newSchedule[n.date].isExcluded = false;
+            }
+          }
+        });
+      });
+      var newScheduleArr = Object.values(newSchedule);
+      return newScheduleArr;
+    }
+    // 打开某个商品详情的弹窗，OS 层这边会记录当前选中的商品，适用于 session 类商品预约
   }, {
     key: "openProductDetail",
     value: function () {
-      var _openProductDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(productId) {
-        var targetProduct;
-        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
+      var _openProductDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(productId) {
+        var targetProduct, targetProductData, newScheduleArr;
+        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
             case 0:
-              _context22.next = 2;
+              _context24.next = 2;
               return this.store.products.getProduct(productId);
             case 2:
-              targetProduct = _context22.sent;
+              targetProduct = _context24.sent;
               if (targetProduct) {
+                targetProductData = targetProduct.getData();
                 this.store.currentProduct = targetProduct;
+                newScheduleArr = this.getScheduleDataByIds(targetProductData['schedule.ids']);
+                targetProduct.setOtherParams('schedule', newScheduleArr);
               }
             case 4:
             case "end":
-              return _context22.stop();
+              return _context24.stop();
           }
-        }, _callee22, this);
+        }, _callee24, this);
       }));
-      function openProductDetail(_x13) {
+      function openProductDetail(_x16) {
         return _openProductDetail.apply(this, arguments);
       }
       return openProductDetail;
     }()
+  }, {
+    key: "closeProductDetail",
+    value: function closeProductDetail() {
+      var _this$store$currentPr;
+      (_this$store$currentPr = this.store.currentProduct) === null || _this$store$currentPr === void 0 || _this$store$currentPr.setOtherParams('schedule', []);
+      this.store.currentProduct = undefined;
+    }
+  }, {
+    key: "getTimeslotBySchedule",
+    value: function getTimeslotBySchedule(_ref12) {
+      var date = _ref12.date,
+        scheduleIds = _ref12.scheduleIds;
+      var targetProduct = this.store.currentProduct;
+      var targetProductData = targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.getData();
+      var targetSchedules = [];
+      // 如果外面传递了 scheduleIds,优先取入参
+      if (scheduleIds !== null && scheduleIds !== void 0 && scheduleIds.length) {
+        targetSchedules = this.store.schedule.getScheduleListByIds(scheduleIds);
+      } else {
+        targetSchedules = this.store.schedule.getScheduleListByIds(targetProductData['schedule.ids']);
+      }
+      var resourcesDates = this.store.date.getDateList();
+      var targetResourceDate = resourcesDates.find(function (n) {
+        return n.date === date;
+      });
+      var minTimeMaxTime = calcMinTimeMaxTimeBySchedules(targetSchedules, {}, date);
+      var scheduleTimeSlots = getAllSortedDateRanges(minTimeMaxTime);
+      console.log('scheduleTimeSlots:', scheduleTimeSlots, targetResourceDate);
+      var formatScheduleTimeSlots = scheduleTimeSlots.map(function (item) {
+        var _targetResourceDate$r;
+        console.log(item);
+        var count = 0;
+        targetResourceDate === null || targetResourceDate === void 0 || (_targetResourceDate$r = targetResourceDate.resource) === null || _targetResourceDate$r === void 0 || _targetResourceDate$r.forEach(function (n) {
+          var res = getIsUsableByTimeItem({
+            timeSlice: {
+              start_time: item.start,
+              end_time: item.end,
+              start_at: dayjs(item.start),
+              end_at: dayjs(item.end)
+            },
+            time: item,
+            resource: n,
+            currentCount: 1
+          });
+          if (res.usable) {
+            count += 1;
+          }
+        });
+        var startDayJs = dayjs(item.start);
+        var endDayJs = dayjs(item.end);
+        return {
+          start_time: startDayJs.format('HH:mm'),
+          end_time: endDayJs.format('HH:mm'),
+          start_at: startDayJs,
+          end_at: endDayJs,
+          count: count
+        };
+      });
+      return formatScheduleTimeSlots;
+    }
+  }, {
+    key: "addProductToCart",
+    value: function addProductToCart(_ref13) {
+      var product = _ref13.product,
+        date = _ref13.date,
+        account = _ref13.account;
+      var _ref14 = product || {},
+        bundle = _ref14.bundle,
+        options = _ref14.options,
+        origin = _ref14.origin,
+        product_variant_id = _ref14.product_variant_id;
+      var productData = _objectSpread(_objectSpread({}, origin), {}, {
+        product_variant_id: product_variant_id
+      });
+      this.store.cart.addItem({
+        product: productData,
+        date: date,
+        account: account,
+        bundle: bundle,
+        options: options
+      });
+    }
+  }, {
+    key: "setOtherData",
+    value: function setOtherData(key, value) {
+      this.otherData[key] = value;
+      this.checkSaveCache({
+        cacheId: this.cacheId,
+        fatherModule: this.name,
+        store: {
+          otherData: this.otherData
+        },
+        cacheKey: ['otherData']
+      });
+    }
+  }, {
+    key: "getOtherData",
+    value: function getOtherData(key) {
+      return this.otherData[key];
+    }
+  }, {
+    key: "getProductTypeById",
+    value: function () {
+      var _getProductTypeById = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(id) {
+        var product;
+        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
+            case 0:
+              _context25.next = 2;
+              return this.store.products.getProduct(id);
+            case 2:
+              product = _context25.sent;
+              if (!product) {
+                _context25.next = 5;
+                break;
+              }
+              return _context25.abrupt("return", product.getProductType());
+            case 5:
+              return _context25.abrupt("return", 'normal');
+            case 6:
+            case "end":
+              return _context25.stop();
+          }
+        }, _callee25, this);
+      }));
+      function getProductTypeById(_x17) {
+        return _getProductTypeById.apply(this, arguments);
+      }
+      return getProductTypeById;
+    }()
   }]);
   return BookingByStepImpl;
 }(BaseModule);