@pisell/pisellos 2.0.20 → 2.0.22

package/dist/solution/BookingByStep/index.js

@@ -204,7 +204,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref) {
         var _schedule_ids;
-        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, _ref$schedule_ids, schedule_ids, schedule_date, schedule_ids_data, productsData;
+        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, _ref$schedule_ids, schedule_ids, schedule_date, schedule_ids_data, userPlugin, customer_id, _userPlugin$get, productsData;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -221,15 +221,24 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   schedule_ids = [0];
                 }
               }
-              _context2.next = 4;
+              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 = 7;
               return this.request.post("/product/query", {
                 open_quotation: 1,
-                open_bundle: 1,
+                open_bundle: 0,
                 extension_type: ['product_appointment', 'appointment_ticket', 'session_product', 'session_ticket'],
                 with: ['category', 'collection', 'resourceRelation'],
                 status: 'published',
                 num: 500,
                 skip: 1,
+                customer_id: customer_id,
                 category_ids: category_ids,
                 ids: product_ids,
                 collection: collection,
@@ -239,11 +248,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }, {
                 useCache: true
               });
-            case 4:
+            case 7:
               productsData = _context2.sent;
               this.store.products.addProduct(productsData.data.list);
               return _context2.abrupt("return", productsData.data.list);
-            case 7:
+            case 10:
             case "end":
               return _context2.stop();
           }
@@ -299,30 +308,146 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         return _loadProductByScheduleDate.apply(this, arguments);
       }
       return loadProductByScheduleDate;
+    }()
+  }, {
+    key: "updateQuotationPriceAndCart",
+    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) {
+            case 0:
+              // 更新完商品数据以后，检测当前购物车里是否有商品，如果有，则需要更新购物车里的商品价格
+              cartItems = this.store.cart.getItems();
+              if (!cartItems.length) {
+                _context5.next = 25;
+                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;
+              } catch (error) {
+                console.error(error);
+              }
+              _context5.next = 7;
+              return this.store.products.loadProductsPrice({
+                ids: cartItems.map(function (n) {
+                  return n.id;
+                }),
+                schedule_date: date,
+                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);
+              });
+              _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 25:
+            case "end":
+              return _context5.stop();
+          }
+        }, _callee4, this, [[9, 18, 21, 24]]);
+      }));
+      function updateQuotationPriceAndCart(_x5) {
+        return _updateQuotationPriceAndCart.apply(this, arguments);
+      }
+      return updateQuotationPriceAndCart;
     }() // 加载当前店铺下所有 schedule
   }, {
     key: "loadAllSchedule",
     value: function () {
-      var _loadAllSchedule = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+      var _loadAllSchedule = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
         var _scheduleList$data;
         var scheduleList;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regeneratorRuntime().wrap(function _callee5$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              _context4.next = 2;
+              _context6.next = 2;
               return this.request.get("/schedule", {
                 num: 999
               }, {
                 useCache: true
               });
             case 2:
-              scheduleList = _context4.sent;
+              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 _context4.stop();
+              return _context6.stop();
           }
-        }, _callee4, this);
+        }, _callee5, this);
       }));
       function loadAllSchedule() {
         return _loadAllSchedule.apply(this, arguments);
@@ -332,11 +457,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadScheduleAvailableDate",
     value: function () {
-      var _loadScheduleAvailableDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(_ref3) {
+      var _loadScheduleAvailableDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref3) {
         var _res$data$date_list;
         var startDate, endDate, custom_page_id, channel, dates, res;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+        return _regeneratorRuntime().wrap(function _callee6$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
               startDate = _ref3.startDate, endDate = _ref3.endDate, custom_page_id = _ref3.custom_page_id, channel = _ref3.channel;
               // 前端传递的 startDate，可能是今天之前的，如果 startDate 小于今天，需要把 startDate 置为今天
@@ -348,12 +473,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               dates = disableAllDates(dates);
               // 如果 endDate 在今天之前，则不用查接口，直接返回 dates
               if (!dayjs(endDate).isBefore(dayjs(), 'day')) {
-                _context5.next = 6;
+                _context7.next = 6;
                 break;
               }
-              return _context5.abrupt("return", dates);
+              return _context7.abrupt("return", dates);
             case 6:
-              _context5.next = 8;
+              _context7.next = 8;
               return this.request.get("/schedule/product/availability", {
                 start_date: startDate,
                 end_date: endDate,
@@ -361,14 +486,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 channel: channel
               });
             case 8:
-              res = _context5.sent;
+              res = _context7.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(), 'day'))) {
-                _context5.next = 12;
+                _context7.next = 12;
                 break;
               }
-              return _context5.abrupt("return", dates);
+              return _context7.abrupt("return", dates);
             case 12:
               res.data.date_list.forEach(function (n) {
                 var index = dates.findIndex(function (m) {
@@ -379,14 +504,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               });
               dates = disableDatesBeforeOneDay(dates);
-              return _context5.abrupt("return", dates);
+              return _context7.abrupt("return", dates);
             case 15:
             case "end":
-              return _context5.stop();
+              return _context7.stop();
           }
-        }, _callee5, this);
+        }, _callee6, this);
       }));
-      function loadScheduleAvailableDate(_x5) {
+      function loadScheduleAvailableDate(_x6) {
         return _loadScheduleAvailableDate.apply(this, arguments);
       }
       return loadScheduleAvailableDate;
@@ -394,10 +519,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "storeProduct",
     value: function () {
-      var _storeProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(productData) {
+      var _storeProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(productData) {
         var activeAccount, _ref4, bundle, options, origin, product_variant_id, product, addCartItem;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+        return _regeneratorRuntime().wrap(function _callee7$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
               // 往购物车加商品数据的时候，默认用当前 activeAccount 填充到 product 的 account 里面
               activeAccount = this.getActiveAccount();
@@ -416,11 +541,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               this.store.cart.addItem(addCartItem);
             case 6:
             case "end":
-              return _context6.stop();
+              return _context8.stop();
           }
-        }, _callee6, this);
+        }, _callee7, this);
       }));
