@pisell/pisellos 3.0.35 → 3.0.37

package/dist/solution/BookingByStep/index.js

@@ -37,6 +37,7 @@ import { getResourcesMap } from "../../modules/Resource/utils";
 import { cloneDeep } from 'lodash-es';
 import { calcCalendarDataByScheduleResult, calcMinTimeMaxTimeBySchedules, getAllSortedDateRanges } from "../../modules/Schedule/utils";
 import { disableAllDates, disableDatesBeforeOneDay, generateMonthDates, handleAvailableDateByResource } from "../../modules/Date/utils";
+import { areAllNormalProducts, isNormalProduct } from "../../modules/Product/utils";
 import { calculateResourceAvailableTime, findFastestAvailableResource } from "./utils/timeslots";
 export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   _inherits(BookingByStepImpl, _BaseModule);
@@ -237,7 +238,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               return this.request.post("/product/query", {
                 open_quotation: 1,
                 open_bundle: 0,
-                extension_type: ['product_appointment', 'appointment_ticket', 'session_product', 'session_ticket', 'normal'],
+                exclude_extension_type: ['product_party', 'product_event', 'product_series_event', 'product_package_ticket', 'ticket', 'event_item'],
                 with: ['category', 'collection', 'resourceRelation'],
                 status: 'published',
                 num: 500,
@@ -271,8 +272,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadProductByScheduleDate",
     value: function () {
       var _loadProductByScheduleDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref2) {
-        var _product_ids;
-        var date, _ref2$product_ids, product_ids, _ref2$category_ids, category_ids, scheduleList, _schedule$product_ids, schedule, otherProductsIds, allProductIds;
+        var _schedule$product_ids;
+        var date, _ref2$product_ids, product_ids, _ref2$category_ids, category_ids, scheduleList, schedule, otherProductsIds, allProductIds;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -295,29 +296,34 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               //   .filter((n) => n !== null && n !== undefined);
 
               // 如果外面没传 product_ids，尝试从对应 schedule 里拿 product_ids
-              if (!((_product_ids = product_ids) !== null && _product_ids !== void 0 && _product_ids.length)) {
-                schedule = scheduleList.find(function (n) {
-                  return n.date === date;
-                });
-                if (schedule && (_schedule$product_ids = schedule.product_ids) !== null && _schedule$product_ids !== void 0 && _schedule$product_ids.length) {
-                  product_ids = schedule.product_ids;
-                }
+              // if (!product_ids?.length) {
+              //   const schedule = scheduleList.find((n) => n.date === date);
+              //   if (schedule && schedule.product_ids?.length) {
+              //     product_ids = schedule.product_ids;
+              //   }
+              // }
+              // V2接口修改后，只能从schedule 接口里拿数据，不可以从外面拿，外面给的是装修数据
+              schedule = scheduleList.find(function (n) {
+                return n.date === date;
+              });
+              if (schedule && (_schedule$product_ids = schedule.product_ids) !== null && _schedule$product_ids !== void 0 && _schedule$product_ids.length) {
+                product_ids = schedule.product_ids;
               }
               // 尝试去拿schedule 里的 other_product_ids 和 product_ids 拼在一起去重
               otherProductsIds = this.store.schedule.getOtherProductsIds() || [];
               allProductIds = [].concat(_toConsumableArray(product_ids), _toConsumableArray(otherProductsIds)).filter(function (n, index, self) {
                 return self.indexOf(n) === index;
               });
-              _context3.next = 8;
+              _context3.next = 9;
               return this.loadProducts({
                 // schedule_ids: scheduleIds,
                 product_ids: allProductIds,
                 category_ids: category_ids
                 // schedule_date: date,
               });
-            case 8:
-              return _context3.abrupt("return", _context3.sent);
             case 9:
+              return _context3.abrupt("return", _context3.sent);
+            case 10:
             case "end":
               return _context3.stop();
           }
@@ -340,7 +346,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               // 更新完商品数据以后，检测当前购物车里是否有商品，如果有，则需要更新购物车里的商品价格
               cartItems = this.store.cart.getItems();
               if (!cartItems.length) {
-                _context5.next = 24;
+                _context5.next = 25;
                 break;
               }
               userPlugin = this.core.getPlugin('user');
@@ -432,6 +438,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               _iterator.f();
               return _context5.finish(21);
             case 24:
+              this.core.effects.emit("".concat(this.store.cart.name, ":onUpdateQuotationPrice"), {});
+            case 25:
             case "end":
               return _context5.stop();
           }
@@ -545,26 +553,48 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "storeProduct",
     value: function () {
       var _storeProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(productData) {
-        var activeAccount, _ref4, bundle, options, origin, product_variant_id, product, addCartItem;
+        var activeAccount, _ref4, bundle, options, origin, product_variant_id, _ref4$quantity, quantity, rowKey, cartItems, targetCartItem, product, addCartItem;
         return _regeneratorRuntime().wrap(function _callee7$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
               // 往购物车加商品数据的时候，默认用当前 activeAccount 填充到 product 的 account 里面
               activeAccount = this.getActiveAccount();
-              _ref4 = productData || {}, bundle = _ref4.bundle, options = _ref4.options, origin = _ref4.origin, product_variant_id = _ref4.product_variant_id;
+              _ref4 = productData || {}, bundle = _ref4.bundle, options = _ref4.options, origin = _ref4.origin, product_variant_id = _ref4.product_variant_id, _ref4$quantity = _ref4.quantity, quantity = _ref4$quantity === void 0 ? 1 : _ref4$quantity, rowKey = _ref4.rowKey; // 检查购物车里是否已经存在 rowKey相同的数据，如果是则更新数量
+              cartItems = this.store.cart.getItems();
+              if (!rowKey) {
+                _context8.next = 8;
+                break;
+              }
+              targetCartItem = cartItems.find(function (n) {
+                var _n$_productOrigin;
+                return ((_n$_productOrigin = n._productOrigin) === null || _n$_productOrigin === void 0 ? void 0 : _n$_productOrigin.rowKey) === rowKey;
+              });
+              if (!(targetCartItem && isNormalProduct(targetCartItem._productOrigin))) {
+                _context8.next = 8;
+                break;
+              }
+              this.store.cart.updateItem({
+                _id: targetCartItem._id,
+                product: _objectSpread({}, targetCartItem._productOrigin),
+                quantity: (targetCartItem.num || 1) + quantity
+              });
+              return _context8.abrupt("return");
+            case 8:
               product = _objectSpread(_objectSpread({}, origin), {}, {
-                product_variant_id: product_variant_id
+                product_variant_id: product_variant_id,
+                rowKey: rowKey
               });
               addCartItem = {
                 product: product,
                 bundle: bundle,
-                options: options
+                options: options,
+                quantity: quantity
               };
               if (activeAccount) {
                 addCartItem.account = activeAccount;
               }
               this.store.cart.addItem(addCartItem);
-            case 6:
+            case 12:
             case "end":
               return _context8.stop();
           }
@@ -735,7 +765,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "fetchHolderAccountsAsync",
     value: (function () {
       var _fetchHolderAccountsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(params) {
-        var cartItems, _this$store$date$getD, date, _cartItems$;
+        var cartItems, _this$store$date$getD, date, normalProductCartItem;
         return _regeneratorRuntime().wrap(function _callee11$(_context12) {
           while (1) switch (_context12.prev = _context12.next) {
             case 0:
@@ -744,7 +774,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 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) || '';
+                  // 不能从购物车里第一个找时间，而是找到购物车里第一个有 start_date 的时间
+                  normalProductCartItem = cartItems.find(function (n) {
+                    return !isNormalProduct(n._productOrigin);
+                  });
+                  date = (normalProductCartItem === null || normalProductCartItem === void 0 ? void 0 : normalProductCartItem.start_date) || '';
                 }
                 this.updateQuotationPriceAndCart(date);
               }
@@ -979,7 +1013,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _setLoginAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(accountId, accountInfo) {
         var _this5 = this;
-        var account, stateAccountId, cartItems, _this$store$date$getD2, date, _cartItems$2;
+        var account, stateAccountId, cartItems, _this$store$date$getD2, date, normalProductCartItem;
         return _regeneratorRuntime().wrap(function _callee18$(_context19) {
           while (1) switch (_context19.prev = _context19.next) {
             case 0:
@@ -1006,7 +1040,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 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) || '';
+                  // 不能从购物车里第一个找时间，而是找到购物车里第一个有 start_date 的时间
+                  normalProductCartItem = cartItems.find(function (n) {
+                    return !isNormalProduct(n._productOrigin);
+                  });
+                  date = (normalProductCartItem === null || normalProductCartItem === void 0 ? void 0 : normalProductCartItem.start_date) || '';
                 }
                 this.updateQuotationPriceAndCart(date);
               }
@@ -1115,14 +1153,19 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   item._origin.number = currentCapacity;
                 }
               });
-              type = this.otherParams.isRetailTemplate ? 'virtual' : 'appointment_booking';
+              type = this.otherParams.isRetailTemplate ? 'virtual' : 'appointment_booking'; // 如果购物车里全都是普通商品，type 也应该为 virtual
+              if (areAllNormalProducts(newCartItems.map(function (n) {
+                return n._productOrigin;
+              }))) {
+                type = 'virtual';
+              }
               return _context22.abrupt("return", this.store.order.submitOrder({
                 query: {
                   cartItems: newCartItems,
                   type: type
                 }
               }));
-            case 5:
+            case 6:
             case "end":
               return _context22.stop();
           }
@@ -1394,7 +1437,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "checkCartItems",
     value: function checkCartItems(type) {
       var _this8 = this;
-      var cartItems = this.store.cart.getItems();
+      // 预约流程中普通商品无需检测这些东西
+      var cartItems = this.store.cart.getItems().filter(function (n) {
+        return !isNormalProduct(n._productOrigin);
+      });
       var errorCartItemIds = [];
       cartItems.forEach(function (cartItem) {
         var result = _this8.store.cart.checkCartItemByType(cartItem, type);
@@ -1437,7 +1483,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         });
       }
       var resourcesMap = getResourcesMap(cloneDeep(resources));
-      var cartItems = this.store.cart.getItems();
+      var cartItems = this.store.cart.getItems().filter(function (n) {
+        return !isNormalProduct(n._productOrigin);
+      });
       var arr = [];
       cartItems.forEach(function (cartItem) {
         var _cartItem$_productOri, _cartItem$_productOri2;
@@ -1562,7 +1610,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         });
       }
       var resourcesMap = getResourcesMap(cloneDeep(resources));
-      var cartItems = this.store.cart.getItems();
+      var cartItems = this.store.cart.getItems().filter(function (n) {
+        return !isNormalProduct(n._productOrigin);
+      });
       var arr = [];
       cartItems.forEach(function (cartItem) {
         var _cartItem$_productOri5, _cartItem$_productOri6;
@@ -1676,7 +1726,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getResourcesListByCartItem",
     value: function getResourcesListByCartItem(id) {
       var _targetCartItem$_prod2, _targetCartItem$_prod3;
-      var cartItems = cloneDeep(this.store.cart.getItems());
+      var cartItems = this.store.cart.getItems().filter(function (n) {
+        return !isNormalProduct(n._productOrigin);
+      });
       var dateRange = this.store.date.getDateRange();
       var resources = [];
       dateRange.forEach(function (n) {
@@ -1755,6 +1807,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         timeSlots = _ref8.timeSlots,
         countMap = _ref8.countMap,
         capacity = _ref8.capacity;
+      if (isNormalProduct(cartItem._productOrigin)) {
+        return {};
+      }
       var dateRange = this.store.date.getDateRange();
       var cartItems = cloneDeep(this.store.cart.getItems());
       // 取到账号下所有的商品，然后根据商品的 duration 和资源列表，获取所有可用的资源
@@ -1767,8 +1822,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       }
       // duration=所有商品时间的集合
       var duration = accountCartItems.reduce(function (acc, n) {
-        var _n$_productOrigin$dur, _n$_productOrigin;
-        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);
+        var _n$_productOrigin$dur, _n$_productOrigin2;
+        return acc + ((_n$_productOrigin$dur = (_n$_productOrigin2 = n._productOrigin) === null || _n$_productOrigin2 === void 0 || (_n$_productOrigin2 = _n$_productOrigin2.duration) === null || _n$_productOrigin2 === void 0 ? void 0 : _n$_productOrigin2.value) !== null && _n$_productOrigin$dur !== void 0 ? _n$_productOrigin$dur : 0);
       }, 0);
       // 正常来说，能进这个业务的所有商品的 duration 类型都是一样的，所以这里取第一个商品的 duration 类型
       // let durationType = accountCartItems[0]?._productOrigin?.duration?.type ?? "minutes";
@@ -2099,7 +2154,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           }
         });
       };
-      var cartItems = cloneDeep(this.store.cart.getItems());
+      var cartItems = this.store.cart.getItems().filter(function (n) {
+        return !isNormalProduct(n._productOrigin);
+      });
 
       // 如果购物车里没有 holderid数据，证明不按 holder 类流程预约走，给所有购物车一次性分派即可，不做账号下资源互斥逻辑
       if (cartItems !== null && cartItems !== void 0 && cartItems[0].holder_id) {
@@ -2120,12 +2177,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     value: function getTimeSlotByAllResources(resources_code) {
       var _dateRange,
         _this10 = this,
-        _cartItems$3,
-        _cartItems$4;
+        _cartItems$,
+        _cartItems$2;
       var dateRange = this.store.date.getDateRange();
       // 取出购物车中所有一已选择的第一步资源
       var resources = [];
-      var cartItems = cloneDeep(this.store.cart.getItems());
+      var cartItems = this.store.cart.getItems().filter(function (n) {
+        return !isNormalProduct(n._productOrigin);
+      });
       // if (cartItems?.[0].start_date) return [];
       var resourceIds = [];
       var resourcesTypeId = undefined;
@@ -2204,18 +2263,18 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       }
       // 如果 cartItem 上既没有时间，也没有资源，认为外部属于异常调用，直接丢一个空数组出去
       // 同时 session 类商品的流程也不应该调用这个方法
-      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)) {
+      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)) {
         return [];
       }
       if (cartItems !== null && cartItems !== void 0 && cartItems[0].start_date && !dateRange) {
-        var _cartItems$5, _cartItems$6;
+        var _cartItems$3, _cartItems$4;
         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$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) || '',
