@pisell/pisellos 2.2.97 → 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/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;