@pisell/pisellos 2.2.97 → 2.2.99

package/lib/server/modules/floor-plan/types.d.ts

@@ -0,0 +1,43 @@
+/**
+ * 平面图（floor-plan）Server 模块类型
+ * 与 GET /shop/schedule/floor-plan 系列接口数据结构对齐
+ */
+export interface FloorPlanItem {
+    id: number;
+    shop_id?: number;
+    code: string;
+    name: string | Record<string, string>;
+    layout: unknown[];
+    canvas_width: number;
+    canvas_height: number;
+    sort: number;
+    status: number;
+    created_at?: string;
+    updated_at?: string;
+}
+export interface FloorPlanState {
+    list: FloorPlanItem[];
+    map: Map<string, FloorPlanItem>;
+    codeMap: Map<string, FloorPlanItem>;
+}
+/** pubsub / Ably 推送消息（与《平面图编辑器API文档》Socket 一节一致） */
+export interface FloorPlanSyncMessage {
+    module?: string;
+    action?: string;
+    operation?: string;
+    id?: number;
+    ids?: number[];
+    body?: Partial<FloorPlanItem> & {
+        id?: number;
+    };
+    message_uuid?: string;
+    timestamp?: string;
+    _channelKey?: string;
+}
+export declare const FloorPlanHooks: {
+    /** 本地列表变更（预加载、合并、删除后） */
+    readonly onFloorPlansChanged: "server_floor_plan:onFloorPlansChanged";
+    /** pubsub 同步处理完成，供 Server 向订阅者推送最新查询结果 */
+    readonly onFloorPlanSyncCompleted: "server_floor_plan:onFloorPlanSyncCompleted";
+};
+export type FloorPlanHooksType = (typeof FloorPlanHooks)[keyof typeof FloorPlanHooks];

package/lib/server/modules/floor-plan/types.js

@@ -0,0 +1,34 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/server/modules/floor-plan/types.ts
+var types_exports = {};
+__export(types_exports, {
+  FloorPlanHooks: () => FloorPlanHooks
+});
+module.exports = __toCommonJS(types_exports);
+var FloorPlanHooks = {
+  /** 本地列表变更（预加载、合并、删除后） */
+  onFloorPlansChanged: "server_floor_plan:onFloorPlansChanged",
+  /** pubsub 同步处理完成，供 Server 向订阅者推送最新查询结果 */
+  onFloorPlanSyncCompleted: "server_floor_plan:onFloorPlanSyncCompleted"
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  FloorPlanHooks
+});

package/lib/server/modules/index.d.ts

@@ -16,6 +16,9 @@ export type { ScheduleState, ScheduleItem } from './schedule/types';
 export { OrderModule } from './order';
 export type { OrderState, OrderData, OrderId, OrderSummary, OrderBookingItem, OrderProductLineItem, OrderPaymentItem, OrderSurchargeItem, OrderProductDiscountItem, OrderWithoutBookings, BookingData, OrderFilters, BookingFilters, OrderFilterResult, BookingFilterResult, OrderModulePagedResult, } from './order/types';
 export { OrderHooks } from './order/types';
+export { FloorPlanModule } from './floor-plan';
+export type { FloorPlanItem, FloorPlanState, FloorPlanSyncMessage } from './floor-plan/types';
+export { FloorPlanHooks } from './floor-plan/types';
 export { ResourceModule, resourceModule } from './resource';
 export type { ResourceState, ResourceData, ResourceId, ResourceBooking, ResourcePageQuery, ResourcePageResult, QueryOptions, ScheduleEventResource, } from './resource';
 export { ResourceHooks } from './resource';

package/lib/server/modules/index.js