-      function storeProduct(_x6) {
+      function storeProduct(_x7) {
         return _storeProduct.apply(this, arguments);
       }
       return storeProduct;
@@ -428,37 +553,37 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addAccount",
     value: function () {
-      var _addAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(account, extra) {
+      var _addAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(account, extra) {
         var accountModules, newAccount;
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+        return _regeneratorRuntime().wrap(function _callee8$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
               if (!((extra === null || extra === void 0 ? void 0 : extra.type) === 'holder')) {
-                _context7.next = 5;
+                _context9.next = 5;
                 break;
               }
-              _context7.next = 3;
+              _context9.next = 3;
               return this.store.accountList.addHolderAccounts({
                 holders: [account],
                 customerId: extra.customerId,
                 type: 'unshift'
               });
             case 3:
-              accountModules = _context7.sent;
-              return _context7.abrupt("return", accountModules[0].getAccount());
+              accountModules = _context9.sent;
+              return _context9.abrupt("return", accountModules[0].getAccount());
             case 5:
-              _context7.next = 7;
+              _context9.next = 7;
               return this.store.accountList.addAccount(account);
             case 7:
-              newAccount = _context7.sent;
-              return _context7.abrupt("return", newAccount.getAccount());
+              newAccount = _context9.sent;
+              return _context9.abrupt("return", newAccount.getAccount());
             case 9:
             case "end":
-              return _context7.stop();
+              return _context9.stop();
           }
-        }, _callee7, this);
+        }, _callee8, this);
       }));
-      function addAccount(_x7, _x8) {
+      function addAccount(_x8, _x9) {
         return _addAccount.apply(this, arguments);
       }
       return addAccount;
@@ -466,13 +591,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addAccounts",
     value: function () {
-      var _addAccounts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(accounts, extra) {
-        var res, _iterator, _step, account, accountModule, accountData;
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+      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) {
             case 0:
               if (!((extra === null || extra === void 0 ? void 0 : extra.type) === 'holder')) {
-                _context8.next = 3;
+                _context10.next = 3;
                 break;
               }
               this.store.accountList.addHolderAccounts({
@@ -480,49 +605,49 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 customerId: extra.customerId,
                 type: 'unshift'
               });
-              return _context8.abrupt("return");
+              return _context10.abrupt("return");
             case 3:
               res = [];
-              _iterator = _createForOfIteratorHelper(accounts);
-              _context8.prev = 5;
-              _iterator.s();
+              _iterator2 = _createForOfIteratorHelper(accounts);
+              _context10.prev = 5;
+              _iterator2.s();
             case 7:
-              if ((_step = _iterator.n()).done) {
-                _context8.next = 16;
+              if ((_step2 = _iterator2.n()).done) {
+                _context10.next = 16;
                 break;
               }
-              account = _step.value;
-              _context8.next = 11;
+              account = _step2.value;
+              _context10.next = 11;
               return this.store.accountList.addAccount(account);
             case 11:
-              accountModule = _context8.sent;
+              accountModule = _context10.sent;
               accountData = accountModule.getAccount();
               if (accountData) {
                 res.push(accountData);
               }
             case 14:
-              _context8.next = 7;
+              _context10.next = 7;
               break;
             case 16:
-              _context8.next = 21;
+              _context10.next = 21;
               break;
             case 18:
-              _context8.prev = 18;
-              _context8.t0 = _context8["catch"](5);
-              _iterator.e(_context8.t0);
+              _context10.prev = 18;
+              _context10.t0 = _context10["catch"](5);
+              _iterator2.e(_context10.t0);
             case 21:
-              _context8.prev = 21;
-              _iterator.f();
-              return _context8.finish(21);
+              _context10.prev = 21;
+              _iterator2.f();
+              return _context10.finish(21);
             case 24:
-              return _context8.abrupt("return", res);
+              return _context10.abrupt("return", res);
             case 25:
             case "end":
-              return _context8.stop();
+              return _context10.stop();
           }
-        }, _callee8, this, [[5, 18, 21, 24]]);
+        }, _callee9, this, [[5, 18, 21, 24]]);
       }));
-      function addAccounts(_x9, _x10) {
+      function addAccounts(_x10, _x11) {
         return _addAccounts.apply(this, arguments);
       }
       return addAccounts;
@@ -530,20 +655,20 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getAccounts",
     value: function () {
-      var _getAccounts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+      var _getAccounts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
         var accounts;
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+        return _regeneratorRuntime().wrap(function _callee10$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
               accounts = this.store.accountList.getAccounts();
-              return _context9.abrupt("return", accounts.map(function (account) {
+              return _context11.abrupt("return", accounts.map(function (account) {
                 return account.getAccount();
               }));
             case 2:
             case "end":
-              return _context9.stop();
+              return _context11.stop();
           }
-        }, _callee9, this);
+        }, _callee10, this);
       }));
       function getAccounts() {
         return _getAccounts.apply(this, arguments);
@@ -584,18 +709,28 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "fetchHolderAccountsAsync",
     value: (function () {
-      var _fetchHolderAccountsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(params) {
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+      var _fetchHolderAccountsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(params) {
+        var cartItems, _this$store$date$getD, date, _cartItems$;
+        return _regeneratorRuntime().wrap(function _callee11$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              return _context10.abrupt("return", this.store.accountList.fetchHolderAccounts(params));
-            case 1:
+              cartItems = this.store.cart.getItems();
+              if (cartItems.length) {
+                date = (_this$store$date$getD = this.store.date.getDateRange()) === null || _this$store$date$getD === void 0 || (_this$store$date$getD = _this$store$date$getD[0]) === null || _this$store$date$getD === void 0 ? void 0 : _this$store$date$getD.date;
+                if (!date) {
+                  // 如果没有日期，则应该是 session 类先选商品的流程，直接从购物车里拿 start_date
+                  date = (cartItems === null || cartItems === void 0 || (_cartItems$ = cartItems[0]) === null || _cartItems$ === void 0 ? void 0 : _cartItems$.start_date) || '';
+                }
+                this.updateQuotationPriceAndCart(date);
+              }
+              return _context12.abrupt("return", this.store.accountList.fetchHolderAccounts(params));
+            case 3:
             case "end":
-              return _context10.stop();
+              return _context12.stop();
           }
-        }, _callee10, this);
+        }, _callee11, this);
       }));
