@pisell/pisellos 2.2.287 → 2.2.289

package/dist/modules/Rules/index.js

@@ -2223,7 +2223,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "checkPackageSubItemUsageRules",
     value: function checkPackageSubItemUsageRules(discount, flatItem) {
-      var _flatItem$product;
+      var _flatItem$product, _flatItem$originProdu, _flatItem$parentProdu10;
       var limitedData = discount.limited_relation_product_data;
       var usageRules = limitedData === null || limitedData === void 0 ? void 0 : limitedData.package_sub_item_usage_rules;
       var rules = ['original_price'].concat(_toConsumableArray((usageRules === null || usageRules === void 0 ? void 0 : usageRules.rules) || []));
@@ -2236,7 +2236,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 套餐适用范围配置
       var packageScope = usageRules === null || usageRules === void 0 ? void 0 : usageRules.package_scope;
       var _ref18 = packageScope || {},
-        scopeType = _ref18.type,
+        _ref18$type = _ref18.type,
+        scopeType = _ref18$type === void 0 ? 'product_all' : _ref18$type,
         _ref18$exclude_bundle = _ref18.exclude_bundle_product_ids,
         exclude_bundle_product_ids = _ref18$exclude_bundle === void 0 ? [] : _ref18$exclude_bundle,
         _ref18$include_bundle = _ref18.include_bundle_product_ids,
@@ -2246,6 +2247,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var isMainProduct = flatItem.type === 'main'; // 单独购买
       var isBundleItem = flatItem.type === 'bundle'; // 套餐中购买
       var bundleMainProductId = (_flatItem$product = flatItem.product) === null || _flatItem$product === void 0 ? void 0 : _flatItem$product.product_id;
+      // 主商品id
+      var mainProductId = (flatItem === null || flatItem === void 0 || (_flatItem$originProdu = flatItem.originProduct) === null || _flatItem$originProdu === void 0 || (_flatItem$originProdu = _flatItem$originProdu._productOrigin) === null || _flatItem$originProdu === void 0 ? void 0 : _flatItem$originProdu.id) || (flatItem === null || flatItem === void 0 || (_flatItem$parentProdu10 = flatItem.parentProduct) === null || _flatItem$parentProdu10 === void 0 ? void 0 : _flatItem$parentProdu10.id) || 0;
 
       // 主商品直接可用
       if (isMainProduct) {
@@ -2258,12 +2261,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return true; // 单独购买时可用
         }
         if (isBundleItem) {
-          var _flatItem$bundleItem10, _flatItem$bundleItem11, _flatItem$originProdu, _flatItem$parentProdu10;
+          var _flatItem$bundleItem10, _flatItem$bundleItem11;
           // 套餐中购买时，判断是否为原价
           var priceType = (_flatItem$bundleItem10 = flatItem.bundleItem) === null || _flatItem$bundleItem10 === void 0 ? void 0 : _flatItem$bundleItem10.price_type;
           var priceTypeExt = (_flatItem$bundleItem11 = flatItem.bundleItem) === null || _flatItem$bundleItem11 === void 0 ? void 0 : _flatItem$bundleItem11.price_type_ext;
           // 主商品id
-          var mainProductId = (flatItem === null || flatItem === void 0 || (_flatItem$originProdu = flatItem.originProduct) === null || _flatItem$originProdu === void 0 || (_flatItem$originProdu = _flatItem$originProdu._productOrigin) === null || _flatItem$originProdu === void 0 ? void 0 : _flatItem$originProdu.id) || (flatItem === null || flatItem === void 0 || (_flatItem$parentProdu10 = flatItem.parentProduct) === null || _flatItem$parentProdu10 === void 0 ? void 0 : _flatItem$parentProdu10.id) || 0;
+          // const mainProductId = flatItem?.originProduct?._productOrigin?.id || flatItem?.parentProduct?.id || 0;
           // original_price 对应：
           // 1. price_type: "markup" && price_type_ext: "product_price"
           // markup_price 对应：
@@ -2288,13 +2291,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               if (!filter) {
                 isScopeValid = true;
               } else {
-                isScopeValid = !exclude_bundle_product_ids.includes(Number(bundleMainProductId));
+                isScopeValid = !exclude_bundle_product_ids.includes(Number(mainProductId));
               }
             }
 
             // 包含套餐判断, products值兼容旧数据
             if (scopeType === 'specific_packages' || scopeType === 'products') {
-              isScopeValid = include_bundle_product_ids.includes(Number(bundleMainProductId));
+              isScopeValid = include_bundle_product_ids.includes(Number(mainProductId));
             }
 
             // 价格和套餐适用范围都符合，则可用
@@ -2357,13 +2360,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               if (!filter) {
                 _isScopeValid = true;
               } else {
-                _isScopeValid = !exclude_bundle_product_ids.includes(Number(bundleMainProductId));
+                _isScopeValid = !exclude_bundle_product_ids.includes(Number(mainProductId));
               }
             }
 
             // 包含套餐判断, products值兼容旧数据
             if (scopeType === 'specific_packages' || scopeType === 'products') {
-              _isScopeValid = include_bundle_product_ids.includes(Number(bundleMainProductId));
+              _isScopeValid = include_bundle_product_ids.includes(Number(mainProductId));
             }
 
             // 价格和套餐适用范围都符合，则可用

