@pisell/pisellos 0.10.16 → 0.10.18

package/lib/solution/BookingTicket/index.js

@@ -21,6 +21,7 @@ Object.keys(_types).forEach(function (key) {
     }
   });
 });
+var _OpenData = require("../../modules/OpenData");
 var _BookingContext = require("../../modules/BookingContext");
 var _BaseSales = require("../BaseSales");
 var _scan = _interopRequireDefault(require("./utils/scan"));
@@ -39,7 +40,7 @@ var _bookingStatus = require("./utils/bookingStatus");
 var _resolveBestAddTimePlan = require("./utils/resolveBestAddTimePlan");
 var _utils = require("../../modules/Order/utils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const OPEN_DATA_SECTION_CODES = ['sale', 'reservation', 'fulfillment', 'menu', 'workflow'];
+const OPEN_DATA_SECTION_CODES = ['sale', 'reservation', 'fulfillment', 'menu', 'workflow', 'documents'];
 const OPEN_DATA_CACHE_TTL = 5 * 60 * 1000;
 const USER_PLATFORM = ['pc', 'h5'];
 
@@ -160,7 +161,9 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
   orderCustomerDiscountRefreshInFlight = null;
   orderCustomerDiscountRefreshCustomerId = null;
   orderCustomerPromotionRefreshInFlight = null;
-  loadOpenDataConfigInFlight = null;
+  loadOpenDataInFlight = null;
+  loadOpenDataInFlightTarget = null;
+  openDataTarget = null;
 
   /**
    * 在 BaseSales 默认模块清单（products/order/salesSummary/schedule）基础上追加 customer + bookingContext。
@@ -210,35 +213,69 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
       console.warn('[BookingTicket] businessCode 缺失，跳过 OpenData 配置加载，当前 module name: ', this.name);
       return null;
     }
+    const channel = this.getSubmitOrderSalesChannel();
+    const target = `${businessCode}+${channel}`;
     const lastFetchedAt = this.store.openData.getLastFetchedAt();
     const cachedData = this.store.openData.getOpenData();
-    if (cachedData && lastFetchedAt && Date.now() - lastFetchedAt < OPEN_DATA_CACHE_TTL) {
+    if (cachedData && this.openDataTarget === target && lastFetchedAt && Date.now() - lastFetchedAt < OPEN_DATA_CACHE_TTL) {
       this.otherParams.openData = cachedData;
       return cachedData;
     }
-    if (this.loadOpenDataConfigInFlight) return await this.loadOpenDataConfigInFlight;
-    const channel = this.getSubmitOrderSalesChannel();
-    this.loadOpenDataConfigInFlight = this.store.openData.fetchOpenData({
+    if (this.loadOpenDataInFlight) {
+      if (this.loadOpenDataInFlightTarget === target) {
+        return await this.loadOpenDataInFlight;
+      }
+      await this.loadOpenDataInFlight;
+      return this.loadOpenDataConfig();
+    }
+    this.loadOpenDataInFlightTarget = target;
+    const request = this.store.openData.fetchOpenData({
       scope: 'board',
-      target: `${businessCode}+${channel}`,
+      target,
       // target: `dine_in+pos`,
       section_code: [...OPEN_DATA_SECTION_CODES]
     });
+    this.loadOpenDataInFlight = request;
     try {
-      const openDataConfig = await this.loadOpenDataConfigInFlight;
-      this.otherParams.openData = openDataConfig;
+      const openDataConfig = await request;
+      // clearOpenDataCache() 或新请求已接管时，旧响应只能返回给原调用方，不能复活缓存归属。
+      if (this.loadOpenDataInFlight === request) {
+        this.openDataTarget = target;
+        this.otherParams.openData = openDataConfig;
+      }
       return openDataConfig;
     } finally {
-      this.loadOpenDataConfigInFlight = null;
+      if (this.loadOpenDataInFlight === request) {
+        this.loadOpenDataInFlight = null;
+        this.loadOpenDataInFlightTarget = null;
+      }
     }
   }
   async getOpenData() {
     return this.loadOpenDataConfig();
   }
+  async getInvoiceLayoutConfig() {
+    const openData = await this.loadOpenDataConfig();
+    if (!openData) return (0, _OpenData.getDefaultInvoiceLayoutConfig)();
+    return this.store.openData.getInvoiceLayoutConfig();
+  }
+  async getInvoiceTemplateSettings() {
+    const openData = await this.loadOpenDataConfig();
+    if (!openData) return (0, _OpenData.getDefaultInvoiceTemplateSettings)();
+    return this.store.openData.getInvoiceTemplateSettings();
+  }
+  isInvoiceOpenDataCacheCurrent() {
+    const businessCode = this.getBookingTicketBusinessCode();
+    const channel = this.getSubmitOrderSalesChannel();
+    if (!businessCode || !channel) return false;
+    return this.openDataTarget === `${businessCode}+${channel}`;
+  }
 
   /** 清除店铺级 OpenData；下一次 getOpenData 时会重新拉取。 */
   clearOpenDataCache() {
-    this.loadOpenDataConfigInFlight = null;
+    this.loadOpenDataInFlight = null;
+    this.loadOpenDataInFlightTarget = null;
+    this.openDataTarget = null;
     this.otherParams.openData = null;
     this.store.openData?.clearCache();
   }
@@ -275,7 +312,10 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
     const prefix = this.normalizeIdPrefix(openDataConfig?.['sale.short_number_prefix'], '');
     const shopOrderPrefix = this.normalizeIdPrefix(openDataConfig?.['sale.sale_number_prefix'], '');
     const resetReceiptSequenceDaily = typeof openDataConfig?.['sale.short_number_daily_reset'] === 'boolean' ? openDataConfig?.['sale.short_number_daily_reset'] : false;
-    const operatingDayBoundary = this.getAppData('operating_day_boundary');
+    const operatingDayBoundary = this.getAppData('operating_day_boundary') || {
+      "type": "start_time",
+      "time": "00:00"
+    };
     const deviceId = await this.getShortNumberOrDeviceId();
     this.setPaymentNumberDevicePrefix(deviceId);
     const businessCode = this.getBookingTicketBusinessCode();
@@ -293,7 +333,7 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
           padReceiptSequence: false,
           receiptSequenceLength,
           resetReceiptSequenceDaily,
-          receiptSequenceResetTime: operatingDayBoundary.time,
+          receiptSequenceResetTime: operatingDayBoundary?.time,
           receiptSequenceStart,
           shopOrderPrefix
         }