-      function fetchHolderAccountsAsync(_x11) {
+      function fetchHolderAccountsAsync(_x12) {
         return _fetchHolderAccountsAsync.apply(this, arguments);
       }
       return fetchHolderAccountsAsync;
@@ -604,18 +739,22 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setDateRange",
     value: function () {
-      var _setDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(dateRange) {
-        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+      var _setDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(dateRange) {
+        return _regeneratorRuntime().wrap(function _callee12$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
               this.store.date.setDateRange(dateRange);
-            case 1:
+              // 日期数据变更后，如果购物车里有数据，需要更新购物车里的报价单的价格
+              if (dateRange.length && this.store.cart.getItems().length) {
+                this.updateQuotationPriceAndCart(dateRange[0].date);
+              }
+            case 2:
             case "end":
-              return _context11.stop();
+              return _context13.stop();
           }
-        }, _callee11, this);
+        }, _callee12, this);
       }));
-      function setDateRange(_x12) {
+      function setDateRange(_x13) {
         return _setDateRange.apply(this, arguments);
       }
       return setDateRange;
@@ -630,16 +769,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getDateRange",
     value: function () {
-      var _getDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
-        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+      var _getDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
+        return _regeneratorRuntime().wrap(function _callee13$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
-              return _context12.abrupt("return", this.store.date.getDateRange());
+              return _context14.abrupt("return", this.store.date.getDateRange());
             case 1:
             case "end":
-              return _context12.stop();
+              return _context14.stop();
           }
-        }, _callee12, this);
+        }, _callee13, this);
       }));
       function getDateRange() {
         return _getDateRange.apply(this, arguments);
@@ -656,8 +795,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getAvailableDate",
     value: function () {
-      var _getAvailableDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
-        var _this3 = this,
+      var _getAvailableDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
+        var _this4 = this,
           _dateRange$,
           _dateRange$2,
           _dateRange$3;
@@ -675,11 +814,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           rules,
           resourcesMap,
           res,
-          _args13 = arguments;
-        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+          _args15 = arguments;
+        return _regeneratorRuntime().wrap(function _callee14$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
-              params = _args13.length > 0 && _args13[0] !== undefined ? _args13[0] : {};
+              params = _args15.length > 0 && _args15[0] !== undefined ? _args15[0] : {};
               // 开始日期如果小于今天，直接以今天当做开始日期
               products = params.products, 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'))) {
@@ -691,7 +830,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               if (tempProducts.length) {
                 tempProducts.forEach(function (p) {
                   if (p !== null && p !== void 0 && p['schedule.ids']) {
-                    var scheduleData = _this3.getScheduleDataByIds(p['schedule.ids']);
+                    var scheduleData = _this4.getScheduleDataByIds(p['schedule.ids']);
                     p['_schedule'] = scheduleData;
                   }
                 });
@@ -706,15 +845,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) {
-                _context13.next = 11;
+                _context15.next = 11;
                 break;
               }
-              return _context13.abrupt("return", []);
+              return _context15.abrupt("return", []);
             case 11:
               // 在这里需要把能收集到的数据都收集上来，拼装好给 date 模块去查询
               _ref5 = getAvailableProductResources(tempProducts) || {}, resourceIds = _ref5.resourceIds, rules = _ref5.rules, resourcesMap = _ref5.resourcesMap;
               this.otherParams.currentResourcesMap = resourcesMap;
-              _context13.next = 15;
+              _context15.next = 15;
               return this.store.date.getResourceDates({
                 url: params.url,
                 query: {
@@ -726,13 +865,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 type: type
               });
             case 15:
-              res = _context13.sent;
-              return _context13.abrupt("return", res);
+              res = _context15.sent;
+              return _context15.abrupt("return", res);
             case 17:
             case "end":
-              return _context13.stop();
+              return _context15.stop();
           }
-        }, _callee13, this);
+        }, _callee14, this);
       }));
       function getAvailableDate() {
         return _getAvailableDate.apply(this, arguments);
@@ -745,22 +884,22 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getSummary",
     value: (function () {
-      var _getSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
+      var _getSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
         var cartItems, summary;
-        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+        return _regeneratorRuntime().wrap(function _callee15$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
               cartItems = this.store.cart.getItems();
-              _context14.next = 3;
+              _context16.next = 3;
               return this.store.summary.getSummary(cartItems);
             case 3:
-              summary = _context14.sent;
-              return _context14.abrupt("return", summary);
+              summary = _context16.sent;
+              return _context16.abrupt("return", summary);
             case 5:
             case "end":
-              return _context14.stop();
+              return _context16.stop();
           }
-        }, _callee14, this);
+        }, _callee15, this);
       }));
       function getSummary() {
         return _getSummary.apply(this, arguments);
@@ -774,18 +913,18 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProtocol",
     value: (function () {
-      var _getProtocol = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(protocolId) {
-        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+      var _getProtocol = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(protocolId) {
+        return _regeneratorRuntime().wrap(function _callee16$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
-              return _context15.abrupt("return", this.store.summary.getProtocol(protocolId));
+              return _context17.abrupt("return", this.store.summary.getProtocol(protocolId));
             case 1:
             case "end":
-              return _context15.stop();
+              return _context17.stop();
           }
-        }, _callee15, this);
+        }, _callee16, this);
       }));
