@pisell/pisellos 0.0.37 → 2.0.1

package/dist/solution/BookingByStep/index.js

@@ -27,7 +27,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { BaseModule } from "../../modules/BaseModule";
 import { BookingByStepHooks, createModule } from "./types";
 import { getAvailableProductResources } from "./utils/products";
-import { getResourcesByProduct, getTimeSlicesByResource, getTimeSlicesByResources, getIsUsableByTimeItem, getOthersSelectedResources, formatDefaultCapacitys, getSumCapacity, checkSubResourcesCapacity } from "./utils/resources";
+import { getResourcesByProduct, getTimeSlicesByResource, getTimeSlicesByResources, getIsUsableByTimeItem } from "./utils/resources";
 import dayjs from "dayjs";
 import { getResourcesMap } from "../../modules/Resource/utils";
 import { cloneDeep } from "lodash-es";
@@ -108,8 +108,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               });
               this.core.effects.emit(BookingByStepHooks.onInited, {});
-              this.loadAllSchedule();
-            case 16:
+            case 15:
             case "end":
               return _context.stop();
           }
@@ -171,16 +170,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadProducts",
     value: function () {
       var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref) {
-        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, _ref$schedule_ids, schedule_ids, productsData;
+        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, productsData;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, _ref$schedule_ids = _ref.schedule_ids, schedule_ids = _ref$schedule_ids === void 0 ? [] : _ref$schedule_ids;
+              _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection;
               _context2.next = 3;
               return this.request.post("/product/query", {
                 open_quotation: 1,
                 open_bundle: 1,
-                extension_type: ["product_appointment", "appointment_ticket", "session_product"],
+                extension_type: ["product_appointment", "appointment_ticket"],
                 with: ["category", "collection"],
                 status: "published",
                 num: 500,
@@ -188,8 +187,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 category_ids: category_ids,
                 ids: product_ids,
                 collection: collection,
-                front_end_cache_id: this.cacheId,
-                schedule_ids: schedule_ids
+                front_end_cache_id: this.cacheId
               }, {
                 useCache: true
               });
@@ -207,76 +205,24 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         return _loadProducts.apply(this, arguments);
       }
       return loadProducts;
-    }() // 加载当前店铺下所有 schedule
-  }, {
-    key: "loadAllSchedule",
-    value: function () {
-      var _loadAllSchedule = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        var scheduleList;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              _context3.next = 2;
-              return this.request.get("/schedule");
-            case 2:
-              scheduleList = _context3.sent;
-            case 3:
-            case "end":
-              return _context3.stop();
-          }
-        }, _callee3, this);
-      }));
-      function loadAllSchedule() {
-        return _loadAllSchedule.apply(this, arguments);
-      }
-      return loadAllSchedule;
-    }() // ui 层提供日期的起始范围，返回一个起始范围内日期的可用情况
-  }, {
-    key: "loadAvailableDate",
-    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) {
-            case 0:
-              startDate = _ref2.startDate, endDate = _ref2.endDate, custom_page_id = _ref2.custom_page_id;
-              _context4.next = 3;
-              return this.request.get("/schedule/product/availability", {
-                start_date: startDate,
-                end_date: endDate,
-                custom_page_id: custom_page_id
-              });
-            case 3:
-              res = _context4.sent;
-              return _context4.abrupt("return", res.data.list);
-            case 5:
-            case "end":
-              return _context4.stop();
-          }
-        }, _callee4, this);
-      }));
-      function loadAvailableDate(_x4) {
-        return _loadAvailableDate.apply(this, arguments);
-      }
-      return loadAvailableDate;
     }()
   }, {
     key: "storeProduct",
     value: function () {
-      var _storeProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(productData) {
-        var activeAccount, _ref3, bundle, options, origin, product_variant_id, product;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+      var _storeProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(productData) {
+        var activeAccount, _ref2, bundle, options, origin, product_variant_id, product;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               // 往购物车加商品数据的时候，默认用当前 activeAccount 填充到 product 的 account 里面
               activeAccount = this.getActiveAccount();
               if (activeAccount) {
-                _context5.next = 3;
+                _context3.next = 3;
                 break;
               }
               throw new Error("没有找到当前账户");
             case 3:
-              _ref3 = productData || {}, bundle = _ref3.bundle, options = _ref3.options, origin = _ref3.origin, product_variant_id = _ref3.product_variant_id;
+              _ref2 = productData || {}, bundle = _ref2.bundle, options = _ref2.options, origin = _ref2.origin, product_variant_id = _ref2.product_variant_id;
               product = _objectSpread(_objectSpread({}, origin), {}, {
                 product_variant_id: product_variant_id
               });
@@ -288,11 +234,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 6:
             case "end":
-              return _context5.stop();
+              return _context3.stop();
           }
-        }, _callee5, this);
+        }, _callee3, this);
       }));
