@pisell/pisellos 2.2.260 → 2.2.262

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

@@ -33,6 +33,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { cloneDeep } from 'lodash-es';
 import dayjs from 'dayjs';
 import { BaseModule } from "../../../modules/BaseModule";
+import { applyOrderCollectionUidRemaps, getOrderCollectionPersistentId, getOrderCollectionReferenceUid, getOrderCollectionUid, isSameOrderCollectionItem, mergeOrderCollectionItems, normalizeOrderCollections } from "../../../modules/Order/utils/orderCollectionIdentity";
 import { OrderHooks } from "./types";
 
 /**
@@ -49,6 +50,19 @@ var ORDER_SILENT_REFRESH_MIN_INTERVAL_MS = 30000;
 /** 视为「业务侧刚写入」的来源，pubsub 回声可跳过 SQLite */
 var ORDER_BUSINESS_WRITE_SOURCES = new Set(['upsertOrdersFromRemote', 'upsertPendingSyncOrders', 'overwriteExistingOrder', 'markOrderSyncedByExternalSaleNumber']);
 
+/**
+ * 合并热路径全表去重自检开关：默认关闭。
+ * 开启后每次合并会额外对整张 store 做一次 O(n^2) 重复检测并告警，
+ * 仅用于排查增量身份索引是否遗漏了重复订单，不应在生产常开。
+ */
+var ORDER_MERGE_SELF_CHECK = false;
+var ORDER_AUTHORITATIVE_COLLECTION_FIELDS = ['products', 'bookings', 'payments'];
+var ORDER_COLLECTION_KIND_BY_FIELD = {
+  products: 'product',
+  bookings: 'booking',
+  payments: 'payment'
+};
+
 /**
  * Order 模块 - 基础框架
  */
@@ -68,8 +82,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "syncTimer", void 0);
     _defineProperty(_assertThisInitialized(_this), "isProcessingSyncBatch", false);
     _defineProperty(_assertThisInitialized(_this), "isIdlePhase", true);
-    // Map<resource_id, OrderId[]> 资源到订单的倒排索引
-    _defineProperty(_assertThisInitialized(_this), "resourceIdIndex", new Map());
     _defineProperty(_assertThisInitialized(_this), "logger", void 0);
     // LoggerManager 实例
     _defineProperty(_assertThisInitialized(_this), "storage", void 0);
@@ -228,6 +240,104 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
     }
 
