@pisell/pisellos 2.0.60 → 2.0.61

package/dist/modules/Cart/index.js

@@ -258,7 +258,8 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
         resources = params.resources,
         note = params.note,
         date = params.date,
-        relationForms = params.relationForms;
+        relationForms = params.relationForms,
+        osWarnTips = params.osWarnTips;
       var quantity = params.quantity;
       var tempCartItem = this.store.list.find(function (i) {
         return i._id === _id;
@@ -324,6 +325,9 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
           note: note
         });
       }
+      if (osWarnTips) {
+        tempCartItem.osWarnTips = osWarnTips;
+      }
       return tempCartItem;
     }
 

package/dist/modules/Cart/types.d.ts

@@ -110,6 +110,8 @@ export interface CartItem {
     bundle?: any[];
     /** 商品规格信息 */
     options?: any[];
+    /** 商品规格选项字符串 */
+    product_option_string?: string;
     /** 是否为普通商品 */
     isNormalProduct?: boolean;
     /** 资源ID */
@@ -142,8 +144,8 @@ export interface CartItem {
     _bundleOrigin?: any[];
     /** 商品规格原始数据 */
     _optionsOrigin?: any[];
-    /** 商品规格组合字符串，提供给 UI 展示的 */
-    product_option_string?: string;
+    /** 操作系统提示 */
+    osWarnTips?: string[];
 }
 /**
  * 购物车状态接口
@@ -217,6 +219,8 @@ export interface IUpdateItemParams {
     }[];
     /** 商品组合规格ID */
     product_variant_id?: number;
+    /** 操作系统提示 */
+    osWarnTips?: string[];
 }
 /**
  * 折扣

package/dist/modules/Cart/utils/cartDate.js

@@ -39,6 +39,7 @@ export var formatDateToCartItemOrigin = function formatDateToCartItemOrigin(para
  * @returns 删除后的购物车
  */
 export var deleteTimeFromCartItem = function deleteTimeFromCartItem(cartItem) {
+  var _cartItem$osWarnTips;
   // 删除UI层的数据
   cartItem.start_date = undefined;
   cartItem.start_time = undefined;
@@ -51,5 +52,10 @@ export var deleteTimeFromCartItem = function deleteTimeFromCartItem(cartItem) {
   cartItem._origin.start_time = null;
   cartItem._origin.end_date = null;
   cartItem._origin.end_time = null;
+
+  // 同时清空 osWarnTips 中的关于时间的提示
+  cartItem.osWarnTips = (_cartItem$osWarnTips = cartItem.osWarnTips) === null || _cartItem$osWarnTips === void 0 ? void 0 : _cartItem$osWarnTips.filter(function (item) {
+    return !item.includes('pisell2.product.card.closing-soon.warning');
+  });
   return cartItem;
 };

package/dist/modules/Product/types.d.ts

@@ -105,6 +105,11 @@ export interface ProductData {
         type: string;
         /** 值 */
         value: number;
+        flexible_config?: {
+            is_enable_minimum_duration?: 0 | 1;
+            warning_threshold?: number;
+            block_threshold?: number;
+        };
     };
     /** 商品显示设置 */
     product_display_setting: {

package/dist/modules/Schedule/utils.js

@@ -140,6 +140,12 @@ var getDaysByRepeatWeek = function getDaysByRepeatWeek(params, isGetRange) {
     for (var i = 0; i < frequency_date.length; i++) {
       var item = frequency_date[i];
       var _start = startTmp.day(item);
+
+      // 如果计算出的日期早于startTmp，则跳到下一周的相同星期几
+      if (_start.isBefore(startTmp, 'day')) {
+        _start = _start.add(1, 'week');
+      }
+
       // 如果周结束的那一天还超过了deadline，则需要把_end置为deadline
       var _end = _start.add(scheduleDiff, 'second');
       if (_end.isAfter(deadline, 'day')) {
@@ -161,7 +167,7 @@ var getDaysByRepeatWeek = function getDaysByRepeatWeek(params, isGetRange) {
         daysArr.push.apply(daysArr, _toConsumableArray(getDaysByStartEnd(_start, _end)));
       }
     }
-    startTmp = startTmp.day(1).add(frequency, 'week');
+    startTmp = startTmp.add(frequency, 'week');
   }
   return Array.from(new Set(daysArr));
 };

package/dist/solution/BookingByStep/index.js

@@ -1528,25 +1528,27 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             });
           });
         } else {
-          var _cartItem$_productOri3, _this10$shopStore$get;
+          var _cartItem$_productOri3, _this10$shopStore$get, _cartItem$_productOri4, _cartItem$_productOri5;
           var hasFlexibleDuration = ((_cartItem$_productOri3 = cartItem._productOrigin) === null || _cartItem$_productOri3 === void 0 || (_cartItem$_productOri3 = _cartItem$_productOri3.duration) === null || _cartItem$_productOri3 === void 0 ? void 0 : _cartItem$_productOri3.type) === 'flexible';
           var operating_day_boundary = (_this10$shopStore$get = _this10.shopStore.get('core')) === null || _this10$shopStore$get === void 0 || (_this10$shopStore$get = _this10$shopStore$get.core) === null || _this10$shopStore$get === void 0 ? void 0 : _this10$shopStore$get.operating_day_boundary;
+          var maxBlockThreshold = (_cartItem$_productOri4 = cartItem._productOrigin) !== null && _cartItem$_productOri4 !== void 0 && (_cartItem$_productOri4 = _cartItem$_productOri4.duration) !== null && _cartItem$_productOri4 !== void 0 && (_cartItem$_productOri4 = _cartItem$_productOri4.flexible_config) !== null && _cartItem$_productOri4 !== void 0 && _cartItem$_productOri4.is_enable_minimum_duration ? ((_cartItem$_productOri5 = cartItem._productOrigin) === null || _cartItem$_productOri5 === void 0 || (_cartItem$_productOri5 = _cartItem$_productOri5.duration) === null || _cartItem$_productOri5 === void 0 || (_cartItem$_productOri5 = _cartItem$_productOri5.flexible_config) === null || _cartItem$_productOri5 === void 0 ? void 0 : _cartItem$_productOri5.block_threshold) || 0 : 0;
           productResources.forEach(function (item) {
             // 如果资源的 capacity 已经小于了当前需要的 capacity ，则需要把资源给过滤掉
             // 同时，在这一步尝试去拉一下时间片，基于商品的时长，看每个资源是否还有空余时间能对这个商品做服务，如果没有则过滤
             item.renderList = item.renderList.filter(function (n) {
-              var _cartItem$_productOri4, _cartItem$_productOri5;
+              var _cartItem$_productOri6, _cartItem$_productOri7;
               var recordCount = n.capacity || 0;
               if (n.onlyComputed) return false;
               // 查一下这个资源基于商品的可用时间片
               var timeSlots = getTimeSlicesByResource({
                 resource: n,
-                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) || 10,
+                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) || 10,
                 split: 10,
                 currentDate: dateRange[0].date,
                 hasFlexibleDuration: hasFlexibleDuration,
-                cut_off_time: (_cartItem$_productOri5 = cartItem._productOrigin) === null || _cartItem$_productOri5 === void 0 ? void 0 : _cartItem$_productOri5.cut_off_time,
-                operating_day_boundary: operating_day_boundary
+                cut_off_time: (_cartItem$_productOri7 = cartItem._productOrigin) === null || _cartItem$_productOri7 === void 0 ? void 0 : _cartItem$_productOri7.cut_off_time,
+                operating_day_boundary: operating_day_boundary,
+                maxBlockThreshold: maxBlockThreshold
               });
               return recordCount >= currentCapacity && timeSlots.length > 0;
             });
@@ -1647,7 +1649,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "autoSelectAccountResources",
     value: function autoSelectAccountResources(_ref9) {
-      var _cartItem$_productOri6, _allProductResources$;
+      var _cartItem$_productOri8, _allProductResources$;
       var cartItem = _ref9.cartItem,
         holder_id = _ref9.holder_id,
         resources_code = _ref9.resources_code,
@@ -1696,7 +1698,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$_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, 1);
+      var allProductResources = getResourcesByProduct(resourcesMap, ((_cartItem$_productOri8 = cartItem._productOrigin) === null || _cartItem$_productOri8 === void 0 || (_cartItem$_productOri8 = _cartItem$_productOri8.product_resource) === null || _cartItem$_productOri8 === void 0 ? void 0 : _cartItem$_productOri8.resources) || [], selectedResources, 1);
       var resources = ((_allProductResources$ = allProductResources.find(function (n) {
         return n.code === resources_code;
       })) === null || _allProductResources$ === void 0 ? void 0 : _allProductResources$.renderList) || [];
@@ -1757,14 +1759,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 return 0; // continue
               }
               var canUseTime = mTimes.find(function (item) {
-                var _cartItem$_productOri7;
+                var _cartItem$_productOri9;
                 var res = getIsUsableByTimeItem({
                   timeSlice: timeSlots,
                   time: item,
                   resource: n,
                   currentCount: totalCapacity + (capacity || 0),
                   resourcesUseableMap: resourcesUseableMap,
-                  cut_off_time: (_cartItem$_productOri7 = cartItem._productOrigin) === null || _cartItem$_productOri7 === void 0 ? void 0 : _cartItem$_productOri7.cut_off_time
+                  cut_off_time: (_cartItem$_productOri9 = cartItem._productOrigin) === null || _cartItem$_productOri9 === void 0 ? void 0 : _cartItem$_productOri9.cut_off_time
                 });
                 // 如果只是因为子资源容量不够，而不是子资源被预约导致没时间片，不应该标记子资源为不可用，从而影响组合资源的情况
                 if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[n.id]) !== false && res.reason !== 'capacityOnly') {
@@ -2132,6 +2134,20 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         return ((_item$_productOrigin14 = item._productOrigin) === null || _item$_productOrigin14 === void 0 || (_item$_productOrigin14 = _item$_productOrigin14.duration) === null || _item$_productOrigin14 === void 0 ? void 0 : _item$_productOrigin14.type) === 'flexible';
       });
       var operating_day_boundary = (_this$shopStore$get = this.shopStore.get('core')) === null || _this$shopStore$get === void 0 || (_this$shopStore$get = _this$shopStore$get.core) === null || _this$shopStore$get === void 0 ? void 0 : _this$shopStore$get.operating_day_boundary;