-      function storeProduct(_x5) {
+      function storeProduct(_x4) {
         return _storeProduct.apply(this, arguments);
       }
       return storeProduct;
@@ -300,21 +246,21 @@ 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 _callee4(accounts) {
         var _this3 = this;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
               accounts.forEach(function (account) {
                 _this3.store.accountList.addAccount(account);
               });
             case 1:
             case "end":
-              return _context6.stop();
+              return _context4.stop();
           }
-        }, _callee6);
+        }, _callee4);
       }));
-      function addAccount(_x6) {
+      function addAccount(_x5) {
         return _addAccount.apply(this, arguments);
       }
       return addAccount;
@@ -322,20 +268,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 _callee5() {
         var accounts;
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
               accounts = this.store.accountList.getAccounts();
-              return _context7.abrupt("return", accounts.map(function (account) {
+              return _context5.abrupt("return", accounts.map(function (account) {
                 return account.getAccount();
               }));
             case 2:
             case "end":
-              return _context7.stop();
+              return _context5.stop();
           }
-        }, _callee7, this);
+        }, _callee5, this);
       }));
       function getAccounts() {
         return _getAccounts.apply(this, arguments);
@@ -373,18 +319,18 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     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 _callee6(dateRange) {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
               this.store.date.setDateRange(dateRange);
             case 1:
             case "end":
-              return _context8.stop();
+              return _context6.stop();
           }
-        }, _callee8, this);
+        }, _callee6, this);
       }));