@@ -19,6 +19,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/server/modules/index.ts
 var modules_exports = {};
 __export(modules_exports, {
+  FloorPlanHooks: () => import_types5.FloorPlanHooks,
+  FloorPlanModule: () => import_floor_plan.FloorPlanModule,
   MenuHooks: () => import_types2.MenuHooks,
   MenuModule: () => import_menu.MenuModule,
   OrderHooks: () => import_types4.OrderHooks,
@@ -42,10 +44,14 @@ var import_types3 = require("./quotation/types");
 var import_schedule = require("./schedule");
 var import_order = require("./order");
 var import_types4 = require("./order/types");
+var import_floor_plan = require("./floor-plan");
+var import_types5 = require("./floor-plan/types");
 var import_resource = require("./resource");
 var import_resource2 = require("./resource");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  FloorPlanHooks,
+  FloorPlanModule,
   MenuHooks,
   MenuModule,
   OrderHooks,

package/lib/server/modules/order/types.d.ts

@@ -121,6 +121,8 @@ export interface OrderProductLineItem {
     product_bundle?: OrderProductBundleItem[];
     /** 元数据；含 unique_identification_number。来源：Detail.metadata */
     metadata?: OrderProductMetadata | null;
+    /** 关联子预约 ID（仅输出，预约订单场景）。来源：Detail.schedule_event_id */
+    schedule_event_id?: number | null;
 }
 /** 预约条目 metadata，常含 unique_identification_number */
 export interface OrderBookingMetadata {
@@ -188,6 +190,14 @@ export interface OrderBookingItem {
     holder?: Record<string, unknown> | null;
     /** 元数据；含 unique_identification_number。来源：ScheduleEvent.metadata */
     metadata?: OrderBookingMetadata | null;
+    /**
+     * 与订单明细等资源的关联（如 resource_type 为订单 Detail 时 resource_id 对应 order_detail_id）。
+     * 来源：服务端 ScheduleEvent 关联表。
+     */
+    relation_items?: {
+        resource_id?: number | null;
+        [key: string]: unknown;
+    }[];
 }
 /** 支付记录 metadata，常含 unique_payment_number */
 export interface OrderPaymentMetadata {
@@ -391,10 +401,12 @@ export interface OrderData {
 /** 去掉 bookings 后的订单快照；展开预约行时挂在 {@link BookingData.order} 上 */
 export type OrderWithoutBookings = Omit<OrderData, 'bookings'>;
 /**
- * 展开后的单条预约视图：协议 {@link OrderBookingItem} 平铺字段 + 所属订单（不含 bookings）
+ * 展开后的单条预约视图：协议 {@link OrderBookingItem} 平铺字段 + 所属订单（不含 bookings）+
+ * 当前预约归属的商品行（由订单 products 按 schedule_event_id / relation_items 归集，不修改 order）
  */
 export type BookingData = OrderBookingItem & {
     order: OrderWithoutBookings;
+    products: OrderProductLineItem[];
 };
 /**
  * 订单列表筛选条件（与 order.ts getFilterButtonList 等 UI 对齐）

package/lib/server/modules/order/utils/filterBookings.d.ts

@@ -1,5 +1,11 @@
-import type { BookingData, BookingFilters, BookingFilterResult, OrderData } from '../types';
+import type { BookingData, BookingFilters, BookingFilterResult, OrderBookingItem, OrderData, OrderProductLineItem } from '../types';
 export type { BookingData, BookingFilters, BookingFilterResult } from '../types';
+/**
+ * 从整单 `order.products` 中归集属于指定 `booking` 的明细行。
+ * - 第一遍：`product.schedule_event_id === booking.schedule_event_id`（保持 products 原顺序）
+ * - 第二遍：按 `relation_items` 顺序追加 `resource_id` 与 `order_detail_id` 匹配且尚未收录的行
+ */
+export declare function productsForBooking(order: OrderData, booking: OrderBookingItem): OrderProductLineItem[];
 export declare function flattenOrdersToBookings(orders: OrderData[]): BookingData[];
 export declare function filterBookingsFromOrders(orders: OrderData[], filters: BookingFilters): BookingFilterResult;
 export declare function sortBookings(result: BookingFilterResult, filters: BookingFilters): BookingFilterResult;

package/lib/server/modules/order/utils/filterBookings.js

@@ -22,6 +22,7 @@ __export(filterBookings_exports, {
   filterBookings: () => filterBookings,
   filterBookingsFromOrders: () => filterBookingsFromOrders,
   flattenOrdersToBookings: () => flattenOrdersToBookings,
+  productsForBooking: () => productsForBooking,
   sortBookings: () => sortBookings
 });
 module.exports = __toCommonJS(filterBookings_exports);
@@ -189,6 +190,58 @@ function matchBooking(booking, orderInfo, ctx) {
   }
   return true;
 }
+function productsForBooking(order, booking) {
+  var _a;
+  const products = order.products;
+  if (!Array.isArray(products) || products.length === 0)
+    return [];
+  const bookingEventId = booking.schedule_event_id;
+  const byDetailId = /* @__PURE__ */ new Map();
+  for (let i = 0, len = products.length; i < len; i++) {
+    const p = products[i];
+    const oid = p.order_detail_id;
+    if (oid === void 0 || oid === null)
+      continue;
+    const detailId = Number(oid);
+    if (Number.isNaN(detailId))
+      continue;
+    byDetailId.set(detailId, p);
+  }
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (let i = 0, len = products.length; i < len; i++) {
+    const p = products[i];
+    const oid = p.order_detail_id;
+    if (oid === void 0 || oid === null)
+      continue;
+    const detailId = Number(oid);
+    if (Number.isNaN(detailId))
+      continue;
+    if (bookingEventId !== void 0 && bookingEventId !== null && p.schedule_event_id !== void 0 && p.schedule_event_id !== null && Number(p.schedule_event_id) === Number(bookingEventId)) {
+      if (!seen.has(detailId)) {
+        seen.add(detailId);
+        out.push(p);
+      }
+    }
+  }
+  const relationItems = booking.relation_items;
+  if (Array.isArray(relationItems) && relationItems.length > 0) {
+    for (let r = 0, rLen = relationItems.length; r < rLen; r++) {
+      const rid = (_a = relationItems[r]) == null ? void 0 : _a.resource_id;
+      if (rid === void 0 || rid === null)
+        continue;
+      const detailId = Number(rid);
+      if (Number.isNaN(detailId) || seen.has(detailId))
+        continue;
+      const line = byDetailId.get(detailId);
+      if (line) {
+        seen.add(detailId);
+        out.push(line);
+      }
+    }
+  }
+  return out;
+}
 function flattenOrdersToBookings(orders) {
   if (!orders || !Array.isArray(orders))
     return [];
@@ -200,7 +253,12 @@ function flattenOrdersToBookings(orders) {
       continue;
     const { bookings: _omit, ...orderInfo } = order;
     for (let j = 0, bLen = bookings.length; j < bLen; j++) {
-      result.push({ ...bookings[j], order: orderInfo });
+      const booking = bookings[j];
+      result.push({
+        ...booking,
+        order: orderInfo,
+        products: productsForBooking(order, booking)
+      });
     }
   }
   return result;
@@ -237,7 +295,11 @@ function filterBookingsFromOrders(orders, filters) {
           const { bookings: _omit, ...rest } = order;
           orderInfo = rest;
         }
-        paginatedList.push({ ...booking, order: orderInfo });
+        paginatedList.push({
+          ...booking,
+          order: orderInfo,
+          products: productsForBooking(order, booking)
+        });
       }
       totalCount++;
     }
@@ -300,7 +362,10 @@ function filterBookings(bookings, filters) {
     if (!matchBooking(booking, order, ctx))
       continue;
     if (totalCount >= startIndex && paginatedList.length < size) {
-      paginatedList.push(booking);
+      paginatedList.push({
+        ...booking,
+        products: productsForBooking(booking.order, booking)
+      });
     }
     totalCount++;
   }
@@ -316,5 +381,6 @@ function filterBookings(bookings, filters) {
   filterBookings,
   filterBookingsFromOrders,
   flattenOrdersToBookings,
+  productsForBooking,
   sortBookings
 });

package/lib/server/modules/resource/index.d.ts

@@ -50,15 +50,12 @@ export declare class ResourceModule extends BaseModule implements Module {
     /**
      * 创建预订
      */
-    createBooking(booking: Partial<ResourceBooking>): ResourceBooking;
     /**
      * 更新预订
      */
-    updateBooking(id: ResourceId, data: Partial<ResourceBooking>): ResourceBooking | undefined;
     /**
      * 删除预订
      */
-    deleteBooking(id: ResourceId): boolean;
     /**
      * 清空缓存
      */
@@ -73,8 +70,6 @@ export declare class ResourceModule extends BaseModule implements Module {
     private loadResourcesByServer;
     private loadResourcesFromSQLite;
     private saveResourcesToSQLite;
-    private loadBookingsFromSQLite;
-    private saveBookingsToSQLite;
     private initResourceDataSource;
     private setupResourceSync;
     private processSyncMessages;

package/lib/server/modules/resource/index.js

@@ -29,7 +29,6 @@ var import_BaseModule = require("../../../modules/BaseModule");
 var import_types = require("./types");
 var import_types2 = require("./types");
 var RESOURCE_STORE_NAME = "resources";
-var BOOKING_STORE_NAME = "resource_bookings";
 var DEFAULT_PAGE_SIZE = 999;
 var RESOURCE_SYNC_DEBOUNCE_MS = 1e4;
 var ResourceModule = class extends import_BaseModule.BaseModule {
@@ -103,11 +102,6 @@ var ResourceModule = class extends import_BaseModule.BaseModule {
         await this.safeEmit(import_types.ResourceHooks.onResourcesChanged, this.store.list);
       }
     }
-    const cachedBookings = await this.loadBookingsFromSQLite();
-    if (cachedBookings.length > 0) {
-      this.store.bookings = (0, import_lodash_es.cloneDeep)(cachedBookings);
-      this.syncBookingsIndex();
-    }
   }
   getRoutes() {
     return [];
@@ -205,54 +199,49 @@ var ResourceModule = class extends import_BaseModule.BaseModule {
   /**
    * 创建预订
    */
-  createBooking(booking) {
-    const id = (booking == null ? void 0 : booking.id) ?? Date.now();
-    const normalized = {
-      id,
-      ...booking
-    };
-    this.store.bookings.push(normalized);
-    const rid = normalized.resource_id ?? normalized.resourceId;
-    if (rid !== void 0) {
-      const existing = this.resourceIdIndex.get(rid) || [];
-      existing.push(normalized);
-      this.resourceIdIndex.set(rid, existing);
-    }
-    this.saveBookingsToSQLite(this.store.bookings).catch(() => {
-    });
-    this.safeEmit(import_types.ResourceHooks.onBookingsChanged, this.store.bookings);
-    return normalized;
-  }
+  // createBooking(booking: Partial<ResourceBooking>): ResourceBooking {
+  //   const id = booking?.id ?? Date.now()
+  //   const normalized: ResourceBooking = {
+  //     id,
+  //     ...booking,
+  //   } as ResourceBooking
+  //   this.store.bookings.push(normalized)
+  //   const rid = normalized.resource_id ?? normalized.resourceId
+  //   if (rid !== undefined) {
+  //     const existing = this.resourceIdIndex.get(rid) || []
+  //     existing.push(normalized)
+  //     this.resourceIdIndex.set(rid, existing)
+  //   }
+  //   this.saveBookingsToSQLite(this.store.bookings).catch(() => {})
+  //   this.safeEmit(ResourceHooks.onBookingsChanged, this.store.bookings)
+  //   return normalized
+  // }
   /**
    * 更新预订
    */
-  updateBooking(id, data) {
-    const index = this.store.bookings.findIndex((b) => this.getIdKey(b.id) === this.getIdKey(id));
-    if (index === -1)
-      return void 0;
-    const old = this.store.bookings[index];
-    const updated = { ...old, ...data, id: old.id };
-    this.store.bookings[index] = updated;
-    this.rebuildBookingsIndex();
-    this.saveBookingsToSQLite(this.store.bookings).catch(() => {
-    });
-    this.safeEmit(import_types.ResourceHooks.onBookingsChanged, this.store.bookings);
-    return updated;
-  }
+  // updateBooking(id: ResourceId, data: Partial<ResourceBooking>): ResourceBooking | undefined {
+  //   const index = this.store.bookings.findIndex(b => this.getIdKey(b.id) === this.getIdKey(id))
+  //   if (index === -1) return undefined
+  //   const old = this.store.bookings[index]
+  //   const updated: ResourceBooking = { ...old, ...data, id: old.id } as ResourceBooking
+  //   this.store.bookings[index] = updated
+  //   this.rebuildBookingsIndex()
+  //   this.saveBookingsToSQLite(this.store.bookings).catch(() => {})
+  //   this.safeEmit(ResourceHooks.onBookingsChanged, this.store.bookings)
+  //   return updated
+  // }
   /**
    * 删除预订
    */
-  deleteBooking(id) {
-    const index = this.store.bookings.findIndex((b) => this.getIdKey(b.id) === this.getIdKey(id));
-    if (index === -1)
-      return false;
-    this.store.bookings.splice(index, 1);
-    this.rebuildBookingsIndex();
-    this.saveBookingsToSQLite(this.store.bookings).catch(() => {
-    });
-    this.safeEmit(import_types.ResourceHooks.onBookingsChanged, this.store.bookings);
-    return true;
-  }
+  // deleteBooking(id: ResourceId): boolean {
+  //   const index = this.store.bookings.findIndex(b => this.getIdKey(b.id) === this.getIdKey(id))
+  //   if (index === -1) return false
+  //   this.store.bookings.splice(index, 1)
+  //   this.rebuildBookingsIndex()
+  //   this.saveBookingsToSQLite(this.store.bookings).catch(() => {})
+  //   this.safeEmit(ResourceHooks.onBookingsChanged, this.store.bookings)
+  //   return true
+  // }
   /**
    * 清空缓存
    */
@@ -396,31 +385,29 @@ var ResourceModule = class extends import_BaseModule.BaseModule {
       });
     }
   }
-  async loadBookingsFromSQLite() {
-    if (!this.dbManager)
-      return [];
-    try {
-      const bookings = await this.dbManager.getAll(BOOKING_STORE_NAME);
-      return bookings || [];
-    } catch {
-      return [];
-    }
-  }
-  async saveBookingsToSQLite(bookings) {
-    if (!this.dbManager)
-      return;
-    try {
-      await this.dbManager.clear(BOOKING_STORE_NAME);
-      if (bookings.length === 0)
-        return;
-      if (this.dbManager.bulkAdd) {
-        await this.dbManager.bulkAdd(BOOKING_STORE_NAME, bookings);
-        return;
-      }
-      await Promise.all(bookings.map((b) => this.dbManager.add(BOOKING_STORE_NAME, b)));
-    } catch {
-    }
-  }
+  // private async loadBookingsFromSQLite(): Promise<ResourceBooking[]> {
+  //   if (!this.dbManager) return []
+  //   try {
+  //     const bookings = await this.dbManager.getAll(BOOKING_STORE_NAME)
+  //     return bookings || []
+  //   } catch {
+  //     return []
+  //   }
+  // }
+  // private async saveBookingsToSQLite(bookings: ResourceBooking[]): Promise<void> {
+  //   if (!this.dbManager) return
+  //   try {
+  //     await this.dbManager.clear(BOOKING_STORE_NAME)
+  //     if (bookings.length === 0) return
+  //     if (this.dbManager.bulkAdd) {
+  //       await this.dbManager.bulkAdd(BOOKING_STORE_NAME, bookings)
+  //       return
+  //     }
+  //     await Promise.all(bookings.map(b => this.dbManager.add(BOOKING_STORE_NAME, b)))
+  //   } catch {
+  //     // 忽略 SQLite 异常
+  //   }
+  // }
   // ─────────────────────────────────────────────────────────────────
   // pubsub 同步
   // ─────────────────────────────────────────────────────────────────

package/lib/server/types.d.ts

@@ -25,6 +25,8 @@ export type RouteHandler = (params: {
     method: 'get' | 'post' | 'remove' | 'put';
     data?: any;
     config?: RequestSetting;
+    /** 路由路径（前缀匹配时由 handleRoute 注入，便于 handler 解析动态段） */
+    path?: string;
 }) => Promise<any> | any;
 /**
  * HTTP 方法类型

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

@@ -344,7 +344,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

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

@@ -87,10 +87,11 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     /**
      * 标准化单条 booking：
      * - 过滤终态（rejected/cancelled/completed）
+     * - 当 deviceTime 早于 currentTime 时，过滤 end_time 早于 currentTime 的历史数据
      * - 注入 status / isTimeout / reserved_status
      */
     private normalizeMatchedBooking;
-    getResourceBookingList(currentTime: string, bookingList?: BookingData[]): Promise<SalesResourceBookingItem[]>;
+    getResourceBookingList(currentTime: string, bookingList?: BookingData[], deviceTime?: string): Promise<SalesResourceBookingItem[]>;
 }
 export { SalesImpl as Sales };
 export default SalesImpl;

package/lib/solution/Sales/index.js

@@ -312,15 +312,19 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
   /**
    * 标准化单条 booking：
    * - 过滤终态（rejected/cancelled/completed）
+   * - 当 deviceTime 早于 currentTime 时，过滤 end_time 早于 currentTime 的历史数据
    * - 注入 status / isTimeout / reserved_status
    */
-  normalizeMatchedBooking(current, booking) {
+  normalizeMatchedBooking(current, deviceCurrent, booking) {
     const appointmentStatus = String(booking.appointment_status ?? booking.status ?? "");
     if (appointmentStatus === "rejected" || appointmentStatus === "cancelled" || appointmentStatus === "completed") {
       return null;
     }
-    const bookingStatus = this.getBookingStatus(appointmentStatus);
     const endAt = this.toBookingDateTime(booking.end_date, booking.end_time);
+    const shouldFilterHistoryByCurrent = deviceCurrent.isBefore(current);
+    if (shouldFilterHistoryByCurrent && endAt.isValid() && endAt.isBefore(current))
+      return null;
+    const bookingStatus = this.getBookingStatus(appointmentStatus);
     const startAt = this.toBookingDateTime(booking.start_date, booking.start_time);
     const isTimeout = bookingStatus === "occupied" && endAt.isValid() && current.isAfter(endAt);
     const timeoutTime = isTimeout ? current.diff(endAt, "minute") : void 0;
@@ -362,11 +366,14 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
       remainingReserveTime
     };
   }
-  async getResourceBookingList(currentTime, bookingList = []) {
+  async getResourceBookingList(currentTime, bookingList = [], deviceTime = currentTime) {
     var _a;
     const current = (0, import_dayjs.default)(currentTime);
     if (!current.isValid())
       return [];
+    const deviceCurrent = (0, import_dayjs.default)(deviceTime);
+    if (!deviceCurrent.isValid())
+      return [];
     const resourceResponse = await this.request.get(
       "/shop/form/resource/page",
       { skip: 1, num: 999 },
@@ -376,7 +383,7 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     const resourceList = ((_a = resourceResponse == null ? void 0 : resourceResponse.data) == null ? void 0 : _a.list) ?? [];
     if (!Array.isArray(resourceList) || resourceList.length === 0)
       return [];
-    const normalizedBookings = bookingList.map((booking) => this.normalizeMatchedBooking(current, booking)).filter((booking) => Boolean(booking)).sort((left, right) => {
+    const normalizedBookings = bookingList.map((booking) => this.normalizeMatchedBooking(current, deviceCurrent, booking)).filter((booking) => Boolean(booking)).sort((left, right) => {
       const leftStartAt = this.toBookingDateTime(left.start_date, left.start_time).valueOf();
       const rightStartAt = this.toBookingDateTime(right.start_date, right.start_time).valueOf();
       return leftStartAt - rightStartAt;

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

@@ -61,7 +61,7 @@ export interface SalesModuleAPI {
     /** 重置预约列表为空 */
     resetReservationList: () => Reservation[];
     /** 获取资源维度的预约占用列表 */
-    getResourceBookingList: (currentTime: string, bookingList: BookingData[]) => Promise<SalesResourceBookingItem[]>;
+    getResourceBookingList: (currentTime: string, bookingList: BookingData[], deviceTime?: string) => Promise<SalesResourceBookingItem[]>;
     /** 获取时间轴每个时间片的预约数量 */
     getTimelineHighlights: (bookingList: BookingData[], startDateTime?: string, endDateTime?: string) => SalesTimelineHighlights;
 }

package/package.json

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