@pisell/pisellos 0.10.16 → 0.10.18

package/dist/solution/Sales/index.js

@@ -26,10 +26,14 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import dayjs from 'dayjs';
+import { cloneDeep } from 'lodash-es';
 import { BaseModule } from "../../modules/BaseModule";
 import { SalesHooks } from "./types";
+import { getDefaultInvoiceLayoutConfig, getDefaultInvoiceTemplateSettings, OpenDataModule } from "../../modules/OpenData";
 export * from "./types";
 var UNPAID_PAYMENT_STATUSES = new Set(['unpaid', 'partially_paid', 'payment_processing']);
+var INVOICE_OPEN_DATA_SECTION_CODES = ['documents'];
+var INVOICE_OPEN_DATA_CACHE_TTL = 5 * 60 * 1000;
 
 /**
  * Sales 解决方案基础骨架
@@ -45,8 +49,6 @@ var UNPAID_PAYMENT_STATUSES = new Set(['unpaid', 'partially_paid', 'payment_proc
 export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
   _inherits(SalesImpl, _BaseModule);
   var _super = _createSuper(SalesImpl);
-  // LoggerManager 实例
-
   function SalesImpl(name, version) {
     var _this;
     _classCallCheck(this, SalesImpl);
@@ -60,6 +62,11 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "otherParams", {});
     _defineProperty(_assertThisInitialized(_this), "request", void 0);
     _defineProperty(_assertThisInitialized(_this), "logger", void 0);
+    // LoggerManager 实例
+    _defineProperty(_assertThisInitialized(_this), "invoiceOpenDataModule", null);
+    _defineProperty(_assertThisInitialized(_this), "invoiceOpenDataTarget", null);
+    _defineProperty(_assertThisInitialized(_this), "invoiceOpenDataInFlight", null);
+    _defineProperty(_assertThisInitialized(_this), "invoiceOpenDataInFlightTarget", null);
     return _this;
   }
   _createClass(SalesImpl, [{
@@ -73,17 +80,25 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               options = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
+              if (this.invoiceOpenDataModule) {
+                try {
+                  this.clearOpenDataCache();
+                  this.invoiceOpenDataModule.destroy();
+                } catch (error) {
+                  console.warn('[Sales] 旧 Invoice OpenData 子模块销毁失败', error);
+                }
+              }
               this.core = core;
               this.options = options;
               this.otherParams = options.otherParams || {};
               appPlugin = this.core.getPlugin('app'); // @ts-ignore
               this.request = appPlugin === null || appPlugin === void 0 ? void 0 : appPlugin.getApp().request;
               if (this.request) {
-                _context.next = 8;
+                _context.next = 9;
                 break;
               }
               throw new Error('Sales 解决方案需要 request 插件支持');
-            case 8:
+            case 9:
               // 初始化 store 状态
               this.store = {
                 currentDay: dayjs().startOf('day'),
@@ -94,9 +109,20 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
               // 在这里补充从 Server/Order 读取 currentDay 原始数据并转换为预约列表。
 
               this.logger = appPlugin === null || appPlugin === void 0 ? void 0 : appPlugin.getApp().logger;
-              _context.next = 12;
+              this.invoiceOpenDataTarget = null;
+              this.invoiceOpenDataInFlight = null;
+              this.invoiceOpenDataInFlightTarget = null;
+              this.invoiceOpenDataModule = new OpenDataModule("".concat(this.name, "_invoiceOpenData"));
+              this.core.registerModule(this.invoiceOpenDataModule, {
+                initialState: {},
+                otherParams: {
+                  fatherModule: this.name,
+                  openCache: false
+                }
+              });
+              _context.next = 18;
               return this.core.effects.emit("".concat(this.name, ":onInited"), {});
-            case 12:
+            case 18:
             case "end":
               return _context.stop();
           }
@@ -218,25 +244,265 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
         return _changeBookingStatus.apply(this, arguments);
       }
       return changeBookingStatus;
-    }() // -------------------------------------------------------------------------
+    }()
+    /**
+     * 将显式 channel 或当前运行上下文归一为 Invoice OpenData 使用的销售入口。
+     * Legacy Sales 的系统上下文没有可打印的 system target，因此统一回退 pos。
+     */
+  }, {
+    key: "getInvoiceSalesChannel",
+    value: function getInvoiceSalesChannel(channel) {
+      var _this$core, _this$core$getChannel, _ref;
+      var contextChannel = (_this$core = this.core) === null || _this$core === void 0 || (_this$core = _this$core.context) === null || _this$core === void 0 || (_this$core$getChannel = _this$core.getChannel) === null || _this$core$getChannel === void 0 ? void 0 : _this$core$getChannel.call(_this$core);
+      var normalized = String((_ref = channel !== null && channel !== void 0 ? channel : contextChannel) !== null && _ref !== void 0 ? _ref : '').trim();
+      return !normalized || normalized === 'system' ? 'pos' : normalized;
+    }
+  }, {
+    key: "loadInvoiceOpenData",
+    value: function () {
+      var _loadInvoiceOpenData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(businessCode, channel) {
+        var target, cachedData, lastFetchedAt, request, openData;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              if (this.invoiceOpenDataModule) {
+                _context4.next = 2;
+                break;
+              }
+              throw new Error('Sales Invoice OpenData 模块未初始化');
+            case 2:
+              target = "".concat(businessCode, "+").concat(channel);
+              cachedData = this.invoiceOpenDataModule.getOpenData();
+              lastFetchedAt = this.invoiceOpenDataModule.getLastFetchedAt();
+              if (!(cachedData && this.invoiceOpenDataTarget === target && typeof lastFetchedAt === 'number' && Date.now() - lastFetchedAt < INVOICE_OPEN_DATA_CACHE_TTL)) {
+                _context4.next = 7;
+                break;
+              }
+              return _context4.abrupt("return", cachedData);
+            case 7:
+              if (!this.invoiceOpenDataInFlight) {
+                _context4.next = 18;
+                break;
+              }
+              if (!(this.invoiceOpenDataInFlightTarget === target)) {
+                _context4.next = 10;
+                break;
+              }
+              return _context4.abrupt("return", this.invoiceOpenDataInFlight);
+            case 10:
+              _context4.prev = 10;
+              _context4.next = 13;
+              return this.invoiceOpenDataInFlight;
+            case 13:
+              _context4.next = 17;
+              break;
+            case 15:
+              _context4.prev = 15;
+              _context4.t0 = _context4["catch"](10);
+            case 17:
+              return _context4.abrupt("return", this.loadInvoiceOpenData(businessCode, channel));
+            case 18:
+              request = this.invoiceOpenDataModule.fetchOpenData({
+                scope: 'board',
+                target: target,
+                section_code: [].concat(INVOICE_OPEN_DATA_SECTION_CODES)
+              });
+              this.invoiceOpenDataInFlight = request;
+              this.invoiceOpenDataInFlightTarget = target;
+              _context4.prev = 21;
+              _context4.next = 24;
+              return request;
+            case 24:
+              openData = _context4.sent;
+              // clearOpenDataCache() 或后续请求接管后，旧响应不得复活 target 归属。
+              if (this.invoiceOpenDataInFlight === request) {
+                this.invoiceOpenDataTarget = target;
+              }
+              return _context4.abrupt("return", openData);
+            case 27:
+              _context4.prev = 27;
+              if (this.invoiceOpenDataInFlight === request) {
+                this.invoiceOpenDataInFlight = null;
+                this.invoiceOpenDataInFlightTarget = null;
+              }
+              return _context4.finish(27);
+            case 30:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4, this, [[10, 15], [21,, 27, 30]]);
+      }));
+      function loadInvoiceOpenData(_x4, _x5) {
+        return _loadInvoiceOpenData.apply(this, arguments);
+      }
+      return loadInvoiceOpenData;
+    }()
+  }, {
+    key: "logInvoiceOpenDataFallback",
+    value: function logInvoiceOpenDataFallback(error) {
+      var _this$logger;
+      var message = error instanceof Error ? error.message : String(error);
+      if ((_this$logger = this.logger) !== null && _this$logger !== void 0 && _this$logger.addLog) {
+        this.logger.addLog({
+          type: 'warning',
+          title: 'Sales Invoice OpenData 加载失败，使用默认配置',
+          metadata: {
+            message: message
+          }
+        });
+        return;
+      }
+      console.warn('[Sales] Invoice OpenData 加载失败，使用默认配置', error);
+    }
+  }, {
+    key: "resolveInvoiceConfigs",
+    value: function () {
+      var _resolveInvoiceConfigs = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(businessCode, channel) {
+        var _this$invoiceOpenData, _this$invoiceOpenData2, _this$invoiceOpenData3, _this$invoiceOpenData4;
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
+            case 0:
+              _context5.prev = 0;
+              _context5.next = 3;
+              return this.loadInvoiceOpenData(businessCode, channel);
+            case 3:
+              if (!(this.invoiceOpenDataTarget !== "".concat(businessCode, "+").concat(channel))) {
+                _context5.next = 5;
+                break;
+              }
+              return _context5.abrupt("return", {
+                invoice: getDefaultInvoiceLayoutConfig(),
+                templateSettings: getDefaultInvoiceTemplateSettings()
+              });
+            case 5:
+              return _context5.abrupt("return", {
+                invoice: (_this$invoiceOpenData = (_this$invoiceOpenData2 = this.invoiceOpenDataModule) === null || _this$invoiceOpenData2 === void 0 ? void 0 : _this$invoiceOpenData2.getInvoiceLayoutConfig()) !== null && _this$invoiceOpenData !== void 0 ? _this$invoiceOpenData : getDefaultInvoiceLayoutConfig(),
+                templateSettings: (_this$invoiceOpenData3 = (_this$invoiceOpenData4 = this.invoiceOpenDataModule) === null || _this$invoiceOpenData4 === void 0 ? void 0 : _this$invoiceOpenData4.getInvoiceTemplateSettings()) !== null && _this$invoiceOpenData3 !== void 0 ? _this$invoiceOpenData3 : getDefaultInvoiceTemplateSettings()
+              });
+            case 8:
+              _context5.prev = 8;
+              _context5.t0 = _context5["catch"](0);
+              this.logInvoiceOpenDataFallback(_context5.t0);
+              return _context5.abrupt("return", {
+                invoice: getDefaultInvoiceLayoutConfig(),
+                templateSettings: getDefaultInvoiceTemplateSettings()
+              });
+            case 12:
+            case "end":
+              return _context5.stop();
+          }
+        }, _callee5, this, [[0, 8]]);
+      }));
+      function resolveInvoiceConfigs(_x6, _x7) {
+        return _resolveInvoiceConfigs.apply(this, arguments);
+      }
+      return resolveInvoiceConfigs;
+    }()
+  }, {
+    key: "printLocalOrderReceipt",
+    value: function () {
+      var _printLocalOrderReceipt = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(lookup, options) {
+        var _options$businessCode;
+        var normalizedLookup, businessCode, channel, _yield$this$resolveIn, invoice, templateSettings, lookupPayload;
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
+            case 0:
+              normalizedLookup = typeof lookup === 'string' ? lookup.trim() : lookup;
+              if (!(normalizedLookup === '' || normalizedLookup === null || normalizedLookup === undefined)) {
+                _context6.next = 3;
+                break;
+              }
+              throw new Error('Sales 本地小票打印需要订单标识');
+            case 3:
+              businessCode = String((_options$businessCode = options === null || options === void 0 ? void 0 : options.businessCode) !== null && _options$businessCode !== void 0 ? _options$businessCode : '').trim();
+              if (businessCode) {
+                _context6.next = 6;
+                break;
+              }
+              throw new Error('Sales 本地小票打印需要 businessCode');
+            case 6:
+              channel = this.getInvoiceSalesChannel(options === null || options === void 0 ? void 0 : options.channel);
+              _context6.next = 9;
+              return this.resolveInvoiceConfigs(businessCode, channel);
+            case 9:
+              _yield$this$resolveIn = _context6.sent;
+              invoice = _yield$this$resolveIn.invoice;
+              templateSettings = _yield$this$resolveIn.templateSettings;
+              lookupPayload = typeof normalizedLookup === 'number' ? {
+                order_id: normalizedLookup
+              } : {
+                external_sale_number: normalizedLookup
+              };
+              return _context6.abrupt("return", this.request.post('/local/print-order', _objectSpread(_objectSpread({}, lookupPayload), {}, {
+                lookup_order_from_db: 1,
+                small_ticket_data_flag: 1,
+                business_code: businessCode,
+                order_sales_channel: channel,
+                invoice: cloneDeep(invoice),
+                template_settings: cloneDeep(templateSettings)
+              }), {
+                osServer: true,
+                customToast: function customToast() {}
+              }));
+            case 14:
+            case "end":
+              return _context6.stop();
+          }
+        }, _callee6, this);
+      }));
+      function printLocalOrderReceipt(_x8, _x9) {
+        return _printLocalOrderReceipt.apply(this, arguments);
+      }
+      return printLocalOrderReceipt;
+    }() /** 清除独立 Documents 缓存；下一次打印会按当前 target 重新获取。 */
+  }, {
+    key: "clearOpenDataCache",
+    value: function clearOpenDataCache() {
+      var _this$invoiceOpenData5;
+      this.invoiceOpenDataInFlight = null;
+      this.invoiceOpenDataInFlightTarget = null;
+      this.invoiceOpenDataTarget = null;
+      (_this$invoiceOpenData5 = this.invoiceOpenDataModule) === null || _this$invoiceOpenData5 === void 0 || _this$invoiceOpenData5.clearCache();
+    }
+
+    // -------------------------------------------------------------------------
     // 生命周期
     // -------------------------------------------------------------------------
   }, {
     key: "destroy",
     value: function () {
-      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+        var invoiceOpenDataModule;
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              _context4.next = 2;
+              this.clearOpenDataCache();
+              invoiceOpenDataModule = this.invoiceOpenDataModule;
+              this.invoiceOpenDataModule = null;
+              if (!invoiceOpenDataModule) {
+                _context7.next = 12;
+                break;
+              }
+              _context7.prev = 4;
+              _context7.next = 7;
+              return invoiceOpenDataModule.destroy();
+            case 7:
+              _context7.next = 12;
+              break;
+            case 9:
+              _context7.prev = 9;
+              _context7.t0 = _context7["catch"](4);
+              console.warn('[Sales] Invoice OpenData 子模块销毁失败', _context7.t0);
+            case 12:
+              _context7.next = 14;
               return this.core.effects.emit("".concat(this.name, ":onDestroy"), {});
-            case 2:
+            case 14:
               _get(_getPrototypeOf(SalesImpl.prototype), "destroy", this).call(this);
-            case 3:
+            case 15:
             case "end":
-              return _context4.stop();
+              return _context7.stop();
           }
-        }, _callee4, this);
+        }, _callee7, this, [[4, 9]]);
       }));
       function destroy() {
         return _destroy.apply(this, arguments);
@@ -258,19 +524,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$core2, _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$core2 = this.core) === null || _this$core2 === void 0 ? void 0 : _this$core2.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 +546,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();
+    }
 
     /**
      * 统计时间轴每个时间片的预约数量。
@@ -310,12 +582,12 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       var customStartAt = startDateTime ? dayjs(startDateTime) : dayjs('');
       var customEndExclusiveAt = endDateTime ? dayjs(endDateTime) : dayjs('');
       var hasValidCustomRange = customStartAt.isValid() && customEndExclusiveAt.isValid();
-      var _ref = hasValidCustomRange ? {
+      var _ref2 = hasValidCustomRange ? {
           startAt: customStartAt,
           endExclusiveAt: customEndExclusiveAt
         } : this.getTimelineRangeByOperatingBoundary(),
-        startAt = _ref.startAt,
-        endExclusiveAt = _ref.endExclusiveAt;
+        startAt = _ref2.startAt,
+        endExclusiveAt = _ref2.endExclusiveAt;
       var startAtMs = startAt.valueOf();
       var endExclusiveAtMs = endExclusiveAt.valueOf();
       if (!startAt.isValid() || !endExclusiveAt.isValid() || endExclusiveAtMs <= startAtMs) return [];
@@ -323,9 +595,9 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       if (slotCount <= 0) return [];
       var diff = new Int32Array(slotCount + 1);
       for (var i = 0; i < bookingList.length; i++) {
-        var _ref2, _booking$appointment_;
+        var _ref3, _booking$appointment_;
         var booking = bookingList[i];
-        var appointmentStatus = String((_ref2 = (_booking$appointment_ = booking.appointment_status) !== null && _booking$appointment_ !== void 0 ? _booking$appointment_ : booking.status) !== null && _ref2 !== void 0 ? _ref2 : '');
+        var appointmentStatus = String((_ref3 = (_booking$appointment_ = booking.appointment_status) !== null && _booking$appointment_ !== void 0 ? _booking$appointment_ : booking.status) !== null && _ref3 !== void 0 ? _ref3 : '');
         if (appointmentStatus === 'new' || appointmentStatus === 'rejected' || appointmentStatus === 'cancelled') continue;
         var bookingStartAt = this.toBookingDateTime(booking.start_date, booking.start_time);
         var bookingEndAt = this.toBookingDateTime(booking.end_date, booking.end_time);
@@ -395,14 +667,14 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getResourceId",
     value: function getResourceId(resource) {
-      var _ref3, _resource$id;
-      return (_ref3 = (_resource$id = resource.id) !== null && _resource$id !== void 0 ? _resource$id : resource.form_record_id) !== null && _ref3 !== void 0 ? _ref3 : '';
+      var _ref4, _resource$id;
+      return (_ref4 = (_resource$id = resource.id) !== null && _resource$id !== void 0 ? _resource$id : resource.form_record_id) !== null && _ref4 !== void 0 ? _ref4 : '';
     }
   }, {
     key: "getBookingAppointmentStatus",
     value: function getBookingAppointmentStatus(booking) {
-      var _ref4, _booking$appointment_2;
-      return String((_ref4 = (_booking$appointment_2 = booking.appointment_status) !== null && _booking$appointment_2 !== void 0 ? _booking$appointment_2 : booking.status) !== null && _ref4 !== void 0 ? _ref4 : '');
+      var _ref5, _booking$appointment_2;
+      return String((_ref5 = (_booking$appointment_2 = booking.appointment_status) !== null && _booking$appointment_2 !== void 0 ? _booking$appointment_2 : booking.status) !== null && _ref5 !== void 0 ? _ref5 : '');
     }
   }, {
     key: "isBookingIncludedInStats",
@@ -485,7 +757,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
      * 2) 若无 active，返回已超时且仍占用中的预约（允许并发多条）
      * 3) 若仍无，返回最近一组未来预约（同 start_time 的并发预约全部返回）
      * 4) 最后兜底返回一条（避免资源有历史预约时完全无反馈）
-     * - includeAllFuture 时，保留选中预约并返回当天全部后续预约；仅详情接口启用。
+     * - includeAllFuture 时，保留选中预约并返回当前营业日全部后续预约；仅详情接口启用。
      */
   }, {
     key: "pickBookingsForCurrentPoint",
@@ -493,15 +765,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 +833,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;
@@ -749,7 +1022,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getResourceBookingList",
     value: function () {
-      var _getResourceBookingList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(currentTime) {
+      var _getResourceBookingList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(currentTime) {
         var _resourceResponse$dat,
           _resourceResponse$dat2,
           _this6 = this;
@@ -763,28 +1036,28 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
           rawBookingMap,
           bookingMap,
           list,
-          _args5 = arguments;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+          _args8 = arguments;
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              bookingList = _args5.length > 1 && _args5[1] !== undefined ? _args5[1] : [];
-              deviceTime = _args5.length > 2 && _args5[2] !== undefined ? _args5[2] : currentTime;
+              bookingList = _args8.length > 1 && _args8[1] !== undefined ? _args8[1] : [];
+              deviceTime = _args8.length > 2 && _args8[2] !== undefined ? _args8[2] : currentTime;
               // currentTime 约定为完整 datetime；非法值直接返回空，避免误判
               current = dayjs(currentTime);
               if (current.isValid()) {
-                _context5.next = 5;
+                _context8.next = 5;
                 break;
               }
-              return _context5.abrupt("return", []);
+              return _context8.abrupt("return", []);
             case 5:
               deviceCurrent = dayjs(deviceTime);
               if (deviceCurrent.isValid()) {
-                _context5.next = 8;
+                _context8.next = 8;
                 break;
               }
-              return _context5.abrupt("return", []);
+              return _context8.abrupt("return", []);
             case 8:
-              _context5.next = 10;
+              _context8.next = 10;
               return this.request.get('/shop/form/resource/page', {
                 skip: 1,
                 num: 999
@@ -795,13 +1068,13 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
                 isShopApi: true
               });
             case 10:
-              resourceResponse = _context5.sent;
+              resourceResponse = _context8.sent;
               resourceList = (_resourceResponse$dat = resourceResponse === null || resourceResponse === void 0 || (_resourceResponse$dat2 = resourceResponse.data) === null || _resourceResponse$dat2 === void 0 ? void 0 : _resourceResponse$dat2.list) !== null && _resourceResponse$dat !== void 0 ? _resourceResponse$dat : [];
               if (!(!Array.isArray(resourceList) || resourceList.length === 0)) {
-                _context5.next = 14;
+                _context8.next = 14;
                 break;
               }
-              return _context5.abrupt("return", []);
+              return _context8.abrupt("return", []);
             case 14:
               // 全局先做 booking 标准化 + start_time 升序，后续映射直接复用
               normalizedBookings = this.normalizeResourceBookings(current, deviceCurrent, bookingList); // 建立 resourceId -> bookings[] 倒排索引，加速资源匹配
@@ -836,14 +1109,14 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
                   list: list === null || list === void 0 ? void 0 : list.length
                 }
               });
-              return _context5.abrupt("return", list);
+              return _context8.abrupt("return", list);
             case 20:
             case "end":
-              return _context5.stop();
+              return _context8.stop();
           }