-      function setDateRange(_x7) {
+      function setDateRange(_x6) {
         return _setDateRange.apply(this, arguments);
       }
       return setDateRange;
@@ -399,16 +345,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 _callee7() {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              return _context9.abrupt("return", this.store.date.getDateRange());
+              return _context7.abrupt("return", this.store.date.getDateRange());
             case 1:
             case "end":
-              return _context9.stop();
+              return _context7.stop();
           }
-        }, _callee9, this);
+        }, _callee7, this);
       }));
       function getDateRange() {
         return _getDateRange.apply(this, arguments);
@@ -425,7 +371,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getAvailableDate",
     value: function () {
-      var _getAvailableDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
+      var _getAvailableDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
         var _this$otherParams3, _this$otherParams4;
         var params,
           products,
@@ -434,16 +380,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           tempProducts,
           tempStartDate,
           tempEndDate,
-          _ref4,
+          _ref3,
           resourceIds,
           rules,
           resourcesMap,
           res,
-          _args10 = arguments;
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+          _args8 = arguments;
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              params = _args10.length > 0 && _args10[0] !== undefined ? _args10[0] : {};
+              params = _args8.length > 0 && _args8[0] !== undefined ? _args8[0] : {};
               // 开始日期如果小于今天，直接以今天当做开始日期
               products = params.products, startDate = params.startDate, endDate = params.endDate;
               tempProducts = products || this.store.cart.getItems().map(function (p) {
@@ -452,16 +398,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               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;
+                _context8.next = 7;
                 break;
               }
-              return _context10.abrupt("return", []);
+              return _context8.abrupt("return", []);
             case 7:
               // 在这里需要把能收集到的数据都收集上来，拼装好给 date 模块去查询
-              _ref4 = getAvailableProductResources(tempProducts) || {}, resourceIds = _ref4.resourceIds, rules = _ref4.rules, resourcesMap = _ref4.resourcesMap;
+              _ref3 = getAvailableProductResources(tempProducts) || {}, resourceIds = _ref3.resourceIds, rules = _ref3.rules, resourcesMap = _ref3.resourcesMap;
               console.log("resourceIds", tempProducts);
               this.otherParams.currentResourcesMap = resourcesMap;
-              _context10.next = 12;
+              _context8.next = 12;
               return this.store.date.getMonthDates({
                 query: {
                   start_date: tempStartDate,
@@ -471,13 +417,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 rules: rules
               });
             case 12:
-              res = _context10.sent;
-              return _context10.abrupt("return", res);
+              res = _context8.sent;
+              return _context8.abrupt("return", res);
             case 14:
             case "end":
-              return _context10.stop();
+              return _context8.stop();
           }
-        }, _callee10, this);
+        }, _callee8, this);
       }));
       function getAvailableDate() {
         return _getAvailableDate.apply(this, arguments);
@@ -490,22 +436,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 _callee9() {
         var cartItems, summary;
-        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
               cartItems = this.store.cart.getItems();
-              _context11.next = 3;
+              _context9.next = 3;
               return this.store.summary.getSummary(cartItems);
             case 3:
-              summary = _context11.sent;
-              return _context11.abrupt("return", summary);
+              summary = _context9.sent;
+              return _context9.abrupt("return", summary);
             case 5:
             case "end":
-              return _context11.stop();
+              return _context9.stop();
           }
-        }, _callee11, this);
+        }, _callee9, this);
       }));
       function getSummary() {
         return _getSummary.apply(this, arguments);
@@ -516,16 +462,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProducts",
     value: function () {
-      var _getProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
-        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+      var _getProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
-              return _context12.abrupt("return", this.store.products.getProducts());
+              return _context10.abrupt("return", this.store.products.getProducts());
             case 1:
             case "end":
-              return _context12.stop();
+              return _context10.stop();
           }
-        }, _callee12, this);
+        }, _callee10, this);
       }));
       function getProducts() {
         return _getProducts.apply(this, arguments);
@@ -535,15 +481,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setLoginAccount",
     value: function () {
-      var _setLoginAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(accountId, accountInfo) {
+      var _setLoginAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(accountId, accountInfo) {
         var _this4 = this;
         var account, stateAccountId, cartItems;
-        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
               account = this.store.accountList.getAccount(accountId);
               if (!account) {
-                _context13.next = 9;
+                _context11.next = 9;
                 break;
               }
               stateAccountId = account.getId();
@@ -559,17 +505,17 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               });
               this.store.accountList.updateAccountListById(stateAccountId, accountInfo);
-              _context13.next = 10;
+              _context11.next = 10;
               break;
             case 9:
               throw new Error("\u6CA1\u6709\u627E\u5230".concat(accountId, "\u8D26\u6237"));
             case 10:
             case "end":
-              return _context13.stop();
+              return _context11.stop();
           }
-        }, _callee13, this);
+        }, _callee11, this);
       }));
-      function setLoginAccount(_x8, _x9) {
+      function setLoginAccount(_x7, _x8) {
         return _setLoginAccount.apply(this, arguments);
       }
       return setLoginAccount;
@@ -577,14 +523,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "generateCartData",
     value: function () {
-      var _generateCartData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
-        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+      var _generateCartData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
             case "end":
-              return _context14.stop();
+              return _context12.stop();
           }
-        }, _callee14);
+        }, _callee12);
       }));
       function generateCartData() {
         return _generateCartData.apply(this, arguments);
@@ -594,23 +540,23 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getFreeProduct",
     value: function () {
-      var _getFreeProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(id) {
+      var _getFreeProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(id) {
         var res;
-        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
-              _context15.next = 2;
+              _context13.next = 2;
               return this.request.post("/pay/order/free-pay/".concat(id));
             case 2:
-              res = _context15.sent;
-              return _context15.abrupt("return", res);
+              res = _context13.sent;
+              return _context13.abrupt("return", res);
             case 4:
             case "end":
-              return _context15.stop();
+              return _context13.stop();
           }
-        }, _callee15, this);
+        }, _callee13, this);
       }));
-      function getFreeProduct(_x10) {
+      function getFreeProduct(_x9) {
         return _getFreeProduct.apply(this, arguments);
       }
       return getFreeProduct;
@@ -618,10 +564,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitOrder",
     value: function () {
-      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
+      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
         var cartItems, newCartItems;
-        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
               cartItems = this.store.cart.getItems();
               newCartItems = cloneDeep(cartItems); // 先整个临时的逻辑，把购物车里所有商品的资源给他格式化一下
@@ -634,16 +580,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   return _objectSpread({}, newResourcesItem);
                 });
               });
