@pisell/pisellos 2.2.259 → 2.2.260

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

@@ -49,13 +49,6 @@ 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;
-
 /**
  * Order 模块 - 基础框架
  */
@@ -75,6 +68,8 @@ 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);
@@ -448,8 +443,9 @@ 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 (coreData !== null && coreData !== void 0 && coreData.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) {
           var today = dayjs();
           if (coreData !== null && coreData !== void 0 && coreData.core.operating_day_boundary) {
             var operatingDayBoundary = coreData.core.operating_day_boundary;
@@ -778,6 +774,17 @@ 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) {
@@ -801,7 +808,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "overwriteExistingOrder",
     value: (function () {
       var _overwriteExistingOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(fresh) {
-        var _this8 = this;
+        var _this9 = this;
         var orderId, key;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
@@ -835,7 +842,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               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 _this8.getIdKey(id) === key ? fresh : order;
+                return _this9.getIdKey(id) === key ? fresh : order;
               });
               this.syncOrdersMap();
               _context8.next = 13;
@@ -901,7 +908,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "markOrderSyncedByExternalSaleNumber",
     value: function () {
       var _markOrderSyncedByExternalSaleNumber = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(params) {
-        var _this9 = this,
+        var _this10 = this,
           _existing$external_sa,
           _nextOrder$order_id;
         var externalSaleNumber, key, targetIndex, existing, nextOrder, storageKey;
@@ -922,7 +929,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 _this9.getIdKey(value) === key;
+                return _this10.getIdKey(value) === key;
               });
               if (!(targetIndex < 0)) {
                 _context10.next = 9;
@@ -979,7 +986,7 @@ 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, identityKeyToIndex, index, _iterator5, _step5, key, _iterator6, _step6, _step6$value, _storageKey, pendingOrder, matchIndex, mergedOrder, insertIndex;
+        var pendingMap, memoryPendingMap, _iterator4, _step4, order, storageKey, patchedOrders, mergeActions, updatedList, _iterator5, _step5, _step5$value, _storageKey, pendingOrder, matchIndex, _iterator6, _step6, _step6$value, _storageKey2, _order;
         return _regeneratorRuntime().wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
@@ -1039,82 +1046,72 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
               patchedOrders = _toConsumableArray(pendingMap.values());
               mergeActions = {};
-              updatedList = _toConsumableArray(this.store.list); // 与 mergeOrdersToStore 一致：基于身份键（field:value）建立索引，把「查找已存在订单」
-              // 从 O(n) 线性扫描降为 O(1)，整体复杂度由 O(n^2) 降为 O(n + m)。
-              identityKeyToIndex = new Map();
-              for (index = 0; index < updatedList.length; index += 1) {
-                _iterator5 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(updatedList[index]));
-                try {
-                  for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-                    key = _step5.value;
-                    // 同一 key 命中多张时保留最靠前的下标，与原 findIndex「取首个匹配」一致
-                    if (!identityKeyToIndex.has(key)) identityKeyToIndex.set(key, index);
-                  }
-                } catch (err) {
-                  _iterator5.e(err);
-                } finally {
-                  _iterator5.f();
-                }
-              }
-              _iterator6 = _createForOfIteratorHelper(memoryPendingMap.entries());
-              _context11.prev = 35;
-              _iterator6.s();
-            case 37:
-              if ((_step6 = _iterator6.n()).done) {
-                _context11.next = 52;
+              updatedList = _toConsumableArray(this.store.list);
+              _iterator5 = _createForOfIteratorHelper(memoryPendingMap.entries());
+              _context11.prev = 33;
+              _iterator5.s();
+            case 35:
+              if ((_step5 = _iterator5.n()).done) {
+                _context11.next = 46;
                 break;
               }
-              _step6$value = _slicedToArray(_step6.value, 2), _storageKey = _step6$value[0], pendingOrder = _step6$value[1];
-              matchIndex = this.lookupOrderIndexByIdentityKeys(identityKeyToIndex, this.getOrderIdentityMatchKeys(pendingOrder));
-              if (!(matchIndex >= 0)) {
-                _context11.next = 46;
+              _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;
                 break;
               }
-              mergedOrder = this.mergeOrderRecords(updatedList[matchIndex], pendingOrder, {
+              return _context11.abrupt("continue", 44);
+            case 40:
+              updatedList[matchIndex] = this.mergeOrderRecords(updatedList[matchIndex], pendingOrder, {
                 preferIncomingProducts: true
               });
-              updatedList[matchIndex] = mergedOrder;
-              // 合并后身份字段可能新增（如挂单拿到 order_id），同步登记，供同批后续 pending 命中同一槽位
-              this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, matchIndex);
+              pendingMap.delete(_storageKey);
+              memoryPendingMap.delete(_storageKey);
               mergeActions[_storageKey] = 'update';
-              return _context11.abrupt("continue", 50);
-            case 46:
-              insertIndex = updatedList.length;
-              updatedList.push(pendingOrder);
-              this.registerOrderIdentityKeys(identityKeyToIndex, pendingOrder, insertIndex);
-              mergeActions[_storageKey] = 'insert';
-            case 50:
-              _context11.next = 37;
+            case 44:
+              _context11.next = 35;
               break;
-            case 52:
-              _context11.next = 57;
+            case 46:
+              _context11.next = 51;
               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:
-              _context11.prev = 54;
-              _context11.t1 = _context11["catch"](35);
-              _iterator6.e(_context11.t1);
-            case 57:
-              _context11.prev = 57;
-              _iterator6.f();
-              return _context11.finish(57);
-            case 60:
-              // 增量索引已保证 store 去重不变量，无需再对全表做 O(n^2) 压缩；仅自检开关开启时兜底。
-              this.store.list = this.runOrderStoreSelfCheck(updatedList, 'upsertPendingSyncOrders.store');
+              _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;
               this.syncOrdersMap();
-              _context11.next = 64;
+              _context11.next = 60;
               return this.patchOrdersInSQLite(patchedOrders, 'upsertPendingSyncOrders', mergeActions);
-            case 64:
+            case 60:
               this.logInfo('upsertPendingSyncOrders-结束', {
                 count: patchedOrders.length,
                 storeOrderCountAfter: this.store.list.length
               });
-              _context11.next = 67;
+              _context11.next = 63;
               return this.emitOrdersChanged(patchedOrders, 'upsertPendingSyncOrders');
-            case 67:
+            case 63:
             case "end":
               return _context11.stop();
           }
-        }, _callee11, this, [[6, 19, 22, 25], [35, 54, 57, 60]]);
+        }, _callee11, this, [[6, 19, 22, 25], [33, 48, 51, 54]]);
       }));
       function upsertPendingSyncOrders(_x7) {
         return _upsertPendingSyncOrders.apply(this, arguments);
@@ -1191,15 +1188,39 @@ 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;
       try {
-        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+        var _loop = function _loop() {
           var order = _step7.value;
-          var primaryIdentity = this.getOrderMapKey(order);
-          if (!primaryIdentity) continue;
-          this.store.map.set(primaryIdentity, order);
+          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;
         }
       } catch (err) {
         _iterator7.e(err);
@@ -1228,7 +1249,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderIdentityEntries",
     value: function getOrderIdentityEntries(order) {
-      var _this10 = this;
+      var _this12 = this;
       if (!order) return [];
       var record = order;
       var candidates = [{
@@ -1245,10 +1266,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         value: record.shop_order_number
       }];
       var entries = [];
-      var _loop = function _loop() {
+      var _loop2 = function _loop2() {
           var candidate = _candidates[_i];
-          if (_this10.isBlankIdentityValue(candidate.value)) return 0; // continue
-          var key = _this10.getIdKey(candidate.value);
+          if (_this12.isBlankIdentityValue(candidate.value)) return 0; // continue
+          var key = _this12.getIdKey(candidate.value);
           if (entries.some(function (entry) {
             return entry.field === candidate.field && entry.key === key;
           })) return 0; // continue
@@ -1259,7 +1280,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         },
         _ret;
       for (var _i = 0, _candidates = candidates; _i < _candidates.length; _i++) {
-        _ret = _loop();
+        _ret = _loop2();
         if (_ret === 0) continue;
       }
       return entries;
@@ -1268,20 +1289,39 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "getOrderIdentityKeys",
     value: function getOrderIdentityKeys(order) {
       var keys = [];
-      var _iterator8 = _createForOfIteratorHelper(this.getOrderIdentityEntries(order)),
-        _step8;
+      var _iterator9 = _createForOfIteratorHelper(this.getOrderIdentityEntries(order)),
+        _step9;
       try {
-        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-          var entry = _step8.value;
+        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+          var entry = _step9.value;
           if (!keys.includes(entry.key)) keys.push(entry.key);
         }
       } catch (err) {
-        _iterator8.e(err);
+        _iterator9.e(err);
       } finally {
-        _iterator8.f();
+        _iterator9.f();
       }
       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) {
@@ -1315,7 +1355,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setupOrderSync",
     value: function setupOrderSync() {
-      var _this11 = this;
+      var _this13 = this;
       if (!this.orderDataSource) return;
       this.orderDataSource.run({
         pubsub: {
@@ -1323,22 +1363,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 = _this11.normalizeOrderSyncMessage(res);
+            var message = _this13.normalizeOrderSyncMessage(res);
             if (!message) return;
             message._pubsubReceivedAt = pubsubReceivedAt;
-            _this11.pendingSyncMessages.push(message);
-            var throttleMs = _this11.getOrderSyncThrottleMs();
-            var routeInfo = _this11.resolveSyncMessageRoute(message);
-            _this11.logInfo('orderSync-收到消息并入队', {
+            _this13.pendingSyncMessages.push(message);
+            var throttleMs = _this13.getOrderSyncThrottleMs();
+            var routeInfo = _this13.resolveSyncMessageRoute(message);
+            _this13.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: _this11.pendingSyncMessages.length,
+              pendingCount: _this13.pendingSyncMessages.length,
               throttleMs: throttleMs,
               pubsubReceivedAt: new Date(pubsubReceivedAt).toISOString(),
               fullMessage: JSON.stringify(message)
             });
-            _this11.scheduleOrderSyncThrottle();
+            _this13.scheduleOrderSyncThrottle();
           }
         }
       }).catch(function () {
@@ -1355,7 +1395,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "scheduleOrderSyncThrottle",
     value: function scheduleOrderSyncThrottle() {
-      var _this12 = this;
+      var _this14 = this;
       if (this.isProcessingSyncBatch) return;
       if (this.isIdlePhase) {
         this.isIdlePhase = false;
@@ -1366,8 +1406,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (this.syncTimer) return;
       var throttleMs = this.getOrderSyncThrottleMs();
       this.syncTimer = setTimeout(function () {
-        _this12.syncTimer = undefined;
-        void _this12.flushOrderSyncMessagesByThrottle();
+        _this14.syncTimer = undefined;
+        void _this14.flushOrderSyncMessagesByThrottle();
       }, throttleMs);
     }
 
@@ -1435,7 +1475,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "processOrderSyncMessages",
     value: (function () {
       var _processOrderSyncMessages = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
-        var _this13 = this;
+        var _this15 = 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) {
@@ -1462,13 +1502,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               upsertOrders = new Map();
               refreshIds = [];
               messages.forEach(function (msg, msgIndex) {
-                var routeInfo = _this13.resolveSyncMessageRoute(msg);
+                var routeInfo = _this15.resolveSyncMessageRoute(msg);
                 var hasBatchIds = routeInfo.hasBatchIds;
                 var singleId = routeInfo.singleId;
                 var hasSingleId = routeInfo.hasSingleId;
-                var normalizedBody = _this13.normalizeOrderSyncPayload(msg.body || msg.data);
+                var normalizedBody = _this15.normalizeOrderSyncPayload(msg.body || msg.data);
                 if (routeInfo.route === 'bodyUpsert' && normalizedBody) {
-                  upsertOrders.set(_this13.getIdKey(normalizedBody.order_id), normalizedBody);
+                  upsertOrders.set(_this15.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));
@@ -1606,137 +1646,94 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "mergeOrdersToStore",
     value: (function () {
       var _mergeOrdersToStore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(freshOrders, source) {
-        var storeOrderCountBefore, normalizedFreshOrders, _iterator9, _step9, order, id, uniqueFreshOrders, uniqueFreshCount, patchedOrders, mergeActions, updatedList, identityKeyToIndex, index, identityKeys, _iterator10, _step10, key, _iterator11, _step11, fresh, freshIdentityKeys, matchIndex, storageKey, mergeKey, existingOrder, _ref2, _existingOrder$order_, _ref3, _external_sale_number, _existingOrder$paymen, _fresh$payment_status, _existingOrder$need_s, _fresh$need_sync, mergedOrder, insertIndex, insertCount, updateCount;
+        var normalizedFreshOrders, _iterator10, _step10, order, id, uniqueFreshOrders, uniqueFreshCount, patchedOrders, mergeActions, updatedList, _iterator11, _step11, fresh, matchIndex, storageKey, mergeKey, mergedOrder, 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: storeOrderCountBefore,
+                storeOrderCountBefore: this.store.list.length,
                 source: source
               });
               this.logDuplicateOrders("".concat(source, ".beforeMerge"), this.store.list);
               normalizedFreshOrders = [];
-              _iterator9 = _createForOfIteratorHelper(freshOrders);
-              _context16.prev = 5;
-              _iterator9.s();
-            case 7:
-              if ((_step9 = _iterator9.n()).done) {
-                _context16.next = 15;
+              _iterator10 = _createForOfIteratorHelper(freshOrders);
+              _context16.prev = 4;
+              _iterator10.s();
+            case 6:
+              if ((_step10 = _iterator10.n()).done) {
+                _context16.next = 14;
                 break;
               }
-              order = _step9.value;
+              order = _step10.value;
               id = order === null || order === void 0 ? void 0 : order.order_id;
               if (!(id === undefined || id === null)) {
-                _context16.next = 12;
+                _context16.next = 11;
                 break;
               }
-              return _context16.abrupt("continue", 13);
-            case 12:
+              return _context16.abrupt("continue", 12);
+            case 11:
               normalizedFreshOrders.push(this.normalizeRemoteSyncedOrder(order));
-            case 13:
-              _context16.next = 7;
+            case 12:
+              _context16.next = 6;
               break;
-            case 15:
-              _context16.next = 20;
+            case 14:
+              _context16.next = 19;
               break;
-            case 17:
-              _context16.prev = 17;
-              _context16.t0 = _context16["catch"](5);
-              _iterator9.e(_context16.t0);
-            case 20:
-              _context16.prev = 20;
-              _iterator9.f();
-              return _context16.finish(20);
-            case 23:
-              // 先对本批新单做去重（批内规模 m 很小），保证每条 fresh 身份唯一
+            case 16:
+              _context16.prev = 16;
+              _context16.t0 = _context16["catch"](4);
+              _iterator10.e(_context16.t0);
+            case 19:
+              _context16.prev = 19;
+              _iterator10.f();
+              return _context16.finish(19);
+            case 22:
               uniqueFreshOrders = this.compactOrderListByIdentity(normalizedFreshOrders, "".concat(source, ".incoming")).list;
               uniqueFreshCount = uniqueFreshOrders.length;
               patchedOrders = [];
               mergeActions = {};
-              updatedList = _toConsumableArray(this.store.list); // 基于身份键（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]);
-                _iterator10 = _createForOfIteratorHelper(identityKeys);
-                try {
-                  for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-                    key = _step10.value;
-                    // 同一 key 命中多张时保留最靠前的下标，与原 findIndex「取首个匹配」一致
-                    if (!identityKeyToIndex.has(key)) identityKeyToIndex.set(key, index);
-                  }
-                } catch (err) {
-                  _iterator10.e(err);
-                } finally {
-                  _iterator10.f();
-                }
-              }
+              updatedList = _toConsumableArray(this.store.list);
               _iterator11 = _createForOfIteratorHelper(uniqueFreshOrders);
-              _context16.prev = 31;
+              _context16.prev = 28;
               _iterator11.s();
-            case 33:
+            case 30:
               if ((_step11 = _iterator11.n()).done) {
-                _context16.next = 57;
+                _context16.next = 46;
                 break;
               }
               fresh = _step11.value;
-              freshIdentityKeys = this.getOrderIdentityMatchKeys(fresh);
-              matchIndex = this.lookupOrderIndexByIdentityKeys(identityKeyToIndex, freshIdentityKeys);
+              matchIndex = this.findOrderIndexByIdentity(updatedList, fresh);
               storageKey = this.getOrderStorageKey(fresh);
               mergeKey = storageKey || (fresh.order_id !== undefined && fresh.order_id !== null ? this.getIdKey(fresh.order_id) : '');
               if (!(matchIndex >= 0)) {
-                _context16.next = 50;
+                _context16.next = 41;
                 break;
               }
-              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_number = existingOrder.external_sale_number) !== null && _external_sale_number !== void 0 ? _external_sale_number : 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);
+              mergedOrder = this.mergeOrderRecords(updatedList[matchIndex], fresh);
               updatedList[matchIndex] = mergedOrder;
-              // 合并后身份字段可能新增（如挂单拿到 order_id），同步登记到索引，
-              // 供同批后续 fresh 命中同一槽位，避免重复插入
-              this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, matchIndex);
               patchedOrders.push(mergedOrder);
               if (mergeKey) mergeActions[mergeKey] = 'update';
-              return _context16.abrupt("continue", 55);
-            case 50:
-              insertIndex = updatedList.length;
+              return _context16.abrupt("continue", 44);
+            case 41:
               updatedList.push(fresh);
-              this.registerOrderIdentityKeys(identityKeyToIndex, fresh, insertIndex);
               patchedOrders.push(fresh);
               if (mergeKey) mergeActions[mergeKey] = 'insert';
-            case 55:
-              _context16.next = 33;
+            case 44:
+              _context16.next = 30;
               break;
-            case 57:
-              _context16.next = 62;
+            case 46:
+              _context16.next = 51;
               break;
-            case 59:
-              _context16.prev = 59;
-              _context16.t1 = _context16["catch"](31);
+            case 48:
+              _context16.prev = 48;
+              _context16.t1 = _context16["catch"](28);
               _iterator11.e(_context16.t1);
-            case 62:
-              _context16.prev = 62;
+            case 51:
+              _context16.prev = 51;
               _iterator11.f();
-              return _context16.finish(62);
-            case 65:
+              return _context16.finish(51);
+            case 54:
               insertCount = Object.values(mergeActions).filter(function (v) {
                 return v === 'insert';
               }).length;
@@ -1748,110 +1745,30 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 updateCount: updateCount,
                 storeOrderCountAfter: this.store.list.length
               });
-              // 增量索引已保证 store 去重不变量，无需再对全表做 O(n^2) 压缩；
-              // 仅在自检开关开启时做一次兜底校验。
-              this.store.list = this.runOrderStoreSelfCheck(updatedList, "".concat(source, ".store"));
+              this.store.list = this.compactOrderListByIdentity(updatedList, "".concat(source, ".store")).list;
               this.syncOrdersMap();
-              _context16.next = 72;
+              _context16.next = 61;
               return this.patchOrdersInSQLite(patchedOrders, source, mergeActions);
-            case 72:
+            case 61:
               this.logInfo('mergeOrdersToStore-结束', {
                 uniqueFreshCount: uniqueFreshCount,
                 storeOrderCountAfter: this.store.list.length,
                 insertCount: insertCount,
                 updateCount: updateCount
               });
-              _context16.next = 75;
+              _context16.next = 64;
               return this.emitOrdersChanged(patchedOrders, source);
-            case 75:
+            case 64:
             case "end":
               return _context16.stop();
           }
-        }, _callee16, this, [[5, 17, 20, 23], [31, 59, 62, 65]]);
+        }, _callee16, this, [[4, 16, 19, 22], [28, 48, 51, 54]]);
       }));
       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 _iterator12 = _createForOfIteratorHelper(identityKeys),
