@pisell/pisellos 0.0.492 → 0.0.494

package/dist/model/strategy/adapter/promotion/index.js

@@ -0,0 +1,9 @@
+// 导出评估器
+export { PromotionEvaluator } from "./evaluator";
+
+// 导出适配器
+export { PromotionAdapter } from "./adapter";
+export { default } from "./adapter";
+
+// 导出策略配置示例常量
+export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY } from "./examples";

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

@@ -382,6 +382,7 @@ export var formatBundleToOrigin = function formatBundleToOrigin(bundle) {
       option: formatOptionsToOrigin(getBundleValueByKey('option')),
       discount_list: d.discount_list,
       "bundle_selling_price": d === null || d === void 0 ? void 0 : d.price,
+      "custom_price": d === null || d === void 0 ? void 0 : d.price,
       metadata: {
         custom_product_bundle_map_id: d._id,
         product_discount_difference: product_discount_difference

package/dist/modules/Order/index.d.ts

@@ -15,6 +15,11 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private cacheId;
     private salesSummaryModuleName;
     private rulesHooksOverride?;
+    /**
+     * Populate `savedAmount` on each discount based on product-level discount details.
+     * Only selected discounts get a non-zero value.
+     */
+    static populateSavedAmounts(productList: Array<Record<string, any>>, discountList: Array<Record<string, any>>): void;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     /**

package/dist/modules/Order/index.js

@@ -1,4 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -185,7 +186,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             original_price: values.original_price !== undefined ? String(values.original_price) : product.original_price,
             discount_list: (_values$discount_list = values.discount_list) !== null && _values$discount_list !== void 0 ? _values$discount_list : product.discount_list,
             num: (_values$quantity = values.quantity) !== null && _values$quantity !== void 0 ? _values$quantity : product.num,
-            product_bundle: (_values$bundle = values.bundle) !== null && _values$bundle !== void 0 ? _values$bundle : product.product_bundle
+            product_bundle: (_values$bundle = values.bundle) !== null && _values$bundle !== void 0 ? _values$bundle : product.product_bundle,
+            metadata: _objectSpread(_objectSpread({}, product.metadata || {}), values.main_product_selling_price !== undefined ? {
+              main_product_selling_price: String(values.main_product_selling_price)
+            } : {})
           });
         }
       };
@@ -361,6 +365,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       if (result !== null && result !== void 0 && result.discountList) {
         var _this$store$discount7;
+        OrderModule.populateSavedAmounts(result.productList || tempOrder.products, result.discountList);
         (_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 || _this$store$discount7.setDiscountList(result.discountList);
         tempOrder.discount_list = result.discountList.filter(function (d) {
           return d.isSelected;
@@ -671,23 +676,32 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "removeProductFromOrder",
     value: function () {
       var _removeProductFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(identity) {
-        var tempOrder;
+        var tempOrder, beforeProducts, removedByStrictIdentity;
         return _regeneratorRuntime().wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
+              beforeProducts = tempOrder.products;
               tempOrder.products = tempOrder.products.filter(function (item) {
                 return !isIdentityMatch(item, identity);
               });
+              removedByStrictIdentity = beforeProducts.length - tempOrder.products.length;
+              if (removedByStrictIdentity === 0 && identity.identity_key) {
+                tempOrder.products = tempOrder.products.filter(function (item) {
+                  var isSameProduct = String(item.product_id) === String(identity.product_id) && String(item.product_variant_id) === String(identity.product_variant_id);
+                  var hasNoIdentityKey = !item.identity_key;
+                  return !(isSameProduct && hasNoIdentityKey);
+                });
+              }
               this.applyDiscount();
-              _context9.next = 5;
+              _context9.next = 8;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 5:
+            case 8:
               this.persistTempOrder();
               return _context9.abrupt("return", tempOrder.products);
-            case 7:
+            case 10:
             case "end":
               return _context9.stop();
           }
@@ -1072,6 +1086,57 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       return scanOrderMore;
     }()
+  }], [{
+    key: "populateSavedAmounts",
+    value:
+    /**
+     * Populate `savedAmount` on each discount based on product-level discount details.
+     * Only selected discounts get a non-zero value.
+     */
+    function populateSavedAmounts(productList, discountList) {
+      var savedMap = new Map();
+      var _iterator = _createForOfIteratorHelper(productList),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var product = _step.value;
+          var qty = product.num || 1;
+          var _iterator3 = _createForOfIteratorHelper(product.discount_list || []),
+            _step3;
+          try {
+            for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+              var _pd$discount, _pd$metadata;
+              var pd = _step3.value;
+              var discountKey = ((_pd$discount = pd.discount) === null || _pd$discount === void 0 ? void 0 : _pd$discount.resource_id) || pd.id;
+              if (discountKey == null) continue;
+              var amount = new Decimal(pd.amount || 0).times(qty).plus(((_pd$metadata = pd.metadata) === null || _pd$metadata === void 0 ? void 0 : _pd$metadata.product_discount_difference) || 0);
+              savedMap.set(discountKey, (savedMap.get(discountKey) || new Decimal(0)).plus(amount));
+            }
+          } catch (err) {
+            _iterator3.e(err);
+          } finally {
+            _iterator3.f();
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      var _iterator2 = _createForOfIteratorHelper(discountList),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var d = _step2.value;
+          var key = d.id;
+          d.savedAmount = d.isSelected && key != null && savedMap.has(key) ? savedMap.get(key).toNumber() : 0;
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+    }
   }]);
   return OrderModule;
 }(BaseModule);