@@ -349,7 +389,12 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
         country_calling_code: selectedCustomer?.country_calling_code
       };
       customerModule.setSelectedCustomer(customer);
-      this.setOrderCustomer(customer);
+      // 详情 hydrate 后仍需广播一次，让 CustomerContext 等 UI 订阅方拿到刚补齐的
+      // customerSnapshot；但它不是用户主动切换客户。通过 source 明确标记初始化事件，
+      // 商品报价/折扣订阅方即可跳过 prepare/config，其他旧订阅方仍可照常刷新 UI。
+      this.setOrderCustomer(customer, {
+        source: 'detailHydrate'
+      });
       // await this.store.order.saveDraft();
     }
     return sales;
@@ -926,7 +971,7 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
    * 同时透传 OrderModule 内部 emit 的 `order:onOrderCustomerChange` 之外，
    * 在 BookingTicket 命名空间也 emit 一次，方便上层统一从 Solution 订阅。
    */
-  setOrderCustomer(customer) {
+  setOrderCustomer(customer, options) {
     if (!customer) {
       this.clearOrderCustomer();
       return;
@@ -947,12 +992,18 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
       const snapshotReplenished = !snapshotBeforeSet && Boolean(snapshotAfterOrderSet);
       if (snapshotReplenished) {
         const next = this.buildOrderCustomerPayload();
-        this.core.effects.emit(`${this.name}:onOrderCustomerChange`, next);
+        this.core.effects.emit(`${this.name}:onOrderCustomerChange`, next && options?.source ? {
+          ...next,
+          source: options.source
+        } : next);
       }
       return;
     }
     const next = this.buildOrderCustomerPayload();
-    this.core.effects.emit(`${this.name}:onOrderCustomerChange`, next);
+    this.core.effects.emit(`${this.name}:onOrderCustomerChange`, next && options?.source ? {
+      ...next,
+      source: options.source
+    } : next);
     this.refreshDiscountConfigAfterOrderCustomerChange(patch.customer_id);
     // 客户切换可能改变可用促销/赠品；触发一次重算（recursion-safe）。
     const promotionRefreshTask = this.store.order.applyPromotion().then(() => undefined);
@@ -1729,6 +1780,8 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
     });
     if (params?.businessCode !== undefined || params?.business_code !== undefined) {
       await this.configureIdGeneratorFromOpenData();
+    } else if (params?.channel !== undefined) {
+      await this.loadOpenDataConfig();
     }
   }
   getDeviceTaskPlugin() {

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

@@ -2,7 +2,7 @@ import dayjs from 'dayjs';
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import type { RequestPlugin } from '../../plugins/request';
-import { SalesState, SalesModuleAPI, Reservation, SalesResourceBookingItem, SalesResourceBookingItemWithGroups, SalesTimelineHighlights, ChangeBookingStatusParams, GetResourceBookingItemParams } from './types';
+import { SalesState, SalesModuleAPI, Reservation, SalesResourceBookingItem, SalesResourceBookingItemWithGroups, SalesTimelineHighlights, ChangeBookingStatusParams, GetResourceBookingItemParams, SalesPrintLocalOrderReceiptOptions } from './types';
 import type { BookingData } from '../../server/modules/order/types';
 export * from './types';
 /**
@@ -26,6 +26,10 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     protected otherParams: Record<string, any>;
     protected request: RequestPlugin;
     private logger;
+    private invoiceOpenDataModule;
+    private invoiceOpenDataTarget;
+    private invoiceOpenDataInFlight;
+    private invoiceOpenDataInFlightTarget;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     /** 获取当前 store 快照 */
@@ -42,6 +46,17 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     resetReservationList(): Reservation[];
     cancelOrder(orderIds: Array<number | string>): Promise<any>;
     changeBookingStatus(params: ChangeBookingStatusParams): Promise<any>;
+    /**
+     * 将显式 channel 或当前运行上下文归一为 Invoice OpenData 使用的销售入口。
+     * Legacy Sales 的系统上下文没有可打印的 system target，因此统一回退 pos。
+     */
+    private getInvoiceSalesChannel;
+    private loadInvoiceOpenData;
+    private logInvoiceOpenDataFallback;
+    private resolveInvoiceConfigs;
+    printLocalOrderReceipt<T = any>(lookup: string | number, options: SalesPrintLocalOrderReceiptOptions): Promise<T>;
+    /** 清除独立 Documents 缓存；下一次打印会按当前 target 重新获取。 */
+    clearOpenDataCache(): void;
     destroy(): Promise<void>;
     /**
      * 时间轴粒度（分钟）
@@ -50,11 +65,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 +111,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

@@ -9,6 +9,7 @@ var _exportNames = {
 };
 exports.default = exports.SalesImpl = exports.Sales = void 0;
 var _dayjs = _interopRequireDefault(require("dayjs"));
+var _lodashEs = require("lodash-es");
 var _BaseModule = require("../../modules/BaseModule");
 var _types = require("./types");
 Object.keys(_types).forEach(function (key) {
@@ -22,8 +23,11 @@ Object.keys(_types).forEach(function (key) {
     }
   });
 });
+var _OpenData = require("../../modules/OpenData");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const UNPAID_PAYMENT_STATUSES = new Set(['unpaid', 'partially_paid', 'payment_processing']);
+const INVOICE_OPEN_DATA_SECTION_CODES = ['documents'];
+const INVOICE_OPEN_DATA_CACHE_TTL = 5 * 60 * 1000;
 
 /**
  * Sales 解决方案基础骨架
@@ -46,11 +50,22 @@ class SalesImpl extends _BaseModule.BaseModule {
   otherParams = {};
   request;
   logger; // LoggerManager 实例
-
+  invoiceOpenDataModule = null;
+  invoiceOpenDataTarget = null;
+  invoiceOpenDataInFlight = null;
+  invoiceOpenDataInFlightTarget = null;
   constructor(name, version) {
     super(name, version);
   }
   async initialize(core, options = {}) {
+    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 || {};
@@ -71,6 +86,17 @@ class SalesImpl extends _BaseModule.BaseModule {
     // 在这里补充从 Server/Order 读取 currentDay 原始数据并转换为预约列表。
 
     this.logger = appPlugin?.getApp().logger;
+    this.invoiceOpenDataTarget = null;
+    this.invoiceOpenDataInFlight = null;
+    this.invoiceOpenDataInFlightTarget = null;
+    this.invoiceOpenDataModule = new _OpenData.OpenDataModule(`${this.name}_invoiceOpenData`);
+    this.core.registerModule(this.invoiceOpenDataModule, {
+      initialState: {},
+      otherParams: {
+        fatherModule: this.name,
+        openCache: false
+      }
+    });
     await this.core.effects.emit(`${this.name}:onInited`, {});
   }
 
@@ -139,11 +165,148 @@ class SalesImpl extends _BaseModule.BaseModule {
     return orderModule.changeBookingStatus(params);
   }
 
+  /**
+   * 将显式 channel 或当前运行上下文归一为 Invoice OpenData 使用的销售入口。
+   * Legacy Sales 的系统上下文没有可打印的 system target，因此统一回退 pos。
+   */
+  getInvoiceSalesChannel(channel) {
+    const contextChannel = this.core?.context?.getChannel?.();
+    const normalized = String(channel ?? contextChannel ?? '').trim();
+    return !normalized || normalized === 'system' ? 'pos' : normalized;
+  }
+  async loadInvoiceOpenData(businessCode, channel) {
+    if (!this.invoiceOpenDataModule) {
+      throw new Error('Sales Invoice OpenData 模块未初始化');
+    }
+    const target = `${businessCode}+${channel}`;
+    const cachedData = this.invoiceOpenDataModule.getOpenData();
+    const lastFetchedAt = this.invoiceOpenDataModule.getLastFetchedAt();
+    if (cachedData && this.invoiceOpenDataTarget === target && typeof lastFetchedAt === 'number' && Date.now() - lastFetchedAt < INVOICE_OPEN_DATA_CACHE_TTL) {
+      return cachedData;
+    }
+    if (this.invoiceOpenDataInFlight) {
+      if (this.invoiceOpenDataInFlightTarget === target) {
+        return this.invoiceOpenDataInFlight;
+      }
+      try {
+        await this.invoiceOpenDataInFlight;
+      } catch {
+        // 另一 target 的失败不应阻断当前 target 获取自己的 Documents 配置。
+      }
+      return this.loadInvoiceOpenData(businessCode, channel);
+    }
+    const request = this.invoiceOpenDataModule.fetchOpenData({
+      scope: 'board',
+      target,
+      section_code: [...INVOICE_OPEN_DATA_SECTION_CODES]
+    });
+    this.invoiceOpenDataInFlight = request;
+    this.invoiceOpenDataInFlightTarget = target;
+    try {
+      const openData = await request;
+      // clearOpenDataCache() 或后续请求接管后，旧响应不得复活 target 归属。
+      if (this.invoiceOpenDataInFlight === request) {
+        this.invoiceOpenDataTarget = target;
+      }
+      return openData;
+    } finally {
+      if (this.invoiceOpenDataInFlight === request) {
+        this.invoiceOpenDataInFlight = null;
+        this.invoiceOpenDataInFlightTarget = null;
+      }
+    }
+  }
+  logInvoiceOpenDataFallback(error) {
+    const message = error instanceof Error ? error.message : String(error);
+    if (this.logger?.addLog) {
+      this.logger.addLog({
+        type: 'warning',
+        title: 'Sales Invoice OpenData 加载失败，使用默认配置',
+        metadata: {
+          message
+        }
+      });
+      return;
+    }
+    console.warn('[Sales] Invoice OpenData 加载失败，使用默认配置', error);
+  }
+  async resolveInvoiceConfigs(businessCode, channel) {
+    try {
+      await this.loadInvoiceOpenData(businessCode, channel);
+      if (this.invoiceOpenDataTarget !== `${businessCode}+${channel}`) {
+        return {
+          invoice: (0, _OpenData.getDefaultInvoiceLayoutConfig)(),
+          templateSettings: (0, _OpenData.getDefaultInvoiceTemplateSettings)()
+        };
+      }
+      return {
+        invoice: this.invoiceOpenDataModule?.getInvoiceLayoutConfig() ?? (0, _OpenData.getDefaultInvoiceLayoutConfig)(),
+        templateSettings: this.invoiceOpenDataModule?.getInvoiceTemplateSettings() ?? (0, _OpenData.getDefaultInvoiceTemplateSettings)()
+      };
+    } catch (error) {
+      this.logInvoiceOpenDataFallback(error);
+      return {
+        invoice: (0, _OpenData.getDefaultInvoiceLayoutConfig)(),
+        templateSettings: (0, _OpenData.getDefaultInvoiceTemplateSettings)()
+      };
+    }
+  }
+  async printLocalOrderReceipt(lookup, options) {
+    const normalizedLookup = typeof lookup === 'string' ? lookup.trim() : lookup;
+    if (normalizedLookup === '' || normalizedLookup === null || normalizedLookup === undefined) {
+      throw new Error('Sales 本地小票打印需要订单标识');
+    }
+    const businessCode = String(options?.businessCode ?? '').trim();
+    if (!businessCode) {
+      throw new Error('Sales 本地小票打印需要 businessCode');
+    }
+    const channel = this.getInvoiceSalesChannel(options?.channel);
+    const {
+      invoice,
+      templateSettings
+    } = await this.resolveInvoiceConfigs(businessCode, channel);
+    const lookupPayload = typeof normalizedLookup === 'number' ? {
+      order_id: normalizedLookup
+    } : {
+      external_sale_number: normalizedLookup
+    };
+    return this.request.post('/local/print-order', {
+      ...lookupPayload,
+      lookup_order_from_db: 1,
+      small_ticket_data_flag: 1,
+      business_code: businessCode,
+      order_sales_channel: channel,
+      invoice: (0, _lodashEs.cloneDeep)(invoice),
+      template_settings: (0, _lodashEs.cloneDeep)(templateSettings)
+    }, {
+      osServer: true,
+      customToast: () => {}
+    });
+  }
+
+  /** 清除独立 Documents 缓存；下一次打印会按当前 target 重新获取。 */
+  clearOpenDataCache() {
+    this.invoiceOpenDataInFlight = null;
+    this.invoiceOpenDataInFlightTarget = null;
+    this.invoiceOpenDataTarget = null;
+    this.invoiceOpenDataModule?.clearCache();
+  }
+
   // -------------------------------------------------------------------------
   // 生命周期
   // -------------------------------------------------------------------------
 
   async destroy() {
+    this.clearOpenDataCache();
+    const invoiceOpenDataModule = this.invoiceOpenDataModule;
+    this.invoiceOpenDataModule = null;
+    if (invoiceOpenDataModule) {
+      try {
+        await invoiceOpenDataModule.destroy();
+      } catch (error) {
+        console.warn('[Sales] Invoice OpenData 子模块销毁失败', error);
+      }
+    }
     await this.core.effects.emit(`${this.name}:onDestroy`, {});
     super.destroy();
   }
@@ -160,16 +323,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 +341,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 +509,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 +572,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/lib/solution/Sales/types.d.ts

@@ -50,6 +50,12 @@ export interface GetResourceBookingItemParams {
     bookingList: BookingData[];
     deviceTime?: string;
 }
+export interface SalesPrintLocalOrderReceiptOptions {
+    /** 当前销售业务类型，用于隔离 Documents Invoice 配置。 */
+    businessCode: string;
+    /** 当前销售入口；缺失或为 system 时按 pos 处理。 */
+    channel?: string;
+}
 /**
  * Sales 解决方案状态
  *
@@ -82,6 +88,10 @@ export interface SalesModuleAPI {
     cancelOrder: (orderIds: Array<number | string>) => Promise<any>;
     /** 变更预约状态 */
     changeBookingStatus: (params: ChangeBookingStatusParams) => Promise<any>;
+    /** 按本地订单标识打印小票；本地未命中时由 OS Server 负责远端兜底。 */
+    printLocalOrderReceipt: <T = any>(lookup: string | number, options: SalesPrintLocalOrderReceiptOptions) => Promise<T>;
+    /** 清除 Legacy Sales 独立维护的 Documents OpenData 缓存。 */
+    clearOpenDataCache: () => void;
     /** 获取资源维度的预约占用列表 */
     getResourceBookingList: (currentTime: string, bookingList: BookingData[], deviceTime?: string) => Promise<SalesResourceBookingItem[]>;
     /** 获取单个资源维度的预约占用、已完成、未支付列表 */

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

@@ -1,6 +1,6 @@
 import type { Module, ModuleOptions, PisellCore } from '../../types';
 import type { ProductData } from '../../modules';
-import type { OpenDataConfig } from '../../modules/OpenData';
+import { type InvoiceLayoutConfig, type InvoiceTemplateSettings, type OpenDataConfig } from '../../modules/OpenData';
 import type { LoadScheduleAvailableDateParams, ScheduleItem } from '../../modules/Schedule/types';
 import type { ProductListLoadProductsParams } from '../../modules/ProductList';
 import type { AvailabilityDateRange, AvailabilityOccupancy, AvailabilityProduct, AvailabilityResource, GetProductTimeRangesRequest } from '../../modules/ResourcePlanner';
@@ -59,9 +59,6 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
     protected defaultVersion: string;
     protected store: UnifiedBookingSalesState;
     private unifiedProductCatalog;
-    private openDataTarget;
-    private loadOpenDataInFlight;
-    private loadOpenDataInFlightTarget;
     private availabilityRuntimeOffsetMinutes;
     private availabilityScheduleCatalog;
     private availabilityProjectionSequence;
@@ -147,6 +144,10 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
      */
     loadOpenData(params: UnifiedBookingSalesLoadOpenDataParams): Promise<OpenDataConfig>;
     getOpenData(): Promise<OpenDataConfig | null>;
+    clearOpenDataCache(): void;
+    getInvoiceLayoutConfig(): Promise<InvoiceLayoutConfig>;
+    getInvoiceTemplateSettings(): Promise<InvoiceTemplateSettings>;
+    protected isInvoiceOpenDataCacheCurrent(): boolean;
     /**
      * Load a resource policy without depending on the legacy appointmentBooking solution.
      */