@pisell/pisellos 2.2.148 → 2.2.150

package/lib/modules/index.d.ts

@@ -11,4 +11,8 @@ export * from './Payment';
 export * from './Resource';
 export * from './Step';
 export * from './Summary';
+export * from './SalesSummary';
 export * from './Schedule';
+export * from './Quotation';
+export * from './ScanOrderLogger';
+export * from './OpenData';

package/lib/modules/index.js

@@ -29,7 +29,11 @@ __reExport(modules_exports, require("./Payment"), module.exports);
 __reExport(modules_exports, require("./Resource"), module.exports);
 __reExport(modules_exports, require("./Step"), module.exports);
 __reExport(modules_exports, require("./Summary"), module.exports);
+__reExport(modules_exports, require("./SalesSummary"), module.exports);
 __reExport(modules_exports, require("./Schedule"), module.exports);
+__reExport(modules_exports, require("./Quotation"), module.exports);
+__reExport(modules_exports, require("./ScanOrderLogger"), module.exports);
+__reExport(modules_exports, require("./OpenData"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./Product"),
@@ -45,5 +49,9 @@ __reExport(modules_exports, require("./Schedule"), module.exports);
   ...require("./Resource"),
   ...require("./Step"),
   ...require("./Summary"),
-  ...require("./Schedule")
+  ...require("./SalesSummary"),
+  ...require("./Schedule"),
+  ...require("./Quotation"),
+  ...require("./ScanOrderLogger"),
+  ...require("./OpenData")
 });

package/lib/server/index.d.ts

@@ -85,6 +85,10 @@ declare class Server {
         config: ModuleRegistryConfig;
         shouldPreload: boolean;
     }[]>;
+    /**
+     * 将普通层 QuotationModule 的报价单计算能力桥接到 Server Products 模块。
+     */
+    private setupProductsQuotationPriceBridge;
     /**
      * 获取 Products 模块实例
      */