package/dist/modules/SalesSummary/index.js

@@ -212,8 +212,8 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
     key: "getSummary",
     value: function () {
       var _getSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
-        var _this$store$surcharge, _ref;
-        var _params$products, products, isPriceIncludeTax, taxRate, shopDiscount, channel, summaryChannel, taxConfig, summarySchedule, needScheduleIds, scheduleList, scheduleById, _iterator, _step, item, summary, summaryWithTaxMeta;
+        var _this$otherParams2, _this$store$surcharge, _ref;
+        var _params$products, products, isPriceIncludeTax, taxRate, shopDiscount, channel, summaryChannel, taxConfig, fatherModuleName, scheduleModuleName, summarySchedule, needScheduleIds, scheduleList, scheduleById, _iterator, _step, item, summary, summaryWithTaxMeta;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -227,7 +227,9 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
               return this.getSurchargeList(summaryChannel);
             case 5:
               taxConfig = this.getTaxConfig();
-              summarySchedule = this.core.getModule("".concat(this.name.split('_')[0], "_schedule"));
+              fatherModuleName = ((_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.fatherModule) || this.name.replace(/_salesSummary$/, '');
+              scheduleModuleName = "".concat(fatherModuleName, "_schedule");
+              summarySchedule = this.core.getModule(scheduleModuleName);
               needScheduleIds = (((_this$store$surcharge = this.store.surchargeList) === null || _this$store$surcharge === void 0 || (_this$store$surcharge = _this$store$surcharge.map(function (item) {
                 return item.available_schedule_ids;
               })) === null || _this$store$surcharge === void 0 ? void 0 : _this$store$surcharge.flat()) || []).filter(function (id) {
@@ -264,7 +266,7 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
               });
               this.store.summary = summaryWithTaxMeta;
               return _context4.abrupt("return", summaryWithTaxMeta);
-            case 15:
+            case 17:
             case "end":
               return _context4.stop();
           }

package/dist/solution/BookingByStep/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 5 | 1 | 2 | 3 | 4 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/dist/solution/BookingTicket/index.d.ts

@@ -334,7 +334,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/dist/solution/Sales/index.d.ts

@@ -50,11 +50,12 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
      */
     private getTimelineBucketMinutes;
     /**
-     * 解析营业日统计窗口：
+     * 解析 current 所属营业日窗口：
      * - 当 operating_day_boundary.type === 'start_time'
-     *   使用「今天 + boundary.time」到「明天 + boundary.time」
+     *   使用「最近一个 boundary.time」到「下一个 boundary.time」
      * - 否则回退自然日（00:00 到次日 00:00）
      */
+    private getOperatingDayRange;
     private getTimelineRangeByOperatingBoundary;
     /**
      * 统计时间轴每个时间片的预约数量。
@@ -95,7 +96,7 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
      * 2) 若无 active，返回已超时且仍占用中的预约（允许并发多条）
      * 3) 若仍无，返回最近一组未来预约（同 start_time 的并发预约全部返回）
      * 4) 最后兜底返回一条（避免资源有历史预约时完全无反馈）
-     * - includeAllFuture 时，保留选中预约并返回当天全部后续预约；仅详情接口启用。
+     * - includeAllFuture 时，保留选中预约并返回当前营业日全部后续预约；仅详情接口启用。
      */
     private pickBookingsForCurrentPoint;
     /**

package/dist/solution/Sales/index.js

@@ -258,19 +258,19 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
     }
 
     /**
-     * 解析营业日统计窗口：
+     * 解析 current 所属营业日窗口：
      * - 当 operating_day_boundary.type === 'start_time'
-     *   使用「今天 + boundary.time」到「明天 + boundary.time」
+     *   使用「最近一个 boundary.time」到「下一个 boundary.time」
      * - 否则回退自然日（00:00 到次日 00:00）
      */
   }, {
-    key: "getTimelineRangeByOperatingBoundary",
-    value: function getTimelineRangeByOperatingBoundary() {
-      var _appPlugin$getApp, _appPlugin$getApp$get, _appPlugin$getApp$get2, _appPlugin$getApp$get3, _coreData$core;
-      var today = dayjs();
-      var defaultStart = today.startOf('day');
+    key: "getOperatingDayRange",
+    value: function getOperatingDayRange() {
+      var _this$core, _appPlugin$getApp, _appPlugin$getApp$get, _appPlugin$getApp$get2, _appPlugin$getApp$get3, _coreData$core;
+      var referenceTime = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : dayjs();
+      var defaultStart = referenceTime.startOf('day');
       var defaultEndExclusive = defaultStart.add(1, 'day');
-      var appPlugin = this.core.getPlugin('app');
+      var appPlugin = (_this$core = this.core) === null || _this$core === void 0 ? void 0 : _this$core.getPlugin('app');
       var coreData = appPlugin === null || appPlugin === void 0 || (_appPlugin$getApp = appPlugin.getApp()) === null || _appPlugin$getApp === void 0 || (_appPlugin$getApp = _appPlugin$getApp.data) === null || _appPlugin$getApp === void 0 || (_appPlugin$getApp = _appPlugin$getApp.store) === null || _appPlugin$getApp === void 0 || (_appPlugin$getApp$get = _appPlugin$getApp.getStore) === null || _appPlugin$getApp$get === void 0 || (_appPlugin$getApp$get2 = (_appPlugin$getApp$get3 = _appPlugin$getApp$get.call(_appPlugin$getApp)).getDataByModel) === null || _appPlugin$getApp$get2 === void 0 ? void 0 : _appPlugin$getApp$get2.call(_appPlugin$getApp$get3, 'core');
       var operatingDayBoundary = coreData === null || coreData === void 0 || (_coreData$core = coreData.core) === null || _coreData$core === void 0 ? void 0 : _coreData$core.operating_day_boundary;
       if ((operatingDayBoundary === null || operatingDayBoundary === void 0 ? void 0 : operatingDayBoundary.type) !== 'start_time') {
@@ -280,18 +280,24 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
         };
       }
       var boundaryTime = String(operatingDayBoundary.time || '').trim();
-      var startAt = dayjs("".concat(today.format('YYYY-MM-DD'), " ").concat(boundaryTime));
-      if (!startAt.isValid()) {
+      var boundaryStart = dayjs("".concat(referenceTime.format('YYYY-MM-DD'), " ").concat(boundaryTime));
+      if (!boundaryStart.isValid()) {
         return {
           startAt: defaultStart,
           endExclusiveAt: defaultEndExclusive
         };
       }
+      var startAt = referenceTime.isBefore(boundaryStart) ? boundaryStart.subtract(1, 'day') : boundaryStart;
       return {
         startAt: startAt,
         endExclusiveAt: startAt.add(1, 'day')
       };
     }
+  }, {
+    key: "getTimelineRangeByOperatingBoundary",
+    value: function getTimelineRangeByOperatingBoundary() {
+      return this.getOperatingDayRange();
+    }
 
     /**
      * 统计时间轴每个时间片的预约数量。
@@ -485,7 +491,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
      * 2) 若无 active，返回已超时且仍占用中的预约（允许并发多条）
      * 3) 若仍无，返回最近一组未来预约（同 start_time 的并发预约全部返回）
      * 4) 最后兜底返回一条（避免资源有历史预约时完全无反馈）
-     * - includeAllFuture 时，保留选中预约并返回当天全部后续预约；仅详情接口启用。
+     * - includeAllFuture 时，保留选中预约并返回当前营业日全部后续预约；仅详情接口启用。
      */
   }, {
     key: "pickBookingsForCurrentPoint",
@@ -493,15 +499,16 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       var _this4 = this;
       var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       if (bookings.length === 0) return [];
-      var currentDayStart = current.startOf('day');
-      var currentDayEnd = current.endOf('day');
+      var _this$getOperatingDay = this.getOperatingDayRange(current),
+        operatingDayStart = _this$getOperatingDay.startAt,
+        operatingDayEndExclusive = _this$getOperatingDay.endExclusiveAt;
 
-      // 仅保留与 current 当天有时间交集的预约，避免跨天误命中
+      // 仅保留与 current 所属营业日窗口有时间交集的预约，避免跨营业日误命中
       var dayScopedBookings = bookings.filter(function (booking) {
         var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
         var endAt = _this4.toBookingDateTime(booking.end_date, booking.end_time);
         if (!startAt.isValid() || !endAt.isValid()) return false;
-        return _this4.isSameOrBefore(startAt, currentDayEnd) && _this4.isSameOrAfter(endAt, currentDayStart);
+        return startAt.isBefore(operatingDayEndExclusive) && _this4.isSameOrAfter(endAt, operatingDayStart);
       });
       if (dayScopedBookings.length === 0) return [];
       var appendNextStartGroupIfNeeded = function appendNextStartGroupIfNeeded(selectedBookings) {
@@ -560,7 +567,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       // upcoming: 从未来预约里只取最早那一组（同 start_time）
       var upcoming = dayScopedBookings.filter(function (booking) {
         var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
-        return startAt.isValid() && startAt.isAfter(current) && startAt.isSame(current, 'day');
+        return startAt.isValid() && startAt.isAfter(current);
       });
       if (upcoming.length > 0) {
         if (options.includeAllFuture) return upcoming;

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

@@ -1,46 +1 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "BUY_X_GET_Y_FREE_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.BUY_X_GET_Y_FREE_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "ITEM_REWARD_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.ITEM_REWARD_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "PromotionAdapter", {
-  enumerable: true,
-  get: function () {
-    return _adapter.PromotionAdapter;
-  }
-});
-Object.defineProperty(exports, "PromotionEvaluator", {
-  enumerable: true,
-  get: function () {
-    return _evaluator.PromotionEvaluator;
-  }
-});
-Object.defineProperty(exports, "X_ITEMS_FOR_Y_PRICE_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.X_ITEMS_FOR_Y_PRICE_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function () {
-    return _adapter.default;
-  }
-});
-var _evaluator = require("./evaluator");
-var _adapter = _interopRequireWildcard(require("./adapter"));
-var _examples = require("./examples");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+"use strict";

package/lib/modules/Rules/index.js

@@ -1961,7 +1961,7 @@ class RulesModule extends _BaseModule.BaseModule {
     // 套餐适用范围配置
     const packageScope = usageRules?.package_scope;
     const {
-      type: scopeType,
+      type: scopeType = 'product_all',
       exclude_bundle_product_ids = [],
       include_bundle_product_ids = [],
       filter = 0
@@ -1969,6 +1969,8 @@ class RulesModule extends _BaseModule.BaseModule {
     const isMainProduct = flatItem.type === 'main'; // 单独购买
     const isBundleItem = flatItem.type === 'bundle'; // 套餐中购买
     const bundleMainProductId = flatItem.product?.product_id;
+    // 主商品id
+    const mainProductId = flatItem?.originProduct?._productOrigin?.id || flatItem?.parentProduct?.id || 0;
 
     // 主商品直接可用
     if (isMainProduct) {
@@ -1985,7 +1987,7 @@ class RulesModule extends _BaseModule.BaseModule {
         const priceType = flatItem.bundleItem?.price_type;
         const priceTypeExt = flatItem.bundleItem?.price_type_ext;
         // 主商品id
-        const mainProductId = flatItem?.originProduct?._productOrigin?.id || flatItem?.parentProduct?.id || 0;
+        // const mainProductId = flatItem?.originProduct?._productOrigin?.id || flatItem?.parentProduct?.id || 0;
         // original_price 对应：
         // 1. price_type: "markup" && price_type_ext: "product_price"
         // markup_price 对应：
@@ -2010,13 +2012,13 @@ class RulesModule extends _BaseModule.BaseModule {
             if (!filter) {
               isScopeValid = true;
             } else {
-              isScopeValid = !exclude_bundle_product_ids.includes(Number(bundleMainProductId));
+              isScopeValid = !exclude_bundle_product_ids.includes(Number(mainProductId));
             }
           }
 
           // 包含套餐判断, products值兼容旧数据
           if (scopeType === 'specific_packages' || scopeType === 'products') {
-            isScopeValid = include_bundle_product_ids.includes(Number(bundleMainProductId));
+            isScopeValid = include_bundle_product_ids.includes(Number(mainProductId));
           }
 
           // 价格和套餐适用范围都符合，则可用
@@ -2078,13 +2080,13 @@ class RulesModule extends _BaseModule.BaseModule {
             if (!filter) {
               isScopeValid = true;
             } else {
-              isScopeValid = !exclude_bundle_product_ids.includes(Number(bundleMainProductId));
+              isScopeValid = !exclude_bundle_product_ids.includes(Number(mainProductId));
             }
           }
 
           // 包含套餐判断, products值兼容旧数据
           if (scopeType === 'specific_packages' || scopeType === 'products') {
-            isScopeValid = include_bundle_product_ids.includes(Number(bundleMainProductId));
+            isScopeValid = include_bundle_product_ids.includes(Number(mainProductId));
           }
 
           // 价格和套餐适用范围都符合，则可用

package/lib/modules/SalesSummary/index.js

@@ -133,7 +133,9 @@ class SalesSummaryModule extends _BaseModule.BaseModule {
       await this.getSurchargeList(summaryChannel);
     }
     const taxConfig = this.getTaxConfig();
-    const summarySchedule = this.core.getModule(`${this.name.split('_')[0]}_schedule`);
+    const fatherModuleName = this.otherParams?.fatherModule || this.name.replace(/_salesSummary$/, '');
+    const scheduleModuleName = `${fatherModuleName}_schedule`;
+    const summarySchedule = this.core.getModule(scheduleModuleName);
     const needScheduleIds = (this.store.surchargeList?.map(item => item.available_schedule_ids)?.flat() || []).filter(id => id !== undefined && id !== null && id !== '');
     const scheduleList = needScheduleIds.length > 0 ? summarySchedule?.getScheduleListByIds(needScheduleIds) : [];
     const scheduleById = {};

package/lib/solution/BookingByStep/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 5 | 1 | 2 | 3 | 4 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingTicket/index.d.ts

@@ -334,7 +334,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/solution/Sales/index.d.ts

@@ -50,11 +50,12 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
      */
     private getTimelineBucketMinutes;
     /**
-     * 解析营业日统计窗口：
+     * 解析 current 所属营业日窗口：
      * - 当 operating_day_boundary.type === 'start_time'
-     *   使用「今天 + boundary.time」到「明天 + boundary.time」
+     *   使用「最近一个 boundary.time」到「下一个 boundary.time」
      * - 否则回退自然日（00:00 到次日 00:00）
      */
+    private getOperatingDayRange;
     private getTimelineRangeByOperatingBoundary;
     /**
      * 统计时间轴每个时间片的预约数量。
@@ -95,7 +96,7 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
      * 2) 若无 active，返回已超时且仍占用中的预约（允许并发多条）
      * 3) 若仍无，返回最近一组未来预约（同 start_time 的并发预约全部返回）
      * 4) 最后兜底返回一条（避免资源有历史预约时完全无反馈）
-     * - includeAllFuture 时，保留选中预约并返回当天全部后续预约；仅详情接口启用。
+     * - includeAllFuture 时，保留选中预约并返回当前营业日全部后续预约；仅详情接口启用。
      */
     private pickBookingsForCurrentPoint;
     /**

package/lib/solution/Sales/index.js

@@ -160,16 +160,15 @@ class SalesImpl extends _BaseModule.BaseModule {
   }
 
   /**
-   * 解析营业日统计窗口：
+   * 解析 current 所属营业日窗口：
    * - 当 operating_day_boundary.type === 'start_time'
-   *   使用「今天 + boundary.time」到「明天 + boundary.time」
+   *   使用「最近一个 boundary.time」到「下一个 boundary.time」
    * - 否则回退自然日（00:00 到次日 00:00）
    */
-  getTimelineRangeByOperatingBoundary() {
-    const today = (0, _dayjs.default)();
-    const defaultStart = today.startOf('day');
+  getOperatingDayRange(referenceTime = (0, _dayjs.default)()) {
+    const defaultStart = referenceTime.startOf('day');
     const defaultEndExclusive = defaultStart.add(1, 'day');
-    const appPlugin = this.core.getPlugin('app');
+    const appPlugin = this.core?.getPlugin('app');
     const coreData = appPlugin?.getApp()?.data?.store?.getStore?.().getDataByModel?.('core');
     const operatingDayBoundary = coreData?.core?.operating_day_boundary;
     if (operatingDayBoundary?.type !== 'start_time') {
@@ -179,18 +178,22 @@ class SalesImpl extends _BaseModule.BaseModule {
       };
     }
     const boundaryTime = String(operatingDayBoundary.time || '').trim();
-    const startAt = (0, _dayjs.default)(`${today.format('YYYY-MM-DD')} ${boundaryTime}`);
-    if (!startAt.isValid()) {
+    const boundaryStart = (0, _dayjs.default)(`${referenceTime.format('YYYY-MM-DD')} ${boundaryTime}`);
+    if (!boundaryStart.isValid()) {
       return {
         startAt: defaultStart,
         endExclusiveAt: defaultEndExclusive
       };
     }
+    const startAt = referenceTime.isBefore(boundaryStart) ? boundaryStart.subtract(1, 'day') : boundaryStart;
     return {
       startAt,
       endExclusiveAt: startAt.add(1, 'day')
     };
   }
+  getTimelineRangeByOperatingBoundary() {
+    return this.getOperatingDayRange();
+  }
 
   /**
    * 统计时间轴每个时间片的预约数量。
@@ -343,19 +346,21 @@ class SalesImpl extends _BaseModule.BaseModule {
    * 2) 若无 active，返回已超时且仍占用中的预约（允许并发多条）
    * 3) 若仍无，返回最近一组未来预约（同 start_time 的并发预约全部返回）
    * 4) 最后兜底返回一条（避免资源有历史预约时完全无反馈）
-   * - includeAllFuture 时，保留选中预约并返回当天全部后续预约；仅详情接口启用。
+   * - includeAllFuture 时，保留选中预约并返回当前营业日全部后续预约；仅详情接口启用。
    */
   pickBookingsForCurrentPoint(current, bookings, options = {}) {
     if (bookings.length === 0) return [];
-    const currentDayStart = current.startOf('day');
-    const currentDayEnd = current.endOf('day');
+    const {
+      startAt: operatingDayStart,
+      endExclusiveAt: operatingDayEndExclusive
+    } = this.getOperatingDayRange(current);
 
-    // 仅保留与 current 当天有时间交集的预约，避免跨天误命中
+    // 仅保留与 current 所属营业日窗口有时间交集的预约，避免跨营业日误命中
     const dayScopedBookings = bookings.filter(booking => {
       const startAt = this.toBookingDateTime(booking.start_date, booking.start_time);
       const endAt = this.toBookingDateTime(booking.end_date, booking.end_time);
       if (!startAt.isValid() || !endAt.isValid()) return false;
-      return this.isSameOrBefore(startAt, currentDayEnd) && this.isSameOrAfter(endAt, currentDayStart);
+      return startAt.isBefore(operatingDayEndExclusive) && this.isSameOrAfter(endAt, operatingDayStart);
     });
     if (dayScopedBookings.length === 0) return [];
     const appendNextStartGroupIfNeeded = selectedBookings => {
@@ -404,7 +409,7 @@ class SalesImpl extends _BaseModule.BaseModule {
     // upcoming: 从未来预约里只取最早那一组（同 start_time）
     const upcoming = dayScopedBookings.filter(booking => {
       const startAt = this.toBookingDateTime(booking.start_date, booking.start_time);
-      return startAt.isValid() && startAt.isAfter(current) && startAt.isSame(current, 'day');
+      return startAt.isValid() && startAt.isAfter(current);
     });
     if (upcoming.length > 0) {
       if (options.includeAllFuture) return upcoming;

package/package.json

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