-        }, _callee5, this);
+        }, _callee8, this);
       }));
-      function getResourceBookingList(_x4) {
+      function getResourceBookingList(_x10) {
         return _getResourceBookingList.apply(this, arguments);
       }
       return getResourceBookingList;
@@ -851,30 +1124,30 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getResourceBookingItem",
     value: function () {
-      var _getResourceBookingItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(params) {
+      var _getResourceBookingItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(params) {
         var _resourceResponse$dat3,
           _resourceResponse$dat4,
           _this7 = this,
           _params$bookingList;
         var current, deviceCurrent, resourceResponse, resourceList, targetResource, resourceId, matchedBookingList, statsBookingList, completedBookingList, unpaidBookingList, bookings, completedBookings, unpaidBookings, orderCount, bookingCount, compeleteBookingCount;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
               current = dayjs(params.currentTime);
               if (current.isValid()) {
-                _context6.next = 3;
+                _context9.next = 3;
                 break;
               }
-              return _context6.abrupt("return", null);
+              return _context9.abrupt("return", null);
             case 3:
               deviceCurrent = dayjs(params.deviceTime || params.currentTime);
               if (deviceCurrent.isValid()) {
-                _context6.next = 6;
+                _context9.next = 6;
                 break;
               }
-              return _context6.abrupt("return", null);
+              return _context9.abrupt("return", null);
             case 6:
-              _context6.next = 8;
+              _context9.next = 8;
               return this.request.get('/shop/form/resource/page', {
                 skip: 1,
                 num: 999
@@ -885,22 +1158,22 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
                 isShopApi: true
               });
             case 8:
-              resourceResponse = _context6.sent;
+              resourceResponse = _context9.sent;
               resourceList = (_resourceResponse$dat3 = resourceResponse === null || resourceResponse === void 0 || (_resourceResponse$dat4 = resourceResponse.data) === null || _resourceResponse$dat4 === void 0 ? void 0 : _resourceResponse$dat4.list) !== null && _resourceResponse$dat3 !== void 0 ? _resourceResponse$dat3 : [];
               if (!(!Array.isArray(resourceList) || resourceList.length === 0)) {
-                _context6.next = 12;
+                _context9.next = 12;
                 break;
               }
-              return _context6.abrupt("return", null);
+              return _context9.abrupt("return", null);
             case 12:
               targetResource = resourceList.find(function (resource) {
                 return String(_this7.getResourceId(resource)) === String(params.resourceId);
               });
               if (targetResource) {
-                _context6.next = 15;
+                _context9.next = 15;
                 break;
               }
-              return _context6.abrupt("return", null);
+              return _context9.abrupt("return", null);
             case 15:
               resourceId = this.getResourceId(targetResource);
               matchedBookingList = params.bookingList.filter(function (booking) {
@@ -953,7 +1226,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
                   compeleteBookingCount: compeleteBookingCount
                 }
               });
-              return _context6.abrupt("return", _objectSpread(_objectSpread({}, targetResource), {}, {
+              return _context9.abrupt("return", _objectSpread(_objectSpread({}, targetResource), {}, {
                 resource_id: resourceId,
                 orderCount: orderCount,
                 bookingCount: bookingCount,
@@ -964,11 +1237,11 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
               }));
             case 28:
             case "end":
-              return _context6.stop();
+              return _context9.stop();
           }
-        }, _callee6, this);
+        }, _callee9, this);
       }));
-      function getResourceBookingItem(_x5) {
+      function getResourceBookingItem(_x11) {
         return _getResourceBookingItem.apply(this, arguments);
       }
       return getResourceBookingItem;