-        _step12;
-      try {
-        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
-          var key = _step12.value;
-          var index = identityKeyToIndex.get(key);
-          if (index === undefined) continue;
-          if (matchIndex < 0 || index < matchIndex) matchIndex = index;
-        }
-      } catch (err) {
-        _iterator12.e(err);
-      } finally {
-        _iterator12.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 _iterator13 = _createForOfIteratorHelper(identityKeys),
-        _step13;
-      try {
-        for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
-          var key = _step13.value;
-          identityKeyToIndex.set(key, index);
-        }
-      } catch (err) {
-        _iterator13.e(err);
-      } finally {
-        _iterator13.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) {
@@ -1884,17 +1801,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "uniqueOrderIds",
     value: function uniqueOrderIds(ids) {
       var idMap = new Map();
-      var _iterator14 = _createForOfIteratorHelper(ids),
-        _step14;
+      var _iterator12 = _createForOfIteratorHelper(ids),
+        _step12;
       try {
-        for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
-          var id = _step14.value;
+        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+          var id = _step12.value;
           idMap.set(this.getIdKey(id), id);
         }
       } catch (err) {
-        _iterator14.e(err);
+        _iterator12.e(err);
       } finally {
-        _iterator14.f();
+        _iterator12.f();
       }
       return _toConsumableArray(idMap.values());
     }