+          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) || '',
           status: 'available',
           week: '',
           weekNum: 0
@@ -2240,7 +2299,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     value: function submitTimeSlot(timeSlots) {
       var _this11 = this;
       // 以账号为维度处理数据。购物车里每一项的 startTime应该是前一个商品的 endTime，如果是第一个商品则用 timeSlots.start_at
-      var cartItems = cloneDeep(this.store.cart.getItems());
+      var cartItems = this.store.cart.getItems().filter(function (n) {
+        return !isNormalProduct(n._productOrigin);
+      });
 
       // 按账号分组
       var itemsByAccount = cartItems.reduce(function (acc, item) {
@@ -2348,7 +2409,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getTimeslotBySchedule",
     value: function getTimeslotBySchedule(_ref12) {
-      var _this$store$currentPr2;
+      var _this$store$currentPr2, _targetProductData$pr;
       var date = _ref12.date,
         scheduleIds = _ref12.scheduleIds,
         resources = _ref12.resources,
@@ -2387,6 +2448,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         return 0;
       });
 
+      // 找到当前商品下第一个启用的资源id
+      var firstEnabledResourceId = targetProductData === null || targetProductData === void 0 || (_targetProductData$pr = targetProductData.product_resource) === null || _targetProductData$pr === void 0 || (_targetProductData$pr = _targetProductData$pr.resources) === null || _targetProductData$pr === void 0 || (_targetProductData$pr = _targetProductData$pr.find(function (n) {
+        return n.status === 1;
+      })) === null || _targetProductData$pr === void 0 ? void 0 : _targetProductData$pr.id;
+
       // 计算每个日程切片下日程可用的资源的容量总和
       var formatScheduleTimeSlots = scheduleTimeSlots.map(function (item) {
         // 用来计算资源的可使用情况，针对单个schedule 时间片
@@ -2434,7 +2500,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           // 在已经选定时间的情况下，只要canUseTime如果有一个 false 那就不可用
           if (!currentResourcesTimeSlotCanUsedArr.some(function (n) {
             return n === false;
-          })) {
+          })
+          // 只统计第一种资源的容量和 left
+          && m.form_id === firstEnabledResourceId) {
             if (currentResourcesCount >= count) {
               count = currentResourcesCount;
             }
@@ -2467,7 +2535,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         bundle = _ref14.bundle,
         options = _ref14.options,
         origin = _ref14.origin,
-        product_variant_id = _ref14.product_variant_id;
+        product_variant_id = _ref14.product_variant_id,
+        rowKey = _ref14.rowKey,
+        _ref14$quantity = _ref14.quantity,
+        quantity = _ref14$quantity === void 0 ? 1 : _ref14$quantity;
       var productData = _objectSpread(_objectSpread({}, origin), {}, {
         product_variant_id: product_variant_id
       });
@@ -2477,17 +2548,36 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           account = activeAccount;
         }
       }
+      if (rowKey) {
+        var cartItems = this.store.cart.getItems();
+        var targetCartItem = cartItems.find(function (n) {
+          var _n$_productOrigin3;
+          return ((_n$_productOrigin3 = n._productOrigin) === null || _n$_productOrigin3 === void 0 ? void 0 : _n$_productOrigin3.rowKey) === rowKey;
+        });
+        if (targetCartItem && isNormalProduct(targetCartItem._productOrigin)) {
+          this.store.cart.updateItem({
+            _id: targetCartItem._id,
+            product: _objectSpread(_objectSpread({}, targetCartItem._productOrigin), {}, {
+              quantity: (targetCartItem.num || 1) + quantity
+            })
+          });
+          return;
+        }
+      }
       this.store.cart.addItem({
         product: productData,
         date: date,
         account: account,
         bundle: bundle,
-        options: options
+        options: options,
+        quantity: quantity
       });
       // 检测，有传递 date，检查购物车里其他商品的 date 是否在同一天，如果不在，清空那些不在同一天的商品
       if (date) {
-        var cartItems = cloneDeep(this.store.cart.getItems());
-        var cartItemsByDate = cartItems.filter(function (n) {
+        var _cartItems = this.store.cart.getItems().filter(function (n) {
+          return !isNormalProduct(n._productOrigin);
+        });
+        var cartItemsByDate = _cartItems.filter(function (n) {
           return !dayjs(n.start_date).isSame(dayjs(date.startTime), 'day');
         });
         if (cartItemsByDate.length) {
@@ -2571,7 +2661,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         });
       }
       var resourcesMap = getResourcesMap(cloneDeep(resources));
-      var cartItems = this.store.cart.getItems();
+      var cartItems = this.store.cart.getItems().filter(function (n) {
+        return !isNormalProduct(n._productOrigin);
+      });
       var cartItem = cartItems.find(function (item) {
         return item._id === cartItemId;
       });
@@ -2802,14 +2894,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var _getAvailableDateForSessionOptimize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30() {
         var _this$store$currentPr3, _this$store$currentPr4, _this$store$currentPr5, _tempProducts, _this$store$currentPr6;
         var params,
-          cache,
           startDate,
           endDate,
+          endDateAfterMonth,
           tempProducts,
           schedule,
           filteredSchedule,
           tempResourceIds,
           res,
+          cache,
           dates,
           currentDate,
           firstAvailableDate,
@@ -2822,34 +2915,26 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context32.prev = _context32.next) {
             case 0:
               params = _args32.length > 0 && _args32[0] !== undefined ? _args32[0] : {};
-              // 先去读缓存结果，因为正常 UI 调用的是 7 天，而下面我会直接计算 30 天（最少也是 14 天），所以先去读缓存结果，如果缓存结果存在，则直接返回
-              cache = (_this$store$currentPr3 = this.store.currentProduct) === null || _this$store$currentPr3 === void 0 ? void 0 : _this$store$currentPr3.getOtherParams()['timeSlotBySchedule'];
-              if (!cache) {
-                _context32.next = 5;
-                break;
-              }
-              if (!(dayjs(params.startDate).isSameOrAfter(dayjs(cache.startDate), 'day') && dayjs(params.endDate).isSameOrBefore(dayjs(cache.endDate), 'day'))) {
-                _context32.next = 5;
-                break;
-              }
-              return _context32.abrupt("return", {
-                dateList: cache.dateList,
-                firstAvailableDate: cache.firstAvailableDate
-              });
-            case 5:
               // 开始日期如果小于今天，直接以今天当做开始日期
               startDate = params.startDate, endDate = params.endDate; // 前端传递的 startDate，可能是今天之前的，如果 startDate 小于今天 且 endDate 小于或等于今天，需要把 startDate 置为今天
               if (dayjs(startDate).isBefore(dayjs(), 'day') && (dayjs(endDate).isAfter(dayjs(), 'day') || dayjs(endDate).isSame(dayjs(), 'day'))) {
                 startDate = dayjs().format('YYYY-MM-DD');
               }
               // 不管前端传什么 endDate 默认查一个月的，以今天为开始日期。用于找到一个月内最近可用的日期
-              endDate = dayjs().add(1, 'month').format('YYYY-MM-DD');
+              // 优化策略：
+              // 在 endDate 添加完一个月以后，如果 endDate 还小于 startDate + 7 天，则还需要 endDate+7 天
+              endDateAfterMonth = dayjs().add(1, 'month').format('YYYY-MM-DD');
+              if (dayjs(startDate).add(7, 'day').isAfter(dayjs(endDateAfterMonth), 'day')) {
+                endDate = dayjs(startDate).add(7, 'day').format('YYYY-MM-DD');
+              } else {
+                endDate = endDateAfterMonth;
+              }
               // 如果当前打开了某个的商品详情弹窗，则应该默认用这个商品
-              tempProducts = (_this$store$currentPr4 = this.store.currentProduct) === null || _this$store$currentPr4 === void 0 ? void 0 : _this$store$currentPr4.getData();
-              schedule = (_this$store$currentPr5 = this.store.currentProduct) === null || _this$store$currentPr5 === void 0 ? void 0 : _this$store$currentPr5.getOtherParams()['schedule'];
+              tempProducts = (_this$store$currentPr3 = this.store.currentProduct) === null || _this$store$currentPr3 === void 0 ? void 0 : _this$store$currentPr3.getData();
+              schedule = (_this$store$currentPr4 = this.store.currentProduct) === null || _this$store$currentPr4 === void 0 ? void 0 : _this$store$currentPr4.getOtherParams()['schedule'];
               filteredSchedule = filterScheduleByDateRange(schedule, startDate || '', endDate || ''); // 1.后端返回的数据，确定资源在每一天的可用和使用情况
               tempResourceIds = getResourcesIdsByProduct(tempProducts);
-              _context32.next = 14;
+              _context32.next = 11;
               return this.store.date.fetchResourceDates({
                 query: {
                   start_date: startDate || '',
@@ -2857,8 +2942,25 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   resource_ids: tempResourceIds
                 }
               });
-            case 14:
+            case 11:
               res = _context32.sent;
+              // 先去读缓存结果，因为正常 UI 调用的是 7 天，而下面我会直接计算 30 天（最少也是 14 天），所以先去读缓存结果，如果缓存结果存在，则直接返回
+              // TODO 优化关于为什么要放在接口后，因为在获取时间切片的时候还需要读一次接口数据，其实可以直接从这个结果里拿了，需要优化
+              cache = (_this$store$currentPr5 = this.store.currentProduct) === null || _this$store$currentPr5 === void 0 ? void 0 : _this$store$currentPr5.getOtherParams()['timeSlotBySchedule'];
+              if (!cache) {
+                _context32.next = 17;
+                break;
+              }
+              if (!(dayjs(params.startDate).isSameOrAfter(dayjs(cache.startDate), 'day') && dayjs(params.endDate).isSameOrBefore(dayjs(cache.endDate), 'day'))) {
+                _context32.next = 17;
+                break;
+              }
+              this.store.date.setDateList(cache.dateList);
+              return _context32.abrupt("return", {
+                dateList: cache.dateList,
+                firstAvailableDate: cache.firstAvailableDate
+              });
+            case 17:
               // 2. 商品 schedule 数据，确定日程在每一天的时间片
               // 3. 把后端返回的和 schedule 的数据进行合并，确定每一天的可用和使用情况
               dates = [];
@@ -2985,22 +3087,22 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   }
                 }, _loop3);
               });