-      function getProtocol(_x13) {
+      function getProtocol(_x14) {
         return _getProtocol.apply(this, arguments);
       }
       return getProtocol;
@@ -794,16 +933,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProducts",
     value: function () {
-      var _getProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
-        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+      var _getProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
+        return _regeneratorRuntime().wrap(function _callee17$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
-              return _context16.abrupt("return", this.store.products.getProducts());
+              return _context18.abrupt("return", this.store.products.getProducts());
             case 1:
             case "end":
-              return _context16.stop();
+              return _context18.stop();
           }
-        }, _callee16, this);
+        }, _callee17, this);
       }));
       function getProducts() {
         return _getProducts.apply(this, arguments);
@@ -813,41 +952,50 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setLoginAccount",
     value: function () {
-      var _setLoginAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(accountId, accountInfo) {
-        var _this4 = this;
-        var account, stateAccountId, cartItems;
-        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+      var _setLoginAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(accountId, accountInfo) {
+        var _this5 = this;
+        var account, stateAccountId, cartItems, _this$store$date$getD2, date, _cartItems$2;
+        return _regeneratorRuntime().wrap(function _callee18$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
               account = this.store.accountList.getAccount(accountId);
               if (!account) {
-                _context17.next = 9;
+                _context19.next = 11;
                 break;
               }
               stateAccountId = account.getId();
+              accountInfo.isLogin = true;
               account.setAccountInfo(accountInfo);
               // 然后去购物车，把原先关联了 holder_id 为 accountId 的商品，替换为 holder_id = accountInfo.id
               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);
-              _context17.next = 10;
+              if (cartItems.length) {
+                date = (_this$store$date$getD2 = this.store.date.getDateRange()) === null || _this$store$date$getD2 === void 0 || (_this$store$date$getD2 = _this$store$date$getD2[0]) === null || _this$store$date$getD2 === void 0 ? void 0 : _this$store$date$getD2.date;
+                if (!date) {
+                  // 如果没有日期，则应该是 session 类先选商品的流程，直接从购物车里拿 start_date
+                  date = (cartItems === null || cartItems === void 0 || (_cartItems$2 = cartItems[0]) === null || _cartItems$2 === void 0 ? void 0 : _cartItems$2.start_date) || '';
+                }
+                this.updateQuotationPriceAndCart(date);
+              }
+              _context19.next = 12;
               break;
-            case 9:
+            case 11:
               throw new Error("\u6CA1\u6709\u627E\u5230".concat(accountId, "\u8D26\u6237"));
-            case 10:
+            case 12:
             case "end":
-              return _context17.stop();
+              return _context19.stop();
           }
-        }, _callee17, this);
+        }, _callee18, this);
       }));
-      function setLoginAccount(_x14, _x15) {
+      function setLoginAccount(_x15, _x16) {
         return _setLoginAccount.apply(this, arguments);
       }
       return setLoginAccount;
@@ -855,14 +1003,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "generateCartData",
     value: function () {
-      var _generateCartData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
-        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+      var _generateCartData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
+        return _regeneratorRuntime().wrap(function _callee19$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
             case "end":
-              return _context18.stop();
+              return _context20.stop();
           }
-        }, _callee18);
+        }, _callee19);
       }));
       function generateCartData() {
         return _generateCartData.apply(this, arguments);
@@ -872,23 +1020,23 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getFreeProduct",
     value: function () {
-      var _getFreeProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(id) {
+      var _getFreeProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(id) {
         var res;
-        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+        return _regeneratorRuntime().wrap(function _callee20$(_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
             case 0:
-              _context19.next = 2;
+              _context21.next = 2;
               return this.request.post("/pay/order/free-pay/".concat(id));
             case 2:
-              res = _context19.sent;
-              return _context19.abrupt("return", res);
+              res = _context21.sent;
+              return _context21.abrupt("return", res);
             case 4:
             case "end":
-              return _context19.stop();
+              return _context21.stop();
           }
-        }, _callee19, this);
+        }, _callee20, this);
       }));
