@pisell/pisellos 2.2.256 → 2.2.258

package/lib/server/index.js

@@ -639,7 +639,8 @@ var Server = class {
           checkoutData,
           order: printableOrder,
           response: null,
-          requireFullyPaid: false
+          requireFullyPaid: false,
+          isManualPrint: true
         });
         return {
           code: 200,
@@ -661,6 +662,86 @@ var Server = class {
         };
       }
     };
+    this.handleMachinecodeBatchMetadata = async ({ data }) => {
+      var _a, _b;
+      const title = "handleMachinecodeBatchMetadata";
+      const backendPath = "/shop/machinecode/batch-metadata";
+      const batchMetadata = Array.isArray(data == null ? void 0 : data.data) ? data.data : [];
+      this.logInfo(`${title}: 开始处理`, {
+        backendPath,
+        batchSize: batchMetadata.length,
+        order_lookup: this.resolveMachinecodeBatchMetadataLookup(data) ?? null
+      });
+      if (batchMetadata.length === 0) {
+        return {
+          code: 200,
+          status: true,
+          message: "",
+          data: []
+        };
+      }
+      try {
+        await this.syncMachinecodeBatchMetadataToLocalOrder(data, batchMetadata);
+      } catch (error) {
+        const message = this.getUnknownErrorMessage(error);
+        this.logError(`${title}: 本地订单 metadata 更新失败`, {
+          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, {
+          data: batchMetadata
+        }, {
+          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);
@@ -737,7 +818,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
@@ -1743,6 +1824,16 @@ var Server = class {
         method: "post",
         path: "/shop/local/print-order",
         handler: this.handleLocalPrintOrder.bind(this)
+      },
+      {
+        method: "post",
+        path: "/shop/machinecode/batch-metadata",
+        handler: this.handleMachinecodeBatchMetadata.bind(this)
+      },
+      {
+        method: "post",
+        path: "/machinecode/batch-metadata",
+        handler: this.handleMachinecodeBatchMetadata.bind(this)
       }
     ]);
     this.registerPrefixRoutes([
@@ -1988,6 +2079,20 @@ var Server = class {
       return null;
     return text.split("T")[0].split(" ")[0] || null;
   }
+  /**
+   * 判断时间范围是否完整落在今天。
+   *
+   * @example
+   * this.isRangeFullyToday('2026-04-15', '2026-04-15') // => true
+   */
+  isRangeFullyToday(startRaw, endRaw) {
+    const startDate = this.extractQueryDate(startRaw);
+    const endDate = this.extractQueryDate(endRaw);
+    if (!startDate || !endDate)
+      return false;
+    const today = (0, import_dayjs.default)().format("YYYY-MM-DD");
+    return startDate === today && endDate === today;
+  }
   /**
    * 判断时间范围是否「开始和结束都不是今天」。
    *
@@ -2004,11 +2109,11 @@ var Server = class {
   }
   /**
    * 订单查询是否走本地：
-   * - 当 start_time 与 end_time 都不是今天时，走远端；
-   * - 其余情况走本地。
+   * - 仅当 start_time 与 end_time 都是今天时，走本地；
+   * - 任意一端不是今天时，走云端，确保跨天查询能拉取非本地窗口数据。
    */
   shouldUseLocalOrderQuery(data) {
-    return !this.isRangeBothNotToday(data == null ? void 0 : data.start_time, data == null ? void 0 : data.end_time);
+    return this.isRangeFullyToday(data == null ? void 0 : data.start_time, data == null ? void 0 : data.end_time);
   }
   /**
    * 预约查询是否走本地：
@@ -2642,10 +2747,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,
@@ -2656,7 +2763,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
@@ -2696,7 +2803,8 @@ var Server = class {
       checkoutData: params.checkoutData,
       syncedOrder: printableOrder,
       response: params.response,
-      receiptOnly: true
+      receiptOnly: true,
+      isManualPrint: params.isManualPrint
     });
     return { printed: true, order: printableOrder };
   }
@@ -2714,6 +2822,107 @@ 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 syncMachinecodeBatchMetadataToLocalOrder(data, batchMetadata) {
+    var _a;
+    const title = "handleMachinecodeBatchMetadata";
+    const lookup = this.resolveMachinecodeBatchMetadataLookup(data);
+    if (lookup === void 0) {
+      this.logWarning(`${title}: order lookup 缺失，跳过本地订单 metadata 更新`, {
+        batchSize: batchMetadata.length
+      });
+      return;
+    }
+    if (!((_a = this.order) == null ? void 0 : _a.getLocalOrderByLookup)) {
+      this.logWarning(`${title}: Order 模块未注册，跳过本地订单 metadata 更新`, {
+        lookup
+      });
+      return;
+    }
+    const localOrder = await this.order.getLocalOrderByLookup(lookup);
+    if (!localOrder) {
+      this.logWarning(`${title}: 本地订单不存在，跳过 metadata 更新`, {
+        lookup
+      });
+      return;
+    }
+    const metadataByVoucherId = /* @__PURE__ */ new Map();
+    for (const item of batchMetadata) {
+      const voucherId = (item == null ? void 0 : item.voucher_id) ?? (item == null ? void 0 : item.voucherId);
+      if (voucherId === void 0 || voucherId === null || voucherId === "")
+        continue;
+      metadataByVoucherId.set(String(voucherId), (item == null ? void 0 : item.metadata) || {});
+    }
+    if (metadataByVoucherId.size === 0) {
+      this.logWarning(`${title}: voucher metadata 缺失，跳过本地订单 metadata 更新`, {
+        lookup
+      });
+      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;
+      const metadata = metadataByVoucherId.get(String(voucherId));
+      if (!metadata)
+        return voucher;
+      hasUpdatedVoucher = true;
+      return {
+        ...voucher,
+        metadata
+      };
+    });
+    if (!hasUpdatedVoucher) {
+      this.logWarning(`${title}: 本地订单未命中任何 voucher，跳过 metadata 更新`, {
+        lookup,
+        voucher_ids: Array.from(metadataByVoucherId.keys())
+      });
+      return;
+    }
+    if (typeof this.order.overwriteExistingOrder === "function") {
+      await this.order.overwriteExistingOrder({
+        ...localOrder,
+        vouchers: nextVouchers
+      });
+      this.logInfo(`${title}: 本地订单 vouchers metadata 已更新`, {
+        lookup,
+        updatedCount: metadataByVoucherId.size
+      });
+      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 metadata 已更新`, {
+        lookup,
+        updatedCount: metadataByVoucherId.size
+      });
+      return;
+    }
+    this.logWarning(`${title}: Order 模块不支持本地订单覆盖，跳过 metadata 更新`, {
+      lookup
+    });
+  }
   async handleOrderCheckoutSubmit(params) {
     const { backendPath, data, title } = params;
     this.logInfo(`${title}: 开始处理`, {
@@ -2911,11 +3120,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) {

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;

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

@@ -48,6 +48,7 @@ var ORDER_BUSINESS_WRITE_SOURCES = /* @__PURE__ */ new Set([
   "overwriteExistingOrder",
   "markOrderSyncedByExternalSaleNumber"
 ]);
+var ORDER_MERGE_SELF_CHECK = false;
 var OrderModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -56,8 +57,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.pendingSyncMessages = [];
     this.isProcessingSyncBatch = false;
     this.isIdlePhase = true;
-    // Map<resource_id, OrderId[]> 资源到订单的倒排索引
-    this.resourceIdIndex = /* @__PURE__ */ new Map();
     this.orderSQLiteSaveQueue = Promise.resolve();
     /** 按 storageKey 记录最近一次 SQLite 写入来源与时间，用于去重 */
     this.recentSqliteWriteByStorageKey = /* @__PURE__ */ new Map();
@@ -481,10 +480,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return this.store.list;
     }
   }
-  getOrdersByResourceId(resourceId) {
-    const ids = this.resourceIdIndex.get(String(resourceId)) || [];
-    return ids.map((id) => this.store.map.get(id)).filter((order) => !!order);
-  }
   normalizeOrderForMemoryList(order) {
     const externalSaleNumber = order == null ? void 0 : order.external_sale_number;
     if ((order == null ? void 0 : order.order_id) !== void 0 && (order == null ? void 0 : order.order_id) !== null && (order == null ? void 0 : order.order_id) !== "") {
@@ -617,22 +612,33 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const patchedOrders = [...pendingMap.values()];
     const mergeActions = {};
     const updatedList = [...this.store.list];
+    const identityKeyToIndex = /* @__PURE__ */ new Map();
+    for (let index = 0; index < updatedList.length; index += 1) {
+      for (const key of this.getOrderIdentityMatchKeys(updatedList[index])) {
+        if (!identityKeyToIndex.has(key))
+          identityKeyToIndex.set(key, index);
+      }
+    }
     for (const [storageKey, pendingOrder] of memoryPendingMap.entries()) {
-      const matchIndex = this.findOrderIndexByIdentity(updatedList, pendingOrder);
-      if (matchIndex < 0)
+      const matchIndex = this.lookupOrderIndexByIdentityKeys(
+        identityKeyToIndex,
+        this.getOrderIdentityMatchKeys(pendingOrder)
+      );
+      if (matchIndex >= 0) {
+        const mergedOrder = this.mergeOrderRecords(updatedList[matchIndex], pendingOrder, {
+          preferIncomingProducts: true
+        });
+        updatedList[matchIndex] = mergedOrder;
+        this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, matchIndex);
+        mergeActions[storageKey] = "update";
         continue;
-      updatedList[matchIndex] = this.mergeOrderRecords(updatedList[matchIndex], pendingOrder, {
-        preferIncomingProducts: true
-      });
-      pendingMap.delete(storageKey);
-      memoryPendingMap.delete(storageKey);
-      mergeActions[storageKey] = "update";
-    }
-    for (const [storageKey, order] of memoryPendingMap.entries()) {
+      }
+      const insertIndex = updatedList.length;
+      updatedList.push(pendingOrder);
+      this.registerOrderIdentityKeys(identityKeyToIndex, pendingOrder, insertIndex);
       mergeActions[storageKey] = "insert";
-      updatedList.push(order);
     }
-    this.store.list = this.compactOrderListByIdentity(updatedList, "upsertPendingSyncOrders.store").list;
+    this.store.list = this.runOrderStoreSelfCheck(updatedList, "upsertPendingSyncOrders.store");
     this.syncOrdersMap();
     await this.patchOrdersInSQLite(patchedOrders, "upsertPendingSyncOrders", mergeActions);
     this.logInfo("upsertPendingSyncOrders-结束", {
@@ -674,21 +680,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   syncOrdersMap() {
     this.store.map.clear();
-    this.resourceIdIndex.clear();
     for (const order of this.store.list) {
       const primaryIdentity = this.getOrderMapKey(order);
       if (!primaryIdentity)
         continue;
       this.store.map.set(primaryIdentity, order);
-      const resourceIds = this.extractResourceIds(order);
-      for (const resourceId of resourceIds) {
-        const key = String(resourceId);
-        const existing = this.resourceIdIndex.get(key) || [];
-        if (existing.some((eid) => this.getIdKey(eid) === primaryIdentity))
-          continue;
-        existing.push(primaryIdentity);
-        this.resourceIdIndex.set(key, existing);
-      }
     }
   }
   getOrderMapKey(order) {
@@ -735,24 +731,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     return keys;
   }
-  extractResourceIds(order) {
-    const ids = /* @__PURE__ */ new Set();
-    const visitResources = (resources) => {
-      if (!Array.isArray(resources))
-        return;
-      resources.forEach((resource) => {
-        const rid = resource == null ? void 0 : resource.relation_id;
-        if (rid !== void 0 && rid !== null && rid !== "")
-          ids.add(String(rid));
-        if (Array.isArray(resource == null ? void 0 : resource.children))
-          visitResources(resource.children);
-      });
-    };
-    if (Array.isArray(order == null ? void 0 : order.bookings)) {
-      order.bookings.forEach((booking) => visitResources((booking == null ? void 0 : booking.resources) || []));
-    }
-    return [...ids];
-  }
   getOrderDateKey(order) {
     var _a, _b, _c, _d;
     const candidates = [
@@ -971,9 +949,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * 将增量订单合并到 store
    */
   async mergeOrdersToStore(freshOrders, source) {
+    const storeOrderCountBefore = this.store.list.length;
     this.logInfo("mergeOrdersToStore-开始", {
       freshOrderCount: freshOrders.length,
-      storeOrderCountBefore: this.store.list.length,
+      storeOrderCountBefore,
       source
     });
     this.logDuplicateOrders(`${source}.beforeMerge`, this.store.list);
@@ -992,19 +971,45 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const patchedOrders = [];
     const mergeActions = {};
     const updatedList = [...this.store.list];
+    const identityKeyToIndex = /* @__PURE__ */ new Map();
+    for (let index = 0; index < updatedList.length; index += 1) {
+      const identityKeys = this.getOrderIdentityMatchKeys(updatedList[index]);
+      for (const key of identityKeys) {
+        if (!identityKeyToIndex.has(key))
+          identityKeyToIndex.set(key, index);
+      }
+    }
     for (const fresh of uniqueFreshOrders) {
-      const matchIndex = this.findOrderIndexByIdentity(updatedList, fresh);
+      const freshIdentityKeys = this.getOrderIdentityMatchKeys(fresh);
+      const matchIndex = this.lookupOrderIndexByIdentityKeys(identityKeyToIndex, freshIdentityKeys);
       const storageKey = this.getOrderStorageKey(fresh);
       const mergeKey = storageKey || (fresh.order_id !== void 0 && fresh.order_id !== null ? this.getIdKey(fresh.order_id) : "");
       if (matchIndex >= 0) {
-        const mergedOrder = this.mergeOrderRecords(updatedList[matchIndex], fresh);
+        const existingOrder = updatedList[matchIndex];
+        if (this.isPendingSyncOrder(existingOrder) && this.isRemoteEchoMergeSource(source)) {
+          this.logInfo("mergeOrdersToStore-跳过 pending 订单远端覆盖", {
+            source,
+            order_id: existingOrder.order_id ?? fresh.order_id ?? null,
+            external_sale_number: existingOrder.external_sale_number ?? fresh.external_sale_number ?? null,
+            local_payment_status: existingOrder.payment_status ?? null,
+            remote_payment_status: fresh.payment_status ?? null,
+            local_need_sync: existingOrder.need_sync ?? null,
+            remote_need_sync: fresh.need_sync ?? null,
+            reason: "protect_pending_sync_order_from_remote_echo"
+          });
+          continue;
+        }
+        const mergedOrder = this.mergeOrderRecords(existingOrder, fresh);
         updatedList[matchIndex] = mergedOrder;
+        this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, matchIndex);
         patchedOrders.push(mergedOrder);
         if (mergeKey)
           mergeActions[mergeKey] = "update";
         continue;
       }
+      const insertIndex = updatedList.length;
       updatedList.push(fresh);
+      this.registerOrderIdentityKeys(identityKeyToIndex, fresh, insertIndex);
       patchedOrders.push(fresh);
       if (mergeKey)
         mergeActions[mergeKey] = "insert";
@@ -1016,7 +1021,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       updateCount,
       storeOrderCountAfter: this.store.list.length
     });
-    this.store.list = this.compactOrderListByIdentity(updatedList, `${source}.store`).list;
+    this.store.list = this.runOrderStoreSelfCheck(updatedList, `${source}.store`);
     this.syncOrdersMap();
     await this.patchOrdersInSQLite(patchedOrders, source, mergeActions);
     this.logInfo("mergeOrdersToStore-结束", {
@@ -1027,6 +1032,53 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
     await this.emitOrdersChanged(patchedOrders, source);
   }
+  /**
+   * 在身份索引中查找与目标订单共享任一身份键的已存在订单下标。
+   * 返回所有命中键里最小的下标，等价于原 findOrderIndexByIdentity 的「取首个匹配」语义。
+   *
+   * @example
+   * const idx = this.lookupOrderIndexByIdentityKeys(identityKeyToIndex, freshIdentityKeys)
+   */
+  lookupOrderIndexByIdentityKeys(identityKeyToIndex, identityKeys) {
+    let matchIndex = -1;
+    for (const key of identityKeys) {
+      const index = identityKeyToIndex.get(key);
+      if (index === void 0)
+        continue;
+      if (matchIndex < 0 || index < matchIndex)
+        matchIndex = index;
+    }
+    return matchIndex;
+  }
+  isRemoteEchoMergeSource(source) {
+    return source === "pubsub.bodyUpsert" || source === "pubsub.httpRefresh";
+  }
+  /**
+   * 将订单的全部身份键登记到索引并指向其在列表中的下标。
+   * 合并后订单新增的身份字段（如挂单同步后拿到 order_id）也会被登记。
+   *
+   * @example
+   * this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, matchIndex)
+   */
+  registerOrderIdentityKeys(identityKeyToIndex, order, index) {
+    const identityKeys = this.getOrderIdentityMatchKeys(order);
+    for (const key of identityKeys) {
+      identityKeyToIndex.set(key, index);
+    }
+  }
+  /**
+   * 合并热路径去重兜底：默认直接返回原列表（增量索引已保证无重复）。
+   * 仅当 ORDER_MERGE_SELF_CHECK 开启时，额外做一次全表压缩并在发现残留重复时告警。
+   */
+  runOrderStoreSelfCheck(orders, source) {
+    if (!ORDER_MERGE_SELF_CHECK)
+      return orders;
+    const { list, removedCount } = this.compactOrderListByIdentity(orders, source);
+    if (removedCount > 0) {
+      this.logWarning("合并自检发现残留重复订单，已压缩", { source, removedCount });
+    }
+    return list;
+  }
   normalizeOrderSyncMessage(res) {
     const data = (res == null ? void 0 : res.data) || res;
     if (!data)
@@ -1640,7 +1692,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   async clear() {
     this.store.list = [];
     this.store.map = /* @__PURE__ */ new Map();
-    this.resourceIdIndex.clear();
     if (this.dbManager) {
       await this.runInOrderSQLiteSaveQueue(async () => {
         await this.dbManager.clear(INDEXDB_STORE_NAME);

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

@@ -30,7 +30,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     protected defaultVersion: string;
     isSolution: boolean;
     protected initializeOptions: ModuleOptions;
-    private logger;
+    protected logger: any;
     protected appPlugin: AppPlugin;
     protected store: BaseSalesState;
     protected otherParams: Record<string, any>;
@@ -46,6 +46,9 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     protected hasManualDiscountSelection: boolean;
     private readonly reusedSharedSubModuleNames;
     private paymentMethodsCache;
+    private queuedAutoPaymentSync;
+    private autoPaymentSyncFlushing;
+    private autoPaymentSyncTimer;
     constructor(name?: string, version?: string);
     /**
      * 子类可覆盖此方法以追加/收敛要注册的子模块。
@@ -195,6 +198,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         payments?: OrderPaymentSource[];
         paymentStatus?: BaseSalesPaymentStatus;
         smallTicketDataFlag?: number;
+        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     /**
@@ -207,12 +211,14 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         payments?: OrderPaymentSource[];
         paymentStatus?: BaseSalesPaymentStatus;
         smallTicketDataFlag?: number;
+        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     submitTempOrderAsync<T = any>(params?: {
         payments?: OrderPaymentSource[];
         paymentStatus?: BaseSalesPaymentStatus;
         smallTicketDataFlag?: number;
+        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     printLocalOrderReceipt<T = any>(lookup?: BaseSalesPrintLocalOrderReceiptParams): Promise<T>;
@@ -222,6 +228,10 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     getOrderPayments(): OrderPaymentData[];
     /** 覆盖当前订单支付项，内部由 OrderModule 清洗为 Sales 协议字段。 */
     setOrderPayments(payments: OrderPaymentSource[]): OrderPaymentData[];
+    private getPaymentStatusForSync;
+    private queueLatestAutoPaymentSync;
+    private scheduleQueuedAutoPaymentSyncFlush;
+    private flushQueuedAutoPaymentSync;
     /** 追加单个支付项到当前订单。 */
     addOrderPayment(payment: OrderPaymentSource): OrderPaymentData[];
     /** 更新当前订单中的指定支付项。 */
@@ -229,7 +239,11 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     /** 删除当前订单中的指定支付项。 */
     deleteOrderPayment(paymentIdentity: string | number): OrderPaymentData[];
     /** 覆盖 wallet pass 支付项，同时保留普通支付项。 */
-    updateVoucherOrderPayments(payments: OrderPaymentSource[]): OrderPaymentData[];
+    updateVoucherOrderPayments(payments: OrderPaymentSource[], options?: {
+        status?: 'paid' | 'payment_pending';
+    }): OrderPaymentData[];
+    confirmPendingVoucherPayments(): OrderPaymentData[];
+    discardPendingVoucherPayments(): OrderPaymentData[];
     private getWalletProductList;
     initWalletData(params?: {
         order_wait_pay_amount?: number;