@pisell/pisellos 2.2.98 → 2.2.99

package/dist/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/dist/server/modules/floor-plan/types.js

@@ -0,0 +1,13 @@
+/**
+ * 平面图（floor-plan）Server 模块类型
+ * 与 GET /shop/schedule/floor-plan 系列接口数据结构对齐
+ */
+
+/** pubsub / Ably 推送消息（与《平面图编辑器API文档》Socket 一节一致） */
+
+export var FloorPlanHooks = {
+  /** 本地列表变更（预加载、合并、删除后） */
+  onFloorPlansChanged: 'server_floor_plan:onFloorPlansChanged',
+  /** pubsub 同步处理完成，供 Server 向订阅者推送最新查询结果 */
+  onFloorPlanSyncCompleted: 'server_floor_plan:onFloorPlanSyncCompleted'
+};

package/dist/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/dist/server/modules/index.js

@@ -21,6 +21,10 @@ export { ScheduleModuleEx } from "./schedule";
 export { OrderModule } from "./order";
 export { OrderHooks } from "./order/types";
 
+// 平面图（floor-plan）
+export { FloorPlanModule } from "./floor-plan";
+export { FloorPlanHooks } from "./floor-plan/types";
+
 // Resource 模块
 export { ResourceModule, resourceModule } from "./resource";
 export { ResourceHooks } from "./resource";

package/dist/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/dist/server/modules/order/types.js

@@ -97,7 +97,8 @@
 /** 去掉 bookings 后的订单快照；展开预约行时挂在 {@link BookingData.order} 上 */
 
 /**
- * 展开后的单条预约视图：协议 {@link OrderBookingItem} 平铺字段 + 所属订单（不含 bookings）
+ * 展开后的单条预约视图：协议 {@link OrderBookingItem} 平铺字段 + 所属订单（不含 bookings）+
+ * 当前预约归属的商品行（由订单 products 按 schedule_event_id / relation_items 归集，不修改 order）
  */
 
 /**

package/dist/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/dist/server/modules/order/utils/filterBookings.js

@@ -180,6 +180,61 @@ function matchBooking(booking, orderInfo, ctx) {
   return true;
 }
 
+// ─────────────────────────────────────────────────────────────────
+// 当前预约归属商品：先按 schedule_event_id 命中，再按 relation_items.resource_id 追加（去重保序）
+// ─────────────────────────────────────────────────────────────────
+
+/**
+ * 从整单 `order.products` 中归集属于指定 `booking` 的明细行。
+ * - 第一遍：`product.schedule_event_id === booking.schedule_event_id`（保持 products 原顺序）
+ * - 第二遍：按 `relation_items` 顺序追加 `resource_id` 与 `order_detail_id` 匹配且尚未收录的行
+ */
+export function productsForBooking(order, booking) {
+  var products = order.products;
+  if (!Array.isArray(products) || products.length === 0) return [];
+  var bookingEventId = booking.schedule_event_id;
+  var byDetailId = new Map();
+  for (var i = 0, len = products.length; i < len; i++) {
+    var p = products[i];
+    var oid = p.order_detail_id;
+    if (oid === undefined || oid === null) continue;
+    var detailId = Number(oid);
+    if (Number.isNaN(detailId)) continue;
+    byDetailId.set(detailId, p);
+  }
+  var seen = new Set();
+  var out = [];
+  for (var _i = 0, _len = products.length; _i < _len; _i++) {
+    var _p = products[_i];
+    var _oid = _p.order_detail_id;
+    if (_oid === undefined || _oid === null) continue;
+    var _detailId = Number(_oid);
+    if (Number.isNaN(_detailId)) continue;
+    if (bookingEventId !== undefined && bookingEventId !== null && _p.schedule_event_id !== undefined && _p.schedule_event_id !== null && Number(_p.schedule_event_id) === Number(bookingEventId)) {
+      if (!seen.has(_detailId)) {
+        seen.add(_detailId);
+        out.push(_p);
+      }
+    }
+  }
+  var relationItems = booking.relation_items;
+  if (Array.isArray(relationItems) && relationItems.length > 0) {
+    for (var r = 0, rLen = relationItems.length; r < rLen; r++) {
+      var _relationItems$r;
+      var rid = (_relationItems$r = relationItems[r]) === null || _relationItems$r === void 0 ? void 0 : _relationItems$r.resource_id;
+      if (rid === undefined || rid === null) continue;
+      var _detailId2 = Number(rid);
+      if (Number.isNaN(_detailId2) || seen.has(_detailId2)) continue;
+      var line = byDetailId.get(_detailId2);
+      if (line) {
+        seen.add(_detailId2);
+        out.push(line);
+      }
+    }
+  }
+  return out;
+}
+
 // ─────────────────────────────────────────────────────────────────
 // 转换：OrderData[] → BookingData[]（独立导出，供其他场景使用）
 // ─────────────────────────────────────────────────────────────────