@@ -260,16 +264,49 @@ declare class Server {
      */
     private handleResourceList;
     /**
-     * 代理刷新 / 合并单个订单到本地：
-     * - 入参：order_id（data 或 url query）
-     * - 流程：调后端 /order/sales/{id}?with[]=... → 若本地已有则覆盖；若无则 merge 写入 → 落 SQLite → emit onOrdersChanged
-     * - 监听级联：onOrdersChanged 触发订单/预约/bookingRemoteCache 三路订阅者推送
+     * 代理刷新 / 合并订单到本地（单笔 / 批量二合一）：
+     * - 入参（GET query 或 data 任一）：
+     *   - `order_id`：单笔模式，原有行为
+     *   - `order_ids`：批量模式，逗号分隔的 id 列表（如 `?order_ids=1,2,3`），数组也兼容
+     *   - 同时存在时优先批量
+     * - 单笔流程：后端 /order/sales/{id}?with[]=all → 本地有则覆盖、无则 merge → 落 SQLite → emit onOrdersChanged
+     * - 批量流程：并发拉取每笔详情 → 一次性 `upsertOrdersFromRemote` 合并写入 → 仅 emit 一次 onOrdersChanged，
+     *   单笔失败不影响其他成功项；返回 { overwritten, inserted, failed }
+     * - 监听级联：onOrdersChanged 触发订单 / 预约 / bookingRemoteCache 三路订阅者推送
+     *
+     * @example 单笔：GET /update/localOrder?order_id=96971
+     * @example 批量：GET /update/localOrder?order_ids=96971,96972,96973
      */
     private handleUpdateLocalOrder;
+    private handleOrderSalesDetail;
+    /**
+     * 解析 order_ids 入参，兼容 url query / data 字段、字符串(csv) / 数组两种形态。
+     * 自动 trim、去空、按字符串去重，输出归一化后的字符串数组。
+     *
+     * @example
+     * // url: /update/localOrder?order_ids=1,2,2,, → ['1','2']
+     * this.parseOrderIdsParam(url, undefined)
+     *
+     * @example
+     * // data: { order_ids: [1, '2', null] } → ['1','2']
+     * this.parseOrderIdsParam('', { order_ids: [1, '2', null] })
+     */
+    private parseOrderIdsParam;
+    /**
+     * 批量代理刷新 / 合并订单到本地：并发拉详情 → 单次合并 → 单次 emit。
+     * - 单笔失败不影响其他成功项
+     * - 没有任何成功项时不触发 emit / 落库
+     *
+     * @example
+     * await this.handleUpdateLocalOrdersBatch(['96971', '96972'])
+     */
+    private handleUpdateLocalOrdersBatch;
     /**
      * 从 url 中解析指定 query 参数，兼容相对路径与绝对路径
      */
     private extractQueryParam;
+    private extractOrderSalesDetailId;
+    private buildOrderSalesDetailBackendPath;
     /**
      * 从 url 或路由 path 解析 pathname（不含 query，去掉末尾 /）
      */

package/lib/server/index.js

@@ -149,24 +149,25 @@ var Server = class {
      */
     this.handleProductQuery = async ({ url, method, data, config }) => {
       console.log("[Server] handleProductQuery:", url, method, data, config);
-      const { menu_list_ids, schedule_datetime, schedule_date } = data;
+      const { menu_list_ids, schedule_datetime, schedule_date, customer_id } = data;
       const { callback, subscriberId } = config || {};
       this.logInfo("handleProductQuery: 开始处理商品查询请求", {
         menu_list_ids,
         schedule_datetime,
-        schedule_date
+        schedule_date,
+        customer_id
       });
       if (subscriberId && typeof callback === "function") {
         this.productQuerySubscribers.set(subscriberId, {
           callback,
-          context: { menu_list_ids, schedule_date, schedule_datetime }
+          context: { menu_list_ids, schedule_date, schedule_datetime, customer_id }
         });
         this.logInfo("handleProductQuery: 已注册订阅者", {
           subscriberId,
           totalSubscribers: this.productQuerySubscribers.size
         });
       }
-      return this.computeProductQueryResult({ menu_list_ids, schedule_date, schedule_datetime });
+      return this.computeProductQueryResult({ menu_list_ids, schedule_date, schedule_datetime, customer_id });
     };
     /**
      * 按商品 id 查询单条（GET /shop/product/query/:productId）
@@ -357,13 +358,25 @@ var Server = class {
       };
     };
     /**
-     * 代理刷新 / 合并单个订单到本地：
-     * - 入参：order_id（data 或 url query）
-     * - 流程：调后端 /order/sales/{id}?with[]=... → 若本地已有则覆盖；若无则 merge 写入 → 落 SQLite → emit onOrdersChanged
-     * - 监听级联：onOrdersChanged 触发订单/预约/bookingRemoteCache 三路订阅者推送
+     * 代理刷新 / 合并订单到本地（单笔 / 批量二合一）：
+     * - 入参（GET query 或 data 任一）：
+     *   - `order_id`：单笔模式，原有行为
+     *   - `order_ids`：批量模式，逗号分隔的 id 列表（如 `?order_ids=1,2,3`），数组也兼容
+     *   - 同时存在时优先批量
+     * - 单笔流程：后端 /order/sales/{id}?with[]=all → 本地有则覆盖、无则 merge → 落 SQLite → emit onOrdersChanged
+     * - 批量流程：并发拉取每笔详情 → 一次性 `upsertOrdersFromRemote` 合并写入 → 仅 emit 一次 onOrdersChanged，
+     *   单笔失败不影响其他成功项；返回 { overwritten, inserted, failed }
+     * - 监听级联：onOrdersChanged 触发订单 / 预约 / bookingRemoteCache 三路订阅者推送
+     *
+     * @example 单笔：GET /update/localOrder?order_id=96971
+     * @example 批量：GET /update/localOrder?order_ids=96971,96972,96973
      */
     this.handleUpdateLocalOrder = async ({ url, data }) => {
       var _a;
+      const batchIds = this.parseOrderIdsParam(url, data);
+      if (batchIds.length > 0) {
+        return this.handleUpdateLocalOrdersBatch(batchIds);
+      }
       const rawOrderId = (data && typeof data === "object" ? data.order_id : void 0) ?? this.extractQueryParam(url, "order_id");
       const orderId = rawOrderId === void 0 || rawOrderId === null || rawOrderId === "" ? null : String(rawOrderId).trim();
       this.logInfo("handleUpdateLocalOrder: 开始处理", { url, orderId });
@@ -438,6 +451,84 @@ var Server = class {
         };
       }
     };
+    this.handleOrderSalesDetail = async ({ url, data, path }) => {
+      var _a;
+      const requestPath = this.parseRequestPath(url, path);
+      const orderId = this.extractOrderSalesDetailId(requestPath);
+      this.logInfo("handleOrderSalesDetail: 开始处理", { url, path: requestPath, orderId });
+      if (!orderId) {
+        this.logWarning("handleOrderSalesDetail: order_id 缺失", { url, path: requestPath });
+        return { code: 400, status: false, message: "order_id 缺失", data: null };
+      }
+      if (!this.order) {
+        this.logError("handleOrderSalesDetail: Order 模块未注册");
+        return { code: 500, status: false, message: "Order 模块未注册", data: null };
+      }
+      const localOrder = await this.order.getLocalOrderByOrderId(orderId);
+      if (localOrder) {
+        this.logInfo("handleOrderSalesDetail: 命中本地订单", { orderId });
+        return {
+          code: 200,
+          status: true,
+          message: "",
+          data: localOrder
+        };
+      }
+      if (!((_a = this.app) == null ? void 0 : _a.request)) {
+        this.logError("handleOrderSalesDetail: app.request 不可用");
+        return { code: 500, status: false, message: "app.request 不可用", data: null };
+      }
+      const backendPath = this.buildOrderSalesDetailBackendPath(orderId, data);
+      try {
+        const response = await this.app.request.get(backendPath, void 0, {
+          isShopApi: true
+        });
+        const fresh = (response == null ? void 0 : response.data) ?? response;
+        if (!fresh || typeof fresh !== "object" || fresh.order_id == null) {
+          this.logError("handleOrderSalesDetail: 后端返回订单为空", {
+            orderId,
+            backendPath
+          });
+          return {
+            code: 500,
+            status: false,
+            message: "后端返回订单为空",
+            data: null
+          };
+        }
+        await this.order.upsertOrdersFromRemote([fresh]);
+        const savedOrder = await this.order.getLocalOrderByOrderId(orderId);
+        if (!savedOrder) {
+          this.logError("handleOrderSalesDetail: 订单写入后回读失败", { orderId });
+          return {
+            code: 500,
+            status: false,
+            message: "订单写入后回读失败",
+            data: null
+          };
+        }
+        this.logInfo("handleOrderSalesDetail: 远端订单已同步到本地", { orderId });
+        return {
+          code: 200,
+          status: true,
+          message: "",
+          data: savedOrder
+        };
+      } catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        this.logError("handleOrderSalesDetail: 请求失败", {
+          orderId,
+          backendPath,
+          error: errorMessage
+        });
+        return {
+          code: 500,
+          status: false,
+          message: errorMessage,
+          data: null
+        };
+      }
+    };
     /**
      * GET /shop/schedule/floor-plan* 前缀路由：读本地 store；支持 subscriberId + callback 订阅更新
      */