-            case 23:
+            case 25:
               if (!(dayjs(currentDate).isBefore(dayjs(endDate), 'day') || dayjs(currentDate).isSame(dayjs(endDate), 'day'))) {
-                _context32.next = 29;
+                _context32.next = 31;
                 break;
               }
-              return _context32.delegateYield(_loop3(), "t0", 25);
-            case 25:
+              return _context32.delegateYield(_loop3(), "t0", 27);
+            case 27:
               if (!_context32.t0) {
-                _context32.next = 27;
+                _context32.next = 29;
                 break;
               }
-              return _context32.abrupt("break", 29);
-            case 27:
-              _context32.next = 23;
-              break;
+              return _context32.abrupt("break", 31);
             case 29:
+              _context32.next = 25;
+              break;
+            case 31:
               // 最终把资源数据也加到日期内
               dates = handleAvailableDateByResource(res.data, dates);
               this.store.date.setDateList(dates);
@@ -3010,13 +3112,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 dateList: dates,
                 firstAvailableDate: firstAvailableDate,
                 startDate: startDate,
-                endDate: endDate
+                endDate: dayjs(currentDate).format('YYYY-MM-DD')
               });
               return _context32.abrupt("return", {
                 dateList: dates,
                 firstAvailableDate: firstAvailableDate
               });