package/dist/modules/Order/utils.js

@@ -114,6 +114,16 @@ function normalizeSubmitProduct(product) {
   if (rawMetadata.unique_identification_number) {
     cleanMetadata.unique_identification_number = rawMetadata.unique_identification_number;
   }
+  var priceMetaKeys = ['main_product_original_price', 'main_product_selling_price', 'source_product_price'];
+  for (var _i = 0, _priceMetaKeys = priceMetaKeys; _i < _priceMetaKeys.length; _i++) {
+    var key = _priceMetaKeys[_i];
+    if (rawMetadata[key] !== undefined) {
+      cleanMetadata[key] = rawMetadata[key];
+    }
+  }
+  if (rawMetadata.price_breakdown) {
+    cleanMetadata.price_breakdown = rawMetadata.price_breakdown;
+  }
   return _objectSpread(_objectSpread(_objectSpread({}, submitProduct), bookingUid ? {
     booking_uid: bookingUid
   } : {}), {}, {
@@ -128,8 +138,8 @@ function resolveTableOccupancyDuration(tempOrder) {
   var _metadata$table_confi, _metadata$tableConfig, _metadata$resource_co, _metadata$resourceCon;
   var metadata = tempOrder.metadata || {};
   var candidates = [metadata.table_occupancy_duration, metadata.booking_duration, metadata.table_duration, metadata.duration, (_metadata$table_confi = metadata.table_config) === null || _metadata$table_confi === void 0 ? void 0 : _metadata$table_confi.occupancy_duration, (_metadata$tableConfig = metadata.tableConfig) === null || _metadata$tableConfig === void 0 ? void 0 : _metadata$tableConfig.occupancy_duration, (_metadata$resource_co = metadata.resource_config) === null || _metadata$resource_co === void 0 ? void 0 : _metadata$resource_co.occupancy_duration, (_metadata$resourceCon = metadata.resourceConfig) === null || _metadata$resourceCon === void 0 ? void 0 : _metadata$resourceCon.occupancy_duration];
-  for (var _i = 0, _candidates = candidates; _i < _candidates.length; _i++) {
-    var value = _candidates[_i];
+  for (var _i2 = 0, _candidates = candidates; _i2 < _candidates.length; _i2++) {
+    var value = _candidates[_i2];
     var duration = Number(value);
     if (Number.isFinite(duration) && duration > 0) {
       return Math.floor(duration);

package/dist/modules/Quotation/index.d.ts

@@ -1,5 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
+import type { ScheduleItem } from '../Schedule/types';
 import type { QuotationItem } from './types';
 export type { QuotationItem, QuotationProductData, QuotationSchedule, QuotationState } from './types';
 export declare class QuotationModule extends BaseModule implements Module {
@@ -7,6 +8,7 @@ export declare class QuotationModule extends BaseModule implements Module {
     protected defaultVersion: string;
     private request;
     private store;
+    private scheduleResolver?;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     loadQuotations(params?: {
@@ -26,6 +28,11 @@ export declare class QuotationModule extends BaseModule implements Module {
         variantId?: number;
         datetime: string;
     }): string | null;
+    getQuotationShelfId(params: {
+        productId: number;
+        variantId?: number;
+        datetime: string;
+    }): number;
     /**
      * Batch pre-compute quotation prices for a set of products across multiple time points.
      * Key format: `${productId}:${timePoint}`
@@ -35,6 +42,7 @@ export declare class QuotationModule extends BaseModule implements Module {
         productIds: number[];
         timePoints: string[];
     }): Map<string, string | null>;
+    setScheduleResolver(resolver: (id: number) => ScheduleItem | undefined): void;
     private isQuotationActiveAt;
     private findProductData;
 }

package/dist/modules/Quotation/index.js

@@ -35,6 +35,7 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "store", {
       list: []
     });
+    _defineProperty(_assertThisInitialized(_this), "scheduleResolver", void 0);
     return _this;
   }
   _createClass(QuotationModule, [{
@@ -137,6 +138,29 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
       }
       return null;
     }
+  }, {
+    key: "getQuotationShelfId",
+    value: function getQuotationShelfId(params) {
+      var productId = params.productId,
+        variantId = params.variantId,
+        datetime = params.datetime;
+      var _iterator2 = _createForOfIteratorHelper(this.store.list),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var quotation = _step2.value;
+          if (!this.isQuotationActiveAt(quotation, datetime)) continue;
+          var match = this.findProductData(quotation.product_data, productId, variantId);
+          if (!match || match.value === 0) continue;
+          return quotation.id;
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+      return 0;
+    }
 
     /**
      * Batch pre-compute quotation prices for a set of products across multiple time points.
@@ -148,16 +172,16 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
     value: function buildProductPriceMap(params) {
       var map = new Map();
       if (!this.store.list.length) return map;
-      var _iterator2 = _createForOfIteratorHelper(params.productIds),
-        _step2;
+      var _iterator3 = _createForOfIteratorHelper(params.productIds),
+        _step3;
       try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var productId = _step2.value;
-          var _iterator3 = _createForOfIteratorHelper(params.timePoints),
-            _step3;
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var productId = _step3.value;
+          var _iterator4 = _createForOfIteratorHelper(params.timePoints),
+            _step4;
           try {
-            for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-              var timePoint = _step3.value;
+            for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+              var timePoint = _step4.value;
               var key = "".concat(productId, ":").concat(timePoint);
               var price = this.getPriceForProduct({
                 productId: productId,
@@ -168,24 +192,33 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
               }
             }
           } catch (err) {
-            _iterator3.e(err);
+            _iterator4.e(err);
           } finally {
-            _iterator3.f();
+            _iterator4.f();
           }
         }
       } catch (err) {
-        _iterator2.e(err);
+        _iterator3.e(err);
       } finally {
-        _iterator2.f();
+        _iterator3.f();
       }
       return map;
     }
+  }, {
+    key: "setScheduleResolver",
+    value: function setScheduleResolver(resolver) {
+      this.scheduleResolver = resolver;
+    }
   }, {
     key: "isQuotationActiveAt",
     value: function isQuotationActiveAt(quotation, datetime) {
-      var _quotation$schedule;
+      var _quotation$schedule,
+        _this2 = this;
       if (!((_quotation$schedule = quotation.schedule) !== null && _quotation$schedule !== void 0 && _quotation$schedule.length)) return false;
       var scheduleItems = quotation.schedule.map(function (s) {
+        var _this2$scheduleResolv;
+        var full = (_this2$scheduleResolv = _this2.scheduleResolver) === null || _this2$scheduleResolv === void 0 ? void 0 : _this2$scheduleResolv.call(_this2, s.id);
+        if (full) return full;
         return _objectSpread(_objectSpread({}, s), {}, {
           repeat_type: s.repeat_type || 'none',
           repeat_rule: s.repeat_rule || null,

package/dist/modules/Schedule/getDateIsInSchedule.js

@@ -60,8 +60,8 @@ var isInStandardSchedule = function isInStandardSchedule(targetDate, targetDateS
   var startDate = dayjs(schedule.start_time);
   var endDate = dayjs(schedule.end_time);
 
-  // 先检查是否在基础时间范围内（不考虑重复）
-  var isInBasicRange = targetDate.isSameOrAfter(startDate) && targetDate.isSameOrBefore(endDate);
+  // 先检查是否在基础时间范围内（不考虑重复），end 为开区间
+  var isInBasicRange = targetDate.isSameOrAfter(startDate) && targetDate.isBefore(endDate);
   if (schedule.repeat_type === 'none') {
     return isInBasicRange;
   }
@@ -75,24 +75,18 @@ var isInTimeSlotsSchedule = function isInTimeSlotsSchedule(targetDate, targetDat
   if (!schedule.start_time) {
     return false;
   }
-  var scheduleDate = schedule.start_time.split(' ')[0];
-
-  // 检查日期是否匹配
-  if (targetDateString !== scheduleDate) {
+  var scheduleStartDate = dayjs(schedule.start_time.split(' ')[0]);
+  if (!isDateInTimeSlotsSchedule(targetDate, schedule, scheduleStartDate)) {
     return false;
   }
-
-  // 检查是否在任一时间段内
   var _iterator2 = _createForOfIteratorHelper(schedule.time_slot),
     _step2;
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var timeSlot = _step2.value;
-      var slotStart = "".concat(scheduleDate, " ").concat(timeSlot.start_time, ":00");
-      var slotEnd = "".concat(scheduleDate, " ").concat(timeSlot.end_time, ":00");
-      var slotStartDate = dayjs(slotStart);
-      var slotEndDate = dayjs(slotEnd);
-      if (targetDate.isSameOrAfter(slotStartDate) && targetDate.isSameOrBefore(slotEndDate)) {
+      var slotStart = dayjs("".concat(targetDateString, " ").concat(timeSlot.start_time, ":00"));
+      var slotEnd = dayjs("".concat(targetDateString, " ").concat(timeSlot.end_time, ":00"));
+      if (targetDate.isSameOrAfter(slotStart) && targetDate.isBefore(slotEnd)) {
         return true;
       }
     }
@@ -120,7 +114,7 @@ var isInDesignationSchedule = function isInDesignationSchedule(targetDate, targe
       var endDateTime = "".concat(designation.end_date, " ").concat(designation.end_time, ":00");
       var startDate = dayjs(startDateTime);
       var endDate = dayjs(endDateTime);
-      if (targetDate.isSameOrAfter(startDate) && targetDate.isSameOrBefore(endDate)) {
+      if (targetDate.isSameOrAfter(startDate) && targetDate.isBefore(endDate)) {
         return true;
       }
     }
@@ -218,9 +212,8 @@ var isInDailyRepeat = function isInDailyRepeat(targetDate, startDate, endDate, r
   var startTimeOfDay = startDate.hour() * 3600 + startDate.minute() * 60 + startDate.second();
   var endTimeOfDay = endDate.hour() * 3600 + endDate.minute() * 60 + endDate.second();
 
-  // 每日重复：每天都在相同的时间段内有效
-  // 例如：01:00:00 - 16:00:00，每天都是这个时间段
-  return targetTimeOfDay >= startTimeOfDay && targetTimeOfDay <= endTimeOfDay;
+  // 每日重复：每天都在相同的时间段内有效 [start, end)
+  return targetTimeOfDay >= startTimeOfDay && targetTimeOfDay < endTimeOfDay;
 };
 
 // 每周重复逻辑
@@ -247,7 +240,7 @@ var isInWeeklyRepeat = function isInWeeklyRepeat(targetDate, startDate, endDate,
   var targetTimeOfDay = targetDate.hour() * 3600 + targetDate.minute() * 60 + targetDate.second();
   var startTimeOfDay = startDate.hour() * 3600 + startDate.minute() * 60 + startDate.second();
   var endTimeOfDay = endDate.hour() * 3600 + endDate.minute() * 60 + endDate.second();
-  return targetTimeOfDay >= startTimeOfDay && targetTimeOfDay <= endTimeOfDay;
+  return targetTimeOfDay >= startTimeOfDay && targetTimeOfDay < endTimeOfDay;
 };
 
 // 日程时间段类型

package/dist/solution/BookingByStep/index.js

@@ -2010,7 +2010,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               return n.code === resources_code;
             })) === null || _productResources$fin === void 0 ? void 0 : _productResources$fin.renderList;
             if (targetRenderList && targetRenderList.length > 0) {
-              var _item$_origin$resourc2;
+              var _item$_origin$resourc2, _dateRange$5, _item$duration2, _item$_productOrigin6;
               // 如果购物车里已经有同类型的 form_id 的资源了，则不处理
               if ((_item$_origin$resourc2 = item._origin.resources) !== null && _item$_origin$resourc2 !== void 0 && _item$_origin$resourc2.some(function (n) {
                 return n.form_id === targetRenderList[0].form_id;
@@ -2020,7 +2020,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               var fastestResource = findFastestAvailableResource({
                 resources: targetRenderList,
                 currentCapacity: currentCapacity,
-                countMap: selectResourcesMap
+                countMap: selectResourcesMap,
+                targetDate: dateRange === null || dateRange === void 0 || (_dateRange$5 = dateRange[0]) === null || _dateRange$5 === void 0 ? void 0 : _dateRange$5.date,
+                durationMinutes: (item === null || item === void 0 || (_item$duration2 = item.duration) === null || _item$duration2 === void 0 ? void 0 : _item$duration2.value) || (item === null || item === void 0 || (_item$_productOrigin6 = item._productOrigin) === null || _item$_productOrigin6 === void 0 || (_item$_productOrigin6 = _item$_productOrigin6.duration) === null || _item$_productOrigin6 === void 0 ? void 0 : _item$_productOrigin6.value) || 10
               });
               var targetResource = fastestResource || targetRenderList[0];
               targetResource.capacity = currentCapacity;
@@ -2086,8 +2088,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var maxCutOffTime = undefined;
       var maxCutOffTimeValue = dayjs();
       cartItems.forEach(function (item) {
-        var _item$_productOrigin6, _item$_productOrigin7, _item$_productOrigin8, _item$_productOrigin9;
-        (_item$_productOrigin6 = item._productOrigin) === null || _item$_productOrigin6 === void 0 || (_item$_productOrigin6 = _item$_productOrigin6.product_resource) === null || _item$_productOrigin6 === void 0 || (_item$_productOrigin6 = _item$_productOrigin6.resources) === null || _item$_productOrigin6 === void 0 || _item$_productOrigin6.forEach(function (n) {
+        var _item$_productOrigin7, _item$_productOrigin8, _item$_productOrigin9, _item$_productOrigin10;
+        (_item$_productOrigin7 = item._productOrigin) === null || _item$_productOrigin7 === void 0 || (_item$_productOrigin7 = _item$_productOrigin7.product_resource) === null || _item$_productOrigin7 === void 0 || (_item$_productOrigin7 = _item$_productOrigin7.resources) === null || _item$_productOrigin7 === void 0 || _item$_productOrigin7.forEach(function (n) {
           // TODO： 少了个 status 的判断
           if (n.code === resources_code) {
             resources.push.apply(resources, _toConsumableArray(n.renderList || []));
@@ -2100,10 +2102,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         if (item.resource_id && !resourceIds.includes(item.resource_id)) {
           resourceIds.push(item.resource_id);
         }
-        resourcesTypeId = item === null || item === void 0 || (_item$_productOrigin7 = item._productOrigin) === null || _item$_productOrigin7 === void 0 || (_item$_productOrigin7 = _item$_productOrigin7.product_resource) === null || _item$_productOrigin7 === void 0 || (_item$_productOrigin7 = _item$_productOrigin7.resources) === null || _item$_productOrigin7 === void 0 || (_item$_productOrigin7 = _item$_productOrigin7.find(function (n) {
+        resourcesTypeId = item === null || item === void 0 || (_item$_productOrigin8 = item._productOrigin) === null || _item$_productOrigin8 === void 0 || (_item$_productOrigin8 = _item$_productOrigin8.product_resource) === null || _item$_productOrigin8 === void 0 || (_item$_productOrigin8 = _item$_productOrigin8.resources) === null || _item$_productOrigin8 === void 0 || (_item$_productOrigin8 = _item$_productOrigin8.find(function (n) {
           return n.code === resources_code;
-        })) === null || _item$_productOrigin7 === void 0 ? void 0 : _item$_productOrigin7.id;
-        if ((_item$_productOrigin8 = item._productOrigin) !== null && _item$_productOrigin8 !== void 0 && _item$_productOrigin8.cut_off_time && ((_item$_productOrigin9 = item._productOrigin) === null || _item$_productOrigin9 === void 0 ? void 0 : _item$_productOrigin9.cut_off_time.type) === 'advance') {
+        })) === null || _item$_productOrigin8 === void 0 ? void 0 : _item$_productOrigin8.id;
+        if ((_item$_productOrigin9 = item._productOrigin) !== null && _item$_productOrigin9 !== void 0 && _item$_productOrigin9.cut_off_time && ((_item$_productOrigin10 = item._productOrigin) === null || _item$_productOrigin10 === void 0 ? void 0 : _item$_productOrigin10.cut_off_time.type) === 'advance') {
           var currentCutOffTime = dayjs().add(item._productOrigin.cut_off_time.unit, item._productOrigin.cut_off_time.unit_type);
           if (currentCutOffTime.isAfter(maxCutOffTimeValue, 'minute')) {
             maxCutOffTimeValue = currentCutOffTime;
@@ -2153,13 +2155,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         cartItems.forEach(function (item) {
           // 单个预约累加账号 多个预约取最大值
           if (isSingleResource) {
-            var _item$_productOrigin10;
-            accountDuration += ((_item$_productOrigin10 = item._productOrigin) === null || _item$_productOrigin10 === void 0 || (_item$_productOrigin10 = _item$_productOrigin10.duration) === null || _item$_productOrigin10 === void 0 ? void 0 : _item$_productOrigin10.value) || 10;
-          } else {
             var _item$_productOrigin11;
-            if (accountDuration < (((_item$_productOrigin11 = item._productOrigin) === null || _item$_productOrigin11 === void 0 || (_item$_productOrigin11 = _item$_productOrigin11.duration) === null || _item$_productOrigin11 === void 0 ? void 0 : _item$_productOrigin11.value) || 10)) {
-              var _item$_productOrigin12;
-              accountDuration = ((_item$_productOrigin12 = item._productOrigin) === null || _item$_productOrigin12 === void 0 || (_item$_productOrigin12 = _item$_productOrigin12.duration) === null || _item$_productOrigin12 === void 0 ? void 0 : _item$_productOrigin12.value) || 10;
+            accountDuration += ((_item$_productOrigin11 = item._productOrigin) === null || _item$_productOrigin11 === void 0 || (_item$_productOrigin11 = _item$_productOrigin11.duration) === null || _item$_productOrigin11 === void 0 ? void 0 : _item$_productOrigin11.value) || 10;
+          } else {
+            var _item$_productOrigin12;
+            if (accountDuration < (((_item$_productOrigin12 = item._productOrigin) === null || _item$_productOrigin12 === void 0 || (_item$_productOrigin12 = _item$_productOrigin12.duration) === null || _item$_productOrigin12 === void 0 ? void 0 : _item$_productOrigin12.value) || 10)) {
+              var _item$_productOrigin13;
+              accountDuration = ((_item$_productOrigin13 = item._productOrigin) === null || _item$_productOrigin13 === void 0 || (_item$_productOrigin13 = _item$_productOrigin13.duration) === null || _item$_productOrigin13 === void 0 ? void 0 : _item$_productOrigin13.value) || 10;
             }
           }
         });
@@ -2196,8 +2198,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       }
       var resourcesUseableMap = {};
       var hasFlexibleDuration = cartItems.some(function (item) {
-        var _item$_productOrigin13;
-        return ((_item$_productOrigin13 = item._productOrigin) === null || _item$_productOrigin13 === void 0 || (_item$_productOrigin13 = _item$_productOrigin13.duration) === null || _item$_productOrigin13 === void 0 ? void 0 : _item$_productOrigin13.type) === 'flexible';
+        var _item$_productOrigin14;
+        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;
 
@@ -2205,11 +2207,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var maxBlockThreshold = 0;
       if (hasFlexibleDuration) {
         maxBlockThreshold = cartItems.reduce(function (max, item) {
-          var _item$_productOrigin14;
+          var _item$_productOrigin15;
           // 如果开启了灵活时长商品配置，则取 block_threshold 的值
-          if ((_item$_productOrigin14 = item._productOrigin) !== null && _item$_productOrigin14 !== void 0 && (_item$_productOrigin14 = _item$_productOrigin14.duration) !== null && _item$_productOrigin14 !== void 0 && (_item$_productOrigin14 = _item$_productOrigin14.flexible_config) !== null && _item$_productOrigin14 !== void 0 && _item$_productOrigin14.is_enable_minimum_duration) {
-            var _item$_productOrigin15;
-            return Math.max(max, ((_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 ? void 0 : _item$_productOrigin15.block_threshold) || 0);
+          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);
@@ -2301,8 +2303,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               maxCutOffTime = undefined;
               maxCutOffTimeValue = dayjs();
               cartItems.forEach(function (item) {
-                var _item$_productOrigin16, _item$_productOrigin17, _item$_productOrigin18, _item$_productOrigin19;
-                (_item$_productOrigin16 = item._productOrigin) === null || _item$_productOrigin16 === void 0 || (_item$_productOrigin16 = _item$_productOrigin16.product_resource) === null || _item$_productOrigin16 === void 0 || (_item$_productOrigin16 = _item$_productOrigin16.resources) === null || _item$_productOrigin16 === void 0 || _item$_productOrigin16.forEach(function (n) {
+                var _item$_productOrigin17, _item$_productOrigin18, _item$_productOrigin19, _item$_productOrigin20;
+                (_item$_productOrigin17 = item._productOrigin) === null || _item$_productOrigin17 === void 0 || (_item$_productOrigin17 = _item$_productOrigin17.product_resource) === null || _item$_productOrigin17 === void 0 || (_item$_productOrigin17 = _item$_productOrigin17.resources) === null || _item$_productOrigin17 === void 0 || _item$_productOrigin17.forEach(function (n) {
                   // TODO： 少了个 status 的判断
                   if (n.code === resources_code) {
                     resources.push.apply(resources, _toConsumableArray(n.renderList || []));
@@ -2315,10 +2317,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 if (item.resource_id && !resourceIds.includes(item.resource_id)) {
                   resourceIds.push(item.resource_id);
                 }
-                resourcesTypeId = item === null || item === void 0 || (_item$_productOrigin17 = item._productOrigin) === null || _item$_productOrigin17 === void 0 || (_item$_productOrigin17 = _item$_productOrigin17.product_resource) === null || _item$_productOrigin17 === void 0 || (_item$_productOrigin17 = _item$_productOrigin17.resources) === null || _item$_productOrigin17 === void 0 || (_item$_productOrigin17 = _item$_productOrigin17.find(function (n) {
+                resourcesTypeId = item === null || item === void 0 || (_item$_productOrigin18 = item._productOrigin) === null || _item$_productOrigin18 === void 0 || (_item$_productOrigin18 = _item$_productOrigin18.product_resource) === null || _item$_productOrigin18 === void 0 || (_item$_productOrigin18 = _item$_productOrigin18.resources) === null || _item$_productOrigin18 === void 0 || (_item$_productOrigin18 = _item$_productOrigin18.find(function (n) {
                   return n.code === resources_code;
-                })) === null || _item$_productOrigin17 === void 0 ? void 0 : _item$_productOrigin17.id;
-                if ((_item$_productOrigin18 = item._productOrigin) !== null && _item$_productOrigin18 !== void 0 && _item$_productOrigin18.cut_off_time && ((_item$_productOrigin19 = item._productOrigin) === null || _item$_productOrigin19 === void 0 ? void 0 : _item$_productOrigin19.cut_off_time.type) === 'advance') {
+                })) === null || _item$_productOrigin18 === void 0 ? void 0 : _item$_productOrigin18.id;
+                if ((_item$_productOrigin19 = item._productOrigin) !== null && _item$_productOrigin19 !== void 0 && _item$_productOrigin19.cut_off_time && ((_item$_productOrigin20 = item._productOrigin) === null || _item$_productOrigin20 === void 0 ? void 0 : _item$_productOrigin20.cut_off_time.type) === 'advance') {
                   var currentCutOffTime = dayjs().add(item._productOrigin.cut_off_time.unit, item._productOrigin.cut_off_time.unit_type);
                   if (currentCutOffTime.isAfter(maxCutOffTimeValue, 'minute')) {
                     maxCutOffTimeValue = currentCutOffTime;
@@ -2341,13 +2343,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 cartItems.forEach(function (item) {
                   // 单个预约累加账号 多个预约取最大值
                   if (isSingleResource) {
-                    var _item$_productOrigin20;
-                    accountDuration += ((_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;
-                  } else {
                     var _item$_productOrigin21;
-                    if (accountDuration < (((_item$_productOrigin21 = item._productOrigin) === null || _item$_productOrigin21 === void 0 || (_item$_productOrigin21 = _item$_productOrigin21.duration) === null || _item$_productOrigin21 === void 0 ? void 0 : _item$_productOrigin21.value) || 10)) {
-                      var _item$_productOrigin22;
-                      accountDuration = ((_item$_productOrigin22 = item._productOrigin) === null || _item$_productOrigin22 === void 0 || (_item$_productOrigin22 = _item$_productOrigin22.duration) === null || _item$_productOrigin22 === void 0 ? void 0 : _item$_productOrigin22.value) || 10;
+                    accountDuration += ((_item$_productOrigin21 = item._productOrigin) === null || _item$_productOrigin21 === void 0 || (_item$_productOrigin21 = _item$_productOrigin21.duration) === null || _item$_productOrigin21 === void 0 ? void 0 : _item$_productOrigin21.value) || 10;
+                  } else {
+                    var _item$_productOrigin22;
+                    if (accountDuration < (((_item$_productOrigin22 = item._productOrigin) === null || _item$_productOrigin22 === void 0 || (_item$_productOrigin22 = _item$_productOrigin22.duration) === null || _item$_productOrigin22 === void 0 ? void 0 : _item$_productOrigin22.value) || 10)) {
+                      var _item$_productOrigin23;
+                      accountDuration = ((_item$_productOrigin23 = item._productOrigin) === null || _item$_productOrigin23 === void 0 || (_item$_productOrigin23 = _item$_productOrigin23.duration) === null || _item$_productOrigin23 === void 0 ? void 0 : _item$_productOrigin23.value) || 10;
                     }
                   }
                 });
@@ -2373,18 +2375,18 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             case 20:
               resourcesUseableMap = {};
               hasFlexibleDuration = cartItems.some(function (item) {
-                var _item$_productOrigin23;
-                return ((_item$_productOrigin23 = item._productOrigin) === null || _item$_productOrigin23 === void 0 || (_item$_productOrigin23 = _item$_productOrigin23.duration) === null || _item$_productOrigin23 === void 0 ? void 0 : _item$_productOrigin23.type) === 'flexible';
+                var _item$_productOrigin24;
+                return ((_item$_productOrigin24 = item._productOrigin) === null || _item$_productOrigin24 === void 0 || (_item$_productOrigin24 = _item$_productOrigin24.duration) === null || _item$_productOrigin24 === void 0 ? void 0 : _item$_productOrigin24.type) === 'flexible';
               });
               operating_day_boundary = (_this$shopStore$get2 = this.shopStore.get('core')) === null || _this$shopStore$get2 === void 0 || (_this$shopStore$get2 = _this$shopStore$get2.core) === null || _this$shopStore$get2 === void 0 ? void 0 : _this$shopStore$get2.operating_day_boundary; // 如果有 hasFlexibleDuration，需要把动态时长商品（可能是多个，取最长的那个最低禁止购买时长）的最低禁止购买时长作为 split 的值
               maxBlockThreshold = 0;
               if (hasFlexibleDuration) {
                 maxBlockThreshold = cartItems.reduce(function (max, item) {
-                  var _item$_productOrigin24;
+                  var _item$_productOrigin25;
                   // 如果开启了灵活时长商品配置，则取 block_threshold 的值
-                  if ((_item$_productOrigin24 = item._productOrigin) !== null && _item$_productOrigin24 !== void 0 && (_item$_productOrigin24 = _item$_productOrigin24.duration) !== null && _item$_productOrigin24 !== void 0 && (_item$_productOrigin24 = _item$_productOrigin24.flexible_config) !== null && _item$_productOrigin24 !== void 0 && _item$_productOrigin24.is_enable_minimum_duration) {
-                    var _item$_productOrigin25;
-                    return Math.max(max, ((_item$_productOrigin25 = item._productOrigin) === null || _item$_productOrigin25 === void 0 || (_item$_productOrigin25 = _item$_productOrigin25.duration) === null || _item$_productOrigin25 === void 0 || (_item$_productOrigin25 = _item$_productOrigin25.flexible_config) === null || _item$_productOrigin25 === void 0 ? void 0 : _item$_productOrigin25.block_threshold) || 0);
+                  if ((_item$_productOrigin25 = item._productOrigin) !== null && _item$_productOrigin25 !== void 0 && (_item$_productOrigin25 = _item$_productOrigin25.duration) !== null && _item$_productOrigin25 !== void 0 && (_item$_productOrigin25 = _item$_productOrigin25.flexible_config) !== null && _item$_productOrigin25 !== void 0 && _item$_productOrigin25.is_enable_minimum_duration) {
+                    var _item$_productOrigin26;
+                    return Math.max(max, ((_item$_productOrigin26 = item._productOrigin) === null || _item$_productOrigin26 === void 0 || (_item$_productOrigin26 = _item$_productOrigin26.duration) === null || _item$_productOrigin26 === void 0 || (_item$_productOrigin26 = _item$_productOrigin26.flexible_config) === null || _item$_productOrigin26 === void 0 ? void 0 : _item$_productOrigin26.block_threshold) || 0);
                   }
                   return 0;
                 }, 0);
@@ -2545,10 +2547,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           var osWarnTips = [];
           var newResources = cloneDeep(item._origin.resources);
           newResources.forEach(function (resource) {
-            var _item$_productOrigin26;
+            var _item$_productOrigin27;
             // 如果商品配置的是灵活时长，开始时间设置为提交的时间，结束时间从资源的可用最晚时间和店铺营业结束时间里取一个最早的
-            if (((_item$_productOrigin26 = item._productOrigin) === null || _item$_productOrigin26 === void 0 || (_item$_productOrigin26 = _item$_productOrigin26.duration) === null || _item$_productOrigin26 === void 0 ? void 0 : _item$_productOrigin26.type) === 'flexible') {
-              var _allResources$find, _item$_productOrigin27, _item$_productOrigin28;
+            if (((_item$_productOrigin27 = item._productOrigin) === null || _item$_productOrigin27 === void 0 || (_item$_productOrigin27 = _item$_productOrigin27.duration) === null || _item$_productOrigin27 === void 0 ? void 0 : _item$_productOrigin27.type) === 'flexible') {
+              var _allResources$find, _item$_productOrigin28, _item$_productOrigin29;
               item.duration = {
                 type: 'minutes',
                 value: 10
@@ -2631,15 +2633,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               resource.endTime = formattedEndTime.format('YYYY-MM-DD HH:mm');
               // 如果是动态时长商品，并且当前选择的时间的结束时间小于了最低提示时长（warningThreshold），则追加一个提示
               // 如果currentStartTime + warningThreshold 大于 currentEndTime,且 osWarnTips 没有pisell2.product.card.closing-soon.warning 这一项，则加入这一项
-              if ((_item$_productOrigin27 = item._productOrigin) !== null && _item$_productOrigin27 !== void 0 && (_item$_productOrigin27 = _item$_productOrigin27.duration) !== null && _item$_productOrigin27 !== void 0 && (_item$_productOrigin27 = _item$_productOrigin27.flexible_config) !== null && _item$_productOrigin27 !== void 0 && _item$_productOrigin27.is_enable_minimum_duration && dayjs(currentStartTime).add(((_item$_productOrigin28 = item._productOrigin) === null || _item$_productOrigin28 === void 0 || (_item$_productOrigin28 = _item$_productOrigin28.duration) === null || _item$_productOrigin28 === void 0 || (_item$_productOrigin28 = _item$_productOrigin28.flexible_config) === null || _item$_productOrigin28 === void 0 ? void 0 : _item$_productOrigin28.warning_threshold) || 0, 'minutes').isAfter(dayjs(formattedEndTime))) {
+              if ((_item$_productOrigin28 = item._productOrigin) !== null && _item$_productOrigin28 !== void 0 && (_item$_productOrigin28 = _item$_productOrigin28.duration) !== null && _item$_productOrigin28 !== void 0 && (_item$_productOrigin28 = _item$_productOrigin28.flexible_config) !== null && _item$_productOrigin28 !== void 0 && _item$_productOrigin28.is_enable_minimum_duration && dayjs(currentStartTime).add(((_item$_productOrigin29 = item._productOrigin) === null || _item$_productOrigin29 === void 0 || (_item$_productOrigin29 = _item$_productOrigin29.duration) === null || _item$_productOrigin29 === void 0 || (_item$_productOrigin29 = _item$_productOrigin29.flexible_config) === null || _item$_productOrigin29 === void 0 ? void 0 : _item$_productOrigin29.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$_productOrigin29;
+              var _item$_productOrigin30;
               resource.startTime = currentStartTime;
-              resource.endTime = dayjs(currentStartTime).add(((_item$_productOrigin29 = item._productOrigin) === null || _item$_productOrigin29 === void 0 || (_item$_productOrigin29 = _item$_productOrigin29.duration) === null || _item$_productOrigin29 === void 0 ? void 0 : _item$_productOrigin29.value) || 10, 'minutes').format('YYYY-MM-DD HH:mm');
+              resource.endTime = dayjs(currentStartTime).add(((_item$_productOrigin30 = item._productOrigin) === null || _item$_productOrigin30 === void 0 || (_item$_productOrigin30 = _item$_productOrigin30.duration) === null || _item$_productOrigin30 === void 0 ? void 0 : _item$_productOrigin30.value) || 10, 'minutes').format('YYYY-MM-DD HH:mm');
             }
             // delete resource.times;
           });

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

@@ -19,10 +19,12 @@ export declare function calculateResourceAvailableTime({ resource, timeSlots, cu
  * @param countMap 已预约数量映射
  * @returns 最快可用的资源
  */
-export declare function findFastestAvailableResource({ resources, currentCapacity, countMap, }: {
+export declare function findFastestAvailableResource({ resources, currentCapacity, countMap, targetDate, durationMinutes, }: {
     resources: ResourceItem[];
     currentCapacity?: number;
     countMap?: Record<number, number>;
+    targetDate?: string | Dayjs;
+    durationMinutes?: number;
 }): ResourceItem | null;
 /**
  * 给定一个时间列表，通过开始和结束时间过滤出符合条件的时间段