+    /**
+     * 在订单进入内存或 SQLite 前统一压缩子项强身份重复并补齐协议 UID。
+     * 仅记录计数与订单标识，不输出商品、预约、支付或客户明细。
+     */
+  }, {
+    key: "normalizeOrderCollectionsForIngress",
+    value: function normalizeOrderCollectionsForIngress(order, source) {
+      var result = normalizeOrderCollections(order);
+      var kinds = ['product', 'booking', 'payment'];
+      var hasChanges = kinds.some(function (kind) {
+        var stats = result.stats[kind];
+        return stats.backfilledUidCount > 0 || stats.collapsedDuplicateCount > 0 || stats.uidConflictCount > 0 || stats.anonymousRowCount > 0;
+      });
+      if (hasChanges) {
+        var _order$order_id, _external_sale_number;
+        var summarize = function summarize(stats) {
+          return {
+            backfilled_uid_count: stats.backfilledUidCount,
+            collapsed_duplicate_count: stats.collapsedDuplicateCount,
+            uid_conflict_count: stats.uidConflictCount,
+            anonymous_row_count: stats.anonymousRowCount
+          };
+        };
+        var context = {
+          source: source,
+          order_id: (_order$order_id = order === null || order === void 0 ? void 0 : order.order_id) !== null && _order$order_id !== void 0 ? _order$order_id : null,
+          external_sale_number: (_external_sale_number = order === null || order === void 0 ? void 0 : order.external_sale_number) !== null && _external_sale_number !== void 0 ? _external_sale_number : null,
+          products: summarize(result.stats.product),
+          bookings: summarize(result.stats.booking),
+          payments: summarize(result.stats.payment)
+        };
+        var hasUnsafeIdentity = kinds.some(function (kind) {
+          var stats = result.stats[kind];
+          return stats.uidConflictCount > 0 || stats.anonymousRowCount > 0;
+        });
+        if (hasUnsafeIdentity) {
+          this.logWarning('订单子项身份存在冲突或匿名行', context);
+        } else {
+          this.logInfo('订单子项身份已规范化', context);
+        }
+      }
+      return result.order;
+    }
+
+    /**
+     * incoming 决定权威成员集合；同一持久化行仍从 existing 补齐 incoming 省略的本地展示字段。
+     */
+  }, {
+    key: "mergeAuthoritativeOrderCollection",
+    value: function mergeAuthoritativeOrderCollection(field, existing, incoming) {
+      var uidRemaps = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
+      var kind = ORDER_COLLECTION_KIND_BY_FIELD[field];
+      var existingItems = Array.isArray(existing) ? existing : [];
+      return incoming.map(function (incomingItem) {
+        var existingItem = existingItems.find(function (item) {
+          return isSameOrderCollectionItem(kind, item, incomingItem);
+        });
+        if (!existingItem) return cloneDeep(incomingItem);
+        var mergedItem = mergeOrderCollectionItems(kind, existingItem, incomingItem);
+        var mergedUid = getOrderCollectionUid(kind, mergedItem);
+        if (mergedUid) {
+          var _iterator = _createForOfIteratorHelper(new Set([getOrderCollectionReferenceUid(kind, existingItem), getOrderCollectionReferenceUid(kind, incomingItem)])),
+            _step;
+          try {
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              var from = _step.value;
+              if (!from || from === mergedUid) continue;
+              uidRemaps.push({
+                kind: kind,
+                from: from,
+                to: mergedUid,
+                persistentId: getOrderCollectionPersistentId(kind, incomingItem) || getOrderCollectionPersistentId(kind, existingItem)
+              });
+            }
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
+          }
+        }
+        return mergedItem;
+      });
+    }
+  }, {
+    key: "reconcileOverwriteOrderCollections",
+    value: function reconcileOverwriteOrderCollections(existing, incoming) {
+      var reconciled = cloneDeep(incoming);
+      var existingRecord = existing;
+      var incomingRecord = incoming;
+      var uidRemaps = [];
+      for (var _i = 0, _ORDER_AUTHORITATIVE_ = ORDER_AUTHORITATIVE_COLLECTION_FIELDS; _i < _ORDER_AUTHORITATIVE_.length; _i++) {
+        var field = _ORDER_AUTHORITATIVE_[_i];
+        if (!Array.isArray(incomingRecord[field])) continue;
+        reconciled[field] = this.mergeAuthoritativeOrderCollection(field, existingRecord[field], incomingRecord[field], uidRemaps);
+      }
+      return this.normalizeOrderCollectionsForIngress(applyOrderCollectionUidRemaps(reconciled, uidRemaps), 'overwriteExistingOrder.reconciled');
+    }
+
     /**
      * 记录订单最近一次 SQLite 写入，供 pubsub 回声去重使用。
      *
@@ -238,11 +348,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "recordRecentSqliteWrite",
     value: function recordRecentSqliteWrite(source, orders) {
       var now = Date.now();
-      var _iterator = _createForOfIteratorHelper(orders),
-        _step;
+      var _iterator2 = _createForOfIteratorHelper(orders),
+        _step2;
       try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var order = _step.value;
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var order = _step2.value;
           var storageKey = this.getOrderStorageKey(order);
           if (!storageKey) continue;
           this.recentSqliteWriteByStorageKey.set(storageKey, {
@@ -251,9 +361,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           });
         }
       } catch (err) {
-        _iterator.e(err);
+        _iterator2.e(err);
       } finally {
-        _iterator.f();
+        _iterator2.f();
       }
     }
 
@@ -276,11 +386,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var now = Date.now();
       var toWrite = [];
       var skipped = [];
-      var _iterator2 = _createForOfIteratorHelper(orders),
-        _step2;
+      var _iterator3 = _createForOfIteratorHelper(orders),
+        _step3;
       try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var order = _step2.value;
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var order = _step3.value;
           var storageKey = this.getOrderStorageKey(order);
           if (!storageKey) {
             toWrite.push(order);
@@ -296,9 +406,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
           var recent = this.recentSqliteWriteByStorageKey.get(storageKey);
           if (recent && ORDER_BUSINESS_WRITE_SOURCES.has(recent.source) && now - recent.ts < ORDER_SQLITE_DEDUPE_MS) {
-            var _order$order_id;
+            var _order$order_id2;
             skipped.push({
-              orderId: (_order$order_id = order.order_id) !== null && _order$order_id !== void 0 ? _order$order_id : null,
+              orderId: (_order$order_id2 = order.order_id) !== null && _order$order_id2 !== void 0 ? _order$order_id2 : null,
               storageKey: storageKey,
               reason: 'skip_pubsub_echo_after_business_write',
               lastSource: recent.source,
@@ -309,9 +419,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           toWrite.push(order);
         }
       } catch (err) {
-        _iterator2.e(err);
+        _iterator3.e(err);
       } finally {
-        _iterator2.f();
+        _iterator3.f();
       }
       return {
         toWrite: toWrite,
@@ -331,11 +441,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var now = Date.now();
       var toFetch = [];
       var skipped = [];
-      var _iterator3 = _createForOfIteratorHelper(ids),
-        _step3;
+      var _iterator4 = _createForOfIteratorHelper(ids),
+        _step4;
       try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          var id = _step3.value;
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var id = _step4.value;
           var existing = this.getOrderByOrderId(id);
           if (!existing) {
             toFetch.push(id);
@@ -354,9 +464,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           toFetch.push(id);
         }
       } catch (err) {
-        _iterator3.e(err);
+        _iterator4.e(err);
       } finally {
-        _iterator3.f();
+        _iterator4.f();
       }
       return {
         toFetch: toFetch,
@@ -443,9 +553,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var appPlugin = this.core.getPlugin('app');
       var app = appPlugin === null || appPlugin === void 0 ? void 0 : appPlugin.getApp();
       if (app) {
-        var _this$store$createdAt;
         var coreData = app.data.store.getStore().getDataByModel('core');
-        if (!((_this$store$createdAt = this.store.createdAtQuery) !== null && _this$store$createdAt !== void 0 && _this$store$createdAt.sales_time_between) && coreData !== null && coreData !== void 0 && coreData.core) {
+        if (coreData !== null && coreData !== void 0 && coreData.core) {
           var today = dayjs();
           if (coreData !== null && coreData !== void 0 && coreData.core.operating_day_boundary) {
             var operatingDayBoundary = coreData.core.operating_day_boundary;
@@ -774,28 +883,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       return silentRefresh;
     }())
-  }, {
-    key: "getOrdersByResourceId",
-    value: function getOrdersByResourceId(resourceId) {
-      var _this8 = this;
-      var ids = this.resourceIdIndex.get(String(resourceId)) || [];
-      return ids.map(function (id) {
-        return _this8.store.map.get(id);
-      }).filter(function (order) {
-        return !!order;
-      });
-    }
   }, {
     key: "normalizeOrderForMemoryList",
     value: function normalizeOrderForMemoryList(order) {
-      var externalSaleNumber = order === null || order === void 0 ? void 0 : order.external_sale_number;
-      if ((order === null || order === void 0 ? void 0 : order.order_id) !== undefined && (order === null || order === void 0 ? void 0 : order.order_id) !== null && (order === null || order === void 0 ? void 0 : order.order_id) !== '') {
-        return order;
+      var source = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'normalizeOrderForMemoryList';
+      var normalizedOrder = this.normalizeOrderCollectionsForIngress(order, source);
+      var externalSaleNumber = normalizedOrder === null || normalizedOrder === void 0 ? void 0 : normalizedOrder.external_sale_number;
+      if ((normalizedOrder === null || normalizedOrder === void 0 ? void 0 : normalizedOrder.order_id) !== undefined && (normalizedOrder === null || normalizedOrder === void 0 ? void 0 : normalizedOrder.order_id) !== null && (normalizedOrder === null || normalizedOrder === void 0 ? void 0 : normalizedOrder.order_id) !== '') {
+        return normalizedOrder;
       }
       if (externalSaleNumber === undefined || externalSaleNumber === null || externalSaleNumber === '') {
-        return order;
+        return normalizedOrder;
       }
-      return _objectSpread(_objectSpread({}, order), {}, {
+      return _objectSpread(_objectSpread({}, normalizedOrder), {}, {
         order_id: externalSaleNumber
       });
     }
@@ -808,8 +908,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "overwriteExistingOrder",
     value: (function () {
       var _overwriteExistingOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(fresh) {
-        var _this9 = this;
-        var orderId, key;
+        var _this8 = this;
+        var orderId, key, normalizedFresh, existingOrder, reconciledFresh;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
@@ -839,26 +939,31 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 orderId: orderId,
                 storeOrderCountBefore: this.store.list.length
               });
+              normalizedFresh = this.normalizeOrderForMemoryList(fresh, 'overwriteExistingOrder.incoming');
+              existingOrder = this.store.map.get(key);
+              reconciledFresh = this.reconcileOverwriteOrderCollections(existingOrder, normalizedFresh);
               this.store.list = this.store.list.map(function (order) {
                 var id = order === null || order === void 0 ? void 0 : order.order_id;
-                if (id === undefined || id === null) return order;
-                return _this9.getIdKey(id) === key ? fresh : order;
+                if (id === undefined || id === null) {
+                  return _this8.normalizeOrderForMemoryList(order, 'overwriteExistingOrder.existingMemory');
+                }
+                return _this8.getIdKey(id) === key ? reconciledFresh : _this8.normalizeOrderForMemoryList(order, 'overwriteExistingOrder.existingMemory');
               });
               this.syncOrdersMap();
-              _context8.next = 13;
-              return this.updateOrderInSQLite(fresh, 'overwriteExistingOrder');
-            case 13:
+              _context8.next = 16;
+              return this.updateOrderInSQLite(reconciledFresh, 'overwriteExistingOrder');
+            case 16:
               this.logInfo('overwriteExistingOrder-结束', {
                 orderId: orderId,
                 storeOrderCountAfter: this.store.list.length
               });
-              _context8.next = 16;
-              return this.emitOrdersChanged([fresh], 'overwriteExistingOrder');
-            case 16:
+              _context8.next = 19;
+              return this.emitOrdersChanged([reconciledFresh], 'overwriteExistingOrder');
+            case 19:
               return _context8.abrupt("return", {
                 overwritten: true
               });
-            case 17:
+            case 20:
             case "end":
               return _context8.stop();
           }
@@ -908,7 +1013,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "markOrderSyncedByExternalSaleNumber",
     value: function () {
       var _markOrderSyncedByExternalSaleNumber = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(params) {
-        var _this10 = this,
+        var _this9 = this,
           _existing$external_sa,
           _nextOrder$order_id;
         var externalSaleNumber, key, targetIndex, existing, nextOrder, storageKey;
@@ -929,7 +1034,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               targetIndex = this.store.list.findIndex(function (order) {
                 var value = order === null || order === void 0 ? void 0 : order.external_sale_number;
                 if (value === undefined || value === null || value === '') return false;
-                return _this10.getIdKey(value) === key;
+                return _this9.getIdKey(value) === key;
               });
               if (!(targetIndex < 0)) {
                 _context10.next = 9;
@@ -986,7 +1091,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "upsertPendingSyncOrders",
     value: (function () {
       var _upsertPendingSyncOrders = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(pendingOrders) {
-        var pendingMap, memoryPendingMap, _iterator4, _step4, order, storageKey, patchedOrders, mergeActions, updatedList, _iterator5, _step5, _step5$value, _storageKey, pendingOrder, matchIndex, _iterator6, _step6, _step6$value, _storageKey2, _order;
+        var _this10 = this;
+        var pendingMap, memoryPendingMap, _iterator5, _step5, order, normalizedOrder, storageKey, mergeActions, updatedList, identityKeyToIndex, index, _iterator6, _step6, key, _iterator7, _step7, _step7$value, _storageKey, pendingOrder, matchIndex, existingOrder, mergedOrder, pendingSnapshot, insertIndex, patchedOrders;
         return _regeneratorRuntime().wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
@@ -999,119 +1105,134 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 3:
               pendingMap = new Map();
               memoryPendingMap = new Map();
-              _iterator4 = _createForOfIteratorHelper(pendingOrders);
+              _iterator5 = _createForOfIteratorHelper(pendingOrders);
               _context11.prev = 6;
-              _iterator4.s();
+              _iterator5.s();
             case 8:
-              if ((_step4 = _iterator4.n()).done) {
-                _context11.next = 17;
+              if ((_step5 = _iterator5.n()).done) {
+                _context11.next = 18;
                 break;
               }
-              order = _step4.value;
-              storageKey = this.getOrderStorageKey(order);
+              order = _step5.value;
+              normalizedOrder = this.normalizeOrderCollectionsForIngress(order, 'upsertPendingSyncOrders.incoming');
+              storageKey = this.getOrderStorageKey(normalizedOrder);
               if (storageKey) {
-                _context11.next = 13;
+                _context11.next = 14;
                 break;
               }
-              return _context11.abrupt("continue", 15);
-            case 13:
-              pendingMap.set(storageKey, order);
-              memoryPendingMap.set(storageKey, this.normalizeOrderForMemoryList(order));
-            case 15:
+              return _context11.abrupt("continue", 16);
+            case 14:
+              pendingMap.set(storageKey, normalizedOrder);
+              memoryPendingMap.set(storageKey, this.normalizeOrderForMemoryList(normalizedOrder, 'upsertPendingSyncOrders.memory'));
+            case 16:
               _context11.next = 8;
               break;
-            case 17:
-              _context11.next = 22;
+            case 18:
+              _context11.next = 23;
               break;
-            case 19:
-              _context11.prev = 19;
+            case 20:
+              _context11.prev = 20;
               _context11.t0 = _context11["catch"](6);
-              _iterator4.e(_context11.t0);
-            case 22:
-              _context11.prev = 22;
-              _iterator4.f();
-              return _context11.finish(22);
-            case 25:
+              _iterator5.e(_context11.t0);
+            case 23:
+              _context11.prev = 23;
+              _iterator5.f();
+              return _context11.finish(23);
+            case 26:
               if (!(pendingMap.size === 0)) {
-                _context11.next = 28;
+                _context11.next = 29;
                 break;
               }
               this.logError('upsertPendingSyncOrders-订单缺少可落库标识', {
                 count: pendingOrders.length
               });
               return _context11.abrupt("return");
-            case 28:
+            case 29:
               this.logInfo('upsertPendingSyncOrders-开始', {
                 count: pendingMap.size
               });
-              patchedOrders = _toConsumableArray(pendingMap.values());
               mergeActions = {};
-              updatedList = _toConsumableArray(this.store.list);
-              _iterator5 = _createForOfIteratorHelper(memoryPendingMap.entries());
-              _context11.prev = 33;
-              _iterator5.s();
-            case 35:
-              if ((_step5 = _iterator5.n()).done) {
-                _context11.next = 46;
+              updatedList = this.store.list.map(function (order) {
+                return _this10.normalizeOrderForMemoryList(order, 'upsertPendingSyncOrders.existingMemory');
+              }); // 与 mergeOrdersToStore 一致：基于身份键（field:value）建立索引，把「查找已存在订单」
+              // 从 O(n) 线性扫描降为 O(1)，整体复杂度由 O(n^2) 降为 O(n + m)。
+              identityKeyToIndex = new Map();
+              for (index = 0; index < updatedList.length; index += 1) {
+                _iterator6 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(updatedList[index]));
+                try {
+                  for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+                    key = _step6.value;
+                    // 同一 key 命中多张时保留最靠前的下标，与原 findIndex「取首个匹配」一致
+                    if (!identityKeyToIndex.has(key)) identityKeyToIndex.set(key, index);
+                  }
+                } catch (err) {
+                  _iterator6.e(err);
+                } finally {
+                  _iterator6.f();
+                }
+              }
+              _iterator7 = _createForOfIteratorHelper(memoryPendingMap.entries());
+              _context11.prev = 35;
+              _iterator7.s();
+            case 37:
+              if ((_step7 = _iterator7.n()).done) {
+                _context11.next = 55;
                 break;
               }
-              _step5$value = _slicedToArray(_step5.value, 2), _storageKey = _step5$value[0], pendingOrder = _step5$value[1];
-              matchIndex = this.findOrderIndexByIdentity(updatedList, pendingOrder);
-              if (!(matchIndex < 0)) {
-                _context11.next = 40;
+              _step7$value = _slicedToArray(_step7.value, 2), _storageKey = _step7$value[0], pendingOrder = _step7$value[1];
+              matchIndex = this.lookupOrderIndexByIdentityKeys(identityKeyToIndex, this.getOrderIdentityMatchKeys(pendingOrder));
+              if (!(matchIndex >= 0)) {
+                _context11.next = 49;
                 break;
               }
-              return _context11.abrupt("continue", 44);
-            case 40:
-              updatedList[matchIndex] = this.mergeOrderRecords(updatedList[matchIndex], pendingOrder, {
-                preferIncomingProducts: true
-              });
-              pendingMap.delete(_storageKey);
-              memoryPendingMap.delete(_storageKey);
+              existingOrder = updatedList[matchIndex];
+              mergedOrder = this.mergeOrderRecords(existingOrder, pendingOrder);
+              updatedList[matchIndex] = mergedOrder;
+              pendingSnapshot = pendingMap.get(_storageKey);
+              if (pendingSnapshot) {
+                pendingMap.set(_storageKey, this.reconcileOverwriteOrderCollections(existingOrder, pendingSnapshot));
+              }
+              // 合并后身份字段可能新增（如挂单拿到 order_id），同步登记，供同批后续 pending 命中同一槽位
+              this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, matchIndex);
               mergeActions[_storageKey] = 'update';
-            case 44:
-              _context11.next = 35;
+              return _context11.abrupt("continue", 53);
+            case 49:
+              insertIndex = updatedList.length;
+              updatedList.push(pendingOrder);
+              this.registerOrderIdentityKeys(identityKeyToIndex, pendingOrder, insertIndex);
+              mergeActions[_storageKey] = 'insert';
+            case 53:
+              _context11.next = 37;
               break;
-            case 46:
-              _context11.next = 51;
+            case 55:
+              _context11.next = 60;
               break;
-            case 48:
-              _context11.prev = 48;
-              _context11.t1 = _context11["catch"](33);
-              _iterator5.e(_context11.t1);
-            case 51:
-              _context11.prev = 51;
-              _iterator5.f();
-              return _context11.finish(51);
-            case 54:
-              _iterator6 = _createForOfIteratorHelper(memoryPendingMap.entries());
-              try {
-                for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-                  _step6$value = _slicedToArray(_step6.value, 2), _storageKey2 = _step6$value[0], _order = _step6$value[1];
-                  mergeActions[_storageKey2] = 'insert';
-                  updatedList.push(_order);
-                }
-              } catch (err) {
-                _iterator6.e(err);
-              } finally {
-                _iterator6.f();
-              }
-              this.store.list = this.compactOrderListByIdentity(updatedList, 'upsertPendingSyncOrders.store').list;
+            case 57:
+              _context11.prev = 57;
+              _context11.t1 = _context11["catch"](35);
+              _iterator7.e(_context11.t1);
+            case 60:
+              _context11.prev = 60;
+              _iterator7.f();
+              return _context11.finish(60);
+            case 63:
+              patchedOrders = _toConsumableArray(pendingMap.values()); // 增量索引已保证 store 去重不变量，无需再对全表做 O(n^2) 压缩；仅自检开关开启时兜底。
+              this.store.list = this.runOrderStoreSelfCheck(updatedList, 'upsertPendingSyncOrders.store');
               this.syncOrdersMap();
-              _context11.next = 60;
+              _context11.next = 68;
               return this.patchOrdersInSQLite(patchedOrders, 'upsertPendingSyncOrders', mergeActions);
-            case 60:
+            case 68:
               this.logInfo('upsertPendingSyncOrders-结束', {
                 count: patchedOrders.length,
                 storeOrderCountAfter: this.store.list.length
               });
-              _context11.next = 63;
+              _context11.next = 71;
               return this.emitOrdersChanged(patchedOrders, 'upsertPendingSyncOrders');
-            case 63:
+            case 71:
             case "end":
               return _context11.stop();
           }
-        }, _callee11, this, [[6, 19, 22, 25], [33, 48, 51, 54]]);
+        }, _callee11, this, [[6, 20, 23, 26], [35, 57, 60, 63]]);
       }));
       function upsertPendingSyncOrders(_x7) {
         return _upsertPendingSyncOrders.apply(this, arguments);
@@ -1188,44 +1309,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncOrdersMap",
     value: function syncOrdersMap() {
-      var _this11 = this;
       this.store.map.clear();
-      this.resourceIdIndex.clear();
-      var _iterator7 = _createForOfIteratorHelper(this.store.list),
-        _step7;
+      var _iterator8 = _createForOfIteratorHelper(this.store.list),
+        _step8;
       try {
-        var _loop = function _loop() {
-          var order = _step7.value;
-          var primaryIdentity = _this11.getOrderMapKey(order);
-          if (!primaryIdentity) return 1; // continue
-          _this11.store.map.set(primaryIdentity, order);
-          var resourceIds = _this11.extractResourceIds(order);
-          var _iterator8 = _createForOfIteratorHelper(resourceIds),
-            _step8;
-          try {
-            for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-              var resourceId = _step8.value;
-              var key = String(resourceId);
-              var existing = _this11.resourceIdIndex.get(key) || [];
-              if (existing.some(function (eid) {
-                return _this11.getIdKey(eid) === primaryIdentity;
-              })) continue;
-              existing.push(primaryIdentity);
-              _this11.resourceIdIndex.set(key, existing);
-            }
-          } catch (err) {
-            _iterator8.e(err);
-          } finally {
-            _iterator8.f();
-          }
-        };
-        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-          if (_loop()) continue;
+        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+          var order = _step8.value;
+          var primaryIdentity = this.getOrderMapKey(order);
+          if (!primaryIdentity) continue;
+          this.store.map.set(primaryIdentity, order);
         }
       } catch (err) {
-        _iterator7.e(err);
+        _iterator8.e(err);
       } finally {
-        _iterator7.f();
+        _iterator8.f();
       }
     }
   }, {
@@ -1249,7 +1346,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderIdentityEntries",
     value: function getOrderIdentityEntries(order) {
-      var _this12 = this;
+      var _this11 = this;
       if (!order) return [];
       var record = order;
       var candidates = [{
@@ -1266,10 +1363,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         value: record.shop_order_number
       }];
       var entries = [];
-      var _loop2 = function _loop2() {
-          var candidate = _candidates[_i];
-          if (_this12.isBlankIdentityValue(candidate.value)) return 0; // continue
-          var key = _this12.getIdKey(candidate.value);
+      var _loop = function _loop() {
+          var candidate = _candidates[_i2];
+          if (_this11.isBlankIdentityValue(candidate.value)) return 0; // continue
+          var key = _this11.getIdKey(candidate.value);
           if (entries.some(function (entry) {
             return entry.field === candidate.field && entry.key === key;
           })) return 0; // continue
@@ -1279,8 +1376,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           });
         },
         _ret;
-      for (var _i = 0, _candidates = candidates; _i < _candidates.length; _i++) {
-        _ret = _loop2();
+      for (var _i2 = 0, _candidates = candidates; _i2 < _candidates.length; _i2++) {
+        _ret = _loop();
         if (_ret === 0) continue;
       }
       return entries;
@@ -1303,32 +1400,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       return keys;
     }
-  }, {
-    key: "extractResourceIds",
-    value: function extractResourceIds(order) {
-      var ids = new Set();
-      var visitResources = function visitResources(resources) {
-        if (!Array.isArray(resources)) return;
-        resources.forEach(function (resource) {
-          var rid = resource === null || resource === void 0 ? void 0 : resource.relation_id;
-          if (rid !== undefined && rid !== null && rid !== '') ids.add(String(rid));
-          if (Array.isArray(resource === null || resource === void 0 ? void 0 : resource.children)) visitResources(resource.children);
-        });
-      };
-      if (Array.isArray(order === null || order === void 0 ? void 0 : order.bookings)) {
-        order.bookings.forEach(function (booking) {
-          return visitResources((booking === null || booking === void 0 ? void 0 : booking.resources) || []);
-        });
-      }
-      return _toConsumableArray(ids);
-    }
   }, {
     key: "getOrderDateKey",
     value: function getOrderDateKey(order) {
       var _order$bookings, _order$bookings2;
       var candidates = [order === null || order === void 0 ? void 0 : order.schedule_date, order === null || order === void 0 ? void 0 : order.create_date, order === null || order === void 0 ? void 0 : order.created_at, order === null || order === void 0 || (_order$bookings = order.bookings) === null || _order$bookings === void 0 || (_order$bookings = _order$bookings[0]) === null || _order$bookings === void 0 ? void 0 : _order$bookings.start_date, order === null || order === void 0 || (_order$bookings2 = order.bookings) === null || _order$bookings2 === void 0 || (_order$bookings2 = _order$bookings2[0]) === null || _order$bookings2 === void 0 ? void 0 : _order$bookings2.select_date];
-      for (var _i2 = 0, _candidates2 = candidates; _i2 < _candidates2.length; _i2++) {
-        var v = _candidates2[_i2];
+      for (var _i3 = 0, _candidates2 = candidates; _i3 < _candidates2.length; _i3++) {
+        var v = _candidates2[_i3];
         if (!v) continue;
         var text = String(v);
         if (!text) continue;
@@ -1355,7 +1433,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setupOrderSync",
     value: function setupOrderSync() {
-      var _this13 = this;
+      var _this12 = this;
       if (!this.orderDataSource) return;
       this.orderDataSource.run({
         pubsub: {
@@ -1363,22 +1441,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             var _message$id, _message$order_id, _message$type;
             console.log('orderDataSource', res);
             var pubsubReceivedAt = Date.now();
-            var message = _this13.normalizeOrderSyncMessage(res);
+            var message = _this12.normalizeOrderSyncMessage(res);
             if (!message) return;
             message._pubsubReceivedAt = pubsubReceivedAt;
-            _this13.pendingSyncMessages.push(message);
-            var throttleMs = _this13.getOrderSyncThrottleMs();
-            var routeInfo = _this13.resolveSyncMessageRoute(message);
-            _this13.logInfo('orderSync-收到消息并入队', {
+            _this12.pendingSyncMessages.push(message);
+            var throttleMs = _this12.getOrderSyncThrottleMs();
+            var routeInfo = _this12.resolveSyncMessageRoute(message);
+            _this12.logInfo('orderSync-收到消息并入队', {
               id: (_message$id = message.id) !== null && _message$id !== void 0 ? _message$id : null,
               order_id: (_message$order_id = message.order_id) !== null && _message$order_id !== void 0 ? _message$order_id : null,
               type: (_message$type = message.type) !== null && _message$type !== void 0 ? _message$type : null,
-              pendingCount: _this13.pendingSyncMessages.length,
+              pendingCount: _this12.pendingSyncMessages.length,
               throttleMs: throttleMs,
               pubsubReceivedAt: new Date(pubsubReceivedAt).toISOString(),
               fullMessage: JSON.stringify(message)
             });
-            _this13.scheduleOrderSyncThrottle();
+            _this12.scheduleOrderSyncThrottle();
           }
         }
       }).catch(function () {
@@ -1395,7 +1473,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "scheduleOrderSyncThrottle",
     value: function scheduleOrderSyncThrottle() {
-      var _this14 = this;
+      var _this13 = this;
       if (this.isProcessingSyncBatch) return;
       if (this.isIdlePhase) {
         this.isIdlePhase = false;
@@ -1406,8 +1484,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (this.syncTimer) return;
       var throttleMs = this.getOrderSyncThrottleMs();
       this.syncTimer = setTimeout(function () {
-        _this14.syncTimer = undefined;
-        void _this14.flushOrderSyncMessagesByThrottle();
+        _this13.syncTimer = undefined;
+        void _this13.flushOrderSyncMessagesByThrottle();
       }, throttleMs);
     }
 
@@ -1475,7 +1553,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "processOrderSyncMessages",
     value: (function () {
       var _processOrderSyncMessages = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
-        var _this15 = this;
+        var _this14 = this;
         var messages, batchProcessStartAt, earliestReceivedAt, upsertOrders, refreshIds, uniqueRefreshIds, upsertList, _this$filterRedundant, toFetch, skipped, freshOrders, batchProcessEndAt;
         return _regeneratorRuntime().wrap(function _callee14$(_context14) {
           while (1) switch (_context14.prev = _context14.next) {
@@ -1502,13 +1580,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               upsertOrders = new Map();
               refreshIds = [];
               messages.forEach(function (msg, msgIndex) {
-                var routeInfo = _this15.resolveSyncMessageRoute(msg);
+                var routeInfo = _this14.resolveSyncMessageRoute(msg);
                 var hasBatchIds = routeInfo.hasBatchIds;
                 var singleId = routeInfo.singleId;
                 var hasSingleId = routeInfo.hasSingleId;
-                var normalizedBody = _this15.normalizeOrderSyncPayload(msg.body || msg.data);
+                var normalizedBody = _this14.normalizeOrderSyncPayload(msg.body || msg.data);
                 if (routeInfo.route === 'bodyUpsert' && normalizedBody) {
-                  upsertOrders.set(_this15.getIdKey(normalizedBody.order_id), normalizedBody);
+                  upsertOrders.set(_this14.getIdKey(normalizedBody.order_id), normalizedBody);
                   return;
                 }
                 if (hasBatchIds) refreshIds.push.apply(refreshIds, _toConsumableArray(routeInfo.batchIds));else if (routeInfo.route === 'httpRefresh.singleId' && singleId !== null) refreshIds.push(singleId);else if (routeInfo.route === 'httpRefresh.relationIds') refreshIds.push.apply(refreshIds, _toConsumableArray(routeInfo.batchIds));
@@ -1646,94 +1724,140 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "mergeOrdersToStore",
     value: (function () {
       var _mergeOrdersToStore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(freshOrders, source) {
-        var normalizedFreshOrders, _iterator10, _step10, order, id, uniqueFreshOrders, uniqueFreshCount, patchedOrders, mergeActions, updatedList, _iterator11, _step11, fresh, matchIndex, storageKey, mergeKey, mergedOrder, insertCount, updateCount;
+        var _this15 = this;
+        var storeOrderCountBefore, normalizedFreshOrders, _iterator10, _step10, order, id, uniqueFreshOrders, uniqueFreshCount, patchedOrders, mergeActions, updatedList, identityKeyToIndex, index, identityKeys, _iterator11, _step11, key, _iterator12, _step12, fresh, freshIdentityKeys, matchIndex, storageKey, mergeKey, existingOrder, _ref2, _existingOrder$order_, _ref3, _external_sale_number2, _existingOrder$paymen, _fresh$payment_status, _existingOrder$need_s, _fresh$need_sync, mergedOrder, insertIndex, insertCount, updateCount;
         return _regeneratorRuntime().wrap(function _callee16$(_context16) {
           while (1) switch (_context16.prev = _context16.next) {
             case 0:
+              storeOrderCountBefore = this.store.list.length;
               this.logInfo('mergeOrdersToStore-开始', {
                 freshOrderCount: freshOrders.length,
-                storeOrderCountBefore: this.store.list.length,
+                storeOrderCountBefore: storeOrderCountBefore,
                 source: source
               });
               this.logDuplicateOrders("".concat(source, ".beforeMerge"), this.store.list);
               normalizedFreshOrders = [];
               _iterator10 = _createForOfIteratorHelper(freshOrders);
-              _context16.prev = 4;
+              _context16.prev = 5;
               _iterator10.s();
-            case 6:
+            case 7:
               if ((_step10 = _iterator10.n()).done) {
-                _context16.next = 14;
+                _context16.next = 15;
                 break;
               }
               order = _step10.value;
               id = order === null || order === void 0 ? void 0 : order.order_id;
               if (!(id === undefined || id === null)) {
-                _context16.next = 11;
+                _context16.next = 12;
                 break;
               }
-              return _context16.abrupt("continue", 12);
-            case 11:
-              normalizedFreshOrders.push(this.normalizeRemoteSyncedOrder(order));
+              return _context16.abrupt("continue", 13);
             case 12:
-              _context16.next = 6;
+              normalizedFreshOrders.push(this.normalizeRemoteSyncedOrder(order));
+            case 13:
+              _context16.next = 7;
               break;
-            case 14:
-              _context16.next = 19;
+            case 15:
+              _context16.next = 20;
               break;
-            case 16:
-              _context16.prev = 16;
-              _context16.t0 = _context16["catch"](4);
+            case 17:
+              _context16.prev = 17;
+              _context16.t0 = _context16["catch"](5);
               _iterator10.e(_context16.t0);
-            case 19:
-              _context16.prev = 19;
+            case 20:
+              _context16.prev = 20;
               _iterator10.f();
-              return _context16.finish(19);
-            case 22:
+              return _context16.finish(20);
+            case 23:
+              // 先对本批新单做去重（批内规模 m 很小），保证每条 fresh 身份唯一
               uniqueFreshOrders = this.compactOrderListByIdentity(normalizedFreshOrders, "".concat(source, ".incoming")).list;
               uniqueFreshCount = uniqueFreshOrders.length;
               patchedOrders = [];
               mergeActions = {};
-              updatedList = _toConsumableArray(this.store.list);
-              _iterator11 = _createForOfIteratorHelper(uniqueFreshOrders);
-              _context16.prev = 28;
-              _iterator11.s();
-            case 30:
-              if ((_step11 = _iterator11.n()).done) {
-                _context16.next = 46;
+              updatedList = this.store.list.map(function (order) {
+                return _this15.normalizeOrderForMemoryList(order, "".concat(source, ".existingMemory"));
+              }); // 基于身份键（field:value）建立索引，把「查找已存在订单」从 O(n) 线性扫描降为 O(1)，
+              // 整体合并复杂度由 O(n^2) 降为 O(n + m)。索引语义与 doOrdersShareIdentity 完全一致：
+              // 任一身份字段（order_id/external_sale_number/order_number/shop_order_number）同值即同一单。
+              identityKeyToIndex = new Map();
+              for (index = 0; index < updatedList.length; index += 1) {
+                identityKeys = this.getOrderIdentityMatchKeys(updatedList[index]);
+                _iterator11 = _createForOfIteratorHelper(identityKeys);
+                try {
+                  for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+                    key = _step11.value;
+                    // 同一 key 命中多张时保留最靠前的下标，与原 findIndex「取首个匹配」一致
+                    if (!identityKeyToIndex.has(key)) identityKeyToIndex.set(key, index);
+                  }
+                } catch (err) {
+                  _iterator11.e(err);
+                } finally {
+                  _iterator11.f();
+                }
+              }
+              _iterator12 = _createForOfIteratorHelper(uniqueFreshOrders);
+              _context16.prev = 31;
+              _iterator12.s();
+            case 33:
+              if ((_step12 = _iterator12.n()).done) {
+                _context16.next = 57;
                 break;
               }
-              fresh = _step11.value;
-              matchIndex = this.findOrderIndexByIdentity(updatedList, fresh);
+              fresh = _step12.value;
+              freshIdentityKeys = this.getOrderIdentityMatchKeys(fresh);
+              matchIndex = this.lookupOrderIndexByIdentityKeys(identityKeyToIndex, freshIdentityKeys);
               storageKey = this.getOrderStorageKey(fresh);
               mergeKey = storageKey || (fresh.order_id !== undefined && fresh.order_id !== null ? this.getIdKey(fresh.order_id) : '');
               if (!(matchIndex >= 0)) {
-                _context16.next = 41;
+                _context16.next = 50;
                 break;
               }
-              mergedOrder = this.mergeOrderRecords(updatedList[matchIndex], fresh);
+              existingOrder = updatedList[matchIndex];
+              if (!(this.isPendingSyncOrder(existingOrder) && this.isRemoteEchoMergeSource(source))) {
+                _context16.next = 44;
+                break;
+              }
+              this.logInfo('mergeOrdersToStore-跳过 pending 订单远端覆盖', {
+                source: source,
+                order_id: (_ref2 = (_existingOrder$order_ = existingOrder.order_id) !== null && _existingOrder$order_ !== void 0 ? _existingOrder$order_ : fresh.order_id) !== null && _ref2 !== void 0 ? _ref2 : null,
+                external_sale_number: (_ref3 = (_external_sale_number2 = existingOrder.external_sale_number) !== null && _external_sale_number2 !== void 0 ? _external_sale_number2 : fresh.external_sale_number) !== null && _ref3 !== void 0 ? _ref3 : null,
+                local_payment_status: (_existingOrder$paymen = existingOrder.payment_status) !== null && _existingOrder$paymen !== void 0 ? _existingOrder$paymen : null,
+                remote_payment_status: (_fresh$payment_status = fresh.payment_status) !== null && _fresh$payment_status !== void 0 ? _fresh$payment_status : null,
+                local_need_sync: (_existingOrder$need_s = existingOrder.need_sync) !== null && _existingOrder$need_s !== void 0 ? _existingOrder$need_s : null,
+                remote_need_sync: (_fresh$need_sync = fresh.need_sync) !== null && _fresh$need_sync !== void 0 ? _fresh$need_sync : null,
+                reason: 'protect_pending_sync_order_from_remote_echo'
+              });
+              return _context16.abrupt("continue", 55);
+            case 44:
+              mergedOrder = this.mergeOrderRecords(existingOrder, fresh);
               updatedList[matchIndex] = mergedOrder;
+              // 合并后身份字段可能新增（如挂单拿到 order_id），同步登记到索引，
+              // 供同批后续 fresh 命中同一槽位，避免重复插入
+              this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, matchIndex);
               patchedOrders.push(mergedOrder);
               if (mergeKey) mergeActions[mergeKey] = 'update';
-              return _context16.abrupt("continue", 44);
-            case 41:
+              return _context16.abrupt("continue", 55);
+            case 50:
+              insertIndex = updatedList.length;
               updatedList.push(fresh);
+              this.registerOrderIdentityKeys(identityKeyToIndex, fresh, insertIndex);
               patchedOrders.push(fresh);
               if (mergeKey) mergeActions[mergeKey] = 'insert';
-            case 44:
-              _context16.next = 30;
+            case 55:
+              _context16.next = 33;
               break;
-            case 46:
-              _context16.next = 51;
+            case 57:
+              _context16.next = 62;
               break;
-            case 48:
-              _context16.prev = 48;
-              _context16.t1 = _context16["catch"](28);
-              _iterator11.e(_context16.t1);
-            case 51:
-              _context16.prev = 51;
-              _iterator11.f();
-              return _context16.finish(51);
-            case 54:
+            case 59:
+              _context16.prev = 59;
+              _context16.t1 = _context16["catch"](31);
+              _iterator12.e(_context16.t1);
+            case 62:
+              _context16.prev = 62;
+              _iterator12.f();
+              return _context16.finish(62);
+            case 65:
               insertCount = Object.values(mergeActions).filter(function (v) {
                 return v === 'insert';
               }).length;
@@ -1745,30 +1869,110 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 updateCount: updateCount,
                 storeOrderCountAfter: this.store.list.length
               });
-              this.store.list = this.compactOrderListByIdentity(updatedList, "".concat(source, ".store")).list;
+              // 增量索引已保证 store 去重不变量，无需再对全表做 O(n^2) 压缩；
+              // 仅在自检开关开启时做一次兜底校验。
+              this.store.list = this.runOrderStoreSelfCheck(updatedList, "".concat(source, ".store"));
               this.syncOrdersMap();
-              _context16.next = 61;
+              _context16.next = 72;
               return this.patchOrdersInSQLite(patchedOrders, source, mergeActions);
-            case 61:
+            case 72:
               this.logInfo('mergeOrdersToStore-结束', {
                 uniqueFreshCount: uniqueFreshCount,
                 storeOrderCountAfter: this.store.list.length,
                 insertCount: insertCount,
                 updateCount: updateCount
               });
-              _context16.next = 64;
+              _context16.next = 75;
               return this.emitOrdersChanged(patchedOrders, source);
-            case 64:
+            case 75:
             case "end":
               return _context16.stop();
           }
-        }, _callee16, this, [[4, 16, 19, 22], [28, 48, 51, 54]]);
+        }, _callee16, this, [[5, 17, 20, 23], [31, 59, 62, 65]]);
       }));
       function mergeOrdersToStore(_x9, _x10) {
         return _mergeOrdersToStore.apply(this, arguments);
       }
       return mergeOrdersToStore;
-    }())
+    }()
+    /**
+     * 在身份索引中查找与目标订单共享任一身份键的已存在订单下标。
+     * 返回所有命中键里最小的下标，等价于原 findOrderIndexByIdentity 的「取首个匹配」语义。
+     *
+     * @example
+     * const idx = this.lookupOrderIndexByIdentityKeys(identityKeyToIndex, freshIdentityKeys)
+     */
+    )
+  }, {
+    key: "lookupOrderIndexByIdentityKeys",
+    value: function lookupOrderIndexByIdentityKeys(identityKeyToIndex, identityKeys) {
+      var matchIndex = -1;
+      var _iterator13 = _createForOfIteratorHelper(identityKeys),
+        _step13;
+      try {
+        for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
+          var key = _step13.value;
+          var index = identityKeyToIndex.get(key);
+          if (index === undefined) continue;
+          if (matchIndex < 0 || index < matchIndex) matchIndex = index;
+        }
+      } catch (err) {
+        _iterator13.e(err);
+      } finally {
+        _iterator13.f();
+      }
+      return matchIndex;
+    }
+  }, {
+    key: "isRemoteEchoMergeSource",
+    value: function isRemoteEchoMergeSource(source) {
+      return source === 'pubsub.bodyUpsert' || source === 'pubsub.httpRefresh';
+    }
+
+    /**
+     * 将订单的全部身份键登记到索引并指向其在列表中的下标。
+     * 合并后订单新增的身份字段（如挂单同步后拿到 order_id）也会被登记。
+     *
+     * @example
+     * this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, matchIndex)
+     */
+  }, {
+    key: "registerOrderIdentityKeys",
+    value: function registerOrderIdentityKeys(identityKeyToIndex, order, index) {
+      var identityKeys = this.getOrderIdentityMatchKeys(order);
+      var _iterator14 = _createForOfIteratorHelper(identityKeys),
+        _step14;
+      try {
+        for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+          var key = _step14.value;
+          identityKeyToIndex.set(key, index);
+        }
+      } catch (err) {
+        _iterator14.e(err);
+      } finally {
+        _iterator14.f();
+      }
+    }
+
+    /**
+     * 合并热路径去重兜底：默认直接返回原列表（增量索引已保证无重复）。
+     * 仅当 ORDER_MERGE_SELF_CHECK 开启时，额外做一次全表压缩并在发现残留重复时告警。
+     */
+  }, {
+    key: "runOrderStoreSelfCheck",
+    value: function runOrderStoreSelfCheck(orders, source) {
+      if (!ORDER_MERGE_SELF_CHECK) return orders;
+      var _this$compactOrderLis = this.compactOrderListByIdentity(orders, source),
+        list = _this$compactOrderLis.list,
+        removedCount = _this$compactOrderLis.removedCount;
+      if (removedCount > 0) {
+        this.logWarning('合并自检发现残留重复订单，已压缩', {
+          source: source,
+          removedCount: removedCount
+        });
+      }
+      return list;
+    }
   }, {
     key: "normalizeOrderSyncMessage",
     value: function normalizeOrderSyncMessage(res) {
@@ -1801,17 +2005,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "uniqueOrderIds",
     value: function uniqueOrderIds(ids) {
       var idMap = new Map();
-      var _iterator12 = _createForOfIteratorHelper(ids),
-        _step12;
+      var _iterator15 = _createForOfIteratorHelper(ids),
+        _step15;
       try {
-        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
-          var id = _step12.value;
+        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+          var id = _step15.value;
           idMap.set(this.getIdKey(id), id);
         }
       } catch (err) {
-        _iterator12.e(err);
+        _iterator15.e(err);
       } finally {
-        _iterator12.f();
+        _iterator15.f();
       }
       return _toConsumableArray(idMap.values());
     }
@@ -1898,153 +2102,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (rightScore >= leftScore) return right;
       return left;
     }