-            case 33:
+            case 35:
             case "end":
               return _context32.stop();
           }
@@ -3027,6 +3129,38 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       }
       return getAvailableDateForSessionOptimize;
     }()
+  }, {
+    key: "isCartAllNormalProducts",
+    value: function isCartAllNormalProducts() {
+      var cartItems = this.store.cart.getItems().filter(function (n) {
+        return !isNormalProduct(n._productOrigin);
+      });
+      return !cartItems.length;
+    }
+  }, {
+    key: "isCartHasDurationProduct",
+    value: function isCartHasDurationProduct() {
+      var cartItems = this.store.cart.getItems().filter(function (n) {
+        return !isNormalProduct(n._productOrigin);
+      });
+      return cartItems.some(function (n) {
+        var _n$_productOrigin4;
+        return (_n$_productOrigin4 = n._productOrigin) === null || _n$_productOrigin4 === void 0 ? void 0 : _n$_productOrigin4.duration;
+      });
+    }
+  }, {
+    key: "isTargetNormalProduct",
+    value: function isTargetNormalProduct(product) {
+      return isNormalProduct(product);
+    }
+  }, {
+    key: "isTargetCartIdNormalProduct",
+    value: function isTargetCartIdNormalProduct(id) {
+      var cartItem = this.store.cart.getItems().find(function (n) {
+        return n._id === id;
+      });
+      return cartItem && isNormalProduct(cartItem._productOrigin);
+    }
   }]);
   return BookingByStepImpl;
 }(BaseModule);

