@pisell/pisellos 2.2.260 → 2.2.261

package/lib/server/index.js

@@ -76,8 +76,6 @@ var Server = class {
     };
     // ---- 商品查询订阅者 ----
     this.productQuerySubscribers = /* @__PURE__ */ new Map();
-    /** subscriberId → 智能定价变价时间点定时器句柄（与 subscriber 分离存储，便于 clear） */
-    this.productQueryScheduleTimers = /* @__PURE__ */ new Map();
     // ---- 订单 / 预约列表查询订阅者 ----
     this.orderQuerySubscribers = /* @__PURE__ */ new Map();
     this.bookingQuerySubscribers = /* @__PURE__ */ new Map();
@@ -210,7 +208,7 @@ 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, customer_id, ids, extension_type, strategy_context } = data;
+      const { menu_list_ids, schedule_datetime, schedule_date, customer_id, ids, extension_type } = data;
       const { callback, subscriberId } = config || {};
       this.logInfo("handleProductQuery: 开始处理商品查询请求", {
         menu_list_ids,
@@ -218,32 +216,19 @@ var Server = class {
         schedule_datetime,
         schedule_date,
         customer_id,
-        extension_type,
-        strategyContextKeys: strategy_context ? Object.keys(strategy_context) : []
+        extension_type
       });
       if (subscriberId && typeof callback === "function") {
         this.productQuerySubscribers.set(subscriberId, {
           callback,
-          context: { menu_list_ids, ids, schedule_date, schedule_datetime, customer_id, extension_type, strategy_context }
+          context: { menu_list_ids, ids, schedule_date, schedule_datetime, customer_id, extension_type }
         });
         this.logInfo("handleProductQuery: 已注册订阅者", {
           subscriberId,
           totalSubscribers: this.productQuerySubscribers.size
         });
       }
-      const result = await this.computeProductQueryResult({
-        menu_list_ids,
-        ids,
-        schedule_date,
-        schedule_datetime,
-        customer_id,
-        extension_type,
-        strategy_context
-      });
-      if (subscriberId && typeof callback === "function") {
-        this.syncProductQueryScheduleTimers(subscriberId, strategy_context);
-      }
-      return result;
+      return this.computeProductQueryResult({ menu_list_ids, ids, schedule_date, schedule_datetime, customer_id, extension_type });
     };
     /**
      * 按商品 id 查询单条（GET /shop/product/query/:productId）
@@ -654,7 +639,8 @@ var Server = class {
           checkoutData,
           order: printableOrder,
           response: null,
-          requireFullyPaid: false
+          requireFullyPaid: false,
+          isManualPrint: true
         });
         return {
           code: 200,
@@ -676,6 +662,97 @@ var Server = class {
         };
       }
     };
+    this.handleMachinecodeBatchMeta = async ({ data }) => {
+      var _a, _b;
+      const title = "handleMachinecodeBatchMeta";
+      const backendPath = "/shop/machinecode/batch";
+      const ids = Array.isArray(data == null ? void 0 : data.ids) ? data.ids : [];
+      const status = data == null ? void 0 : data.status;
+      this.logInfo(`${title}: 开始处理`, {
+        backendPath,
+        batchSize: ids.length,
+        status,
+        order_lookup: this.resolveMachinecodeBatchMetadataLookup(data) ?? null
+      });
+      if (ids.length === 0) {
+        return {
+          code: 200,
+          status: true,
+          message: "",
+          data: []
+        };
+      }
+      if (status !== "used" && status !== "unused") {
+        return {
+          code: 400,
+          status: false,
+          message: "无效的核销状态",
+          data: null
+        };
+      }
+      try {
+        await this.syncMachinecodeRedeemStatusToLocalOrder(data, ids, status);
+      } catch (error) {
+        const message = this.getUnknownErrorMessage(error);
+        this.logError(`${title}: 本地订单核销状态更新失败`, {
+          error: message,
+          error_detail: this.normalizeUnknownError(error)
+        });
+        return {
+          code: 500,
+          status: false,
+          message,
+          data: null
+        };
+      }
+      if (!((_b = (_a = this.app) == null ? void 0 : _a.request) == null ? void 0 : _b.post)) {
+        this.logError(`${title}: app.request 不可用`, { backendPath });
+        return {
+          code: 500,
+          status: false,
+          message: "app.request 不可用",
+          data: null
+        };
+      }
+      try {
+        const response = await this.app.request.post(backendPath, {
+          ids,
+          status
+        }, {
+          isShopApi: true,
+          customToast: () => {
+          }
+        });
+        return {
+          code: (response == null ? void 0 : response.code) ?? 200,
+          status: (response == null ? void 0 : response.status) ?? true,
+          message: (response == null ? void 0 : response.message) ?? "",
+          data: (response == null ? void 0 : response.data) ?? response
+        };
+      } catch (error) {
+        const backendError = this.extractBackendErrorResponse(error);
+        if (backendError) {
+          return {
+            code: backendError.code ?? 500,
+            status: backendError.status ?? false,
+            message: backendError.message ?? "后端拒绝 batch-metadata",
+            data: backendError.data ?? null
+          };
+        }
+        const message = this.getUnknownErrorMessage(error);
+        this.logError(`${title}: 请求失败`, {
+          backendPath,
+          error: message,
+          error_detail: this.normalizeUnknownError(error)
+        });
+        return {
+          code: 500,
+          status: false,
+          message,
+          data: null
+        };
+      }
+    };
     this.handleOrderSalesDetail = async ({ url, data, path }) => {
       var _a;
       const requestPath = this.parseRequestPath(url, path);
@@ -752,7 +829,7 @@ var Server = class {
         };
       } catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
-        this.logError("handleOrderSalesDetail: 请求失败", {
+        this.logInfo("handleOrderSalesDetail: 请求失败", {
           lookup,
           backendPath,
           error: errorMessage
@@ -1758,6 +1835,16 @@ var Server = class {
         method: "post",
         path: "/shop/local/print-order",
         handler: this.handleLocalPrintOrder.bind(this)
+      },
+      {
+        method: "post",
+        path: "/shop/machinecode/batch",
+        handler: this.handleMachinecodeBatchMeta.bind(this)
+      },
+      {
+        method: "post",
+        path: "/machinecode/batch",
+        handler: this.handleMachinecodeBatchMeta.bind(this)
       }
     ]);
     this.registerPrefixRoutes([
@@ -1822,7 +1909,6 @@ var Server = class {
    */
   removeProductQuerySubscriber(subscriberId) {
     if (subscriberId) {
-      this.clearSubscriberScheduleTimers(subscriberId);
       this.productQuerySubscribers.delete(subscriberId);
       this.logInfo("removeProductQuerySubscriber: 已移除订阅者", {
         subscriberId,
@@ -1830,156 +1916,6 @@ var Server = class {
       });
     }
   }
-  /**
-   * 构建商品 query 响应 data 段，附带智能定价 schedule_time_points 元数据。
-   */
-  buildProductQueryResultPayload(list, count) {
-    var _a, _b;
-    return {
-      list,
-      count: count ?? list.length,
-      schedule_time_points: ((_b = (_a = this.products) == null ? void 0 : _a.getLastScheduleTimePoints) == null ? void 0 : _b.call(_a)) ?? []
-    };
-  }
-  /**
-   * 是否启用商品 query 订阅的 schedule 时间点定时重算。
-   * strategy_context.enable_schedule_reload === false 时关闭。
-   */
-  shouldScheduleProductQueryReload(strategy_context) {
-    return (strategy_context == null ? void 0 : strategy_context.enable_schedule_reload) !== false;
-  }
-  /**
-   * 清除指定 subscriber 的全部 schedule 定时器，防止重复 query 或 unsubscribe 后泄漏。
-   */
-  clearSubscriberScheduleTimers(subscriberId) {
-    const timers = this.productQueryScheduleTimers.get(subscriberId);
-    if (timers == null ? void 0 : timers.length) {
-      timers.forEach((timerId) => clearTimeout(timerId));
-    }
-    this.productQueryScheduleTimers.delete(subscriberId);
-    const subscriber = this.productQuerySubscribers.get(subscriberId);
-    if (subscriber) {
-      subscriber.scheduleTimerIds = [];
-    }
-  }
-  /**
-   * 从 productQueryScheduleTimers 移除已触发的 timer 引用。
-   */
-  removeScheduleTimerRef(subscriberId, timerId) {
-    const timers = this.productQueryScheduleTimers.get(subscriberId);
-    if (!(timers == null ? void 0 : timers.length))
-      return;
-    const next = timers.filter((id) => id !== timerId);
-    if (next.length === 0) {
-      this.productQueryScheduleTimers.delete(subscriberId);
-    } else {
-      this.productQueryScheduleTimers.set(subscriberId, next);
-    }
-    const subscriber = this.productQuerySubscribers.get(subscriberId);
-    if (subscriber) {
-      subscriber.scheduleTimerIds = next;
-    }
-  }
-  /**
-   * 计算 schedule 变价时间点到当前时刻的延迟（ms）。已过期返回 -1。
-   */
-  computeScheduleTimePointDelayMs(scheduleDate, timePoint) {
-    const parts = timePoint.split(":");
-    if (parts.length < 2)
-      return -1;
-    const hours = parseInt(parts[0], 10);
-    const minutes = parseInt(parts[1], 10);
-    if (!Number.isFinite(hours) || !Number.isFinite(minutes))
-      return -1;
-    const target = (0, import_dayjs.default)(scheduleDate).hour(hours).minute(minutes).second(4).millisecond(0);
-    const delayMs = target.diff((0, import_dayjs.default)());
-    return delayMs >= 0 ? delayMs : -1;
-  }
-  /**
-   * 定时重算前刷新 subscriber schedule 上下文：使用执行瞬间时间，禁止沿用首次 query 的 schedule_datetime。
-   */
-  refreshSubscriberScheduleAtExecution(subscriber) {
-    const executedAt = (0, import_dayjs.default)();
-    const bookingDate = subscriber.context.schedule_date || executedAt.format("YYYY-MM-DD");
-    subscriber.context.schedule_date = bookingDate;
-    subscriber.context.schedule_datetime = `${bookingDate} ${executedAt.format("HH:mm:ss")}`;
-  }
-  /**
-   * 为 subscriber 注册智能定价 scheduleTimePoints 定时重算。
-   * 必须先 clearSubscriberScheduleTimers，再调用本方法。
-   */
-  scheduleSubscriberTimePointReloads(subscriberId, timePoints) {
-    const subscriber = this.productQuerySubscribers.get(subscriberId);
-    if (!subscriber || !timePoints.length)
-      return;
-    const scheduleDate = subscriber.context.schedule_date || (0, import_dayjs.default)().format("YYYY-MM-DD");
-    const timerIds = [];
-    for (const timePoint of timePoints) {
-      const delayMs = this.computeScheduleTimePointDelayMs(scheduleDate, timePoint);
-      if (delayMs < 0)
-        continue;
-      const timerId = setTimeout(() => {
-        void this.onScheduleTimePointTimerFire(subscriberId, timerId);
-      }, delayMs);
-      timerIds.push(timerId);
-    }
-    if (timerIds.length > 0) {
-      this.productQueryScheduleTimers.set(subscriberId, timerIds);
-      subscriber.scheduleTimerIds = timerIds;
-      this.logInfo("scheduleSubscriberTimePointReloads: 已注册定时器", {
-        subscriberId,
-        timerCount: timerIds.length,
-        timePoints
-      });
-    }
-  }
-  /**
-   * schedule 变价时间点定时器触发：刷新 schedule_datetime 后重算并 callback。
-   */
-  async onScheduleTimePointTimerFire(subscriberId, timerId) {
-    this.removeScheduleTimerRef(subscriberId, timerId);
-    if (!this.productQuerySubscribers.has(subscriberId))
-      return;
-    const subscriber = this.productQuerySubscribers.get(subscriberId);
-    this.refreshSubscriberScheduleAtExecution(subscriber);
-    await this.recomputeAndNotifySubscriber(subscriberId);
-  }
-  /**
-   * 对单个商品 query 订阅者重算并推送（定时路径；不新建 schedule timer）。
-   */
-  async recomputeAndNotifySubscriber(subscriberId) {
-    const subscriber = this.productQuerySubscribers.get(subscriberId);
-    if (!subscriber)
-      return;
-    try {
-      const result = await this.computeProductQueryResult(subscriber.context);
-      subscriber.callback(result);
-      this.logInfo("recomputeAndNotifySubscriber: 已推送", {
-        subscriberId,
-        schedule_datetime: subscriber.context.schedule_datetime
-      });
-    } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : String(error);
-      this.logError("recomputeAndNotifySubscriber: 推送失败", {
-        subscriberId,
-        error: errorMessage
-      });
-    }
-  }
-  /**
-   * query 完成后为 subscriber 同步 schedule 定时器（先 clear 再 schedule）。
-   */
-  syncProductQueryScheduleTimers(subscriberId, strategy_context) {
-    var _a, _b;
-    this.clearSubscriberScheduleTimers(subscriberId);
-    if (!this.shouldScheduleProductQueryReload(strategy_context)) {
-      return;
-    }
-    const timePoints = ((_b = (_a = this.products) == null ? void 0 : _a.getLastScheduleTimePoints) == null ? void 0 : _b.call(_a)) ?? [];
-    if (timePoints.length > 0) {
-      this.scheduleSubscriberTimePointReloads(subscriberId, timePoints);
-    }
-  }
   /**
    * 执行 sales 搜索并登记可见订单号。
    * 搜索参数完全透传后端，OS 不做过滤、筛选、排序。
@@ -2822,10 +2758,12 @@ var Server = class {
         action: "print_all",
         device_id: params.deviceId ?? deviceId,
         payload: {
-          type: params.receiptOnly ? "0" : "99",
+          type: params.isManualPrint ? "0" : "99",
           data: params.receiptOnly ? {
             order_id: printIdentity,
-            small_ticket_data: (_b = (_a = params.syncedOrder) == null ? void 0 : _a.payment_info) == null ? void 0 : _b.small_ticket_data
+            small_ticket_data: (_b = (_a = params.syncedOrder) == null ? void 0 : _a.payment_info) == null ? void 0 : _b.small_ticket_data,
+            skip_wristband: true,
+            skip_voucher: true
           } : {
             order_id: printIdentity,
             machine_code_print_info: (_d = (_c = params.syncedOrder) == null ? void 0 : _c.payment_info) == null ? void 0 : _d.machine_code_print_info,
@@ -2836,7 +2774,7 @@ var Server = class {
         idempotency_key: this.buildPrintOtherReceiptIdempotencyKey(params.syncedOrder, {
           receiptOnly: params.receiptOnly
         }),
-        name: "打印转发",
+        name: "PRINT_V1",
         source: "server",
         source_type: "order",
         source_id: printIdentity
@@ -2876,7 +2814,8 @@ var Server = class {
       checkoutData: params.checkoutData,
       syncedOrder: printableOrder,
       response: params.response,
-      receiptOnly: true
+      receiptOnly: true,
+      isManualPrint: params.isManualPrint
     });
     return { printed: true, order: printableOrder };
   }
@@ -2894,6 +2833,110 @@ var Server = class {
     }
     return void 0;
   }
+  resolveMachinecodeBatchMetadataLookup(data) {
+    const candidates = [
+      data == null ? void 0 : data.order_lookup,
+      data == null ? void 0 : data.orderLookup,
+      data == null ? void 0 : data.external_sale_number,
+      data == null ? void 0 : data.externalSaleNumber,
+      data == null ? void 0 : data.order_id,
+      data == null ? void 0 : data.orderId,
+      data == null ? void 0 : data.order_number,
+      data == null ? void 0 : data.orderNumber,
+      data == null ? void 0 : data.shop_order_number,
+      data == null ? void 0 : data.shopOrderNumber,
+      data == null ? void 0 : data.shop_full_order_number,
+      data == null ? void 0 : data.shopFullOrderNumber
+    ];
+    return candidates.find((candidate) => candidate !== void 0 && candidate !== null && candidate !== "");
+  }
+  async syncMachinecodeRedeemStatusToLocalOrder(data, ids, status) {
+    var _a;
+    const title = "handleMachinecodeBatchMetadata";
+    const lookup = this.resolveMachinecodeBatchMetadataLookup(data);
+    if (lookup === void 0) {
+      this.logWarning(`${title}: order lookup 缺失，跳过本地订单核销状态更新`, {
+        batchSize: ids.length,
+        status
+      });
+      return;
+    }
+    if (!((_a = this.order) == null ? void 0 : _a.getLocalOrderByLookup)) {
+      this.logWarning(`${title}: Order 模块未注册，跳过本地订单核销状态更新`, {
+        lookup,
+        status
+      });
+      return;
+    }
+    const localOrder = await this.order.getLocalOrderByLookup(lookup);
+    if (!localOrder) {
+      this.logWarning(`${title}: 本地订单不存在，跳过核销状态更新`, {
+        lookup,
+        status
+      });
+      return;
+    }
+    const voucherIdSet = new Set(
+      ids.filter((id) => id !== void 0 && id !== null && id !== "").map((id) => String(id))
+    );
+    if (voucherIdSet.size === 0) {
+      this.logWarning(`${title}: voucher ids 缺失，跳过本地订单核销状态更新`, {
+        lookup,
+        status
+      });
+      return;
+    }
+    const vouchers = Array.isArray(localOrder.vouchers) ? localOrder.vouchers : [];
+    let hasUpdatedVoucher = false;
+    const nextVouchers = vouchers.map((voucher) => {
+      const voucherId = voucher == null ? void 0 : voucher.voucher_id;
+      if (voucherId === void 0 || voucherId === null)
+        return voucher;
+      if (!voucherIdSet.has(String(voucherId)))
+        return voucher;
+      hasUpdatedVoucher = true;
+      return {
+        ...voucher,
+        status
+      };
+    });
+    if (!hasUpdatedVoucher) {
+      this.logWarning(`${title}: 本地订单未命中任何 voucher，跳过核销状态更新`, {
+        lookup,
+        voucher_ids: Array.from(voucherIdSet),
+        status
+      });
+      return;
+    }
+    if (typeof this.order.overwriteExistingOrder === "function") {
+      await this.order.overwriteExistingOrder({
+        ...localOrder,
+        vouchers: nextVouchers
+      });
+      this.logInfo(`${title}: 本地订单 vouchers 核销状态已更新`, {
+        lookup,
+        updatedCount: voucherIdSet.size,
+        status
+      });
+      return;
+    }
+    if ((data == null ? void 0 : data.external_sale_number) && typeof this.order.markOrderSyncedByExternalSaleNumber === "function") {
+      await this.order.markOrderSyncedByExternalSaleNumber({
+        externalSaleNumber: data.external_sale_number,
+        patch: { vouchers: nextVouchers }
+      });
+      this.logInfo(`${title}: 本地订单 vouchers 核销状态已更新`, {
+        lookup,
+        updatedCount: voucherIdSet.size,
+        status
+      });
+      return;
+    }
+    this.logWarning(`${title}: Order 模块不支持本地订单覆盖，跳过核销状态更新`, {
+      lookup,
+      status
+    });
+  }
   async handleOrderCheckoutSubmit(params) {
     const { backendPath, data, title } = params;
     this.logInfo(`${title}: 开始处理`, {
@@ -3091,11 +3134,8 @@ var Server = class {
     );
   }
   shouldBuildSmallTicketData(order) {
-    var _a;
     if (!order || typeof order !== "object")
       return false;
-    if ((0, import_small_ticket.hasSmallTicketData)((_a = order.payment_info) == null ? void 0 : _a.small_ticket_data))
-      return false;
     return Number(order.small_ticket_data_flag ?? order.smallTicketDataFlag ?? 0) === 1;
   }
   shouldPrintSyncedOrder(params) {
@@ -3952,14 +3992,8 @@ var Server = class {
    */
   async computeProductQueryResult(context, options) {
     const tTotal = performance.now();
-    const { menu_list_ids, ids, schedule_date, schedule_datetime, customer_id, extension_type, product_id, strategy_context } = context;
+    const { menu_list_ids, ids, schedule_date, schedule_datetime, customer_id, extension_type, product_id } = context;
     const queryIds = Array.isArray(ids) ? ids.map((id) => Number(id)).filter((id) => Number.isFinite(id)) : [];
-    const formatterContext = this.buildProductFormatterContext({
-      schedule_date,
-      schedule_datetime,
-      customer_id,
-      strategy_context
-    });
     this.logInfo("computeProductQueryResult 开始", {
       menuListIdsCount: (menu_list_ids == null ? void 0 : menu_list_ids.length) ?? 0,
       ids: queryIds,
@@ -3968,17 +4002,20 @@ var Server = class {
       customer_id,
       extension_type,
       product_id,
-      strategyContextKeys: strategy_context ? Object.keys(strategy_context) : [],
       changedIds: options == null ? void 0 : options.changedIds
     });
     if (!this.products) {
       this.logError("computeProductQueryResult: Products 模块未注册");
-      return { message: "Products 模块未注册", data: this.buildProductQueryResultPayload([], 0) };
+      return { message: "Products 模块未注册", data: { list: [], count: 0 } };
     }
     if (queryIds.length > 0) {
       const uniqueIds = Array.from(new Set(queryIds));
       const tPrice2 = performance.now();
-      const productsWithPrice = await this.products.getProductsWithPrice(schedule_date, formatterContext, {
+      const productsWithPrice = await this.products.getProductsWithPrice(schedule_date, {
+        scheduleModule: this.getSchedule(),
+        schedule_datetime,
+        customer_id
+      }, {
         changedIds: options == null ? void 0 : options.changedIds,
         productIds: uniqueIds
       });
@@ -3999,7 +4036,7 @@ var Server = class {
       });
       return {
         code: 200,
-        data: this.buildProductQueryResultPayload(extensionFilteredProducts),
+        data: { list: extensionFilteredProducts, count: extensionFilteredProducts.length },
         message: "",
         status: true
       };
@@ -4007,7 +4044,9 @@ var Server = class {
     if (product_id != null && Number.isFinite(Number(product_id))) {
       const pid = Number(product_id);
       const tPrice2 = performance.now();
-      const allProductsWithPrice = await this.products.getProductsWithPrice(schedule_date, formatterContext, {
+      const allProductsWithPrice = await this.products.getProductsWithPrice(schedule_date, {
+        scheduleModule: this.getSchedule()
+      }, {
         changedIds: options == null ? void 0 : options.changedIds
       });
       (0, import_product.perfMark)("computeQuery.getProductsWithPrice(single)", performance.now() - tPrice2, {
@@ -4037,7 +4076,11 @@ var Server = class {
     }
     if (this.shouldQueryProductsByExtensionTypes(extension_type)) {
       const tPrice2 = performance.now();
-      let filteredProducts2 = await this.products.getProductsWithPrice(schedule_date, formatterContext, {
+      let filteredProducts2 = await this.products.getProductsWithPrice(schedule_date, {
+        scheduleModule: this.getSchedule(),
+        schedule_datetime,
+        customer_id
+      }, {
         changedIds: options == null ? void 0 : options.changedIds
       });
       (0, import_product.perfMark)("computeQuery.getProductsWithPrice(extensionType)", performance.now() - tPrice2, {
@@ -4077,18 +4120,18 @@ var Server = class {
       });
       return {
         code: 200,
-        data: this.buildProductQueryResultPayload(filteredProducts2),
+        data: { list: filteredProducts2, count: filteredProducts2.length },
         message: "",
         status: true
       };
     }
     if (!this.menu) {
       this.logError("computeProductQueryResult: Menu 模块未注册");
-      return { message: "Menu 模块未注册", data: this.buildProductQueryResultPayload([], 0) };
+      return { message: "Menu 模块未注册", data: { list: [], count: 0 } };
     }
     if (!this.schedule) {
       this.logError("computeProductQueryResult: Schedule 模块未注册");
-      return { message: "Schedule 模块未注册", data: this.buildProductQueryResultPayload([], 0) };
+      return { message: "Schedule 模块未注册", data: { list: [], count: 0 } };
     }
     let activeMenuList = [];
     if (menu_list_ids && Array.isArray(menu_list_ids) && menu_list_ids.length > 0) {
@@ -4112,7 +4155,11 @@ var Server = class {
       isAllProducts: !!productScope.isAllProducts
     });
     const tPrice = performance.now();
-    let filteredProducts = scopedProductIds.length > 0 ? await this.products.getProductsWithPrice(schedule_date, formatterContext, {
+    let filteredProducts = scopedProductIds.length > 0 ? await this.products.getProductsWithPrice(schedule_date, {
+      scheduleModule: this.getSchedule(),
+      schedule_datetime,
+      customer_id
+    }, {
       changedIds: options == null ? void 0 : options.changedIds,
       productIds: productScope.isAllProducts ? void 0 : scopedProductIds
     }) : [];
@@ -4155,29 +4202,11 @@ var Server = class {
     });
     return {
       code: 200,
-      data: this.buildProductQueryResultPayload(filteredProducts),
+      data: { list: filteredProducts, count: filteredProducts.length },
       message: "",
       status: true
     };
   }
-  /**
-   * 构建商品格式化上下文。
-   *
-   * 智能定价条件使用全量 menuList/scheduleList；Product Query 顶层参数只保留筛选商品集合所需字段。
-   */
-  buildProductFormatterContext(context) {
-    var _a, _b, _c, _d;
-    const scheduleModule = this.getSchedule();
-    return {
-      scheduleModule,
-      schedule_datetime: context.schedule_datetime,
-      customer_id: context.customer_id,
-      strategy_context: context.strategy_context,
-      menuList: ((_b = (_a = this.menu) == null ? void 0 : _a.getMenuList) == null ? void 0 : _b.call(_a)) || [],
-      scheduleList: ((_c = scheduleModule == null ? void 0 : scheduleModule.getScheduleList) == null ? void 0 : _c.call(scheduleModule)) || [],
-      dataVariantEvaluator: (_d = this.core.context) == null ? void 0 : _d.dataVariantEvaluator
-    };
-  }
   /**
    * 数据变更后，遍历所有订阅者重新计算查询结果并通过 callback 推送
    * 由 ProductsModule 的 onProductsSyncCompleted 事件触发

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

@@ -15,7 +15,6 @@ export declare class OrderModule extends BaseModule implements Module {
     private syncTimer?;
     private isProcessingSyncBatch;
     private isIdlePhase;
-    private resourceIdIndex;
     private logger;
     private storage;
     private orderSQLiteSaveQueue; /** 按 storageKey 记录最近一次 SQLite 写入来源与时间，用于去重 */
@@ -89,7 +88,6 @@ export declare class OrderModule extends BaseModule implements Module {
      * @returns 刷新后的订单列表
      */
     silentRefresh(): Promise<OrderData[]>;
-    getOrdersByResourceId(resourceId: string | number): OrderData[];
     private normalizeOrderForMemoryList;
     /**
      * 仅覆盖本地已存在的订单；不存在则直接跳过，不落库、不 emit。
@@ -126,7 +124,6 @@ export declare class OrderModule extends BaseModule implements Module {
     private isBlankIdentityValue;
     private getOrderIdentityEntries;
     private getOrderIdentityKeys;
-    private extractResourceIds;
     private getOrderDateKey;
     /**
      * 初始化 OrderDataSource 实例
@@ -175,6 +172,28 @@ export declare class OrderModule extends BaseModule implements Module {
      * 将增量订单合并到 store
      */
     private mergeOrdersToStore;
+    /**
+     * 在身份索引中查找与目标订单共享任一身份键的已存在订单下标。
+     * 返回所有命中键里最小的下标，等价于原 findOrderIndexByIdentity 的「取首个匹配」语义。
+     *
+     * @example
+     * const idx = this.lookupOrderIndexByIdentityKeys(identityKeyToIndex, freshIdentityKeys)
+     */
+    private lookupOrderIndexByIdentityKeys;
+    private isRemoteEchoMergeSource;
+    /**
+     * 将订单的全部身份键登记到索引并指向其在列表中的下标。
+     * 合并后订单新增的身份字段（如挂单同步后拿到 order_id）也会被登记。
+     *
+     * @example
+     * this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, matchIndex)
+     */
+    private registerOrderIdentityKeys;
+    /**
+     * 合并热路径去重兜底：默认直接返回原列表（增量索引已保证无重复）。
+     * 仅当 ORDER_MERGE_SELF_CHECK 开启时，额外做一次全表压缩并在发现残留重复时告警。
+     */
+    private runOrderStoreSelfCheck;
     private normalizeOrderSyncMessage;
     private normalizeOrderSyncPayload;
     private uniqueOrderIds;