@@ -801,6 +892,7 @@ var Server = class {
     } else {
       this.logInfo("跳过自动预加载", { autoPreload });
     }
+    await this.setupProductsQuotationPriceBridge();
     this.core.effects.on(import_types2.ProductsHooks.onProductsSyncCompleted, (payload) => {
       this.recomputeAndNotifyProductQuery({
         changedIds: payload == null ? void 0 : payload.changedIds
@@ -821,6 +913,30 @@ var Server = class {
     });
     return registeredModules;
   }
+  /**
+   * 将普通层 QuotationModule 的报价单计算能力桥接到 Server Products 模块。
+   */
+  async setupProductsQuotationPriceBridge() {
+    var _a;
+    if (!this.products) {
+      this.logWarning("setupProductsQuotationPriceBridge: Products 模块未注册");
+      return;
+    }
+    if (!this.schedule) {
+      this.logWarning("setupProductsQuotationPriceBridge: Schedule 模块未注册");
+      return;
+    }
+    try {
+      await this.products.setupQuotationPriceBridge({
+        scheduleModule: this.schedule,
+        channel: (_a = this.core.context) == null ? void 0 : _a.channel
+      });
+      this.logInfo("Products 报价单价格桥接初始化完成");
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      this.logError("Products 报价单价格桥接初始化失败", { error: errorMessage });
+    }
+  }
   /**
    * 获取 Products 模块实例
    */
@@ -1094,6 +1210,11 @@ var Server = class {
       }
     ]);
     this.registerPrefixRoutes([
+      {
+        method: "get",
+        prefix: "/shop/order/sales",
+        handler: this.handleOrderSalesDetail.bind(this)
+      },
       {
         method: "get",
         prefix: "/shop/schedule/floor-plan",
@@ -1553,6 +1674,127 @@ var Server = class {
       };
     }
   }
+  /**
+   * 解析 order_ids 入参，兼容 url query / data 字段、字符串(csv) / 数组两种形态。
+   * 自动 trim、去空、按字符串去重，输出归一化后的字符串数组。
+   *
+   * @example
+   * // url: /update/localOrder?order_ids=1,2,2,, → ['1','2']
+   * this.parseOrderIdsParam(url, undefined)
+   *
+   * @example
+   * // data: { order_ids: [1, '2', null] } → ['1','2']
+   * this.parseOrderIdsParam('', { order_ids: [1, '2', null] })
+   */
+  parseOrderIdsParam(url, data) {
+    const collected = [];
+    const pushRaw = (raw) => {
+      if (raw === void 0 || raw === null)
+        return;
+      if (Array.isArray(raw)) {
+        raw.forEach(pushRaw);
+        return;
+      }
+      const str = String(raw).trim();
+      if (!str)
+        return;
+      str.split(",").forEach((piece) => {
+        const v = piece.trim();
+        if (v)
+          collected.push(v);
+      });
+    };
+    if (data && typeof data === "object") {
+      pushRaw(data.order_ids);
+    }
+    pushRaw(this.extractQueryParam(url, "order_ids"));
+    const seen = /* @__PURE__ */ new Set();
+    const result = [];
+    for (const id of collected) {
+      if (seen.has(id))
+        continue;
+      seen.add(id);
+      result.push(id);
+    }
+    return result;
+  }
+  /**
+   * 批量代理刷新 / 合并订单到本地：并发拉详情 → 单次合并 → 单次 emit。
+   * - 单笔失败不影响其他成功项
+   * - 没有任何成功项时不触发 emit / 落库
+   *
+   * @example
+   * await this.handleUpdateLocalOrdersBatch(['96971', '96972'])
+   */
+  async handleUpdateLocalOrdersBatch(orderIds) {
+    var _a;
+    this.logInfo("handleUpdateLocalOrdersBatch: 开始处理", {
+      count: orderIds.length,
+      orderIds
+    });
+    if (!this.order) {
+      this.logError("handleUpdateLocalOrdersBatch: Order 模块未注册");
+      return { code: 500, status: false, message: "Order 模块未注册", data: null };
+    }
+    if (!((_a = this.app) == null ? void 0 : _a.request)) {
+      this.logError("handleUpdateLocalOrdersBatch: app.request 不可用");
+      return { code: 500, status: false, message: "app.request 不可用", data: null };
+    }
+    const existedBefore = /* @__PURE__ */ new Map();
+    for (const id of orderIds) {
+      existedBefore.set(id, !!this.order.getOrderByOrderId(id));
+    }
+    let fetched = [];
+    try {
+      fetched = await this.order.fetchOrdersByHttp(orderIds);
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      this.logError("handleUpdateLocalOrdersBatch: 批量拉取失败", { message });
+      return { code: 500, status: false, message, data: null };
+    }
+    const fetchedMap = /* @__PURE__ */ new Map();
+    for (const order of fetched) {
+      const oid = order == null ? void 0 : order.order_id;
+      if (oid === void 0 || oid === null)
+        continue;
+      fetchedMap.set(String(oid), order);
+    }
+    const freshOrders = [];
+    const succeedIds = [];
+    const failed = [];
+    for (const id of orderIds) {
+      const fresh = fetchedMap.get(id);
+      if (fresh) {
+        freshOrders.push(fresh);
+        succeedIds.push(id);
+      } else {
+        failed.push({ order_id: id, message: "后端未返回该订单详情" });
+      }
+    }
+    if (freshOrders.length > 0) {
+      try {
+        await this.order.upsertOrdersFromRemote(freshOrders);
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        this.logError("handleUpdateLocalOrdersBatch: 合并写入失败", { message });
+        return { code: 500, status: false, message, data: null };
+      }
+    }
+    const overwritten = succeedIds.filter((id) => existedBefore.get(id));
+    const inserted = succeedIds.filter((id) => !existedBefore.get(id));
+    this.logInfo("handleUpdateLocalOrdersBatch: 完成", {
+      total: orderIds.length,
+      overwrittenCount: overwritten.length,
+      insertedCount: inserted.length,
+      failedCount: failed.length
+    });
+    return {
+      code: 200,
+      status: true,
+      message: "",
+      data: { overwritten, inserted, failed }
+    };
+  }
   /**
    * 从 url 中解析指定 query 参数，兼容相对路径与绝对路径
    */
@@ -1584,6 +1826,23 @@ var Server = class {
       return null;
     }
   }