+
+      // 如果有 hasFlexibleDuration，需要把动态时长商品（可能是多个，取最长的那个最低禁止购买时长）的最低禁止购买时长作为 split 的值
+      var maxBlockThreshold = 0;
+      if (hasFlexibleDuration) {
+        maxBlockThreshold = cartItems.reduce(function (max, item) {
+          var _item$_productOrigin15;
+          // 如果开启了灵活时长商品配置，则取 block_threshold 的值
+          if ((_item$_productOrigin15 = item._productOrigin) !== null && _item$_productOrigin15 !== void 0 && (_item$_productOrigin15 = _item$_productOrigin15.duration) !== null && _item$_productOrigin15 !== void 0 && (_item$_productOrigin15 = _item$_productOrigin15.flexible_config) !== null && _item$_productOrigin15 !== void 0 && _item$_productOrigin15.is_enable_minimum_duration) {
+            var _item$_productOrigin16;
+            return Math.max(max, ((_item$_productOrigin16 = item._productOrigin) === null || _item$_productOrigin16 === void 0 || (_item$_productOrigin16 = _item$_productOrigin16.duration) === null || _item$_productOrigin16 === void 0 || (_item$_productOrigin16 = _item$_productOrigin16.flexible_config) === null || _item$_productOrigin16 === void 0 ? void 0 : _item$_productOrigin16.block_threshold) || 0);
+          }
+          return 0;
+        }, 0);
+      }
       var timeSlots = getTimeSlicesByResources({
         resourceIds: resourceIds,
         resourcesMap: resourcesMap,
@@ -2141,7 +2157,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         resourcesUseableMap: resourcesUseableMap,
         cut_off_time: maxCutOffTime,
         hasFlexibleDuration: hasFlexibleDuration,
-        operating_day_boundary: operating_day_boundary
+        operating_day_boundary: operating_day_boundary,
+        maxBlockThreshold: maxBlockThreshold
       });
       return timeSlots;
     }
