@pisell/pisellos 2.0.19 → 2.0.20

package/dist/modules/Date/utils.js

@@ -209,7 +209,18 @@ export var handleAvailableDatesByRules = function handleAvailableDatesByRules(da
     var disabledDate = _objectSpread(_objectSpread({}, date), {}, {
       status: 'unavailable'
     });
-
+    var hasScheduleConfig = rules.find(function (n) {
+      var _n$schedule;
+      return (_n$schedule = n.schedule) === null || _n$schedule === void 0 ? void 0 : _n$schedule.length;
+    });
+    // 如果外面穿了 schedule，但是这个时候scheduleMap为空，则设置为不可用
+    // 这种情况为，商品设置了 5.1-5.31 可用，资源设置了 5.1-6.30 可用，session 类商品详情弹窗里里看到的6 月以后的日期都应该是不可用的
+    if (Object.keys(scheduleMap).length === 0 && hasScheduleConfig) {
+      return _objectSpread(_objectSpread({}, date), {}, {
+        color: '',
+        status: 'unavailable'
+      });
+    }
     // 根据日程判断日期是否可用
     if (Object.keys(scheduleMap).length) {
       var schedule = scheduleMap[date.date];

package/dist/modules/Rules/index.js

@@ -243,7 +243,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
       // 然后再处理应用哪些优惠券，此时只考虑filteredDiscountList中的优惠券
       sortedProductList.forEach(function (originProduct) {
-        var _product$discount_lis3, _product$discount_lis4, _product$discount_lis5;
+        var _product$discount_lis3, _product$discount_lis4, _product$discount_lis5, _product$discount_lis6, _product$discount_lis7;
         var product = _this3.hooks.getProduct(originProduct);
         if (product !== null && product !== void 0 && product.booking_id && (_product$discount_lis3 = product.discount_list) !== null && _product$discount_lis3 !== void 0 && _product$discount_lis3.length && product !== null && product !== void 0 && (_product$discount_lis4 = product.discount_list) !== null && _product$discount_lis4 !== void 0 && _product$discount_lis4.every(function (discount) {
           return discount.id && discount.type === 'good_pass';
@@ -271,7 +271,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var selectedDiscount = applicableDiscounts[0];
 
         // 如果是手动折扣，则不适用优惠券
-        var isManualDiscount = typeof product.isManualDiscount === 'boolean' ? product.isManualDiscount : product.total != product.origin_total && !((_product$discount_lis5 = product.discount_list) !== null && _product$discount_lis5 !== void 0 && _product$discount_lis5.length);
+        var isManualDiscount = typeof product.isManualDiscount === 'boolean' ? product.isManualDiscount : product.total != product.origin_total && (!((_product$discount_lis5 = product.discount_list) !== null && _product$discount_lis5 !== void 0 && _product$discount_lis5.length) || (product === null || product === void 0 || (_product$discount_lis6 = product.discount_list) === null || _product$discount_lis6 === void 0 || (_product$discount_lis7 = _product$discount_lis6.every) === null || _product$discount_lis7 === void 0 ? void 0 : _product$discount_lis7.call(_product$discount_lis6, function (item) {
+          return item.type === 'product';
+        })));
 
         // 勾选时覆盖手动折扣
         if (options !== null && options !== void 0 && options.discountId && (options === null || options === void 0 ? void 0 : options.discountId) === (selectedDiscount === null || selectedDiscount === void 0 ? void 0 : selectedDiscount.id)) {

package/dist/modules/Schedule/utils.js

@@ -716,7 +716,7 @@ export function getAllSortedDateRanges(schedules) {
   }
 
   // 按照开始时间和时长排序
-  return allDateRanges.sort(function (a, b) {
+  var sortedDateRanges = allDateRanges.sort(function (a, b) {
     // 首先按开始时间排序
     var startTimeCompare = dayjs(a.start).valueOf() - dayjs(b.start).valueOf();
     if (startTimeCompare !== 0) return startTimeCompare;
@@ -726,4 +726,13 @@ export function getAllSortedDateRanges(schedules) {
     var durationB = dayjs(b.end).valueOf() - dayjs(b.start).valueOf();
     return durationA - durationB;
   });
+
+  // 排序完了，还需要做个去重，如果有开始时间结束时间完全一致的，则只保留一个
+  // 需要使用 dayjs 的 isSame 方法来判断
+  var uniqueDateRanges = sortedDateRanges.filter(function (range, index, self) {
+    return index === self.findIndex(function (t) {
+      return dayjs(t.start).isSame(dayjs(range.start)) && dayjs(t.end).isSame(dayjs(range.end));
+    });
+  });
+  return uniqueDateRanges;
 }

package/dist/solution/BookingByStep/index.js

@@ -216,6 +216,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 });
                 if (schedule_ids_data.length) {
                   schedule_ids = schedule_ids_data;
+                } else if (schedule_date) {
+                  // 后端说如果 schedule_ids 如果为空，需要给[0]
+                  schedule_ids = [0];
                 }
               }
               _context2.next = 4;
@@ -1293,6 +1296,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 return false;
               }
               var canUseArr = mTimes.map(function (item) {
+                var _cartItem$_productOri3;
                 var res = getIsUsableByTimeItem({
                   timeSlice: {
                     start_time: startTime.format('HH:mm'),
@@ -1303,7 +1307,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   time: item,
                   resource: m,
                   currentCount: currentCapacity || 0,
-                  resourcesUseableMap: resourcesUseableMap
+                  resourcesUseableMap: resourcesUseableMap,
+                  cut_off_time: (_cartItem$_productOri3 = cartItem._productOrigin) === null || _cartItem$_productOri3 === void 0 ? void 0 : _cartItem$_productOri3.cut_off_time
                 });
                 // 如果仅仅是因为子资源容量不够，不应该标记子资源是被占用的情况
                 if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== 'capacityOnly') {
@@ -1323,13 +1328,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             // 如果资源的 capacity 已经小于了当前需要的 capacity ，则需要把资源给过滤掉
             // 同时，在这一步尝试去拉一下时间片，基于商品的时长，看每个资源是否还有空余时间能对这个商品做服务，如果没有则过滤
             item.renderList = item.renderList.filter(function (n) {
-              var _cartItem$_productOri3;
+              var _cartItem$_productOri4;
               var recordCount = n.capacity || 0;
               if (n.onlyComputed) return false;
               // 查一下这个资源基于商品的可用时间片
               var timeSlots = getTimeSlicesByResource({
                 resource: n,
-                duration: ((_cartItem$_productOri3 = cartItem._productOrigin) === null || _cartItem$_productOri3 === void 0 || (_cartItem$_productOri3 = _cartItem$_productOri3.duration) === null || _cartItem$_productOri3 === void 0 ? void 0 : _cartItem$_productOri3.value) || 0,
+                duration: ((_cartItem$_productOri4 = cartItem._productOrigin) === null || _cartItem$_productOri4 === void 0 || (_cartItem$_productOri4 = _cartItem$_productOri4.duration) === null || _cartItem$_productOri4 === void 0 ? void 0 : _cartItem$_productOri4.value) || 0,
                 split: 10,
                 currentDate: dateRange[0].date
               });
@@ -1373,10 +1378,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var cartItems = this.store.cart.getItems();
       var arr = [];
       cartItems.forEach(function (cartItem) {
-        var _cartItem$_productOri4, _cartItem$_productOri5;
+        var _cartItem$_productOri5, _cartItem$_productOri6;
         var selectedResources = [];
         var formatCapacity = formatDefaultCapacitys({
-          capacity: (_cartItem$_productOri4 = cartItem._productOrigin) === null || _cartItem$_productOri4 === void 0 ? void 0 : _cartItem$_productOri4.capacity,
+          capacity: (_cartItem$_productOri5 = cartItem._productOrigin) === null || _cartItem$_productOri5 === void 0 ? void 0 : _cartItem$_productOri5.capacity,
           product_bundle: cartItem._origin.product.product_bundle
         });
         cartItem._origin.metadata.capacity = formatCapacity;
@@ -1388,7 +1393,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         } else {
           selectedResources = getOthersCartSelectedResources(cartItems, cartItem._id, resourcesMap);
         }
-        var productResources = getResourcesByProduct(resourcesMap, ((_cartItem$_productOri5 = cartItem._productOrigin) === null || _cartItem$_productOri5 === void 0 || (_cartItem$_productOri5 = _cartItem$_productOri5.product_resource) === null || _cartItem$_productOri5 === void 0 ? void 0 : _cartItem$_productOri5.resources) || [], selectedResources, currentCapacity);
+        var productResources = getResourcesByProduct(resourcesMap, ((_cartItem$_productOri6 = cartItem._productOrigin) === null || _cartItem$_productOri6 === void 0 || (_cartItem$_productOri6 = _cartItem$_productOri6.product_resource) === null || _cartItem$_productOri6 === void 0 ? void 0 : _cartItem$_productOri6.resources) || [], selectedResources, currentCapacity);
         // 如果购物车里已经有了时间片，则需要按照时间片过滤
         if (cartItem._origin.start_time) {
           var startTime = dayjs("".concat(cartItem._origin.start_date, " ").concat(cartItem._origin.start_time));
@@ -1416,6 +1421,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 return false;
               }
               var canUseArr = mTimes.map(function (item) {
+                var _cartItem$_productOri7;
                 var res = getIsUsableByTimeItem({
                   timeSlice: {
                     start_time: startTime.format('HH:mm'),
@@ -1426,7 +1432,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   time: item,
                   resource: m,
                   currentCount: currentCapacity || 0,
-                  resourcesUseableMap: resourcesUseableMap
+                  resourcesUseableMap: resourcesUseableMap,
+                  cut_off_time: (_cartItem$_productOri7 = cartItem._productOrigin) === null || _cartItem$_productOri7 === void 0 ? void 0 : _cartItem$_productOri7.cut_off_time
                 });
                 // 如果仅仅是因为子资源容量不够，不应该标记子资源是被占用的情况
                 if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== 'capacityOnly') {
@@ -1446,13 +1453,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             // 如果资源的 capacity 已经小于了当前需要的 capacity ，则需要把资源给过滤掉
             // 同时，在这一步尝试去拉一下时间片，基于商品的时长，看每个资源是否还有空余时间能对这个商品做服务，如果没有则过滤
             item.renderList = item.renderList.filter(function (n) {
-              var _cartItem$_productOri6;
+              var _cartItem$_productOri8;
               var recordCount = n.capacity || 0;
               if (n.onlyComputed) return false;
               // 查一下这个资源基于商品的可用时间片
               var timeSlots = getTimeSlicesByResource({
                 resource: n,
-                duration: ((_cartItem$_productOri6 = cartItem._productOrigin) === null || _cartItem$_productOri6 === void 0 || (_cartItem$_productOri6 = _cartItem$_productOri6.duration) === null || _cartItem$_productOri6 === void 0 ? void 0 : _cartItem$_productOri6.value) || 0,
+                duration: ((_cartItem$_productOri8 = cartItem._productOrigin) === null || _cartItem$_productOri8 === void 0 || (_cartItem$_productOri8 = _cartItem$_productOri8.duration) === null || _cartItem$_productOri8 === void 0 ? void 0 : _cartItem$_productOri8.value) || 0,
                 split: 10,
                 currentDate: dateRange[0].date
               });
@@ -1554,7 +1561,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "autoSelectAccountResources",
     value: function autoSelectAccountResources(_ref8) {
-      var _cartItem$_productOri7, _allProductResources$;
+      var _cartItem$_productOri9, _allProductResources$;
       var cartItem = _ref8.cartItem,
         holder_id = _ref8.holder_id,
         resources_code = _ref8.resources_code,
@@ -1603,7 +1610,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var resourcesMap = getResourcesMap(cloneDeep(AllResources));
       var allCartItems = cloneDeep(this.store.cart.getItems());
       var selectedResources = getOthersSelectedResources(allCartItems, holder_id, resourcesMap);
-      var allProductResources = getResourcesByProduct(resourcesMap, ((_cartItem$_productOri7 = cartItem._productOrigin) === null || _cartItem$_productOri7 === void 0 || (_cartItem$_productOri7 = _cartItem$_productOri7.product_resource) === null || _cartItem$_productOri7 === void 0 ? void 0 : _cartItem$_productOri7.resources) || [], selectedResources, 1);
+      var allProductResources = getResourcesByProduct(resourcesMap, ((_cartItem$_productOri9 = cartItem._productOrigin) === null || _cartItem$_productOri9 === void 0 || (_cartItem$_productOri9 = _cartItem$_productOri9.product_resource) === null || _cartItem$_productOri9 === void 0 ? void 0 : _cartItem$_productOri9.resources) || [], selectedResources, 1);
       var resources = ((_allProductResources$ = allProductResources.find(function (n) {
         return n.code === resources_code;
       })) === null || _allProductResources$ === void 0 ? void 0 : _allProductResources$.renderList) || [];
@@ -1653,12 +1660,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 return 0; // continue
               }
               var canUseTime = mTimes.find(function (item) {
+                var _cartItem$_productOri10;
                 var res = getIsUsableByTimeItem({
                   timeSlice: timeSlots,
                   time: item,
                   resource: n,
                   currentCount: recordCount + (capacity || 0),
-                  resourcesUseableMap: resourcesUseableMap
+                  resourcesUseableMap: resourcesUseableMap,
+                  cut_off_time: (_cartItem$_productOri10 = cartItem._productOrigin) === null || _cartItem$_productOri10 === void 0 ? void 0 : _cartItem$_productOri10.cut_off_time
                 });
                 // 如果只是因为子资源容量不够，而不是子资源被预约导致没时间片，不应该标记子资源为不可用，从而影响组合资源的情况
                 if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[n.id]) !== false && res.reason !== 'capacityOnly') {
@@ -1909,11 +1918,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       // if (cartItems?.[0].start_date) return [];
       var resourceIds = [];
       var resourcesTypeId = undefined;
+      var isSingleResource = false;
       cartItems.forEach(function (item) {
         var _item$_productOrigin11, _item$_productOrigin12;
         (_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) {
           if (n.code === resources_code) {
             resources.push.apply(resources, _toConsumableArray(n.renderList || []));
+            isSingleResource = n.type === 'single';
           }
         });
         // item._origin.resources?.forEach((n: any) => {
@@ -1944,8 +1955,17 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var checkDuration = function checkDuration(cartItems) {
         var accountDuration = 0;
         cartItems.forEach(function (item) {
-          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;
+          // 单个预约累加账号 多个预约取最大值
+          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;
+          } 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;
+            }
+          }
         });
         if (accountDuration > duration) {
           duration = accountDuration;
@@ -2015,9 +2035,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           var _newResources$;
           var newResources = cloneDeep(item._origin.resources);
           newResources.forEach(function (resource) {
-            var _item$_productOrigin$4, _item$_productOrigin14, _ref11, _item$_productOrigin15;
+            var _item$_productOrigin$6, _item$_productOrigin16, _ref11, _item$_productOrigin17;
             resource.startTime = currentStartTime;
-            resource.endTime = dayjs(currentStartTime).add((_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, (_ref11 = (_item$_productOrigin15 = item._productOrigin) === null || _item$_productOrigin15 === void 0 || (_item$_productOrigin15 = _item$_productOrigin15.duration) === null || _item$_productOrigin15 === void 0 ? void 0 : _item$_productOrigin15.type) !== null && _ref11 !== void 0 ? _ref11 : 'minutes').format('YYYY-MM-DD HH:mm');
+            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');
             delete resource.times;
           });
           _this10.store.cart.updateItem({

package/dist/solution/BookingByStep/utils/resources.d.ts

@@ -37,6 +37,11 @@ export declare const getIsUsableByTimeItem: ({ timeSlice, time, resource, curren
         future_day: number;
         unit: number;
         unit_type: string;
+        type: string;
+        ongoing?: {
+            type: string;
+            unit: number;
+        } | undefined;
     } | undefined;
 }) => {
     afterToDay: boolean;

package/dist/solution/BookingByStep/utils/resources.js

@@ -190,14 +190,32 @@ export var getIsUsableByTimeItem = function getIsUsableByTimeItem(_ref2) {
   };
   // 最早可预约时间为 当前日期之后并且提前量之后
   var earliest = dayjs();
+  var canBookingForOngoing = false;
   var _ref3 = cut_off_time || {},
     unit = _ref3.unit,
-    unit_type = _ref3.unit_type;
-  if (unit) {
-    earliest = earliest.add(unit, unit_type);
+    unit_type = _ref3.unit_type,
+    type = _ref3.type,
+    ongoing = _ref3.ongoing;
+  // 允许购买已开始的活动
+  if (type === 'ongoing' && (ongoing === null || ongoing === void 0 ? void 0 : ongoing.type) === 'after_start') {
+    // 如果timeSlice.start_at 小于当前时间，判断当前时间是否在如果timeSlice.start_at+ongoing.unit之间
+    // 即，如果现在是15:30，timeSlice.start_at是15:00，ongoing.unit是60分钟，则允许预约
+    if (dayjs(timeSlice.start_at).isBefore(dayjs())) {
+      if (earliest.isBefore(dayjs(timeSlice.start_at).add(ongoing.unit, 'minute'))) {
+        canBookingForOngoing = true;
+      }
+    }
+  } else if (type === 'ongoing' && (ongoing === null || ongoing === void 0 ? void 0 : ongoing.type) === 'before_end') {
+    if (dayjs(timeSlice.end_at).isAfter(earliest)) {
+      canBookingForOngoing = true;
+    }
+  } else {
+    if (unit) {
+      earliest = earliest.add(unit, unit_type);
+    }
   }
   // 不可预约提前量时间之前的
-  if (!checkAfterToDay(timeSlice.start_at, earliest)) {
+  if (!checkAfterToDay(timeSlice.start_at, earliest) && !canBookingForOngoing) {
     return status;
   }
   status.afterToDay = true;

package/lib/modules/Date/utils.js

@@ -155,6 +155,13 @@ var handleAvailableDatesByRules = (dates, rules) => {
   newDates = newDates.map((date) => {
     var _a;
     const disabledDate = { ...date, status: "unavailable" };
+    const hasScheduleConfig = rules.find((n) => {
+      var _a2;
+      return (_a2 = n.schedule) == null ? void 0 : _a2.length;
+    });
+    if (Object.keys(scheduleMap).length === 0 && hasScheduleConfig) {
+      return { ...date, color: "", status: "unavailable" };
+    }
     if (Object.keys(scheduleMap).length) {
       const schedule = scheduleMap[date.date];
       if (!schedule || (schedule == null ? void 0 : schedule.isExcluded)) {

package/lib/modules/Rules/index.js

@@ -154,7 +154,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       });
     });
     sortedProductList.forEach((originProduct) => {
-      var _a, _b, _c;
+      var _a, _b, _c, _d, _e;
       const product = this.hooks.getProduct(originProduct);
       if ((product == null ? void 0 : product.booking_id) && ((_a = product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount) => discount.id && discount.type === "good_pass"))) {
         processedProductsMap.set(product._id, originProduct);
@@ -172,7 +172,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         return false;
       });
       const selectedDiscount = applicableDiscounts[0];
-      let isManualDiscount = typeof product.isManualDiscount === "boolean" ? product.isManualDiscount : product.total != product.origin_total && !((_c = product.discount_list) == null ? void 0 : _c.length);
+      let isManualDiscount = typeof product.isManualDiscount === "boolean" ? product.isManualDiscount : product.total != product.origin_total && (!((_c = product.discount_list) == null ? void 0 : _c.length) || ((_e = (_d = product == null ? void 0 : product.discount_list) == null ? void 0 : _d.every) == null ? void 0 : _e.call(_d, (item) => item.type === "product")));
       if ((options == null ? void 0 : options.discountId) && (options == null ? void 0 : options.discountId) === (selectedDiscount == null ? void 0 : selectedDiscount.id)) {
         isManualDiscount = false;
       }

package/lib/modules/Schedule/utils.js

@@ -573,7 +573,7 @@ function getAllSortedDateRanges(schedules) {
     console.log("No dateRanges found in schedules:", schedules);
     return [];
   }
-  return allDateRanges.sort((a, b) => {
+  let sortedDateRanges = allDateRanges.sort((a, b) => {
     const startTimeCompare = (0, import_dayjs.default)(a.start).valueOf() - (0, import_dayjs.default)(b.start).valueOf();
     if (startTimeCompare !== 0)
       return startTimeCompare;
@@ -581,6 +581,10 @@ function getAllSortedDateRanges(schedules) {
     const durationB = (0, import_dayjs.default)(b.end).valueOf() - (0, import_dayjs.default)(b.start).valueOf();
     return durationA - durationB;
   });
+  const uniqueDateRanges = sortedDateRanges.filter(
+    (range, index, self) => index === self.findIndex((t) => (0, import_dayjs.default)(t.start).isSame((0, import_dayjs.default)(range.start)) && (0, import_dayjs.default)(t.end).isSame((0, import_dayjs.default)(range.end)))
+  );
+  return uniqueDateRanges;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/solution/BookingByStep/index.js

@@ -165,6 +165,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       const schedule_ids_data = this.store.schedule.getScheduleListByIds(schedule_ids).map((n) => n.id);
       if (schedule_ids_data.length) {
         schedule_ids = schedule_ids_data;
+      } else if (schedule_date) {
+        schedule_ids = [0];
       }
     }
     const productsData = await this.request.post(
@@ -728,6 +730,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               return false;
             }
             const canUseArr = mTimes.map((item) => {
+              var _a2;
               const res = (0, import_resources.getIsUsableByTimeItem)({
                 timeSlice: {
                   start_time: startTime.format("HH:mm"),
@@ -738,7 +741,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
                 time: item,
                 resource: m,
                 currentCount: currentCapacity || 0,
-                resourcesUseableMap
+                resourcesUseableMap,
+                cut_off_time: (_a2 = cartItem._productOrigin) == null ? void 0 : _a2.cut_off_time
               });
               if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== "capacityOnly") {
                 resourcesUseableMap[m.id] = res.usable;
@@ -855,6 +859,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               return false;
             }
             const canUseArr = mTimes.map((item) => {
+              var _a2;
               const res = (0, import_resources.getIsUsableByTimeItem)({
                 timeSlice: {
                   start_time: startTime.format("HH:mm"),
@@ -865,7 +870,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
                 time: item,
                 resource: m,
                 currentCount: currentCapacity || 0,
-                resourcesUseableMap
+                resourcesUseableMap,
+                cut_off_time: (_a2 = cartItem._productOrigin) == null ? void 0 : _a2.cut_off_time
               });
               if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== "capacityOnly") {
                 resourcesUseableMap[m.id] = res.usable;
@@ -1059,12 +1065,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           continue;
         }
         const canUseTime = mTimes.find((item) => {
+          var _a2;
           const res = (0, import_resources.getIsUsableByTimeItem)({
             timeSlice: timeSlots,
             time: item,
             resource: n,
             currentCount: recordCount + (capacity || 0),
-            resourcesUseableMap
+            resourcesUseableMap,
+            cut_off_time: (_a2 = cartItem._productOrigin) == null ? void 0 : _a2.cut_off_time
           });
           if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[n.id]) !== false && res.reason !== "capacityOnly") {
             resourcesUseableMap[n.id] = res.usable;
@@ -1284,11 +1292,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
     const resourceIds = [];
     let resourcesTypeId = void 0;
+    let isSingleResource = false;
     cartItems.forEach((item) => {
       var _a2, _b2, _c2, _d2, _e2, _f2, _g;
       (_c2 = (_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.product_resource) == null ? void 0 : _b2.resources) == null ? void 0 : _c2.forEach((n) => {
         if (n.code === resources_code) {
           resources.push(...n.renderList || []);
+          isSingleResource = n.type === "single";
         }
       });
       if (item.resource_id) {
@@ -1311,8 +1321,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const checkDuration = (cartItems2) => {
       let accountDuration = 0;
       cartItems2.forEach((item) => {
-        var _a2, _b2;
-        accountDuration += ((_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) ?? 0;
+        var _a2, _b2, _c2, _d2, _e2, _f2;
+        if (isSingleResource) {
+          accountDuration += ((_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) ?? 0;
+        } else {
+          if (accountDuration < (((_d2 = (_c2 = item._productOrigin) == null ? void 0 : _c2.duration) == null ? void 0 : _d2.value) ?? 0)) {
+            accountDuration = ((_f2 = (_e2 = item._productOrigin) == null ? void 0 : _e2.duration) == null ? void 0 : _f2.value) ?? 0;
+          }
+        }
       });
       if (accountDuration > duration) {
         duration = accountDuration;

package/lib/solution/BookingByStep/utils/resources.d.ts

@@ -37,6 +37,11 @@ export declare const getIsUsableByTimeItem: ({ timeSlice, time, resource, curren
         future_day: number;
         unit: number;
         unit_type: string;
+        type: string;
+        ongoing?: {
+            type: string;
+            unit: number;
+        } | undefined;
     } | undefined;
 }) => {
     afterToDay: boolean;

package/lib/solution/BookingByStep/utils/resources.js

@@ -141,11 +141,24 @@ var getIsUsableByTimeItem = ({
     reason: ""
   };
   let earliest = (0, import_dayjs.default)();
-  const { unit, unit_type } = cut_off_time || {};
-  if (unit) {
-    earliest = earliest.add(unit, unit_type);
+  let canBookingForOngoing = false;
+  const { unit, unit_type, type, ongoing } = cut_off_time || {};
+  if (type === "ongoing" && (ongoing == null ? void 0 : ongoing.type) === "after_start") {
+    if ((0, import_dayjs.default)(timeSlice.start_at).isBefore((0, import_dayjs.default)())) {
+      if (earliest.isBefore((0, import_dayjs.default)(timeSlice.start_at).add(ongoing.unit, "minute"))) {
+        canBookingForOngoing = true;
+      }
+    }
+  } else if (type === "ongoing" && (ongoing == null ? void 0 : ongoing.type) === "before_end") {
+    if ((0, import_dayjs.default)(timeSlice.end_at).isAfter(earliest)) {
+      canBookingForOngoing = true;
+    }
+  } else {
+    if (unit) {
+      earliest = earliest.add(unit, unit_type);
+    }
   }
-  if (!checkAfterToDay(timeSlice.start_at, earliest)) {
+  if (!checkAfterToDay(timeSlice.start_at, earliest) && !canBookingForOngoing) {
     return status;
   }
   status.afterToDay = true;

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.0.19",
+  "version": "2.0.20",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",