@@ -194,8 +249,10 @@ export function flattenOrdersToBookings(orders) {
     var _omit = order.bookings,
       orderInfo = _objectWithoutProperties(order, _excluded);
     for (var j = 0, bLen = bookings.length; j < bLen; j++) {
-      result.push(_objectSpread(_objectSpread({}, bookings[j]), {}, {
-        order: orderInfo
+      var booking = bookings[j];
+      result.push(_objectSpread(_objectSpread({}, booking), {}, {
+        order: orderInfo,
+        products: productsForBooking(order, booking)
       }));
     }
   }
@@ -256,7 +313,8 @@ export function filterBookingsFromOrders(orders, filters) {
           orderInfo = _rest;
         }
         paginatedList.push(_objectSpread(_objectSpread({}, booking), {}, {
-          order: orderInfo
+          order: orderInfo,
+          products: productsForBooking(order, booking)
         }));
       }
       totalCount++;
@@ -337,7 +395,9 @@ export function filterBookings(bookings, filters) {
     if (!matchOrder(order, ctx)) continue;
     if (!matchBooking(booking, order, ctx)) continue;
     if (totalCount >= startIndex && paginatedList.length < size) {
-      paginatedList.push(booking);
+      paginatedList.push(_objectSpread(_objectSpread({}, booking), {}, {
+        products: productsForBooking(booking.order, booking)
+      }));
     }
     totalCount++;
   }

package/dist/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/dist/solution/BookingTicket/index.d.ts

@@ -131,7 +131,7 @@ export declare class BookingTicketImpl extends BaseModule 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

@@ -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/dist/solution/Sales/index.js

@@ -423,18 +423,21 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
     /**
      * 标准化单条 booking：
      * - 过滤终态（rejected/cancelled/completed）
+     * - 当 deviceTime 早于 currentTime 时，过滤 end_time 早于 currentTime 的历史数据
      * - 注入 status / isTimeout / reserved_status
      */
   }, {
     key: "normalizeMatchedBooking",
-    value: function normalizeMatchedBooking(current, booking) {
+    value: function normalizeMatchedBooking(current, deviceCurrent, booking) {
       var _ref3, _booking$appointment_;
       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 === 'rejected' || appointmentStatus === 'cancelled' || appointmentStatus === 'completed') {
         return null;
       }
-      var bookingStatus = this.getBookingStatus(appointmentStatus);
       var endAt = this.toBookingDateTime(booking.end_date, booking.end_time);
+      var shouldFilterHistoryByCurrent = deviceCurrent.isBefore(current);
+      if (shouldFilterHistoryByCurrent && endAt.isValid() && endAt.isBefore(current)) return null;
+      var bookingStatus = this.getBookingStatus(appointmentStatus);
       var startAt = this.toBookingDateTime(booking.start_date, booking.start_time);
       var isTimeout = bookingStatus === 'occupied' && endAt.isValid() && current.isAfter(endAt);
       var timeoutTime = isTimeout ? current.diff(endAt, 'minute') : undefined;
@@ -478,7 +481,9 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
           _resourceResponse$dat2,
           _this3 = this;
         var bookingList,
+          deviceTime,
           current,
+          deviceCurrent,
           resourceResponse,
           resourceList,
           normalizedBookings,
@@ -488,15 +493,23 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               bookingList = _args3.length > 1 && _args3[1] !== undefined ? _args3[1] : [];
+              deviceTime = _args3.length > 2 && _args3[2] !== undefined ? _args3[2] : currentTime;
               // currentTime 约定为完整 datetime；非法值直接返回空，避免误判
               current = dayjs(currentTime);
               if (current.isValid()) {
-                _context3.next = 4;
+                _context3.next = 5;
+                break;
+              }
+              return _context3.abrupt("return", []);
+            case 5:
+              deviceCurrent = dayjs(deviceTime);
+              if (deviceCurrent.isValid()) {
+                _context3.next = 8;
                 break;
               }
               return _context3.abrupt("return", []);
-            case 4:
-              _context3.next = 6;
+            case 8:
+              _context3.next = 10;
               return this.request.get('/shop/form/resource/page', {
                 skip: 1,
                 num: 999
@@ -506,18 +519,18 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
                 osServer: true,
                 isShopApi: true
               });
-            case 6:
+            case 10:
               resourceResponse = _context3.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)) {
-                _context3.next = 10;
+                _context3.next = 14;
                 break;
               }
               return _context3.abrupt("return", []);
-            case 10:
+            case 14:
               // 全局先做 booking 标准化 + start_time 升序，后续映射直接复用
               normalizedBookings = bookingList.map(function (booking) {
-                return _this3.normalizeMatchedBooking(current, booking);
+                return _this3.normalizeMatchedBooking(current, deviceCurrent, booking);
               }).filter(function (booking) {
                 return Boolean(booking);
               }).sort(function (left, right) {
@@ -548,7 +561,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
                   bookings: bookings
                 });
               }));