-              return _context16.abrupt("return", this.store.order.commitOrder({
+              return _context14.abrupt("return", this.store.order.commitOrder({
                 query: {
                   cartItems: newCartItems
                 }
               }));
             case 4:
             case "end":
-              return _context16.stop();
+              return _context14.stop();
           }
-        }, _callee16, this);
+        }, _callee14, this);
       }));
       function submitOrder() {
         return _submitOrder.apply(this, arguments);
@@ -653,14 +599,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "pay",
     value: function () {
-      var _pay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
-        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+      var _pay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
+        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
             case "end":
-              return _context17.stop();
+              return _context15.stop();
           }
-        }, _callee17);
+        }, _callee15);
       }));
       function pay() {
         return _pay.apply(this, arguments);
@@ -670,14 +616,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getPayInfo",
     value: function () {
-      var _getPayInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
-        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+      var _getPayInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
+        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
             case "end":
-              return _context18.stop();
+              return _context16.stop();
           }
-        }, _callee18);
+        }, _callee16);
       }));
       function getPayInfo() {
         return _getPayInfo.apply(this, arguments);
@@ -687,15 +633,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setOtherParams",
     value: function () {
-      var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(params) {
-        var _ref5,
-          _ref5$cover,
+      var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(params) {
+        var _ref4,
+          _ref4$cover,
           cover,
-          _args19 = arguments;
-        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+          _args17 = arguments;
+        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
-              _ref5 = _args19.length > 1 && _args19[1] !== undefined ? _args19[1] : {}, _ref5$cover = _ref5.cover, cover = _ref5$cover === void 0 ? false : _ref5$cover;
+              _ref4 = _args17.length > 1 && _args17[1] !== undefined ? _args17[1] : {}, _ref4$cover = _ref4.cover, cover = _ref4$cover === void 0 ? false : _ref4$cover;
               if (cover) {
                 this.otherParams = params;
               } else {
@@ -703,11 +649,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }
             case 2:
             case "end":
-              return _context19.stop();
+              return _context17.stop();
           }
-        }, _callee19, this);
+        }, _callee17, this);
       }));