@@ -1906,12 +1823,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "isOrderLookupMatch",
     value: function isOrderLookupMatch(order, lookupKey) {
-      var _this14 = this;
+      var _this16 = this;
       if (!order || !lookupKey) return false;
       var candidates = [order.order_id, order.external_sale_number, order.order_number, order.shop_order_number, order.shop_full_order_number];
       return candidates.some(function (value) {
         if (value === undefined || value === null || value === '') return false;
-        return _this14.getIdKey(value) === lookupKey;
+        return _this16.getIdKey(value) === lookupKey;
       });
     }
 
@@ -1954,10 +1871,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "findOrderIndexByIdentity",
     value: function findOrderIndexByIdentity(orders, target) {
-      var _this15 = this;
+      var _this17 = this;
       if (this.getOrderIdentityMatchKeys(target).length === 0) return -1;
       return orders.findIndex(function (order) {
-        return _this15.doOrdersShareIdentity(order, target);
+        return _this17.doOrdersShareIdentity(order, target);
       });
     }
   }, {
@@ -2006,58 +1923,58 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (secondaryList.length === 0) return preferredList;
       if (preferredList.length === 0) return secondaryList;
       var seenKeys = new Set();
-      var _iterator15 = _createForOfIteratorHelper(preferredList),
-        _step15;
+      var _iterator13 = _createForOfIteratorHelper(preferredList),
+        _step13;
       try {
-        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
-          var item = _step15.value;
+        for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
+          var item = _step13.value;
           var keys = this.getProductIdentityKeys(item);
-          var _iterator17 = _createForOfIteratorHelper(keys),
-            _step17;
+          var _iterator15 = _createForOfIteratorHelper(keys),
+            _step15;
           try {
-            for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
-              var key = _step17.value;
+            for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+              var key = _step15.value;
               seenKeys.add(key);
             }
           } catch (err) {
-            _iterator17.e(err);
+            _iterator15.e(err);
           } finally {
-            _iterator17.f();
+            _iterator15.f();
           }
         }
       } catch (err) {
-        _iterator15.e(err);
+        _iterator13.e(err);
       } finally {
-        _iterator15.f();
+        _iterator13.f();
       }
       var result = _toConsumableArray(preferredList);