-  }, {
-    key: "getProductIdentityKeys",
-    value: function getProductIdentityKeys(product) {
-      var _record$metadata;
-      var record = product;
-      if (!record) return [];
-      var keys = [];
-      var metadataUid = (_record$metadata = record.metadata) === null || _record$metadata === void 0 ? void 0 : _record$metadata.unique_identification_number;
-      if (!this.isBlankIdentityValue(metadataUid)) keys.push("uid:".concat(String(metadataUid)));
-      var topLevelUid = record.unique_identification_number;
-      if (!this.isBlankIdentityValue(topLevelUid)) keys.push("uid:".concat(String(topLevelUid)));
-      var orderDetailId = record.order_detail_id;
-      if (!this.isBlankIdentityValue(orderDetailId)) keys.push("detail:".concat(String(orderDetailId)));
-      var bookingUid = record.booking_uid;
-      if (!this.isBlankIdentityValue(bookingUid)) keys.push("booking:".concat(String(bookingUid)));
-      return keys;
-    }
-  }, {
-    key: "mergeOrderProductLists",
-    value: function mergeOrderProductLists(preferred, secondary) {
-      var preferredList = Array.isArray(preferred) ? preferred : [];
-      var secondaryList = Array.isArray(secondary) ? secondary : [];
-      if (secondaryList.length === 0) return preferredList;
-      if (preferredList.length === 0) return secondaryList;
-      var seenKeys = new Set();
-      var _iterator13 = _createForOfIteratorHelper(preferredList),
-        _step13;
-      try {
-        for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
-          var item = _step13.value;
-          var keys = this.getProductIdentityKeys(item);
-          var _iterator15 = _createForOfIteratorHelper(keys),
-            _step15;
-          try {
-            for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
-              var key = _step15.value;
-              seenKeys.add(key);
-            }
-          } catch (err) {
-            _iterator15.e(err);
-          } finally {
-            _iterator15.f();
-          }
-        }
-      } catch (err) {
-        _iterator13.e(err);
-      } finally {
-        _iterator13.f();
-      }
-      var result = _toConsumableArray(preferredList);
-      var _iterator14 = _createForOfIteratorHelper(secondaryList),
-        _step14;
-      try {
-        for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
-          var _item = _step14.value;
-          var _keys = this.getProductIdentityKeys(_item);
-          if (_keys.length === 0 || _keys.some(function (key) {
-            return seenKeys.has(key);
-          })) continue;
-          var _iterator16 = _createForOfIteratorHelper(_keys),
-            _step16;
-          try {
-            for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
-              var _key = _step16.value;
-              seenKeys.add(_key);
-            }
-          } catch (err) {
-            _iterator16.e(err);
-          } finally {
-            _iterator16.f();
-          }
-          result.push(cloneDeep(_item));
-        }
-      } catch (err) {
-        _iterator14.e(err);
-      } finally {
-        _iterator14.f();
-      }
-      return result;
-    }
-  }, {
-    key: "getPaymentMergeKey",
-    value: function getPaymentMergeKey(payment) {
-      var _record$metadata2;
-      var record = payment;
-      if (!record) return '';
-      var uniquePaymentNumber = (_record$metadata2 = record.metadata) === null || _record$metadata2 === void 0 ? void 0 : _record$metadata2.unique_payment_number;
-      if (!this.isBlankIdentityValue(uniquePaymentNumber)) {
-        return "unique:".concat(String(uniquePaymentNumber));
-      }
-      var orderPaymentId = record.order_payment_id;
-      if (!this.isBlankIdentityValue(orderPaymentId)) return "order_payment:".concat(String(orderPaymentId));
-      var code = record.code;
-      var customPaymentId = record.custom_payment_id;
-      if (!this.isBlankIdentityValue(code) && !this.isBlankIdentityValue(customPaymentId)) {
-        return "custom:".concat(String(code), "#").concat(String(customPaymentId));
-      }
-      return '';
-    }
-  }, {
-    key: "mergeOrderPaymentLists",
-    value: function mergeOrderPaymentLists(existing, incoming) {
-      var _this18 = this;
-      var existingList = Array.isArray(existing) ? existing : [];
-      var incomingList = Array.isArray(incoming) ? incoming : [];
-      if (incomingList.length === 0) return cloneDeep(existingList);
-      if (existingList.length === 0) return cloneDeep(incomingList);
-      var existingByKey = new Map();
-      var _iterator17 = _createForOfIteratorHelper(existingList),
-        _step17;
-      try {
-        for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
-          var payment = _step17.value;
-          var key = this.getPaymentMergeKey(payment);
-          if (!key) continue;
-          existingByKey.set(key, payment);
-        }
-      } catch (err) {
-        _iterator17.e(err);
-      } finally {
-        _iterator17.f();
-      }
-      return incomingList.map(function (payment) {
-        var incomingPayment = payment;
-        var key = _this18.getPaymentMergeKey(incomingPayment);
-        var existingPayment = key ? existingByKey.get(key) : undefined;
-        if (!existingPayment) return cloneDeep(incomingPayment);
-        return _objectSpread(_objectSpread(_objectSpread({}, cloneDeep(existingPayment)), cloneDeep(incomingPayment)), {}, {
-          metadata: _objectSpread(_objectSpread({}, cloneDeep(existingPayment.metadata || {})), cloneDeep(incomingPayment.metadata || {}))
-        });
-      });
-    }
   }, {
     key: "mergeOrderRecords",
-    value: function mergeOrderRecords(existing, incoming, options) {
+    value: function mergeOrderRecords(existing, incoming) {
       var preferred = this.pickPreferredOrder(existing, incoming);
       var secondary = preferred === existing ? incoming : existing;
       var merged = _objectSpread(_objectSpread({}, secondary), preferred);
       var fieldsToPreserve = ['order_id', 'external_sale_number', 'order_number', 'shop_order_number', 'shop_full_order_number'];
-      var incomingPatchFields = ['payment_status', 'status', 'shipping_status', 'updated_at', 'shop_discount', 'summary', 'products', 'bookings', 'note', 'customer_id', 'customer_name', 'customer', 'holder', 'contacts_info', 'phone', 'email', 'relation_forms'];
+      var incomingPatchFields = ['payment_status', 'status', 'shipping_status', 'updated_at', 'shop_discount', 'summary', 'note', 'customer_id', 'customer_name', 'customer', 'holder', 'contacts_info', 'phone', 'email', 'relation_forms'];
       var mergedRecord = merged;
       var preferredRecord = preferred;
       var secondaryRecord = secondary;
+      var existingRecord = existing;
       var incomingRecord = incoming;
-      var previousRecord = preferred === incoming ? secondaryRecord : preferredRecord;
-      for (var _i3 = 0, _fieldsToPreserve = fieldsToPreserve; _i3 < _fieldsToPreserve.length; _i3++) {
-        var field = _fieldsToPreserve[_i3];
+      var childUidRemaps = [];
+      for (var _i4 = 0, _fieldsToPreserve = fieldsToPreserve; _i4 < _fieldsToPreserve.length; _i4++) {
+        var field = _fieldsToPreserve[_i4];
         if (!this.isBlankIdentityValue(preferredRecord[field])) {
           mergedRecord[field] = preferredRecord[field];
           continue;
@@ -2053,73 +2126,78 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           mergedRecord[field] = secondaryRecord[field];
         }
       }
-      var hasIncomingProducts = Object.prototype.hasOwnProperty.call(incomingRecord, 'products');
-      var shouldUseIncomingProductsSnapshot = (options === null || options === void 0 ? void 0 : options.preferIncomingProducts) === true && hasIncomingProducts && incomingRecord.products !== undefined && incomingRecord.products !== null;
-      for (var _i4 = 0, _incomingPatchFields = incomingPatchFields; _i4 < _incomingPatchFields.length; _i4++) {
-        var _field = _incomingPatchFields[_i4];
+      for (var _i5 = 0, _incomingPatchFields = incomingPatchFields; _i5 < _incomingPatchFields.length; _i5++) {
+        var _field = _incomingPatchFields[_i5];
         if (!Object.prototype.hasOwnProperty.call(incomingRecord, _field)) continue;
         if (incomingRecord[_field] === undefined || incomingRecord[_field] === null) continue;
         if (typeof incomingRecord[_field] === 'string' && incomingRecord[_field] === '') continue;
         mergedRecord[_field] = cloneDeep(incomingRecord[_field]);
       }
-      mergedRecord.products = shouldUseIncomingProductsSnapshot ? cloneDeep(incomingRecord.products) : this.mergeOrderProductLists(preferredRecord.products, secondaryRecord.products);
-      if (Object.prototype.hasOwnProperty.call(incomingRecord, 'payments')) {
-        if (Array.isArray(incomingRecord.payments)) {
-          mergedRecord.payments = this.mergeOrderPaymentLists(previousRecord.payments, incomingRecord.payments);
-        } else if (incomingRecord.payments !== undefined && incomingRecord.payments !== null) {
-          mergedRecord.payments = cloneDeep(incomingRecord.payments);
+
+      // 子项数组遵循完整快照语义：incoming 自有且为数组（包括 []）时权威替换；
+      // 字段缺席或不是数组时视为稀疏 patch，继续保留 existing。
+      for (var _i6 = 0, _ORDER_AUTHORITATIVE_2 = ORDER_AUTHORITATIVE_COLLECTION_FIELDS; _i6 < _ORDER_AUTHORITATIVE_2.length; _i6++) {
+        var _field2 = _ORDER_AUTHORITATIVE_2[_i6];
+        if (Array.isArray(incomingRecord[_field2])) {
+          mergedRecord[_field2] = this.mergeAuthoritativeOrderCollection(_field2, existingRecord[_field2], incomingRecord[_field2], childUidRemaps);
+          continue;
+        }
+        if (Object.prototype.hasOwnProperty.call(existingRecord, _field2)) {
+          mergedRecord[_field2] = cloneDeep(existingRecord[_field2]);
+        } else {
+          delete mergedRecord[_field2];
         }
       }
       if (!this.isPendingSyncOrder(preferred) || !this.isPendingSyncOrder(secondary)) {
         merged.need_sync = 0;
       }
-      return merged;
+      return this.normalizeOrderCollectionsForIngress(applyOrderCollectionUidRemaps(merged, childUidRemaps), 'mergeOrderRecords');
     }
   }, {
     key: "summarizeDuplicateOrders",
     value: function summarizeDuplicateOrders(orders) {
       var groups = new Map();
-      var _iterator18 = _createForOfIteratorHelper(orders),
-        _step18;
+      var _iterator16 = _createForOfIteratorHelper(orders),
+        _step16;
       try {
-        for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
-          var order = _step18.value;
-          var _iterator19 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(order)),
-            _step19;
+        for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
+          var order = _step16.value;
+          var _iterator17 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(order)),
+            _step17;
           try {
-            for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
-              var key = _step19.value;
+            for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
+              var key = _step17.value;
               var group = groups.get(key) || [];
               group.push(order);
               groups.set(key, group);
             }
           } catch (err) {
-            _iterator19.e(err);
+            _iterator17.e(err);
           } finally {
-            _iterator19.f();
+            _iterator17.f();
           }
         }
       } catch (err) {
-        _iterator18.e(err);
+        _iterator16.e(err);
       } finally {
-        _iterator18.f();
+        _iterator16.f();
       }
-      return _toConsumableArray(groups.entries()).filter(function (_ref2) {
-        var _ref3 = _slicedToArray(_ref2, 2),
-          group = _ref3[1];
-        return group.length > 1;
-      }).slice(0, 20).map(function (_ref4) {
+      return _toConsumableArray(groups.entries()).filter(function (_ref4) {
         var _ref5 = _slicedToArray(_ref4, 2),
-          key = _ref5[0],
           group = _ref5[1];
+        return group.length > 1;
+      }).slice(0, 20).map(function (_ref6) {
+        var _ref7 = _slicedToArray(_ref6, 2),
+          key = _ref7[0],
+          group = _ref7[1];
         return {
           key: key,
           count: group.length,
           orders: group.map(function (order) {
-            var _order$order_id2, _external_sale_number, _shop_order_number, _shop_full_order_numb, _order$need_sync;
+            var _order$order_id3, _external_sale_number3, _shop_order_number, _shop_full_order_numb, _order$need_sync;
             return {
-              order_id: (_order$order_id2 = order.order_id) !== null && _order$order_id2 !== void 0 ? _order$order_id2 : null,
-              external_sale_number: (_external_sale_number = order.external_sale_number) !== null && _external_sale_number !== void 0 ? _external_sale_number : null,
+              order_id: (_order$order_id3 = order.order_id) !== null && _order$order_id3 !== void 0 ? _order$order_id3 : null,
+              external_sale_number: (_external_sale_number3 = order.external_sale_number) !== null && _external_sale_number3 !== void 0 ? _external_sale_number3 : null,
               shop_order_number: (_shop_order_number = order.shop_order_number) !== null && _shop_order_number !== void 0 ? _shop_order_number : null,
               shop_full_order_number: (_shop_full_order_numb = order.shop_full_order_number) !== null && _shop_full_order_numb !== void 0 ? _shop_full_order_numb : null,
               need_sync: (_order$need_sync = order.need_sync) !== null && _order$need_sync !== void 0 ? _order$need_sync : null
@@ -2144,23 +2222,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function compactOrderListByIdentity(orders, source) {
       var list = [];
       var removedCount = 0;
-      var _iterator20 = _createForOfIteratorHelper(orders),
-        _step20;
+      var _iterator18 = _createForOfIteratorHelper(orders),
+        _step18;
       try {
-        for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
-          var order = _step20.value;
-          var matchIndex = this.findOrderIndexByIdentity(list, order);
+        for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
+          var order = _step18.value;
+          var normalizedOrder = this.normalizeOrderCollectionsForIngress(order, "".concat(source, ".order"));
+          var matchIndex = this.findOrderIndexByIdentity(list, normalizedOrder);
           if (matchIndex < 0) {
-            list.push(order);
+            list.push(normalizedOrder);
             continue;
           }
-          list[matchIndex] = this.mergeOrderRecords(list[matchIndex], order);
+          list[matchIndex] = this.mergeOrderRecords(list[matchIndex], normalizedOrder);
           removedCount += 1;
         }
       } catch (err) {
-        _iterator20.e(err);
+        _iterator18.e(err);
       } finally {
-        _iterator20.f();
+        _iterator18.f();
       }
       if (removedCount > 0) {
         this.logWarning('订单列表重复项已压缩', {
@@ -2259,6 +2338,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "loadOrdersFromSQLite",
     value: function () {
       var _loadOrdersFromSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
+        var _this18 = this;
         var orders;
         return _regeneratorRuntime().wrap(function _callee17$(_context17) {
           while (1) switch (_context17.prev = _context17.next) {
@@ -2274,7 +2354,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               return this.dbManager.getAll(INDEXDB_STORE_NAME);
             case 5:
               orders = _context17.sent;
-              return _context17.abrupt("return", orders || []);
+              return _context17.abrupt("return", (orders || []).map(function (order) {
+                return _this18.normalizeOrderCollectionsForIngress(order, 'loadOrdersFromSQLite');
+              }));
             case 9:
               _context17.prev = 9;
               _context17.t0 = _context17["catch"](2);
@@ -2298,8 +2380,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeRemoteSyncedOrder",
     value: function normalizeRemoteSyncedOrder(order) {
-      if (this.isPendingSyncOrder(order)) return order;
-      return _objectSpread(_objectSpread({}, order), {}, {
+      var normalizedOrder = this.normalizeOrderCollectionsForIngress(order, 'normalizeRemoteSyncedOrder');
+      if (this.isPendingSyncOrder(normalizedOrder)) return normalizedOrder;
+      return _objectSpread(_objectSpread({}, normalizedOrder), {}, {
         need_sync: 0
       });
     }
@@ -2310,11 +2393,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var merged = remoteOrders.map(function (order) {
         return _this19.normalizeRemoteSyncedOrder(order);
       });
-      var _iterator21 = _createForOfIteratorHelper(existingOrders),
-        _step21;
+      var _iterator19 = _createForOfIteratorHelper(existingOrders),
+        _step19;
       try {
-        for (_iterator21.s(); !(_step21 = _iterator21.n()).done;) {
-          var order = _step21.value;
+        for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
+          var rawOrder = _step19.value;
+          var order = this.normalizeOrderCollectionsForIngress(rawOrder, 'mergeRemoteSnapshotWithPendingOrders.existingSQLite');
           if (!this.isPendingSyncOrder(order)) continue;
           var matchIndex = this.findOrderIndexByIdentity(merged, order);
           if (matchIndex >= 0) {
@@ -2325,9 +2409,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           merged.push(order);
         }
       } catch (err) {
-        _iterator21.e(err);
+        _iterator19.e(err);
       } finally {
-        _iterator21.f();
+        _iterator19.f();
       }
       return this.compactOrderListByIdentity(merged, 'mergeRemoteSnapshotWithPendingOrders').list;
     }
@@ -2395,7 +2479,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               return _context20.abrupt("return");
             case 3:
-              ordersSnapshot = cloneDeep(orders).filter(function (order) {
+              ordersSnapshot = cloneDeep(orders).map(function (order) {
+                return _this20.normalizeOrderCollectionsForIngress(order, "".concat(source, ".sqliteIngress"));
+              }).filter(function (order) {
                 return _this20.getOrderStorageKey(order);
               });
               if (!(ordersSnapshot.length === 0)) {
@@ -2421,7 +2507,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               _context20.prev = 12;
               _context20.next = 15;
               return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
-                var writeMethod, _iterator22, _step22, order;
+                var writeMethod, _iterator20, _step20, order;
                 return _regeneratorRuntime().wrap(function _callee19$(_context19) {
                   while (1) switch (_context19.prev = _context19.next) {
                     case 0:
@@ -2458,15 +2544,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                         break;
                       }
                       writeMethod = 'update';
-                      _iterator22 = _createForOfIteratorHelper(compactedToWrite);
+                      _iterator20 = _createForOfIteratorHelper(compactedToWrite);
                       _context19.prev = 17;
-                      _iterator22.s();
+                      _iterator20.s();
                     case 19:
-                      if ((_step22 = _iterator22.n()).done) {
+                      if ((_step20 = _iterator20.n()).done) {
                         _context19.next = 25;
                         break;
                       }
-                      order = _step22.value;
+                      order = _step20.value;
                       _context19.next = 23;
                       return _this20.dbManager.update(INDEXDB_STORE_NAME, order);
                     case 23:
@@ -2478,10 +2564,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                     case 27:
                       _context19.prev = 27;
                       _context19.t0 = _context19["catch"](17);
-                      _iterator22.e(_context19.t0);
+                      _iterator20.e(_context19.t0);
                     case 30:
                       _context19.prev = 30;
-                      _iterator22.f();
+                      _iterator20.f();
                       return _context19.finish(30);
                     case 33:
                       _this20.recordRecentSqliteWrite(source, compactedToWrite);
@@ -2540,7 +2626,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               return _context22.abrupt("return");
             case 2:
-              orderSnapshot = cloneDeep(order);
+              orderSnapshot = this.normalizeOrderCollectionsForIngress(cloneDeep(order), "".concat(source, ".sqliteIngress"));
               _context22.prev = 3;
               _context22.next = 6;
               return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
@@ -2642,7 +2728,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 return _this22.normalizeRemoteSyncedOrder(order);
               }), "".concat(source, ".snapshotNoDb")).list);
             case 2:
-              remoteSnapshot = cloneDeep(orderList);
+              remoteSnapshot = cloneDeep(orderList).map(function (order) {
+                return _this22.normalizeOrderCollectionsForIngress(order, "".concat(source, ".remoteIngress"));
+              });
               mergedSnapshot = this.compactOrderListByIdentity(remoteSnapshot.map(function (order) {
                 return _this22.normalizeRemoteSyncedOrder(order);
               }), "".concat(source, ".remoteSnapshot")).list;
@@ -2741,12 +2829,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               this.store.list = [];
               this.store.map = new Map();
-              this.resourceIdIndex.clear();
               if (!this.dbManager) {
-                _context26.next = 6;
+                _context26.next = 5;
                 break;
               }
-              _context26.next = 6;
+              _context26.next = 5;
               return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25() {
                 return _regeneratorRuntime().wrap(function _callee25$(_context25) {
                   while (1) switch (_context25.prev = _context25.next) {
@@ -2759,10 +2846,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   }
                 }, _callee25);
               })));
-            case 6:
+            case 5:
               this.setStorageItem(ORDER_LAST_FULL_FETCH_AT_STORAGE_KEY, '');
               this.emitOrdersChanged([], 'clear');
-            case 8:
+            case 7:
             case "end":
               return _context26.stop();
           }