-      function getFreeProduct(_x16) {
+      function getFreeProduct(_x17) {
         return _getFreeProduct.apply(this, arguments);
       }
       return getFreeProduct;
@@ -911,10 +1059,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitOrder",
     value: function () {
-      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20() {
+      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
         var cartItems, newCartItems;
-        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+        return _regeneratorRuntime().wrap(function _callee21$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
               cartItems = this.store.cart.getItems();
               newCartItems = cloneDeep(cartItems); // 先整个临时的逻辑，把购物车里所有商品的资源给他格式化一下
@@ -940,16 +1088,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 item._origin.metadata.capacity = formatCapacity;
                 item._origin.number = currentCapacity;
               });
-              return _context20.abrupt("return", this.store.order.submitOrder({
+              return _context22.abrupt("return", this.store.order.submitOrder({
                 query: {
                   cartItems: newCartItems
                 }
               }));
             case 4:
             case "end":
-              return _context20.stop();
+              return _context22.stop();
           }
-        }, _callee20, this);
+        }, _callee21, this);
       }));
       function submitOrder() {
         return _submitOrder.apply(this, arguments);
@@ -959,14 +1107,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "pay",
     value: function () {
-      var _pay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
-        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+      var _pay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22() {
+        return _regeneratorRuntime().wrap(function _callee22$(_context23) {
+          while (1) switch (_context23.prev = _context23.next) {
             case 0:
             case "end":
-              return _context21.stop();
+              return _context23.stop();
           }
-        }, _callee21);
+        }, _callee22);
       }));
       function pay() {
         return _pay.apply(this, arguments);
@@ -976,14 +1124,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getPayInfo",
     value: function () {
-      var _getPayInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22() {
-        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
+      var _getPayInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
+        return _regeneratorRuntime().wrap(function _callee23$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
             case 0:
             case "end":
-              return _context22.stop();
+              return _context24.stop();
           }
-        }, _callee22);
+        }, _callee23);
       }));
       function getPayInfo() {
         return _getPayInfo.apply(this, arguments);
@@ -993,15 +1141,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setOtherParams",
     value: function () {
-      var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(params) {
+      var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(params) {
         var _ref6,
           _ref6$cover,
           cover,
-          _args23 = arguments;
-        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+          _args25 = arguments;
+        return _regeneratorRuntime().wrap(function _callee24$(_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
             case 0:
-              _ref6 = _args23.length > 1 && _args23[1] !== undefined ? _args23[1] : {}, _ref6$cover = _ref6.cover, cover = _ref6$cover === void 0 ? false : _ref6$cover;
+              _ref6 = _args25.length > 1 && _args25[1] !== undefined ? _args25[1] : {}, _ref6$cover = _ref6.cover, cover = _ref6$cover === void 0 ? false : _ref6$cover;
               if (cover) {
                 this.otherParams = params;
               } else {
@@ -1009,11 +1157,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }
             case 2:
             case "end":
-              return _context23.stop();
+              return _context25.stop();
           }
-        }, _callee23, this);
+        }, _callee24, this);
       }));