-      var _iterator16 = _createForOfIteratorHelper(secondaryList),
-        _step16;
+      var _iterator14 = _createForOfIteratorHelper(secondaryList),
+        _step14;
       try {
-        for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
-          var _item = _step16.value;
+        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 _iterator18 = _createForOfIteratorHelper(_keys),
-            _step18;
+          var _iterator16 = _createForOfIteratorHelper(_keys),
+            _step16;
           try {
-            for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
-              var _key = _step18.value;
+            for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
+              var _key = _step16.value;
               seenKeys.add(_key);
             }
           } catch (err) {
-            _iterator18.e(err);
+            _iterator16.e(err);
           } finally {
-            _iterator18.f();
+            _iterator16.f();
           }
           result.push(cloneDeep(_item));
         }
       } catch (err) {
-        _iterator16.e(err);
+        _iterator14.e(err);
       } finally {
-        _iterator16.f();
+        _iterator14.f();
       }
       return result;
     }
@@ -2083,29 +2000,29 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "mergeOrderPaymentLists",
     value: function mergeOrderPaymentLists(existing, incoming) {
-      var _this16 = this;
+      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 _iterator19 = _createForOfIteratorHelper(existingList),
-        _step19;
+      var _iterator17 = _createForOfIteratorHelper(existingList),
+        _step17;
       try {
-        for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
-          var payment = _step19.value;
+        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) {
-        _iterator19.e(err);
+        _iterator17.e(err);
       } finally {
-        _iterator19.f();
+        _iterator17.f();
       }
       return incomingList.map(function (payment) {
         var incomingPayment = payment;
-        var key = _this16.getPaymentMergeKey(incomingPayment);
+        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)), {}, {
@@ -2162,47 +2079,47 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "summarizeDuplicateOrders",
     value: function summarizeDuplicateOrders(orders) {
       var groups = new Map();
-      var _iterator20 = _createForOfIteratorHelper(orders),
-        _step20;
+      var _iterator18 = _createForOfIteratorHelper(orders),
+        _step18;
       try {
-        for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
-          var order = _step20.value;
-          var _iterator21 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(order)),
-            _step21;
+        for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
+          var order = _step18.value;
+          var _iterator19 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(order)),
+            _step19;
           try {
-            for (_iterator21.s(); !(_step21 = _iterator21.n()).done;) {
-              var key = _step21.value;
+            for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
+              var key = _step19.value;
               var group = groups.get(key) || [];
               group.push(order);
               groups.set(key, group);
             }
           } catch (err) {
-            _iterator21.e(err);
+            _iterator19.e(err);
           } finally {
-            _iterator21.f();
+            _iterator19.f();
           }
         }
       } catch (err) {
-        _iterator20.e(err);
+        _iterator18.e(err);
       } finally {
-        _iterator20.f();
+        _iterator18.f();
       }