@@ -2178,12 +2195,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         var currentStartTime = timeSlots.start_at.format('YYYY-MM-DD HH:mm');
         accountItems.forEach(function (item, index) {
           var _newResources$;
+          var osWarnTips = [];
           var newResources = cloneDeep(item._origin.resources);
           newResources.forEach(function (resource) {
-            var _item$_productOrigin15;
+            var _item$_productOrigin17;
             // 如果商品配置的是灵活时长，开始时间设置为提交的时间，结束时间从资源的可用最晚时间和店铺营业结束时间里取一个最早的
-            if (((_item$_productOrigin15 = item._productOrigin) === null || _item$_productOrigin15 === void 0 || (_item$_productOrigin15 = _item$_productOrigin15.duration) === null || _item$_productOrigin15 === void 0 ? void 0 : _item$_productOrigin15.type) === 'flexible') {
-              var _allResources$find;
+            if (((_item$_productOrigin17 = item._productOrigin) === null || _item$_productOrigin17 === void 0 || (_item$_productOrigin17 = _item$_productOrigin17.duration) === null || _item$_productOrigin17 === void 0 ? void 0 : _item$_productOrigin17.type) === 'flexible') {
+              var _allResources$find, _item$_productOrigin18, _item$_productOrigin19;
               item.duration = {
                 type: 'minutes',
                 value: 10
@@ -2211,16 +2229,24 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 formattedEndTime = dayjs(endTime);
               }
               resource.endTime = formattedEndTime.format('YYYY-MM-DD HH:mm');
+              // 如果是动态时长商品，并且当前选择的时间的结束时间小于了最低提示时长（warningThreshold），则追加一个提示
+              // 如果currentStartTime + warningThreshold 大于 currentEndTime,且 osWarnTips 没有pisell2.product.card.closing-soon.warning 这一项，则加入这一项
+              if ((_item$_productOrigin18 = item._productOrigin) !== null && _item$_productOrigin18 !== void 0 && (_item$_productOrigin18 = _item$_productOrigin18.duration) !== null && _item$_productOrigin18 !== void 0 && (_item$_productOrigin18 = _item$_productOrigin18.flexible_config) !== null && _item$_productOrigin18 !== void 0 && _item$_productOrigin18.is_enable_minimum_duration && dayjs(currentStartTime).add(((_item$_productOrigin19 = item._productOrigin) === null || _item$_productOrigin19 === void 0 || (_item$_productOrigin19 = _item$_productOrigin19.duration) === null || _item$_productOrigin19 === void 0 || (_item$_productOrigin19 = _item$_productOrigin19.flexible_config) === null || _item$_productOrigin19 === void 0 ? void 0 : _item$_productOrigin19.warning_threshold) || 0, 'minutes').isAfter(dayjs(formattedEndTime))) {
+                if (!osWarnTips.includes('pisell2.product.card.closing-soon.warning')) {
+                  osWarnTips.push('pisell2.product.card.closing-soon.warning');
+                }
+              }
             } else {
-              var _item$_productOrigin16;
+              var _item$_productOrigin20;
               resource.startTime = currentStartTime;
-              resource.endTime = dayjs(currentStartTime).add(((_item$_productOrigin16 = item._productOrigin) === null || _item$_productOrigin16 === void 0 || (_item$_productOrigin16 = _item$_productOrigin16.duration) === null || _item$_productOrigin16 === void 0 ? void 0 : _item$_productOrigin16.value) || 10, 'minutes').format('YYYY-MM-DD HH:mm');
+              resource.endTime = dayjs(currentStartTime).add(((_item$_productOrigin20 = item._productOrigin) === null || _item$_productOrigin20 === void 0 || (_item$_productOrigin20 = _item$_productOrigin20.duration) === null || _item$_productOrigin20 === void 0 ? void 0 : _item$_productOrigin20.value) || 10, 'minutes').format('YYYY-MM-DD HH:mm');
             }
             // delete resource.times;
           });
           _this13.store.cart.updateItem({
             _id: item._id,
-            resources: newResources
+            resources: newResources,
+            osWarnTips: osWarnTips
           });
 
           // 更新下一个商品的开始时间为当前商品的结束时间
@@ -2514,7 +2540,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getResourcesByCartItemAndCode",
     value: function getResourcesByCartItemAndCode(cartItemId, resourceCode) {
-      var _cartItem$_productOri8;
+      var _cartItem$_productOri10;
       var dateRange = this.store.date.getDateRange();
       var resources = [];
       if (dateRange !== null && dateRange !== void 0 && dateRange.length) {
@@ -2546,7 +2572,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       } else {
         selectedResources = getOthersCartSelectedResources(cartItems, cartItem._id, resourcesMap);
       }
-      var productResources = getResourcesByProduct(resourcesMap, ((_cartItem$_productOri8 = cartItem._productOrigin) === null || _cartItem$_productOri8 === void 0 || (_cartItem$_productOri8 = _cartItem$_productOri8.product_resource) === null || _cartItem$_productOri8 === void 0 ? void 0 : _cartItem$_productOri8.resources) || [], selectedResources, currentCapacity);
+      var productResources = getResourcesByProduct(resourcesMap, ((_cartItem$_productOri10 = cartItem._productOrigin) === null || _cartItem$_productOri10 === void 0 || (_cartItem$_productOri10 = _cartItem$_productOri10.product_resource) === null || _cartItem$_productOri10 === void 0 ? void 0 : _cartItem$_productOri10.resources) || [], selectedResources, currentCapacity);
       var targetResource = productResources.find(function (resource) {
         return resource.code === resourceCode;
       });
@@ -2569,7 +2595,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           });
           if (mTimes.length === 0) return false;
           var canUseArr = mTimes.map(function (item) {
-            var _cartItem$_productOri9;
+            var _cartItem$_productOri11;
             var res = getIsUsableByTimeItem({
               timeSlice: {
                 start_time: startTime.format('HH:mm'),
@@ -2581,7 +2607,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               resource: m,
               currentCount: currentCapacity || 0,
               resourcesUseableMap: resourcesUseableMap,
-              cut_off_time: (_cartItem$_productOri9 = cartItem._productOrigin) === null || _cartItem$_productOri9 === void 0 ? void 0 : _cartItem$_productOri9.cut_off_time
+              cut_off_time: (_cartItem$_productOri11 = cartItem._productOrigin) === null || _cartItem$_productOri11 === void 0 ? void 0 : _cartItem$_productOri11.cut_off_time
             });
             if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== 'capacityOnly') {
               resourcesUseableMap[m.id] = res.usable;
@@ -2595,12 +2621,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         });
       } else {
         targetResource.renderList = targetResource.renderList.filter(function (n) {
-          var _cartItem$_productOri10;
+          var _cartItem$_productOri12;
           var recordCount = n.capacity || 0;
           if (n.onlyComputed) return false;
           var timeSlots = getTimeSlicesByResource({
             resource: n,
-            duration: ((_cartItem$_productOri10 = cartItem._productOrigin) === null || _cartItem$_productOri10 === void 0 || (_cartItem$_productOri10 = _cartItem$_productOri10.duration) === null || _cartItem$_productOri10 === void 0 ? void 0 : _cartItem$_productOri10.value) || 10,
+            duration: ((_cartItem$_productOri12 = cartItem._productOrigin) === null || _cartItem$_productOri12 === void 0 || (_cartItem$_productOri12 = _cartItem$_productOri12.duration) === null || _cartItem$_productOri12 === void 0 ? void 0 : _cartItem$_productOri12.value) || 10,
             split: 10,
             currentDate: dateRange[0].date
           });

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

@@ -79,7 +79,7 @@ export declare const formatResources: ({ booking, resources, }: {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getTimeSlicesByResource: ({ resource, duration, split, currentDate, capacity, resourcesUseableMap, cut_off_time, hasFlexibleDuration, operating_day_boundary, }: {
+export declare const getTimeSlicesByResource: ({ resource, duration, split, currentDate, capacity, resourcesUseableMap, cut_off_time, hasFlexibleDuration, operating_day_boundary, maxBlockThreshold }: {
     resource: ResourceItem;
     duration: number;
     split: number;
@@ -101,6 +101,7 @@ export declare const getTimeSlicesByResource: ({ resource, duration, split, curr
         type: string;
         time: string;
     } | undefined;
+    maxBlockThreshold?: number | undefined;
 }) => TimeSliceItem[];
 /**
  * @title: 获取时间切片列表的交集
@@ -138,7 +139,7 @@ export declare const mergeSubResourcesTimeSlices: (resources: ResourceItem[], re
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, duration, currentDate, split, capacity, resourcesUseableMap, cut_off_time, hasFlexibleDuration, operating_day_boundary, }: {
+export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, duration, currentDate, split, capacity, resourcesUseableMap, cut_off_time, hasFlexibleDuration, operating_day_boundary, maxBlockThreshold }: {
     resourceIds: number[];
     resourcesMap: any;
     duration: number;
@@ -161,6 +162,7 @@ export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, dur
         type: string;
         time: string;
     } | undefined;
+    maxBlockThreshold?: number | undefined;
 }) => any[];
 /**
  * @title: 获取其他人的已选资源

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

@@ -417,11 +417,16 @@ export var getTimeSlicesByResource = function getTimeSlicesByResource(_ref5) {
     resourcesUseableMap = _ref5$resourcesUseabl === void 0 ? {} : _ref5$resourcesUseabl,
     cut_off_time = _ref5.cut_off_time,
     hasFlexibleDuration = _ref5.hasFlexibleDuration,
-    operating_day_boundary = _ref5.operating_day_boundary;
+    operating_day_boundary = _ref5.operating_day_boundary,
+    maxBlockThreshold = _ref5.maxBlockThreshold;
   var times = resource.times;
 
   // 存储所有时间切片
   var timeSlices = [];
+  // times 先以开始时间为准做个排序，时间早的先循环
+  times.sort(function (a, b) {
+    return dayjs(a.start_at).diff(dayjs(b.start_at), 'minute');
+  });
 
   // 处理每个时间范围
   times.forEach(function (time) {
@@ -467,6 +472,13 @@ export var getTimeSlicesByResource = function getTimeSlicesByResource(_ref5) {
         if (hasFlexibleDuration && operating_day_boundary && timeSlice.start_time >= (operatingBoundaryDateTime || '23:59')) {
           break;
         }
+        // 如果有配置了最低禁止购买时长，则需要判断时间切片是否在最低禁止购买时长内
+        // 看一下endTime和operatingBoundaryDateTime哪个早，哪个早用哪个去比较
+        var operatingBoundaryDateTimeObj = dayjs("".concat(endTime.format('YYYY-MM-DD'), " ").concat(operatingBoundaryDateTime));
+        var earlyTime = endTime.isBefore(operatingBoundaryDateTimeObj) ? endTime : operatingBoundaryDateTimeObj;
+        if (hasFlexibleDuration && operating_day_boundary && maxBlockThreshold && timeSlice.start_at.add(maxBlockThreshold || 0, 'minutes').isAfter(earlyTime)) {
+          break;
+        }
         // 添加时间切片  09:00 ~ 10:00   09:20 ~ 10:20   09:00 ~ 10:00   09:20 ~ 10:20  11:00 ~ 12:00   11:20 ~ 12:20
         timeSlices.push(_objectSpread(_objectSpread({}, timeSlice), {}, {
           // 这里需要补充这个时间段内是否可预约
@@ -574,7 +586,8 @@ export var getTimeSlicesByResources = function getTimeSlicesByResources(_ref6) {
     resourcesUseableMap = _ref6.resourcesUseableMap,
     cut_off_time = _ref6.cut_off_time,
     hasFlexibleDuration = _ref6.hasFlexibleDuration,
-    operating_day_boundary = _ref6.operating_day_boundary;
+    operating_day_boundary = _ref6.operating_day_boundary,
+    maxBlockThreshold = _ref6.maxBlockThreshold;
   // 获取资源列表
   var resources = getResourcesByIds(resourcesMap, resourceIds);
   mergeSubResourcesTimeSlices(resources, resourcesMap);
@@ -599,7 +612,8 @@ export var getTimeSlicesByResources = function getTimeSlicesByResources(_ref6) {
       resourcesUseableMap: resourcesUseableMap,
       cut_off_time: cut_off_time,
       hasFlexibleDuration: hasFlexibleDuration,
-      operating_day_boundary: operating_day_boundary
+      operating_day_boundary: operating_day_boundary,
+      maxBlockThreshold: maxBlockThreshold
     }));
   }, []);
 

package/lib/modules/Cart/index.js

@@ -144,7 +144,8 @@ var CartModule = class extends import_BaseModule.BaseModule {
       resources,
       note,
       date,
-      relationForms
+      relationForms,
+      osWarnTips
     } = params;
     let quantity = params.quantity;
     let tempCartItem = this.store.list.find((i) => i._id === _id);
@@ -202,6 +203,9 @@ var CartModule = class extends import_BaseModule.BaseModule {
     if (note) {
       tempCartItem = (0, import_utils.formatNoteToCartItem)({ cartItem: tempCartItem, note });
     }
+    if (osWarnTips) {
+      tempCartItem.osWarnTips = osWarnTips;
+    }
     return tempCartItem;
   }
   /**

package/lib/modules/Cart/types.d.ts

@@ -110,6 +110,8 @@ export interface CartItem {
     bundle?: any[];
     /** 商品规格信息 */
     options?: any[];
+    /** 商品规格选项字符串 */
+    product_option_string?: string;
     /** 是否为普通商品 */
     isNormalProduct?: boolean;
     /** 资源ID */
@@ -142,8 +144,8 @@ export interface CartItem {
     _bundleOrigin?: any[];
     /** 商品规格原始数据 */
     _optionsOrigin?: any[];
-    /** 商品规格组合字符串，提供给 UI 展示的 */
-    product_option_string?: string;
+    /** 操作系统提示 */
+    osWarnTips?: string[];
 }
 /**
  * 购物车状态接口
@@ -217,6 +219,8 @@ export interface IUpdateItemParams {
     }[];
     /** 商品组合规格ID */
     product_variant_id?: number;
+    /** 操作系统提示 */
+    osWarnTips?: string[];
 }
 /**
  * 折扣

package/lib/modules/Cart/utils/cartDate.js

@@ -56,6 +56,7 @@ var formatDateToCartItemOrigin = (params) => {
   return origin;
 };
 var deleteTimeFromCartItem = (cartItem) => {
+  var _a;
   cartItem.start_date = void 0;
   cartItem.start_time = void 0;
   cartItem.end_date = void 0;
@@ -65,6 +66,7 @@ var deleteTimeFromCartItem = (cartItem) => {
   cartItem._origin.start_time = null;
   cartItem._origin.end_date = null;
   cartItem._origin.end_time = null;
+  cartItem.osWarnTips = (_a = cartItem.osWarnTips) == null ? void 0 : _a.filter((item) => !item.includes("pisell2.product.card.closing-soon.warning"));
   return cartItem;
 };
 // Annotate the CommonJS export names for ESM import in node:

package/lib/modules/Product/types.d.ts

@@ -105,6 +105,11 @@ export interface ProductData {
         type: string;
         /** 值 */
         value: number;
+        flexible_config?: {
+            is_enable_minimum_duration?: 0 | 1;
+            warning_threshold?: number;
+            block_threshold?: number;
+        };
     };
     /** 商品显示设置 */
     product_display_setting: {

package/lib/modules/Schedule/utils.js

@@ -139,7 +139,10 @@ var getDaysByRepeatWeek = (params, isGetRange) => {
   while (startTmp.isBefore(deadline, "day") || startTmp.isSame(deadline, "day")) {
     for (let i = 0; i < frequency_date.length; i++) {
       const item = frequency_date[i];
-      const _start = startTmp.day(item);
+      let _start = startTmp.day(item);
+      if (_start.isBefore(startTmp, "day")) {
+        _start = _start.add(1, "week");
+      }
       let _end = _start.add(scheduleDiff, "second");
       if (_end.isAfter(deadline, "day")) {
         _end = deadline;
@@ -160,7 +163,7 @@ var getDaysByRepeatWeek = (params, isGetRange) => {
         daysArr.push(...getDaysByStartEnd(_start, _end));
       }
     }
-    startTmp = startTmp.day(1).add(frequency, "week");
+    startTmp = startTmp.add(frequency, "week");
   }
   return Array.from(new Set(daysArr));
 };
@@ -585,7 +588,9 @@ function getAllSortedDateRanges(schedules) {
     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)))
+    (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;
 }

package/lib/solution/BookingByStep/index.js

@@ -855,7 +855,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const resourcesMap = (0, import_utils.getResourcesMap)((0, import_lodash_es.cloneDeep)(resources));
     const arr = [];
     cartItems.forEach((cartItem) => {
-      var _a, _b, _c, _d, _e, _f;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
       let selectedResources = [];
       const { currentCapacity, formatCapacity } = (0, import_capacity.getCapacityInfoByCartItem)(cartItem);
       cartItem._origin.metadata.capacity = formatCapacity;
@@ -925,6 +925,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       } else {
         const hasFlexibleDuration = ((_d = (_c = cartItem._productOrigin) == null ? void 0 : _c.duration) == null ? void 0 : _d.type) === "flexible";
         const operating_day_boundary = (_f = (_e = this.shopStore.get("core")) == null ? void 0 : _e.core) == null ? void 0 : _f.operating_day_boundary;
+        const maxBlockThreshold = ((_i = (_h = (_g = cartItem._productOrigin) == null ? void 0 : _g.duration) == null ? void 0 : _h.flexible_config) == null ? void 0 : _i.is_enable_minimum_duration) ? ((_l = (_k = (_j = cartItem._productOrigin) == null ? void 0 : _j.duration) == null ? void 0 : _k.flexible_config) == null ? void 0 : _l.block_threshold) || 0 : 0;
         productResources.forEach((item) => {
           item.renderList = item.renderList.filter((n) => {
             var _a2, _b2, _c2;
@@ -938,7 +939,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               currentDate: dateRange[0].date,
               hasFlexibleDuration,
               cut_off_time: (_c2 = cartItem._productOrigin) == null ? void 0 : _c2.cut_off_time,
-              operating_day_boundary
+              operating_day_boundary,
+              maxBlockThreshold
             });
             return recordCount >= currentCapacity && timeSlots.length > 0;
           });
@@ -1469,7 +1471,17 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         return ((_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.type) === "flexible";
       }
     );
-    const operating_day_boundary = (_h = (_g = this.shopStore.get("core")) == null ? void 0 : _g.core) == null ? void 0 : _h.operating_day_boundary;
+    let operating_day_boundary = (_h = (_g = this.shopStore.get("core")) == null ? void 0 : _g.core) == null ? void 0 : _h.operating_day_boundary;
+    let maxBlockThreshold = 0;
+    if (hasFlexibleDuration) {
+      maxBlockThreshold = cartItems.reduce((max, item) => {
+        var _a2, _b2, _c2, _d2, _e2, _f2;
+        if ((_c2 = (_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.flexible_config) == null ? void 0 : _c2.is_enable_minimum_duration) {
+          return Math.max(max, ((_f2 = (_e2 = (_d2 = item._productOrigin) == null ? void 0 : _d2.duration) == null ? void 0 : _e2.flexible_config) == null ? void 0 : _f2.block_threshold) || 0);
+        }
+        return 0;
+      }, 0);
+    }
     const timeSlots = (0, import_resources.getTimeSlicesByResources)({
       resourceIds,
       resourcesMap,
@@ -1479,7 +1491,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       resourcesUseableMap,
       cut_off_time: maxCutOffTime,
       hasFlexibleDuration,
-      operating_day_boundary
+      operating_day_boundary,
+      maxBlockThreshold
     });
     return timeSlots;
   }
@@ -1506,9 +1519,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       let currentStartTime = timeSlots.start_at.format("YYYY-MM-DD HH:mm");
       accountItems.forEach((item, index) => {
         var _a2;
+        const osWarnTips = [];
         const newResources = (0, import_lodash_es.cloneDeep)(item._origin.resources);
         newResources.forEach((resource) => {
-          var _a3, _b2, _c, _d, _e;
+          var _a3, _b2, _c, _d, _e, _f, _g, _h, _i, _j, _k;
           if (((_b2 = (_a3 = item._productOrigin) == null ? void 0 : _a3.duration) == null ? void 0 : _b2.type) === "flexible") {
             item.duration = {
               type: "minutes",
@@ -1539,14 +1553,20 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               formattedEndTime = (0, import_dayjs.default)(endTime);
             }
             resource.endTime = formattedEndTime.format("YYYY-MM-DD HH:mm");
+            if (((_f = (_e = (_d = item._productOrigin) == null ? void 0 : _d.duration) == null ? void 0 : _e.flexible_config) == null ? void 0 : _f.is_enable_minimum_duration) && (0, import_dayjs.default)(currentStartTime).add(((_i = (_h = (_g = item._productOrigin) == null ? void 0 : _g.duration) == null ? void 0 : _h.flexible_config) == null ? void 0 : _i.warning_threshold) || 0, "minutes").isAfter((0, import_dayjs.default)(formattedEndTime))) {
+              if (!osWarnTips.includes("pisell2.product.card.closing-soon.warning")) {
+                osWarnTips.push("pisell2.product.card.closing-soon.warning");
+              }
+            }
           } else {
             resource.startTime = currentStartTime;
-            resource.endTime = (0, import_dayjs.default)(currentStartTime).add(((_e = (_d = item._productOrigin) == null ? void 0 : _d.duration) == null ? void 0 : _e.value) || 10, "minutes").format("YYYY-MM-DD HH:mm");
+            resource.endTime = (0, import_dayjs.default)(currentStartTime).add(((_k = (_j = item._productOrigin) == null ? void 0 : _j.duration) == null ? void 0 : _k.value) || 10, "minutes").format("YYYY-MM-DD HH:mm");
           }
         });
         this.store.cart.updateItem({
           _id: item._id,
-          resources: newResources
+          resources: newResources,
+          osWarnTips
         });
         if (index < accountItems.length - 1 && ((_a2 = newResources == null ? void 0 : newResources[0]) == null ? void 0 : _a2.resourceType) === "single") {
           currentStartTime = newResources[0].endTime;

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

@@ -79,7 +79,7 @@ export declare const formatResources: ({ booking, resources, }: {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getTimeSlicesByResource: ({ resource, duration, split, currentDate, capacity, resourcesUseableMap, cut_off_time, hasFlexibleDuration, operating_day_boundary, }: {
+export declare const getTimeSlicesByResource: ({ resource, duration, split, currentDate, capacity, resourcesUseableMap, cut_off_time, hasFlexibleDuration, operating_day_boundary, maxBlockThreshold }: {
     resource: ResourceItem;
     duration: number;
     split: number;
@@ -101,6 +101,7 @@ export declare const getTimeSlicesByResource: ({ resource, duration, split, curr
         type: string;
         time: string;
     } | undefined;
+    maxBlockThreshold?: number | undefined;
 }) => TimeSliceItem[];
 /**
  * @title: 获取时间切片列表的交集
@@ -138,7 +139,7 @@ export declare const mergeSubResourcesTimeSlices: (resources: ResourceItem[], re
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, duration, currentDate, split, capacity, resourcesUseableMap, cut_off_time, hasFlexibleDuration, operating_day_boundary, }: {
+export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, duration, currentDate, split, capacity, resourcesUseableMap, cut_off_time, hasFlexibleDuration, operating_day_boundary, maxBlockThreshold }: {
     resourceIds: number[];
     resourcesMap: any;
     duration: number;
@@ -161,6 +162,7 @@ export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, dur
         type: string;
         time: string;
     } | undefined;
+    maxBlockThreshold?: number | undefined;
 }) => any[];
 /**
  * @title: 获取其他人的已选资源

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

@@ -334,10 +334,14 @@ var getTimeSlicesByResource = ({
   resourcesUseableMap = {},
   cut_off_time,
   hasFlexibleDuration,
-  operating_day_boundary
+  operating_day_boundary,
+  maxBlockThreshold
 }) => {
-  const { times } = resource;
+  let { times } = resource;
   const timeSlices = [];
+  times.sort((a, b) => {
+    return (0, import_dayjs.default)(a.start_at).diff((0, import_dayjs.default)(b.start_at), "minute");
+  });
   times.forEach((time) => {
     const startTime = (0, import_dayjs.default)(`${time.start_at}`);
     const endTime = (0, import_dayjs.default)(`${time.end_at}`);
@@ -369,6 +373,11 @@ var getTimeSlicesByResource = ({
         if (hasFlexibleDuration && operating_day_boundary && timeSlice.start_time >= (operatingBoundaryDateTime || "23:59")) {
           break;
         }
+        const operatingBoundaryDateTimeObj = (0, import_dayjs.default)(`${endTime.format("YYYY-MM-DD")} ${operatingBoundaryDateTime}`);
+        const earlyTime = endTime.isBefore(operatingBoundaryDateTimeObj) ? endTime : operatingBoundaryDateTimeObj;
+        if (hasFlexibleDuration && operating_day_boundary && maxBlockThreshold && timeSlice.start_at.add(maxBlockThreshold || 0, "minutes").isAfter(earlyTime)) {
+          break;
+        }
         timeSlices.push({
           ...timeSlice,
           // 这里需要补充这个时间段内是否可预约
@@ -428,7 +437,8 @@ var getTimeSlicesByResources = ({
   resourcesUseableMap,
   cut_off_time,
   hasFlexibleDuration,
-  operating_day_boundary
+  operating_day_boundary,
+  maxBlockThreshold
 }) => {
   let resources = getResourcesByIds(resourcesMap, resourceIds);
   mergeSubResourcesTimeSlices(resources, resourcesMap);
@@ -454,7 +464,8 @@ var getTimeSlicesByResources = ({
           resourcesUseableMap,
           cut_off_time,
           hasFlexibleDuration,
-          operating_day_boundary
+          operating_day_boundary,
+          maxBlockThreshold
         })
       );
     },

package/package.json

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