-            case 14:
+            case 18:
             case "end":
               return _context3.stop();
           }

package/dist/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/lib/modules/Order/index.d.ts

@@ -23,7 +23,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      */
     private logError;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/server/index.d.ts

@@ -3,6 +3,7 @@ import { MenuModule } from './modules/menu';
 import { QuotationModule } from './modules/quotation';
 import { ScheduleModuleEx } from './modules/schedule';
 import { ResourceModule } from './modules/resource';
+import { FloorPlanModule } from './modules/floor-plan';
 import { PisellCore, ServerModuleConfig, InitializeServerOptions } from '../types';
 import type { RouteHandler, HttpMethod, RouteDefinition, Router, ModuleRegistryConfig, RequestSetting } from './types';
 import { OrderModule } from './modules/order';
@@ -21,10 +22,14 @@ declare class Server {
     schedule?: ScheduleModuleEx;
     resource?: ResourceModule;
     order?: OrderModule;
+    floor_plan?: FloorPlanModule;
+    /** GET 前缀路由（最长前缀优先匹配） */
+    private prefixRouterGet;
     router: Router;
     private productQuerySubscribers;
     private orderQuerySubscribers;
     private bookingQuerySubscribers;
+    private floorPlanQuerySubscribers;
     private moduleRegistry;
     constructor(core: PisellCore);
     /**
@@ -32,6 +37,10 @@ declare class Server {
      * @param routes 路由定义数组
      */
     private registerRoutes;
+    /**
+     * 注册前缀路由（仅 GET）。匹配规则：path === prefix 或 path 以 prefix + '/' 开头；最长前缀优先。
+     */
+    private registerPrefixRoutes;
     /**
      * 注册单个模块并自动注册其路由
      * @param module 模块实例
@@ -184,6 +193,27 @@ declare class Server {
      * 转发到资源模块去
      */
     private handleResourceList;
+    /**
+     * 从 url 或路由 path 解析 pathname（不含 query，去掉末尾 /）
+     */
+    private parseRequestPath;
+    /**
+     * 解析平面图 GET 路径为查询上下文
+     */
+    private resolveFloorPlanQueryContext;
+    /**
+     * GET /shop/schedule/floor-plan* 前缀路由：读本地 store；支持 subscriberId + callback 订阅更新
+     */
+    private handleFloorPlanGet;
+    private computeFloorPlanQueryResult;
+    /**
+     * 平面图数据变更后向所有 GET 订阅者推送最新结果
+     */
+    private recomputeAndNotifyFloorPlanQuery;
+    /**
+     * 取消平面图 GET 订阅（也可走 GET .../unsubscribe + subscriberId）
+     */
+    removeFloorPlanQuerySubscriber(subscriberId?: string): void;
     /**
      * 取消预约列表查询订阅（HTTP 路由入口）
      */