+  extractOrderSalesDetailId(url) {
+    const path = this.parseRequestPath(url);
+    const match = path.match(/^\/shop\/order\/sales\/([^/?#]+)$/);
+    return (match == null ? void 0 : match[1]) ? decodeURIComponent(match[1]) : null;
+  }
+  buildOrderSalesDetailBackendPath(orderId, data) {
+    const rawWith = data && typeof data === "object" ? data.with : void 0;
+    const withFields = Array.isArray(rawWith) && rawWith.length > 0 ? rawWith : ["products", "scheduleEvents"];
+    const searchParams = new URLSearchParams();
+    withFields.forEach((field) => {
+      if (field === void 0 || field === null || field === "")
+        return;
+      searchParams.append("with[]", String(field));
+    });
+    const query = searchParams.toString();
+    return `/shop/order/sales/${encodeURIComponent(orderId)}${query ? `?${query}` : ""}`;
+  }
   /**
    * 从 url 或路由 path 解析 pathname（不含 query，去掉末尾 /）
    */
@@ -1759,11 +2018,12 @@ var Server = class {
    */
   async computeProductQueryResult(context, options) {
     const tTotal = performance.now();
-    const { menu_list_ids, schedule_date, schedule_datetime, product_id } = context;
+    const { menu_list_ids, schedule_date, schedule_datetime, customer_id, product_id } = context;
     this.logInfo("computeProductQueryResult 开始", {
       menuListIdsCount: (menu_list_ids == null ? void 0 : menu_list_ids.length) ?? 0,
       schedule_datetime,
       schedule_date,
+      customer_id,
       product_id,
       changedIds: options == null ? void 0 : options.changedIds
     });
@@ -1824,7 +2084,9 @@ var Server = class {
     }
     const tPrice = performance.now();
     const allProductsWithPrice = await this.products.getProductsWithPrice(schedule_date, {
-      scheduleModule: this.getSchedule()
+      scheduleModule: this.getSchedule(),
+      schedule_datetime,
+      customer_id
     }, {
       changedIds: options == null ? void 0 : options.changedIds
     });

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

@@ -38,6 +38,7 @@ export declare class OrderModule extends BaseModule implements Module {
     getOrderById(id: OrderId): OrderData | undefined;
     /** 按 order_id 查询（推荐） */
     getOrderByOrderId(orderId: OrderId): OrderData | undefined;
+    getLocalOrderByOrderId(orderId: OrderId): Promise<OrderData | null>;
     loadOrdersByServer(): Promise<OrderData[]>;
     getOrdersByResourceId(resourceId: string | number): OrderData[];
     /**
@@ -94,9 +95,16 @@ export declare class OrderModule extends BaseModule implements Module {
      */
     private processOrderSyncMessages;
     /**
-     * 通过 HTTP 按 ids 增量拉取订单
+     * 通过 HTTP 按 ids 批量拉取订单详情（走 orderDataSource）。
+     *
+     * - 优先使用 `orderDataSource.fetchOrdersByIds`（如适配器实现了该方法）
+     * - 否则回退到 `orderDataSource.run({ http: { query: { ids } } })`
+     * - 失败统一返回空数组（由调用方按"返回缺失的 id" 判断单笔失败）
+     *
+     * @example
+     * const fresh = await orderModule.fetchOrdersByHttp(['96971', '96972'])
      */
-    private fetchOrdersByHttp;
+    fetchOrdersByHttp(ids: OrderId[]): Promise<OrderData[]>;
     /**
      * 将增量订单合并到 store
      */

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

@@ -185,6 +185,24 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   getOrderByOrderId(orderId) {
     return this.store.map.get(this.getIdKey(orderId));
   }
+  async getLocalOrderByOrderId(orderId) {
+    const key = this.getIdKey(orderId);
+    const memoryOrder = this.store.map.get(key);
+    if (memoryOrder)
+      return memoryOrder;
+    const orders = await this.loadOrdersFromSQLite();
+    const localOrder = orders.find((order) => {
+      const id = order == null ? void 0 : order.order_id;
+      if (id === void 0 || id === null)
+        return false;
+      return this.getIdKey(id) === key;
+    });
+    if (!localOrder)
+      return null;
+    this.store.list = orders;
+    this.syncOrdersMap();
+    return localOrder;
+  }
   async loadOrdersByServer() {
     var _a;
     let orderList = [];
@@ -511,7 +529,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     await this.core.effects.emit(import_types.OrderHooks.onOrdersSyncCompleted, null);
   }
   /**
-   * 通过 HTTP 按 ids 增量拉取订单
+   * 通过 HTTP 按 ids 批量拉取订单详情（走 orderDataSource）。
+   *
+   * - 优先使用 `orderDataSource.fetchOrdersByIds`（如适配器实现了该方法）
+   * - 否则回退到 `orderDataSource.run({ http: { query: { ids } } })`
+   * - 失败统一返回空数组（由调用方按"返回缺失的 id" 判断单笔失败）
+   *
+   * @example
+   * const fresh = await orderModule.fetchOrdersByHttp(['96971', '96972'])
    */
   async fetchOrdersByHttp(ids) {
     if (!this.orderDataSource || ids.length === 0)

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

@@ -19,6 +19,11 @@ export declare class ProductsModule extends BaseModule implements Module {
     private readonly CACHE_MAX_DAYS;
     private formatters;
     private isPriceFormatterRegistered;
+    private quotationPriceBridge?;
+    private quotationBridgeChannel?;
+    private quotationBridgeCustomerId?;
+    private quotationBridgeRefreshPromise?;
+    private quotationBridgeRefreshKey?;
     private productDataSource;
     private pendingSyncMessages;
     private syncTimer?;
@@ -47,6 +52,26 @@ export declare class ProductsModule extends BaseModule implements Module {
      * @private
      */
     private loadProductsPrice;
+    /**
+     * 设置报价单价格桥接器。
+     * Server 层负责传入完整 schedule 模块，Products 只负责把报价单计算结果转成价格响应形状。
+     */
+    setupQuotationPriceBridge(params: {
+        scheduleModule?: any;
+        channel?: string;
+        customer_id?: number | string;
+    }): Promise<void>;
+    /**
+     * 刷新桥接器内的报价单列表。
+     */
+    refreshQuotationPriceBridge(params?: {
+        customer_id?: number | string;
+    }): Promise<void>;
+    private ensureQuotationBridgeReady;
+    private getQuotationBridgeScopeKey;
+    private buildPriceDataFromQuotation;
+    private buildVariantPriceData;
+    private buildBundleGroupPriceData;
     /**
      * 获取应用了价格的商品列表（带缓存）
      * 使用日期作为缓存 key，同一天的商品价格会被缓存
@@ -70,6 +95,7 @@ export declare class ProductsModule extends BaseModule implements Module {
      * @private
      */
     private prepareProductsWithPrice;
+    private getProductsPriceCacheKey;
     /**
      * 应用所有已注册的格式化器
      * @param products 商品列表