-      return _toConsumableArray(groups.entries()).filter(function (_ref4) {
+      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) {
         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_number2, _shop_order_number, _shop_full_order_numb, _order$need_sync;
+            var _order$order_id2, _external_sale_number, _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_number2 = order.external_sale_number) !== null && _external_sale_number2 !== void 0 ? _external_sale_number2 : null,
+              external_sale_number: (_external_sale_number = order.external_sale_number) !== null && _external_sale_number !== void 0 ? _external_sale_number : 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
@@ -2227,11 +2144,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function compactOrderListByIdentity(orders, source) {
       var list = [];
       var removedCount = 0;
-      var _iterator22 = _createForOfIteratorHelper(orders),
-        _step22;
+      var _iterator20 = _createForOfIteratorHelper(orders),
+        _step20;
       try {
-        for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
-          var order = _step22.value;
+        for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
+          var order = _step20.value;
           var matchIndex = this.findOrderIndexByIdentity(list, order);
           if (matchIndex < 0) {
             list.push(order);
@@ -2241,9 +2158,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           removedCount += 1;
         }
       } catch (err) {
-        _iterator22.e(err);
+        _iterator20.e(err);
       } finally {
-        _iterator22.f();
+        _iterator20.f();
       }
       if (removedCount > 0) {
         this.logWarning('订单列表重复项已压缩', {
@@ -2389,15 +2306,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "mergeRemoteSnapshotWithPendingOrders",
     value: function mergeRemoteSnapshotWithPendingOrders(remoteOrders, existingOrders) {
-      var _this17 = this;
+      var _this19 = this;
       var merged = remoteOrders.map(function (order) {
-        return _this17.normalizeRemoteSyncedOrder(order);
+        return _this19.normalizeRemoteSyncedOrder(order);
       });
-      var _iterator23 = _createForOfIteratorHelper(existingOrders),
-        _step23;
+      var _iterator21 = _createForOfIteratorHelper(existingOrders),
+        _step21;
       try {
-        for (_iterator23.s(); !(_step23 = _iterator23.n()).done;) {
-          var order = _step23.value;
+        for (_iterator21.s(); !(_step21 = _iterator21.n()).done;) {
+          var order = _step21.value;
           if (!this.isPendingSyncOrder(order)) continue;
           var matchIndex = this.findOrderIndexByIdentity(merged, order);
           if (matchIndex >= 0) {
@@ -2408,9 +2325,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           merged.push(order);
         }
       } catch (err) {
-        _iterator23.e(err);
+        _iterator21.e(err);
       } finally {
-        _iterator23.f();
+        _iterator21.f();
       }
       return this.compactOrderListByIdentity(merged, 'mergeRemoteSnapshotWithPendingOrders').list;
     }
@@ -2460,7 +2377,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "patchOrdersInSQLite",
     value: (function () {
       var _patchOrdersInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(orders, source) {
-        var _this18 = this;
+        var _this20 = this;
         var mergeActions,
           ordersSnapshot,
           _this$filterRedundant2,
@@ -2479,7 +2396,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               return _context20.abrupt("return");
             case 3:
               ordersSnapshot = cloneDeep(orders).filter(function (order) {
-                return _this18.getOrderStorageKey(order);
+                return _this20.getOrderStorageKey(order);
               });
               if (!(ordersSnapshot.length === 0)) {
                 _context20.next = 6;
@@ -2504,54 +2421,54 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               _context20.prev = 12;
               _context20.next = 15;
               return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
-                var writeMethod, _iterator24, _step24, order;
+                var writeMethod, _iterator22, _step22, order;
                 return _regeneratorRuntime().wrap(function _callee19$(_context19) {
                   while (1) switch (_context19.prev = _context19.next) {
                     case 0:
                       writeMethod = 'none';
-                      _this18.logInfo('patchOrdersInSQLite-开始', {
+                      _this20.logInfo('patchOrdersInSQLite-开始', {
                         source: source,
                         count: compactedToWrite.length,
                         dedupedCount: skipped.length
                       });
-                      if (!(typeof _this18.dbManager.bulkUpdate === 'function')) {
+                      if (!(typeof _this20.dbManager.bulkUpdate === 'function')) {
                         _context19.next = 8;
                         break;
                       }
                       writeMethod = 'bulkUpdate';
                       _context19.next = 6;
-                      return _this18.dbManager.bulkUpdate(INDEXDB_STORE_NAME, compactedToWrite);
+                      return _this20.dbManager.bulkUpdate(INDEXDB_STORE_NAME, compactedToWrite);
                     case 6:
                       _context19.next = 33;
                       break;
                     case 8:
-                      if (!(typeof _this18.dbManager.bulkAdd === 'function')) {
+                      if (!(typeof _this20.dbManager.bulkAdd === 'function')) {
                         _context19.next = 14;
                         break;
                       }
                       writeMethod = 'bulkAdd';
                       _context19.next = 12;
-                      return _this18.dbManager.bulkAdd(INDEXDB_STORE_NAME, compactedToWrite);
+                      return _this20.dbManager.bulkAdd(INDEXDB_STORE_NAME, compactedToWrite);
                     case 12:
                       _context19.next = 33;
                       break;
                     case 14:
-                      if (!(typeof _this18.dbManager.update === 'function')) {
+                      if (!(typeof _this20.dbManager.update === 'function')) {
                         _context19.next = 33;
                         break;
                       }
                       writeMethod = 'update';
-                      _iterator24 = _createForOfIteratorHelper(compactedToWrite);
+                      _iterator22 = _createForOfIteratorHelper(compactedToWrite);
                       _context19.prev = 17;
-                      _iterator24.s();
+                      _iterator22.s();
                     case 19:
-                      if ((_step24 = _iterator24.n()).done) {
+                      if ((_step22 = _iterator22.n()).done) {
                         _context19.next = 25;
                         break;
                       }
-                      order = _step24.value;
+                      order = _step22.value;
                       _context19.next = 23;
-                      return _this18.dbManager.update(INDEXDB_STORE_NAME, order);
+                      return _this20.dbManager.update(INDEXDB_STORE_NAME, order);
                     case 23:
                       _context19.next = 19;
                       break;
@@ -2561,14 +2478,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                     case 27:
                       _context19.prev = 27;
                       _context19.t0 = _context19["catch"](17);
-                      _iterator24.e(_context19.t0);
+                      _iterator22.e(_context19.t0);
                     case 30:
                       _context19.prev = 30;
-                      _iterator24.f();
+                      _iterator22.f();
                       return _context19.finish(30);
                     case 33:
-                      _this18.recordRecentSqliteWrite(source, compactedToWrite);
-                      _this18.logInfo('patchOrdersInSQLite-完成', {
+                      _this20.recordRecentSqliteWrite(source, compactedToWrite);
+                      _this20.logInfo('patchOrdersInSQLite-完成', {
                         source: source,
                         count: compactedToWrite.length,
                         writeMethod: writeMethod,
@@ -2612,7 +2529,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "updateOrderInSQLite",
     value: (function () {
       var _updateOrderInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(order, source) {
-        var _this19 = this;
+        var _this21 = this;
         var orderSnapshot, _orderSnapshot$order_3;
         return _regeneratorRuntime().wrap(function _callee22$(_context22) {
           while (1) switch (_context22.prev = _context22.next) {
@@ -2633,43 +2550,43 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   while (1) switch (_context21.prev = _context21.next) {
                     case 0:
                       writeMethod = 'none';
-                      _this19.logInfo('updateOrderInSQLite-开始', {
+                      _this21.logInfo('updateOrderInSQLite-开始', {
                         source: source,
                         orderId: (_orderSnapshot$order_ = orderSnapshot.order_id) !== null && _orderSnapshot$order_ !== void 0 ? _orderSnapshot$order_ : null,
-                        storageKey: _this19.getOrderStorageKey(orderSnapshot)
+                        storageKey: _this21.getOrderStorageKey(orderSnapshot)
                       });
-                      if (!(typeof _this19.dbManager.update === 'function')) {
+                      if (!(typeof _this21.dbManager.update === 'function')) {
                         _context21.next = 8;
                         break;
                       }
                       writeMethod = 'update';
                       _context21.next = 6;
-                      return _this19.dbManager.update(INDEXDB_STORE_NAME, orderSnapshot);
+                      return _this21.dbManager.update(INDEXDB_STORE_NAME, orderSnapshot);
                     case 6:
                       _context21.next = 18;
                       break;
                     case 8:
-                      if (!(typeof _this19.dbManager.bulkUpdate === 'function')) {
+                      if (!(typeof _this21.dbManager.bulkUpdate === 'function')) {
                         _context21.next = 14;
                         break;
                       }
                       writeMethod = 'bulkUpdate';
                       _context21.next = 12;
-                      return _this19.dbManager.bulkUpdate(INDEXDB_STORE_NAME, [orderSnapshot]);
+                      return _this21.dbManager.bulkUpdate(INDEXDB_STORE_NAME, [orderSnapshot]);
                     case 12:
                       _context21.next = 18;
                       break;
                     case 14:
-                      if (!(typeof _this19.dbManager.bulkAdd === 'function')) {
+                      if (!(typeof _this21.dbManager.bulkAdd === 'function')) {
                         _context21.next = 18;
                         break;
                       }
                       writeMethod = 'bulkAdd';
                       _context21.next = 18;
-                      return _this19.dbManager.bulkAdd(INDEXDB_STORE_NAME, [orderSnapshot]);
+                      return _this21.dbManager.bulkAdd(INDEXDB_STORE_NAME, [orderSnapshot]);
                     case 18:
-                      _this19.recordRecentSqliteWrite(source, [orderSnapshot]);
-                      _this19.logInfo('updateOrderInSQLite-完成', {
+                      _this21.recordRecentSqliteWrite(source, [orderSnapshot]);
+                      _this21.logInfo('updateOrderInSQLite-完成', {
                         source: source,
                         orderId: (_orderSnapshot$order_2 = orderSnapshot.order_id) !== null && _orderSnapshot$order_2 !== void 0 ? _orderSnapshot$order_2 : null,
                         writeMethod: writeMethod
@@ -2712,7 +2629,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "replaceOrdersSnapshotInSQLite",
     value: (function () {
       var _replaceOrdersSnapshotInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(orderList, source) {
-        var _this20 = this;
+        var _this22 = this;
         var remoteSnapshot, mergedSnapshot;
         return _regeneratorRuntime().wrap(function _callee24$(_context24) {
           while (1) switch (_context24.prev = _context24.next) {
@@ -2722,12 +2639,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 break;
               }
               return _context24.abrupt("return", this.compactOrderListByIdentity(orderList.map(function (order) {
-                return _this20.normalizeRemoteSyncedOrder(order);
+                return _this22.normalizeRemoteSyncedOrder(order);
               }), "".concat(source, ".snapshotNoDb")).list);
             case 2:
               remoteSnapshot = cloneDeep(orderList);
               mergedSnapshot = this.compactOrderListByIdentity(remoteSnapshot.map(function (order) {
-                return _this20.normalizeRemoteSyncedOrder(order);
+                return _this22.normalizeRemoteSyncedOrder(order);
               }), "".concat(source, ".remoteSnapshot")).list;
               _context24.prev = 4;
               _context24.next = 7;
@@ -2736,12 +2653,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 return _regeneratorRuntime().wrap(function _callee23$(_context23) {
                   while (1) switch (_context23.prev = _context23.next) {
                     case 0:
-                      if (!(typeof _this20.dbManager.getAll === 'function')) {
+                      if (!(typeof _this22.dbManager.getAll === 'function')) {
                         _context23.next = 6;
                         break;
                       }
                       _context23.next = 3;
-                      return _this20.dbManager.getAll(INDEXDB_STORE_NAME);
+                      return _this22.dbManager.getAll(INDEXDB_STORE_NAME);
                     case 3:
                       _context23.t0 = _context23.sent;
                       _context23.next = 7;
@@ -2750,18 +2667,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       _context23.t0 = [];
                     case 7:
                       existingOrders = _context23.t0;
-                      orderListSnapshot = _this20.mergeRemoteSnapshotWithPendingOrders(remoteSnapshot, existingOrders || []);
-                      mergedSnapshot = _this20.compactOrderListByIdentity(orderListSnapshot, "".concat(source, ".sqliteSnapshot")).list;
-                      _this20.logInfo('replaceOrdersSnapshotInSQLite-开始', {
+                      orderListSnapshot = _this22.mergeRemoteSnapshotWithPendingOrders(remoteSnapshot, existingOrders || []);
+                      mergedSnapshot = _this22.compactOrderListByIdentity(orderListSnapshot, "".concat(source, ".sqliteSnapshot")).list;
+                      _this22.logInfo('replaceOrdersSnapshotInSQLite-开始', {
                         source: source,
                         count: mergedSnapshot.length,
                         remoteCount: remoteSnapshot.length,
                         preservedPendingCount: mergedSnapshot.length - remoteSnapshot.length
                       });
                       _context23.next = 13;
-                      return _this20.dbManager.clear(INDEXDB_STORE_NAME);
+                      return _this22.dbManager.clear(INDEXDB_STORE_NAME);
                     case 13:
-                      _this20.logInfo('replaceOrdersSnapshotInSQLite-clear完成', {
+                      _this22.logInfo('replaceOrdersSnapshotInSQLite-clear完成', {
                         count: mergedSnapshot.length
                       });
                       if (!(mergedSnapshot.length === 0)) {
@@ -2771,10 +2688,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       return _context23.abrupt("return");
                     case 16:
                       _context23.next = 18;
-                      return _this20.dbManager.bulkAdd(INDEXDB_STORE_NAME, mergedSnapshot);
+                      return _this22.dbManager.bulkAdd(INDEXDB_STORE_NAME, mergedSnapshot);
                     case 18:
-                      _this20.recordRecentSqliteWrite(source, mergedSnapshot);
-                      _this20.logInfo('replaceOrdersSnapshotInSQLite-bulkAdd完成', {
+                      _this22.recordRecentSqliteWrite(source, mergedSnapshot);
+                      _this22.logInfo('replaceOrdersSnapshotInSQLite-bulkAdd完成', {
                         source: source,
                         count: mergedSnapshot.length
                       });
@@ -2818,33 +2735,34 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "clear",
     value: (function () {
       var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26() {
-        var _this21 = this;
+        var _this23 = this;
         return _regeneratorRuntime().wrap(function _callee26$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
             case 0:
               this.store.list = [];
               this.store.map = new Map();
+              this.resourceIdIndex.clear();
               if (!this.dbManager) {
-                _context26.next = 5;
+                _context26.next = 6;
                 break;
               }
-              _context26.next = 5;
+              _context26.next = 6;
               return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25() {
                 return _regeneratorRuntime().wrap(function _callee25$(_context25) {
                   while (1) switch (_context25.prev = _context25.next) {
                     case 0:
                       _context25.next = 2;
-                      return _this21.dbManager.clear(INDEXDB_STORE_NAME);
+                      return _this23.dbManager.clear(INDEXDB_STORE_NAME);
                     case 2:
                     case "end":
                       return _context25.stop();
                   }
                 }, _callee25);
               })));
-            case 5:
+            case 6:
               this.setStorageItem(ORDER_LAST_FULL_FETCH_AT_STORAGE_KEY, '');
               this.emitOrdersChanged([], 'clear');
-            case 7:
+            case 8:
             case "end":
               return _context26.stop();
           }