package/dist/solution/ShopDiscount/index.js

@@ -30,7 +30,6 @@ import { BaseModule } from "../../modules/BaseModule";
 import { ShopDiscountHooks } from "./types";
 import { DiscountModule } from "../../modules/Discount";
 import { RulesModule } from "../../modules/Rules";
-import { uniqueById } from "./utils";
 export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   _inherits(ShopDiscountImpl, _BaseModule);
   var _super = _createSuper(ShopDiscountImpl);
@@ -278,7 +277,9 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
             isManualSelect: !isSelected
           });
         }
-        return discount;
+        return _objectSpread(_objectSpread({}, discount), {}, {
+          isManualSelect: !(discount !== null && discount !== void 0 && discount.isSelected)
+        });
       });
 
       // 更新优惠券列表
@@ -451,9 +452,9 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           });
         }
       });
-      var newDiscountList = uniqueById([].concat(editModeDiscountList, _toConsumableArray(discountList.filter(function (item) {
+      var newDiscountList = [].concat(editModeDiscountList, _toConsumableArray(discountList.filter(function (item) {
         return !item.isDisabled;
-      }))), 'product_id');
+      })));
       (_this$store$discount5 = this.store.discount) === null || _this$store$discount5 === void 0 || _this$store$discount5.setDiscountList(newDiscountList);
       this.emitDiscountListChange(newDiscountList);
       return newDiscountList;