-      function setOtherParams(_x17) {
+      function setOtherParams(_x18) {
         return _setOtherParams.apply(this, arguments);
       }
       return setOtherParams;
@@ -1021,16 +1169,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOtherParams",
     value: function () {
-      var _getOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24() {
-        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
+      var _getOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25() {
+        return _regeneratorRuntime().wrap(function _callee25$(_context26) {
+          while (1) switch (_context26.prev = _context26.next) {
             case 0:
-              return _context24.abrupt("return", this.otherParams);
+              return _context26.abrupt("return", this.otherParams);
             case 1:
             case "end":
-              return _context24.stop();
+              return _context26.stop();
           }
-        }, _callee24, this);
+        }, _callee25, this);
       }));
       function getOtherParams() {
         return _getOtherParams.apply(this, arguments);
@@ -1040,7 +1188,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateCart",
     value: function updateCart(params) {
-      var _this5 = this;
+      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"));
@@ -1129,7 +1277,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;
-              _this5.store.cart.updateItem({
+              _this6.store.cart.updateItem({
                 _id: item._id,
                 resources: resources,
                 date: {
@@ -1138,7 +1286,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               });
             } else {
-              _this5.store.cart.updateItem({
+              _this6.store.cart.updateItem({
                 _id: item._id,
                 resources: resources
               });
@@ -1175,10 +1323,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);
@@ -1206,11 +1354,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "checkCartItems",
     value: function checkCartItems(type) {
-      var _this7 = this;
+      var _this8 = this;
       var cartItems = this.store.cart.getItems();
       var errorCartItemIds = [];
       cartItems.forEach(function (cartItem) {
-        var result = _this7.store.cart.checkCartItemByType(cartItem, type);
+        var result = _this8.store.cart.checkCartItemByType(cartItem, type);
         if (!result) {
           errorCartItemIds.push(cartItem._id);
         }
@@ -1638,11 +1786,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         //   .format("HH:mm");
         // 根据 start_time 和 end_time 去匹配资源
         var targetResource = null;
-        var _iterator2 = _createForOfIteratorHelper(resources),
-          _step2;
+        var _iterator3 = _createForOfIteratorHelper(resources),
+          _step3;
         try {
-          var _loop = function _loop() {
-              var n = _step2.value;
+          var _loop2 = function _loop2() {
+              var n = _step3.value;
               // 如果资源是独占的，并且 countMap 里选择过这个资源，则直接跳过
               // if (n.resourceType === 'single' && countMap[n.id]) {
               //   resourcesUseableMap[n.id] = false;
@@ -1681,15 +1829,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }
             },
             _ret;
-          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-            _ret = _loop();
+          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+            _ret = _loop2();
             if (_ret === 0) continue;
             if (_ret === 1) break;
           }
         } catch (err) {
-          _iterator2.e(err);
+          _iterator3.e(err);
         } finally {
-          _iterator2.f();
+          _iterator3.f();
         }
         return {
           selectedResource: targetResource
@@ -1724,7 +1872,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "autoSelectAllProductResources",
     value: function autoSelectAllProductResources(resources_code, timeSlots) {
       var _dateRange$4,
-        _this8 = this;
+        _this9 = 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) {
@@ -1781,7 +1929,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               };
             }
             // 如果传递了 timeSlots，代表是第二种资源，则直接拿 timeSlots 去匹配
-            var res = _this8.autoSelectAccountResources({
+            var res = _this9.autoSelectAccountResources({
               cartItem: item,
               holder_id: item.holder_id,
               resources_code: resources_code,
@@ -1801,7 +1949,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }
               res.selectedResource.capacity = currentCapacity;
               checkSubResourcesCapacity(res.selectedResource);
-              _this8.store.cart.updateItem({
+              _this9.store.cart.updateItem({
                 _id: item._id,
                 // 这里要做去重，避免出现同样类型的资源被塞进同一个商品
                 resources: [].concat(_toConsumableArray((item._origin.resources || []).filter(function (existingRes) {
@@ -1816,7 +1964,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           } else {
             var _item$_productOrigin10, _productResources$fin;
             // 这里必须每次循环重新读，避免前一次循环操作了购物车，导致数据变更
-            var allCartItems = cloneDeep(_this8.store.cart.getItems());
+            var allCartItems = cloneDeep(_this9.store.cart.getItems());
             // 如果没有传递 timeSlots，代表是第一种资源，则直接拿商品的 duration，到资源列表里找一个公共可用的
             var selectedResources = [];
             var _resources = cloneDeep(((_item$_productOrigin10 = item._productOrigin) === null || _item$_productOrigin10 === void 0 || (_item$_productOrigin10 = _item$_productOrigin10.product_resource) === null || _item$_productOrigin10 === void 0 ? void 0 : _item$_productOrigin10.resources) || []);
@@ -1875,7 +2023,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               } else {
                 selectResourcesMap[targetResource.id] += currentCapacity;
               }
-              _this8.store.cart.updateItem({
+              _this9.store.cart.updateItem({
                 _id: item._id,
                 resources: [].concat(_toConsumableArray((item._origin.resources || []).filter(function (existingRes) {
                   return existingRes.resourceType !== targetRenderList[0].resourceType;
@@ -1893,7 +2041,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 = _this8.store.cart.getCartByAccount(account.getId());
+          var cartItems = _this9.store.cart.getCartByAccount(account.getId());
           selectForCartResources(cartItems);
         });
       } else {
@@ -1908,9 +2056,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getTimeSlotByAllResources",
     value: function getTimeSlotByAllResources(resources_code) {
       var _dateRange,
-        _this9 = this,
-        _cartItems$,
-        _cartItems$2;
+        _this10 = this,
+        _cartItems$3,
+        _cartItems$4;
       var dateRange = this.store.date.getDateRange();
       // 取出购物车中所有一已选择的第一步资源
       var resources = [];
@@ -1919,9 +2067,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var resourceIds = [];
       var resourcesTypeId = undefined;
       var isSingleResource = false;
+
+      // 找出购物车里最大的 cut_off_time
+      var maxCutOffTime = undefined;
+      var maxCutOffTimeValue = dayjs();
       cartItems.forEach(function (item) {
-        var _item$_productOrigin11, _item$_productOrigin12;
+        var _item$_productOrigin11, _item$_productOrigin12, _item$_productOrigin13, _item$_productOrigin14;
         (_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.forEach(function (n) {
+          // TODO： 少了个 status 的判断
           if (n.code === resources_code) {
             resources.push.apply(resources, _toConsumableArray(n.renderList || []));
             isSingleResource = n.type === 'single';
@@ -1936,6 +2089,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         resourcesTypeId = item === null || item === void 0 || (_item$_productOrigin12 = item._productOrigin) === null || _item$_productOrigin12 === void 0 || (_item$_productOrigin12 = _item$_productOrigin12.product_resource) === null || _item$_productOrigin12 === void 0 || (_item$_productOrigin12 = _item$_productOrigin12.resources) === null || _item$_productOrigin12 === void 0 || (_item$_productOrigin12 = _item$_productOrigin12.find(function (n) {
           return n.code === resources_code;
         })) === null || _item$_productOrigin12 === void 0 ? void 0 : _item$_productOrigin12.id;
+        if ((_item$_productOrigin13 = item._productOrigin) !== null && _item$_productOrigin13 !== void 0 && _item$_productOrigin13.cut_off_time && ((_item$_productOrigin14 = item._productOrigin) === null || _item$_productOrigin14 === void 0 ? void 0 : _item$_productOrigin14.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;
+            maxCutOffTime = item._productOrigin.cut_off_time;
+          }
+        }
       });
       // 保险起见，在这里如果 dateRange 里也有 resources 的话，也 push 进去
       if ((_dateRange = dateRange) !== null && _dateRange !== void 0 && (_dateRange = _dateRange[0]) !== null && _dateRange !== void 0 && (_dateRange = _dateRange.resource) !== null && _dateRange !== void 0 && _dateRange.length) {
@@ -1957,13 +2117,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         cartItems.forEach(function (item) {
           // 单个预约累加账号 多个预约取最大值
           if (isSingleResource) {
-            var _item$_productOrigin$3, _item$_productOrigin13;
-            accountDuration += (_item$_productOrigin$3 = (_item$_productOrigin13 = item._productOrigin) === null || _item$_productOrigin13 === void 0 || (_item$_productOrigin13 = _item$_productOrigin13.duration) === null || _item$_productOrigin13 === void 0 ? void 0 : _item$_productOrigin13.value) !== null && _item$_productOrigin$3 !== void 0 ? _item$_productOrigin$3 : 0;
+            var _item$_productOrigin$3, _item$_productOrigin15;
+            accountDuration += (_item$_productOrigin$3 = (_item$_productOrigin15 = item._productOrigin) === null || _item$_productOrigin15 === void 0 || (_item$_productOrigin15 = _item$_productOrigin15.duration) === null || _item$_productOrigin15 === void 0 ? void 0 : _item$_productOrigin15.value) !== null && _item$_productOrigin$3 !== void 0 ? _item$_productOrigin$3 : 0;
           } else {
-            var _item$_productOrigin$4, _item$_productOrigin14;
-            if (accountDuration < ((_item$_productOrigin$4 = (_item$_productOrigin14 = item._productOrigin) === null || _item$_productOrigin14 === void 0 || (_item$_productOrigin14 = _item$_productOrigin14.duration) === null || _item$_productOrigin14 === void 0 ? void 0 : _item$_productOrigin14.value) !== null && _item$_productOrigin$4 !== void 0 ? _item$_productOrigin$4 : 0)) {
-              var _item$_productOrigin$5, _item$_productOrigin15;
-              accountDuration = (_item$_productOrigin$5 = (_item$_productOrigin15 = item._productOrigin) === null || _item$_productOrigin15 === void 0 || (_item$_productOrigin15 = _item$_productOrigin15.duration) === null || _item$_productOrigin15 === void 0 ? void 0 : _item$_productOrigin15.value) !== null && _item$_productOrigin$5 !== void 0 ? _item$_productOrigin$5 : 0;
+            var _item$_productOrigin$4, _item$_productOrigin16;
+            if (accountDuration < ((_item$_productOrigin$4 = (_item$_productOrigin16 = item._productOrigin) === null || _item$_productOrigin16 === void 0 || (_item$_productOrigin16 = _item$_productOrigin16.duration) === null || _item$_productOrigin16 === void 0 ? void 0 : _item$_productOrigin16.value) !== null && _item$_productOrigin$4 !== void 0 ? _item$_productOrigin$4 : 0)) {
+              var _item$_productOrigin$5, _item$_productOrigin17;
+              accountDuration = (_item$_productOrigin$5 = (_item$_productOrigin17 = item._productOrigin) === null || _item$_productOrigin17 === void 0 || (_item$_productOrigin17 = _item$_productOrigin17.duration) === null || _item$_productOrigin17 === void 0 ? void 0 : _item$_productOrigin17.value) !== null && _item$_productOrigin$5 !== void 0 ? _item$_productOrigin$5 : 0;
             }
           }
         });
@@ -1973,7 +2133,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       };
       if (cartItems !== null && cartItems !== void 0 && cartItems[0].holder_id) {
         accountList.forEach(function (account) {
-          var cartItems = _this9.store.cart.getCartByAccount(account.getId());
+          var cartItems = _this10.store.cart.getCartByAccount(account.getId());
           checkDuration(cartItems);
         });
       } else {
@@ -1981,18 +2141,18 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       }
       // 如果 cartItem 上既没有时间，也没有资源，认为外部属于异常调用，直接丢一个空数组出去
       // 同时 session 类商品的流程也不应该调用这个方法
-      if (!(cartItems !== null && cartItems !== void 0 && (_cartItems$ = cartItems[0]) !== null && _cartItems$ !== void 0 && _cartItems$.start_date) && !(cartItems !== null && cartItems !== void 0 && (_cartItems$2 = cartItems[0]) !== null && _cartItems$2 !== void 0 && _cartItems$2.resource_id) || !(cartItems !== null && cartItems !== void 0 && cartItems[0].duration)) {
+      if (!(cartItems !== null && cartItems !== void 0 && (_cartItems$3 = cartItems[0]) !== null && _cartItems$3 !== void 0 && _cartItems$3.start_date) && !(cartItems !== null && cartItems !== void 0 && (_cartItems$4 = cartItems[0]) !== null && _cartItems$4 !== void 0 && _cartItems$4.resource_id) || !(cartItems !== null && cartItems !== void 0 && cartItems[0].duration)) {
         return [];
       }
       if (cartItems !== null && cartItems !== void 0 && cartItems[0].start_date && !dateRange) {
-        var _cartItems$3, _cartItems$4;
+        var _cartItems$5, _cartItems$6;
         dateRange = [{
           date: cartItems === null || cartItems === void 0 ? void 0 : cartItems[0].start_date,
           status: 'available',
           week: '',
           weekNum: 0
         }, {
-          date: (cartItems === null || cartItems === void 0 || (_cartItems$3 = cartItems[0]) === null || _cartItems$3 === void 0 ? void 0 : _cartItems$3.end_date) || (cartItems === null || cartItems === void 0 || (_cartItems$4 = cartItems[0]) === null || _cartItems$4 === void 0 ? void 0 : _cartItems$4.start_date) || '',
+          date: (cartItems === null || cartItems === void 0 || (_cartItems$5 = cartItems[0]) === null || _cartItems$5 === void 0 ? void 0 : _cartItems$5.end_date) || (cartItems === null || cartItems === void 0 || (_cartItems$6 = cartItems[0]) === null || _cartItems$6 === void 0 ? void 0 : _cartItems$6.start_date) || '',
           status: 'available',
           week: '',
           weekNum: 0
@@ -2005,7 +2165,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         duration: duration,
         currentDate: dateRange[0].date,
         split: 10,
-        resourcesUseableMap: resourcesUseableMap
+        resourcesUseableMap: resourcesUseableMap,
+        cut_off_time: maxCutOffTime
       });
       return timeSlots;
     }
@@ -2014,7 +2175,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitTimeSlot",
     value: function submitTimeSlot(timeSlots) {
-      var _this10 = this;
+      var _this11 = this;
       // 以账号为维度处理数据。购物车里每一项的 startTime应该是前一个商品的 endTime，如果是第一个商品则用 timeSlots.start_at
       var cartItems = cloneDeep(this.store.cart.getItems());
 
@@ -2035,12 +2196,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           var _newResources$;
           var newResources = cloneDeep(item._origin.resources);
           newResources.forEach(function (resource) {
-            var _item$_productOrigin$6, _item$_productOrigin16, _ref11, _item$_productOrigin17;
+            var _item$_productOrigin$6, _item$_productOrigin18, _ref11, _item$_productOrigin19;
             resource.startTime = currentStartTime;
-            resource.endTime = dayjs(currentStartTime).add((_item$_productOrigin$6 = (_item$_productOrigin16 = item._productOrigin) === null || _item$_productOrigin16 === void 0 || (_item$_productOrigin16 = _item$_productOrigin16.duration) === null || _item$_productOrigin16 === void 0 ? void 0 : _item$_productOrigin16.value) !== null && _item$_productOrigin$6 !== void 0 ? _item$_productOrigin$6 : 0, (_ref11 = (_item$_productOrigin17 = item._productOrigin) === null || _item$_productOrigin17 === void 0 || (_item$_productOrigin17 = _item$_productOrigin17.duration) === null || _item$_productOrigin17 === void 0 ? void 0 : _item$_productOrigin17.type) !== null && _ref11 !== void 0 ? _ref11 : 'minutes').format('YYYY-MM-DD HH:mm');
+            resource.endTime = dayjs(currentStartTime).add((_item$_productOrigin$6 = (_item$_productOrigin18 = item._productOrigin) === null || _item$_productOrigin18 === void 0 || (_item$_productOrigin18 = _item$_productOrigin18.duration) === null || _item$_productOrigin18 === void 0 ? void 0 : _item$_productOrigin18.value) !== null && _item$_productOrigin$6 !== void 0 ? _item$_productOrigin$6 : 0, (_ref11 = (_item$_productOrigin19 = item._productOrigin) === null || _item$_productOrigin19 === void 0 || (_item$_productOrigin19 = _item$_productOrigin19.duration) === null || _item$_productOrigin19 === void 0 ? void 0 : _item$_productOrigin19.type) !== null && _ref11 !== void 0 ? _ref11 : 'minutes').format('YYYY-MM-DD HH:mm');
             delete resource.times;
           });
-          _this10.store.cart.updateItem({
+          _this11.store.cart.updateItem({
             _id: item._id,
             resources: newResources
           });
@@ -2088,15 +2249,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "openProductDetail",
     value: function () {
-      var _openProductDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(productId) {
+      var _openProductDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(productId) {
         var targetProduct, targetProductData, newScheduleArr;
-        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
-          while (1) switch (_context25.prev = _context25.next) {
+        return _regeneratorRuntime().wrap(function _callee26$(_context27) {
+          while (1) switch (_context27.prev = _context27.next) {
             case 0:
-              _context25.next = 2;
+              _context27.next = 2;
               return this.store.products.getProduct(productId);
             case 2:
-              targetProduct = _context25.sent;
+              targetProduct = _context27.sent;
               if (targetProduct) {
                 targetProductData = targetProduct.getData();
                 this.store.currentProduct = targetProduct;
@@ -2105,11 +2266,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }
             case 4:
             case "end":
-              return _context25.stop();
+              return _context27.stop();
           }
-        }, _callee25, this);
+        }, _callee26, this);
       }));
-      function openProductDetail(_x18) {
+      function openProductDetail(_x19) {
         return _openProductDetail.apply(this, arguments);
       }
       return openProductDetail;
@@ -2127,9 +2288,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var _this$store$currentPr2;
       var date = _ref12.date,
         scheduleIds = _ref12.scheduleIds,
-        resources = _ref12.resources;
+        resources = _ref12.resources,
+        product = _ref12.product;
       var targetProduct = this.store.currentProduct;
-      var targetProductData = targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.getData();
+      // 如果外面传递了product 优先用外面的
+      var targetProductData = product || (targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.getData());
       var targetSchedules = [];
       // 如果外面传递了 scheduleIds,优先取入参
       if (scheduleIds !== null && scheduleIds !== void 0 && scheduleIds.length) {
@@ -2176,7 +2339,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           // 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(item.start)) && !dayjs(n.end_at).isBefore(dayjs(item.end));
+            return !dayjs(n.start_at).isAfter(dayjs(item.start), 'minute') && !dayjs(n.end_at).isBefore(dayjs(item.end), 'minute');
           });
           // 如果在这个区间的时间一个都没有，可以直接认为这个资源不可用
           if (mTimes.length === 0) {
@@ -2227,7 +2390,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addProductToCart",
     value: function addProductToCart(_ref13) {
-      var _this11 = this;
+      var _this12 = this;
       var product = _ref13.product,
         date = _ref13.date,
         account = _ref13.account;
@@ -2260,7 +2423,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         });
         if (cartItemsByDate.length) {
           cartItemsByDate.forEach(function (n) {
-            _this11.store.cart.removeItem(n._id);
+            _this12.store.cart.removeItem(n._id);
           });
         }
       }
@@ -2286,29 +2449,29 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProductTypeById",
     value: function () {
-      var _getProductTypeById = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(id) {
+      var _getProductTypeById = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(id) {
         var product;
-        return _regeneratorRuntime().wrap(function _callee26$(_context26) {
-          while (1) switch (_context26.prev = _context26.next) {
+        return _regeneratorRuntime().wrap(function _callee27$(_context28) {
+          while (1) switch (_context28.prev = _context28.next) {
             case 0:
-              _context26.next = 2;
+              _context28.next = 2;
               return this.store.products.getProduct(id);
             case 2:
-              product = _context26.sent;
+              product = _context28.sent;
               if (!product) {
-                _context26.next = 5;
+                _context28.next = 5;
                 break;
               }
-              return _context26.abrupt("return", product.getProductType());
+              return _context28.abrupt("return", product.getProductType());
             case 5:
-              return _context26.abrupt("return", 'normal');
+              return _context28.abrupt("return", 'normal');
             case 6:
             case "end":
-              return _context26.stop();
+              return _context28.stop();
           }
-        }, _callee26, this);
+        }, _callee27, this);
       }));
-      function getProductTypeById(_x19) {
+      function getProductTypeById(_x20) {
         return _getProductTypeById.apply(this, arguments);
       }
       return getProductTypeById;