-      function setOtherParams(_x11) {
+      function setOtherParams(_x10) {
         return _setOtherParams.apply(this, arguments);
       }
       return setOtherParams;
@@ -715,16 +661,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOtherParams",
     value: function () {
-      var _getOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20() {
-        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+      var _getOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
+        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
-              return _context20.abrupt("return", this.otherParams);
+              return _context18.abrupt("return", this.otherParams);
             case 1:
             case "end":
-              return _context20.stop();
+              return _context18.stop();
           }
-        }, _callee20, this);
+        }, _callee18, this);
       }));
       function getOtherParams() {
         return _getOtherParams.apply(this, arguments);
@@ -746,15 +692,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         if (item.holder_id !== (targetCartItem === null || targetCartItem === void 0 ? void 0 : targetCartItem.holder_id)) {
           var _item$_origin$resourc;
           var resources = (_item$_origin$resourc = item._origin.resources) === null || _item$_origin$resourc === void 0 ? void 0 : _item$_origin$resourc.filter(function (m) {
-            // 检查当前资源是否与目标资源的任何资源匹配
             return !targetCartItem._origin.resources.some(function (targetRes) {
-              var _targetRes$metadata$c, _m$metadata$combined_;
-              // 检查主资源ID是否匹配
-              if (targetRes.id === m.id) return true;
-              // 检查组合资源的情况
-              if (((_targetRes$metadata$c = targetRes.metadata.combined_resource) === null || _targetRes$metadata$c === void 0 ? void 0 : _targetRes$metadata$c.status) === 1 && targetRes.metadata.combined_resource.resource_ids.includes(m.id)) return true;
-              if (((_m$metadata$combined_ = m.metadata.combined_resource) === null || _m$metadata$combined_ === void 0 ? void 0 : _m$metadata$combined_.status) === 1 && m.metadata.combined_resource.resource_ids.includes(targetRes.id)) return true;
-              return false;
+              return targetRes.id === m.id;
             });
           });
           _this5.store.cart.updateItem({
@@ -836,18 +775,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var cartItems = this.store.cart.getItems();
       var arr = [];
       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 formatCapacity = formatDefaultCapacitys({
-          capacity: (_cartItem$_productOri = cartItem._productOrigin) === null || _cartItem$_productOri === void 0 ? void 0 : _cartItem$_productOri.capacity,
-          product_bundle: cartItem._origin.product.product_bundle
-        });
-        var currentCapacity = getSumCapacity({
-          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);
+        var productResources = getResourcesByProduct(resourcesMap, cartItem, cartItems);
         arr.push({
           id: cartItem.id,
           // 这里返回的是购物车 id ，后面提交的时候要用的，用这个 id 绑定资源和时间
@@ -866,7 +794,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getResourcesListByCartItem",
     value: function getResourcesListByCartItem(id) {
-      var _targetCartItem$_prod, _targetCartItem$_prod2;
       var cartItems = this.store.cart.getItems();
       var dateRange = this.store.date.getDateRange();
       var resources = [];
@@ -874,22 +801,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         if (n.resource) resources.push.apply(resources, _toConsumableArray(n.resource));
       });
       var resourcesMap = getResourcesMap(resources);
+      var arr = [];
       var targetCartItem = cartItems.find(function (n) {
         return n._id === id;
       });
       if (!targetCartItem) {
         throw new Error("\u6CA1\u6709\u627E\u5230".concat(id, "\u8D2D\u7269\u8F66\u5546\u54C1"));
       }
-      if (!targetCartItem.holder_id) return;
-      var selectedResources = getOthersSelectedResources(cartItems, targetCartItem.holder_id, resourcesMap);
-      var formatCapacity = formatDefaultCapacitys({
-        capacity: (_targetCartItem$_prod = targetCartItem._productOrigin) === null || _targetCartItem$_prod === void 0 ? void 0 : _targetCartItem$_prod.capacity,
-        product_bundle: targetCartItem._origin.product.product_bundle
-      });
-      var currentCapacity = getSumCapacity({
-        capacity: formatCapacity
-      });
-      var productResources = getResourcesByProduct(resourcesMap, ((_targetCartItem$_prod2 = targetCartItem._productOrigin) === null || _targetCartItem$_prod2 === void 0 || (_targetCartItem$_prod2 = _targetCartItem$_prod2.product_resource) === null || _targetCartItem$_prod2 === void 0 ? void 0 : _targetCartItem$_prod2.resources) || [], selectedResources, currentCapacity);
+      var productResources = getResourcesByProduct(resourcesMap, targetCartItem, cartItems);
       if (productResources) {
         return {
           id: targetCartItem.id,
@@ -907,10 +826,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     // 通过资源列表和指定的资源 id，获取指定资源的时间切片
   }, {
     key: "getResourceTimeSlot",
-    value: function getResourceTimeSlot(_ref6) {
-      var product = _ref6.product,
-        resources = _ref6.resources,
-        currentResourceId = _ref6.currentResourceId;
+    value: function getResourceTimeSlot(_ref5) {
+      var product = _ref5.product,
+        resources = _ref5.resources,
+        currentResourceId = _ref5.currentResourceId;
       var dateRange = this.store.date.getDateRange();
       var timeSlots = getTimeSlicesByResource({
         resource: resources.find(function (n) {
@@ -923,13 +842,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       return timeSlots;
     }
 
-    // 自动分派可用的资源-单种资源类型——此方法目前未使用，未经验证
+    // 自动分派可用的资源-单种资源类型
   }, {
     key: "autoSelectResource",
-    value: function autoSelectResource(_ref7) {
-      var resourceProductData = _ref7.resourceProductData,
-        resources = _ref7.resources,
-        timeSlots = _ref7.timeSlots;
+    value: function autoSelectResource(_ref6) {
+      var resourceProductData = _ref6.resourceProductData,
+        resources = _ref6.resources,
+        timeSlots = _ref6.timeSlots;
       var dateRange = this.store.date.getDateRange();
       if (timeSlots) {
         // 如果 start_time 存在，则直接根据 start_time 算出商品总共需要的时长，然后根据时长去匹配资源
@@ -998,12 +917,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     // 自动分派可用资源-pro 版，ui 传递某个账号，自动给某个账号下所有商品分配第一种资源
   }, {
     key: "autoSelectAccountResources",
-    value: function autoSelectAccountResources(_ref8) {
-      var holder_id = _ref8.holder_id,
-        resources_code = _ref8.resources_code,
-        timeSlots = _ref8.timeSlots,
-        countMap = _ref8.countMap,
-        capacity = _ref8.capacity;
+    value: function autoSelectAccountResources(_ref7) {
+      var _accountCartItems$0$_, _accountCartItems$;
+      var holder_id = _ref7.holder_id,
+        resources_code = _ref7.resources_code,
+        timeSlots = _ref7.timeSlots,
+        countMap = _ref7.countMap;
       var dateRange = this.store.date.getDateRange();
       var cartItems = this.store.cart.getItems();
       // 取到账号下所有的商品，然后根据商品的 duration 和资源列表，获取所有可用的资源
@@ -1022,7 +941,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         return acc + ((_n$_productOrigin$dur = (_n$_productOrigin = n._productOrigin) === null || _n$_productOrigin === void 0 || (_n$_productOrigin = _n$_productOrigin.duration) === null || _n$_productOrigin === void 0 ? void 0 : _n$_productOrigin.value) !== null && _n$_productOrigin$dur !== void 0 ? _n$_productOrigin$dur : 0);
       }, 0);
       // 正常来说，能进这个业务的所有商品的 duration 类型都是一样的，所以这里取第一个商品的 duration 类型
-      // let durationType = accountCartItems[0]?._productOrigin?.duration?.type ?? "minutes";
+      var durationType = (_accountCartItems$0$_ = (_accountCartItems$ = accountCartItems[0]) === null || _accountCartItems$ === void 0 || (_accountCartItems$ = _accountCartItems$._productOrigin) === null || _accountCartItems$ === void 0 || (_accountCartItems$ = _accountCartItems$.duration) === null || _accountCartItems$ === void 0 ? void 0 : _accountCartItems$.type) !== null && _accountCartItems$0$_ !== void 0 ? _accountCartItems$0$_ : "minutes";
       // 取出账号下所对应类型的所有的可用资源
       var resources = [];
       accountCartItems.forEach(function (item) {
@@ -1054,7 +973,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 timeSlice: timeSlots,
                 time: item,
                 resource: n,
-                currentCount: recordCount + (capacity || 0)
+                currentCount: recordCount + 1
               });
               return res.usable;
             });
@@ -1084,8 +1003,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           resourcesMap: resourcesMap,
           duration: duration,
           currentDate: dateRange[0].date,
-          split: 10,
-          capacity: capacity
+          split: 10
         });
         // 如果timeSlots返回了 空数组，代表没有可用的资源了
         if (!_timeSlots2) {
@@ -1114,25 +1032,19 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var selectResourcesMap = {};
       this.store.accountList.getAccounts().forEach(function (account) {
         var cartItems = _this7.store.cart.getCartByAccount(account.getId());
+        // 这里必须每次循环重新读，避免前一次循环操作了购物车，导致数据变更
+        var allCartItems = _this7.store.cart.getItems();
         var recordTimeSlots = cloneDeep(timeSlots);
         // timeSlots 传进来的只是用户选中的时间片，但是实际上需要根据多个商品时间进行累加
         // 假设 timeSlots.start_time 是15:40 duration 是 30min
         // 第一个商品分配完以后，第二个商品分配的start_time应该是第一个商品的 end_time ,然后 end_time 应该是 start_time+duration
 
         cartItems.forEach(function (item, index) {
-          var _item$_productOrigin2;
-          var formatCapacity = formatDefaultCapacitys({
-            capacity: (_item$_productOrigin2 = item._productOrigin) === null || _item$_productOrigin2 === void 0 ? void 0 : _item$_productOrigin2.capacity,
-            product_bundle: item._origin.product.product_bundle
-          });
-          var currentCapacity = getSumCapacity({
-            capacity: formatCapacity
-          });
           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 _item$_productOrigin$, _item$_productOrigin2, _ref8, _item$_productOrigin3, _item$_productOrigin$2, _item$_productOrigin4, _ref9, _item$_productOrigin5;
+              var start_at = dayjs(recordTimeSlots.end_time).add((_item$_productOrigin$ = (_item$_productOrigin2 = item._productOrigin) === null || _item$_productOrigin2 === void 0 || (_item$_productOrigin2 = _item$_productOrigin2.duration) === null || _item$_productOrigin2 === void 0 ? void 0 : _item$_productOrigin2.value) !== null && _item$_productOrigin$ !== void 0 ? _item$_productOrigin$ : 0, (_ref8 = (_item$_productOrigin3 = item._productOrigin) === null || _item$_productOrigin3 === void 0 || (_item$_productOrigin3 = _item$_productOrigin3.duration) === null || _item$_productOrigin3 === void 0 ? void 0 : _item$_productOrigin3.type) !== null && _ref8 !== void 0 ? _ref8 : "minutes");
+              var end_at = start_at.add((_item$_productOrigin$2 = (_item$_productOrigin4 = item._productOrigin) === null || _item$_productOrigin4 === void 0 || (_item$_productOrigin4 = _item$_productOrigin4.duration) === null || _item$_productOrigin4 === void 0 ? void 0 : _item$_productOrigin4.value) !== null && _item$_productOrigin$2 !== void 0 ? _item$_productOrigin$2 : 0, (_ref9 = (_item$_productOrigin5 = item._productOrigin) === null || _item$_productOrigin5 === void 0 || (_item$_productOrigin5 = _item$_productOrigin5.duration) === null || _item$_productOrigin5 === void 0 ? void 0 : _item$_productOrigin5.type) !== null && _ref9 !== void 0 ? _ref9 : "minutes");
               recordTimeSlots = {
                 start_time: start_at.format("HH:mm"),
                 end_time: end_at.format("HH:mm"),
@@ -1145,8 +1057,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               holder_id: item.holder_id,
               resources_code: resources_code,
               timeSlots: recordTimeSlots,
-              countMap: selectResourcesMap,
-              capacity: currentCapacity
+              countMap: selectResourcesMap
             });
             // // 如果购物车里已经有同类型的 form_id 的资源了，则不处理
             // if (item._origin.resources?.some((n: any) => n.form_id === res?.selectedResource?.form_id)) {
@@ -1154,12 +1065,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             // }
             if (res !== null && res !== void 0 && res.selectedResource) {
               if (!selectResourcesMap[res.selectedResource.id]) {
-                selectResourcesMap[res.selectedResource.id] = currentCapacity;
+                selectResourcesMap[res.selectedResource.id] = 1;
               } else {
-                selectResourcesMap[res.selectedResource.id] += currentCapacity;
+                selectResourcesMap[res.selectedResource.id]++;
               }
-              res.selectedResource.capacity = currentCapacity;
-              checkSubResourcesCapacity(res.selectedResource);
+              console.log(_this7.store.cart.getItems());
+              res.selectedResource.capacity = 1;
               _this7.store.cart.updateItem({
                 _id: item._id,
                 // 这里要做去重，避免出现同样类型的资源被塞进同一个商品
@@ -1167,18 +1078,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   return existingRes.form_id !== res.selectedResource.form_id;
                 })), [res.selectedResource])
               });
+              console.log(_this7.store.cart.getItems());
             } else {
               // 如果没有可用的技师了，推到错误列表里让 UI 去提示
               errorList.push(item._id);
             }
           } else {
-            var _item$_productOrigin7, _productResources$fin;
-            // 这里必须每次循环重新读，避免前一次循环操作了购物车，导致数据变更
-            var allCartItems = _this7.store.cart.getItems();
+            var _productResources$fin;
             // 如果没有传递 timeSlots，代表是第一种资源，则直接拿商品的 duration，到资源列表里找一个公共可用的
-            if (!item.holder_id) return;
-            var selectedResources = getOthersSelectedResources(allCartItems, item.holder_id, resourcesMap);
-            var productResources = getResourcesByProduct(resourcesMap, ((_item$_productOrigin7 = item._productOrigin) === null || _item$_productOrigin7 === void 0 || (_item$_productOrigin7 = _item$_productOrigin7.product_resource) === null || _item$_productOrigin7 === void 0 ? void 0 : _item$_productOrigin7.resources) || [], selectedResources, currentCapacity);
+            var productResources = getResourcesByProduct(resourcesMap, item, allCartItems);
             // 自动选择 productResources 中对应 resources_code 的资源
             var targetRenderList = (_productResources$fin = productResources.find(function (n) {
               return n.code === resources_code;
@@ -1192,16 +1100,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 return;
               }
               var targetResource = targetRenderList[0];
-              targetResource.capacity = currentCapacity;
-              // 在这里处理 children 的数据
-              checkSubResourcesCapacity(targetResource);
+              targetResource.capacity = 1;
               _this7.store.cart.updateItem({
                 _id: item._id,
                 resources: [].concat(_toConsumableArray((item._origin.resources || []).filter(function (existingRes) {
                   return existingRes.resourceType !== targetRenderList[0].resourceType;
                 })), [targetResource])
               });
-              console.log(account, '已分配');
             } else {
               // 如果没有可用的技师了，推到错误列表里让 UI 去提示
               errorList.push(item._id);
@@ -1224,8 +1129,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var cartItems = this.store.cart.getItems();
       var resourceIds = [];
       cartItems.forEach(function (item) {
-        var _item$_productOrigin8;
-        (_item$_productOrigin8 = item._productOrigin) === null || _item$_productOrigin8 === void 0 || (_item$_productOrigin8 = _item$_productOrigin8.product_resource) === null || _item$_productOrigin8 === void 0 || (_item$_productOrigin8 = _item$_productOrigin8.resources) === null || _item$_productOrigin8 === void 0 || _item$_productOrigin8.forEach(function (n) {
+        var _item$_productOrigin6;
+        (_item$_productOrigin6 = item._productOrigin) === null || _item$_productOrigin6 === void 0 || (_item$_productOrigin6 = _item$_productOrigin6.product_resource) === null || _item$_productOrigin6 === void 0 || (_item$_productOrigin6 = _item$_productOrigin6.resources) === null || _item$_productOrigin6 === void 0 || _item$_productOrigin6.forEach(function (n) {
           if (n.code === resources_code) {
             resources.push.apply(resources, _toConsumableArray(n.renderList || []));
           }
@@ -1244,8 +1149,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         var accountDuration = 0;
         var cartItems = _this8.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;
+          var _item$_productOrigin$3, _item$_productOrigin7;
+          accountDuration += (_item$_productOrigin$3 = (_item$_productOrigin7 = item._productOrigin) === null || _item$_productOrigin7 === void 0 || (_item$_productOrigin7 = _item$_productOrigin7.duration) === null || _item$_productOrigin7 === void 0 ? void 0 : _item$_productOrigin7.value) !== null && _item$_productOrigin$3 !== void 0 ? _item$_productOrigin$3 : 0;
         });
         if (accountDuration > duration) {
           duration = accountDuration;
@@ -1285,9 +1190,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         accountItems.forEach(function (item, index) {
           var newResources = cloneDeep(item._origin.resources);
           newResources.forEach(function (resource) {
-            var _item$_productOrigin$4, _item$_productOrigin10, _ref11, _item$_productOrigin11;
+            var _item$_productOrigin$4, _item$_productOrigin8, _ref10, _item$_productOrigin9;
             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$_productOrigin8 = item._productOrigin) === null || _item$_productOrigin8 === void 0 || (_item$_productOrigin8 = _item$_productOrigin8.duration) === null || _item$_productOrigin8 === void 0 ? void 0 : _item$_productOrigin8.value) !== null && _item$_productOrigin$4 !== void 0 ? _item$_productOrigin$4 : 0, (_ref10 = (_item$_productOrigin9 = item._productOrigin) === null || _item$_productOrigin9 === void 0 || (_item$_productOrigin9 = _item$_productOrigin9.duration) === null || _item$_productOrigin9 === void 0 ? void 0 : _item$_productOrigin9.type) !== null && _ref10 !== void 0 ? _ref10 : "minutes").format("YYYY-MM-DD HH:mm");
             delete resource.times;
           });
           _this9.store.cart.updateItem({
@@ -1308,32 +1213,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "clearCacheByModule",
     value: function clearCacheByModule(module) {}
-  }, {
-    key: "openProductDetail",
-    value: function () {
-      var _openProductDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(productId) {
-        var targetProduct;
-        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
-            case 0:
-              _context21.next = 2;
-              return this.store.products.getProduct(productId);
-            case 2:
-              targetProduct = _context21.sent;
-              if (targetProduct) {
-                this.store.currentProduct = targetProduct;
-              }
-            case 4:
-            case "end":
-              return _context21.stop();
-          }
-        }, _callee21, this);
-      }));
-      function openProductDetail(_x12) {
-        return _openProductDetail.apply(this, arguments);
-      }
-      return openProductDetail;
-    }()
   }]);
   return BookingByStepImpl;
 }(BaseModule);