@pisell/pisellos 2.2.263 → 2.2.264

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

@@ -33,7 +33,6 @@ 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";
 
 /**
@@ -56,12 +55,6 @@ var ORDER_BUSINESS_WRITE_SOURCES = new Set(['upsertOrdersFromRemote', 'upsertPen
  * 仅用于排查增量身份索引是否遗漏了重复订单，不应在生产常开。
  */
 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 模块 - 基础框架
@@ -240,104 +233,6 @@ 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 回声去重使用。
      *
@@ -348,11 +243,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "recordRecentSqliteWrite",
     value: function recordRecentSqliteWrite(source, orders) {
       var now = Date.now();
-      var _iterator2 = _createForOfIteratorHelper(orders),
-        _step2;
+      var _iterator = _createForOfIteratorHelper(orders),
+        _step;
       try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var order = _step2.value;
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var order = _step.value;
           var storageKey = this.getOrderStorageKey(order);
           if (!storageKey) continue;
           this.recentSqliteWriteByStorageKey.set(storageKey, {
@@ -361,9 +256,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           });
         }
       } catch (err) {
-        _iterator2.e(err);
+        _iterator.e(err);
       } finally {
-        _iterator2.f();
+        _iterator.f();
       }
     }
 
@@ -386,11 +281,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var now = Date.now();
       var toWrite = [];
       var skipped = [];
-      var _iterator3 = _createForOfIteratorHelper(orders),
-        _step3;
+      var _iterator2 = _createForOfIteratorHelper(orders),
+        _step2;
       try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          var order = _step3.value;
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var order = _step2.value;
           var storageKey = this.getOrderStorageKey(order);
           if (!storageKey) {
             toWrite.push(order);
@@ -406,9 +301,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_id2;
+            var _order$order_id;
             skipped.push({
-              orderId: (_order$order_id2 = order.order_id) !== null && _order$order_id2 !== void 0 ? _order$order_id2 : null,
+              orderId: (_order$order_id = order.order_id) !== null && _order$order_id !== void 0 ? _order$order_id : null,
               storageKey: storageKey,
               reason: 'skip_pubsub_echo_after_business_write',
               lastSource: recent.source,
@@ -419,9 +314,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           toWrite.push(order);
         }
       } catch (err) {
-        _iterator3.e(err);
+        _iterator2.e(err);
       } finally {
-        _iterator3.f();
+        _iterator2.f();
       }
       return {
         toWrite: toWrite,
@@ -441,11 +336,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var now = Date.now();
       var toFetch = [];
       var skipped = [];
-      var _iterator4 = _createForOfIteratorHelper(ids),
-        _step4;
+      var _iterator3 = _createForOfIteratorHelper(ids),
+        _step3;
       try {
-        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-          var id = _step4.value;
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var id = _step3.value;
           var existing = this.getOrderByOrderId(id);
           if (!existing) {
             toFetch.push(id);
@@ -464,9 +359,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           toFetch.push(id);
         }
       } catch (err) {
-        _iterator4.e(err);
+        _iterator3.e(err);
       } finally {
-        _iterator4.f();
+        _iterator3.f();
       }
       return {
         toFetch: toFetch,
@@ -886,16 +781,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeOrderForMemoryList",
     value: function normalizeOrderForMemoryList(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;
+      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;
       }
       if (externalSaleNumber === undefined || externalSaleNumber === null || externalSaleNumber === '') {
-        return normalizedOrder;
+        return order;
       }
-      return _objectSpread(_objectSpread({}, normalizedOrder), {}, {
+      return _objectSpread(_objectSpread({}, order), {}, {
         order_id: externalSaleNumber
       });
     }
@@ -909,7 +802,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _overwriteExistingOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(fresh) {
         var _this8 = this;
-        var orderId, key, normalizedFresh, existingOrder, reconciledFresh;
+        var orderId, key;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
@@ -939,31 +832,26 @@ 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 _this8.normalizeOrderForMemoryList(order, 'overwriteExistingOrder.existingMemory');
-                }
-                return _this8.getIdKey(id) === key ? reconciledFresh : _this8.normalizeOrderForMemoryList(order, 'overwriteExistingOrder.existingMemory');
+                if (id === undefined || id === null) return order;
+                return _this8.getIdKey(id) === key ? fresh : order;
               });
               this.syncOrdersMap();
-              _context8.next = 16;
-              return this.updateOrderInSQLite(reconciledFresh, 'overwriteExistingOrder');
-            case 16:
+              _context8.next = 13;
+              return this.updateOrderInSQLite(fresh, 'overwriteExistingOrder');
+            case 13:
               this.logInfo('overwriteExistingOrder-结束', {
                 orderId: orderId,
                 storeOrderCountAfter: this.store.list.length
               });
-              _context8.next = 19;
-              return this.emitOrdersChanged([reconciledFresh], 'overwriteExistingOrder');
-            case 19:
+              _context8.next = 16;
+              return this.emitOrdersChanged([fresh], 'overwriteExistingOrder');
+            case 16:
               return _context8.abrupt("return", {
                 overwritten: true
               });
-            case 20:
+            case 17:
             case "end":
               return _context8.stop();
           }
@@ -1091,8 +979,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "upsertPendingSyncOrders",
     value: (function () {
       var _upsertPendingSyncOrders = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(pendingOrders) {
-        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;
+        var pendingMap, memoryPendingMap, _iterator4, _step4, order, storageKey, patchedOrders, mergeActions, updatedList, identityKeyToIndex, index, _iterator5, _step5, key, _iterator6, _step6, _step6$value, _storageKey, pendingOrder, matchIndex, mergedOrder, insertIndex;
         return _regeneratorRuntime().wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
@@ -1105,134 +992,129 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 3:
               pendingMap = new Map();
               memoryPendingMap = new Map();
-              _iterator5 = _createForOfIteratorHelper(pendingOrders);
+              _iterator4 = _createForOfIteratorHelper(pendingOrders);
               _context11.prev = 6;
-              _iterator5.s();
+              _iterator4.s();
             case 8:
-              if ((_step5 = _iterator5.n()).done) {
-                _context11.next = 18;
+              if ((_step4 = _iterator4.n()).done) {
+                _context11.next = 17;
                 break;
               }
-              order = _step5.value;
-              normalizedOrder = this.normalizeOrderCollectionsForIngress(order, 'upsertPendingSyncOrders.incoming');
-              storageKey = this.getOrderStorageKey(normalizedOrder);
+              order = _step4.value;
+              storageKey = this.getOrderStorageKey(order);
               if (storageKey) {
-                _context11.next = 14;
+                _context11.next = 13;
                 break;
               }
-              return _context11.abrupt("continue", 16);
-            case 14:
-              pendingMap.set(storageKey, normalizedOrder);
-              memoryPendingMap.set(storageKey, this.normalizeOrderForMemoryList(normalizedOrder, 'upsertPendingSyncOrders.memory'));
-            case 16:
+              return _context11.abrupt("continue", 15);
+            case 13:
+              pendingMap.set(storageKey, order);
+              memoryPendingMap.set(storageKey, this.normalizeOrderForMemoryList(order));
+            case 15:
               _context11.next = 8;
               break;
-            case 18:
-              _context11.next = 23;
+            case 17:
+              _context11.next = 22;
               break;
-            case 20:
-              _context11.prev = 20;
+            case 19:
+              _context11.prev = 19;
               _context11.t0 = _context11["catch"](6);
-              _iterator5.e(_context11.t0);
-            case 23:
-              _context11.prev = 23;
-              _iterator5.f();
-              return _context11.finish(23);
-            case 26:
+              _iterator4.e(_context11.t0);
+            case 22:
+              _context11.prev = 22;
+              _iterator4.f();
+              return _context11.finish(22);
+            case 25:
               if (!(pendingMap.size === 0)) {
-                _context11.next = 29;
+                _context11.next = 28;
                 break;
               }
               this.logError('upsertPendingSyncOrders-订单缺少可落库标识', {
                 count: pendingOrders.length
               });
               return _context11.abrupt("return");
-            case 29:
+            case 28:
               this.logInfo('upsertPendingSyncOrders-开始', {
                 count: pendingMap.size
               });
+              patchedOrders = _toConsumableArray(pendingMap.values());
               mergeActions = {};
-              updatedList = this.store.list.map(function (order) {
-                return _this10.normalizeOrderForMemoryList(order, 'upsertPendingSyncOrders.existingMemory');
-              }); // 与 mergeOrdersToStore 一致：基于身份键（field:value）建立索引，把「查找已存在订单」
+              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) {
-                _iterator6 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(updatedList[index]));
+                _iterator5 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(updatedList[index]));
                 try {
-                  for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-                    key = _step6.value;
+                  for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+                    key = _step5.value;
                     // 同一 key 命中多张时保留最靠前的下标，与原 findIndex「取首个匹配」一致
                     if (!identityKeyToIndex.has(key)) identityKeyToIndex.set(key, index);
                   }
                 } catch (err) {
-                  _iterator6.e(err);
+                  _iterator5.e(err);
                 } finally {
-                  _iterator6.f();
+                  _iterator5.f();
                 }
               }
-              _iterator7 = _createForOfIteratorHelper(memoryPendingMap.entries());
+              _iterator6 = _createForOfIteratorHelper(memoryPendingMap.entries());
               _context11.prev = 35;
-              _iterator7.s();
+              _iterator6.s();
             case 37:
-              if ((_step7 = _iterator7.n()).done) {
-                _context11.next = 55;
+              if ((_step6 = _iterator6.n()).done) {
+                _context11.next = 52;
                 break;
               }
-              _step7$value = _slicedToArray(_step7.value, 2), _storageKey = _step7$value[0], pendingOrder = _step7$value[1];
+              _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 = 49;
+                _context11.next = 46;
                 break;
               }
-              existingOrder = updatedList[matchIndex];
-              mergedOrder = this.mergeOrderRecords(existingOrder, pendingOrder);
+              mergedOrder = this.mergeOrderRecords(updatedList[matchIndex], pendingOrder, {
+                preferIncomingProducts: true
+              });
               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';
-              return _context11.abrupt("continue", 53);
-            case 49:
+              return _context11.abrupt("continue", 50);
+            case 46:
               insertIndex = updatedList.length;
               updatedList.push(pendingOrder);
               this.registerOrderIdentityKeys(identityKeyToIndex, pendingOrder, insertIndex);
               mergeActions[_storageKey] = 'insert';
-            case 53:
+            case 50:
               _context11.next = 37;
               break;
-            case 55:
-              _context11.next = 60;
+            case 52:
+              _context11.next = 57;
               break;
+            case 54:
+              _context11.prev = 54;
+              _context11.t1 = _context11["catch"](35);
+              _iterator6.e(_context11.t1);
             case 57:
               _context11.prev = 57;
-              _context11.t1 = _context11["catch"](35);
-              _iterator7.e(_context11.t1);
+              _iterator6.f();
+              return _context11.finish(57);
             case 60:
-              _context11.prev = 60;
-              _iterator7.f();
-              return _context11.finish(60);
-            case 63:
-              patchedOrders = _toConsumableArray(pendingMap.values()); // 增量索引已保证 store 去重不变量，无需再对全表做 O(n^2) 压缩；仅自检开关开启时兜底。
+              // 增量索引已保证 store 去重不变量，无需再对全表做 O(n^2) 压缩；仅自检开关开启时兜底。
               this.store.list = this.runOrderStoreSelfCheck(updatedList, 'upsertPendingSyncOrders.store');
               this.syncOrdersMap();
-              _context11.next = 68;
+              _context11.next = 64;
               return this.patchOrdersInSQLite(patchedOrders, 'upsertPendingSyncOrders', mergeActions);
-            case 68:
+            case 64:
               this.logInfo('upsertPendingSyncOrders-结束', {
                 count: patchedOrders.length,
                 storeOrderCountAfter: this.store.list.length
               });
-              _context11.next = 71;
+              _context11.next = 67;
               return this.emitOrdersChanged(patchedOrders, 'upsertPendingSyncOrders');
-            case 71:
+            case 67:
             case "end":
               return _context11.stop();
           }
-        }, _callee11, this, [[6, 20, 23, 26], [35, 57, 60, 63]]);
+        }, _callee11, this, [[6, 19, 22, 25], [35, 54, 57, 60]]);
       }));
       function upsertPendingSyncOrders(_x7) {
         return _upsertPendingSyncOrders.apply(this, arguments);
@@ -1310,19 +1192,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "syncOrdersMap",
     value: function syncOrdersMap() {
       this.store.map.clear();
-      var _iterator8 = _createForOfIteratorHelper(this.store.list),
-        _step8;
+      var _iterator7 = _createForOfIteratorHelper(this.store.list),
+        _step7;
       try {
-        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-          var order = _step8.value;
+        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+          var order = _step7.value;
           var primaryIdentity = this.getOrderMapKey(order);
           if (!primaryIdentity) continue;
           this.store.map.set(primaryIdentity, order);
         }
       } catch (err) {
-        _iterator8.e(err);
+        _iterator7.e(err);
       } finally {
-        _iterator8.f();
+        _iterator7.f();
       }
     }
   }, {
@@ -1346,7 +1228,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderIdentityEntries",
     value: function getOrderIdentityEntries(order) {
-      var _this11 = this;
+      var _this10 = this;
       if (!order) return [];
       var record = order;
       var candidates = [{
@@ -1364,9 +1246,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }];
       var entries = [];
       var _loop = function _loop() {
-          var candidate = _candidates[_i2];
-          if (_this11.isBlankIdentityValue(candidate.value)) return 0; // continue
-          var key = _this11.getIdKey(candidate.value);
+          var candidate = _candidates[_i];
+          if (_this10.isBlankIdentityValue(candidate.value)) return 0; // continue
+          var key = _this10.getIdKey(candidate.value);
           if (entries.some(function (entry) {
             return entry.field === candidate.field && entry.key === key;
           })) return 0; // continue
@@ -1376,7 +1258,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           });
         },
         _ret;
-      for (var _i2 = 0, _candidates = candidates; _i2 < _candidates.length; _i2++) {
+      for (var _i = 0, _candidates = candidates; _i < _candidates.length; _i++) {
         _ret = _loop();
         if (_ret === 0) continue;
       }
@@ -1386,17 +1268,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "getOrderIdentityKeys",
     value: function getOrderIdentityKeys(order) {
       var keys = [];
-      var _iterator9 = _createForOfIteratorHelper(this.getOrderIdentityEntries(order)),
-        _step9;
+      var _iterator8 = _createForOfIteratorHelper(this.getOrderIdentityEntries(order)),
+        _step8;
       try {
-        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-          var entry = _step9.value;
+        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+          var entry = _step8.value;
           if (!keys.includes(entry.key)) keys.push(entry.key);
         }
       } catch (err) {
-        _iterator9.e(err);
+        _iterator8.e(err);
       } finally {
-        _iterator9.f();
+        _iterator8.f();
       }
       return keys;
     }
@@ -1405,8 +1287,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     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 _i3 = 0, _candidates2 = candidates; _i3 < _candidates2.length; _i3++) {
-        var v = _candidates2[_i3];
+      for (var _i2 = 0, _candidates2 = candidates; _i2 < _candidates2.length; _i2++) {
+        var v = _candidates2[_i2];
         if (!v) continue;
         var text = String(v);
         if (!text) continue;
@@ -1433,7 +1315,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setupOrderSync",
     value: function setupOrderSync() {
-      var _this12 = this;
+      var _this11 = this;
       if (!this.orderDataSource) return;
       this.orderDataSource.run({
         pubsub: {
@@ -1441,22 +1323,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 = _this12.normalizeOrderSyncMessage(res);
+            var message = _this11.normalizeOrderSyncMessage(res);
             if (!message) return;
             message._pubsubReceivedAt = pubsubReceivedAt;
-            _this12.pendingSyncMessages.push(message);
-            var throttleMs = _this12.getOrderSyncThrottleMs();
-            var routeInfo = _this12.resolveSyncMessageRoute(message);
-            _this12.logInfo('orderSync-收到消息并入队', {
+            _this11.pendingSyncMessages.push(message);
+            var throttleMs = _this11.getOrderSyncThrottleMs();
+            var routeInfo = _this11.resolveSyncMessageRoute(message);
+            _this11.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: _this12.pendingSyncMessages.length,
+              pendingCount: _this11.pendingSyncMessages.length,
               throttleMs: throttleMs,
               pubsubReceivedAt: new Date(pubsubReceivedAt).toISOString(),
               fullMessage: JSON.stringify(message)
             });
-            _this12.scheduleOrderSyncThrottle();
+            _this11.scheduleOrderSyncThrottle();
           }
         }
       }).catch(function () {
@@ -1473,7 +1355,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "scheduleOrderSyncThrottle",
     value: function scheduleOrderSyncThrottle() {
-      var _this13 = this;
+      var _this12 = this;
       if (this.isProcessingSyncBatch) return;
       if (this.isIdlePhase) {
         this.isIdlePhase = false;
@@ -1484,8 +1366,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (this.syncTimer) return;
       var throttleMs = this.getOrderSyncThrottleMs();
       this.syncTimer = setTimeout(function () {
-        _this13.syncTimer = undefined;
-        void _this13.flushOrderSyncMessagesByThrottle();
+        _this12.syncTimer = undefined;
+        void _this12.flushOrderSyncMessagesByThrottle();
       }, throttleMs);
     }
 
@@ -1553,7 +1435,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "processOrderSyncMessages",
     value: (function () {
       var _processOrderSyncMessages = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
-        var _this14 = this;
+        var _this13 = 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) {
@@ -1580,13 +1462,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               upsertOrders = new Map();
               refreshIds = [];
               messages.forEach(function (msg, msgIndex) {
-                var routeInfo = _this14.resolveSyncMessageRoute(msg);
+                var routeInfo = _this13.resolveSyncMessageRoute(msg);
                 var hasBatchIds = routeInfo.hasBatchIds;
                 var singleId = routeInfo.singleId;
                 var hasSingleId = routeInfo.hasSingleId;
-                var normalizedBody = _this14.normalizeOrderSyncPayload(msg.body || msg.data);
+                var normalizedBody = _this13.normalizeOrderSyncPayload(msg.body || msg.data);
                 if (routeInfo.route === 'bodyUpsert' && normalizedBody) {
-                  upsertOrders.set(_this14.getIdKey(normalizedBody.order_id), normalizedBody);
+                  upsertOrders.set(_this13.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));
@@ -1724,8 +1606,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "mergeOrdersToStore",
     value: (function () {
       var _mergeOrdersToStore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(freshOrders, source) {
-        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;
+        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;
         return _regeneratorRuntime().wrap(function _callee16$(_context16) {
           while (1) switch (_context16.prev = _context16.next) {
             case 0:
@@ -1737,15 +1618,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
               this.logDuplicateOrders("".concat(source, ".beforeMerge"), this.store.list);
               normalizedFreshOrders = [];
-              _iterator10 = _createForOfIteratorHelper(freshOrders);
+              _iterator9 = _createForOfIteratorHelper(freshOrders);
               _context16.prev = 5;
-              _iterator10.s();
+              _iterator9.s();
             case 7:
-              if ((_step10 = _iterator10.n()).done) {
+              if ((_step9 = _iterator9.n()).done) {
                 _context16.next = 15;
                 break;
               }
-              order = _step10.value;
+              order = _step9.value;
               id = order === null || order === void 0 ? void 0 : order.order_id;
               if (!(id === undefined || id === null)) {
                 _context16.next = 12;
@@ -1763,10 +1644,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 17:
               _context16.prev = 17;
               _context16.t0 = _context16["catch"](5);
-              _iterator10.e(_context16.t0);
+              _iterator9.e(_context16.t0);
             case 20:
               _context16.prev = 20;
-              _iterator10.f();
+              _iterator9.f();
               return _context16.finish(20);
             case 23:
               // 先对本批新单做去重（批内规模 m 很小），保证每条 fresh 身份唯一
@@ -1774,36 +1655,34 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               uniqueFreshCount = uniqueFreshOrders.length;
               patchedOrders = [];
               mergeActions = {};
-              updatedList = this.store.list.map(function (order) {
-                return _this15.normalizeOrderForMemoryList(order, "".concat(source, ".existingMemory"));
-              }); // 基于身份键（field:value）建立索引，把「查找已存在订单」从 O(n) 线性扫描降为 O(1)，
+              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]);
-                _iterator11 = _createForOfIteratorHelper(identityKeys);
+                _iterator10 = _createForOfIteratorHelper(identityKeys);
                 try {
-                  for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
-                    key = _step11.value;
+                  for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+                    key = _step10.value;
                     // 同一 key 命中多张时保留最靠前的下标，与原 findIndex「取首个匹配」一致
                     if (!identityKeyToIndex.has(key)) identityKeyToIndex.set(key, index);
                   }
                 } catch (err) {
-                  _iterator11.e(err);
+                  _iterator10.e(err);
                 } finally {
-                  _iterator11.f();
+                  _iterator10.f();
                 }
               }
-              _iterator12 = _createForOfIteratorHelper(uniqueFreshOrders);
+              _iterator11 = _createForOfIteratorHelper(uniqueFreshOrders);
               _context16.prev = 31;
-              _iterator12.s();
+              _iterator11.s();
             case 33:
-              if ((_step12 = _iterator12.n()).done) {
+              if ((_step11 = _iterator11.n()).done) {
                 _context16.next = 57;
                 break;
               }
-              fresh = _step12.value;
+              fresh = _step11.value;
               freshIdentityKeys = this.getOrderIdentityMatchKeys(fresh);
               matchIndex = this.lookupOrderIndexByIdentityKeys(identityKeyToIndex, freshIdentityKeys);
               storageKey = this.getOrderStorageKey(fresh);
@@ -1820,7 +1699,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               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,
+                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,
@@ -1852,10 +1731,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 59:
               _context16.prev = 59;
               _context16.t1 = _context16["catch"](31);
-              _iterator12.e(_context16.t1);
+              _iterator11.e(_context16.t1);
             case 62:
               _context16.prev = 62;
-              _iterator12.f();
+              _iterator11.f();
               return _context16.finish(62);
             case 65:
               insertCount = Object.values(mergeActions).filter(function (v) {
@@ -1907,19 +1786,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "lookupOrderIndexByIdentityKeys",
     value: function lookupOrderIndexByIdentityKeys(identityKeyToIndex, identityKeys) {
       var matchIndex = -1;
-      var _iterator13 = _createForOfIteratorHelper(identityKeys),
-        _step13;
+      var _iterator12 = _createForOfIteratorHelper(identityKeys),
+        _step12;
       try {
-        for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
-          var key = _step13.value;
+        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) {
-        _iterator13.e(err);
+        _iterator12.e(err);
       } finally {
-        _iterator13.f();
+        _iterator12.f();
       }
       return matchIndex;
     }
@@ -1940,17 +1819,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "registerOrderIdentityKeys",
     value: function registerOrderIdentityKeys(identityKeyToIndex, order, index) {
       var identityKeys = this.getOrderIdentityMatchKeys(order);
-      var _iterator14 = _createForOfIteratorHelper(identityKeys),
-        _step14;
+      var _iterator13 = _createForOfIteratorHelper(identityKeys),
+        _step13;
       try {
-        for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
-          var key = _step14.value;
+        for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
+          var key = _step13.value;
           identityKeyToIndex.set(key, index);
         }
       } catch (err) {
-        _iterator14.e(err);
+        _iterator13.e(err);
       } finally {
-        _iterator14.f();
+        _iterator13.f();
       }
     }
 
@@ -2005,17 +1884,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "uniqueOrderIds",
     value: function uniqueOrderIds(ids) {
       var idMap = new Map();
-      var _iterator15 = _createForOfIteratorHelper(ids),
-        _step15;
+      var _iterator14 = _createForOfIteratorHelper(ids),
+        _step14;
       try {
-        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
-          var id = _step15.value;
+        for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+          var id = _step14.value;
           idMap.set(this.getIdKey(id), id);
         }
       } catch (err) {
-        _iterator15.e(err);
+        _iterator14.e(err);
       } finally {
-        _iterator15.f();
+        _iterator14.f();
       }
       return _toConsumableArray(idMap.values());
     }
@@ -2027,12 +1906,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "isOrderLookupMatch",
     value: function isOrderLookupMatch(order, lookupKey) {
-      var _this16 = this;
+      var _this14 = 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 _this16.getIdKey(value) === lookupKey;
+        return _this14.getIdKey(value) === lookupKey;
       });
     }
 
@@ -2075,10 +1954,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "findOrderIndexByIdentity",
     value: function findOrderIndexByIdentity(orders, target) {
-      var _this17 = this;
+      var _this15 = this;
       if (this.getOrderIdentityMatchKeys(target).length === 0) return -1;
       return orders.findIndex(function (order) {
-        return _this17.doOrdersShareIdentity(order, target);
+        return _this15.doOrdersShareIdentity(order, target);
       });
     }
   }, {
@@ -2102,22 +1981,153 @@ 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 _iterator15 = _createForOfIteratorHelper(preferredList),
+        _step15;
+      try {
+        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+          var item = _step15.value;
+          var keys = this.getProductIdentityKeys(item);
+          var _iterator17 = _createForOfIteratorHelper(keys),
+            _step17;
+          try {
+            for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
+              var key = _step17.value;
+              seenKeys.add(key);
+            }
+          } catch (err) {
+            _iterator17.e(err);
+          } finally {
+            _iterator17.f();
+          }
+        }
+      } catch (err) {
+        _iterator15.e(err);
+      } finally {
+        _iterator15.f();
+      }
+      var result = _toConsumableArray(preferredList);
+      var _iterator16 = _createForOfIteratorHelper(secondaryList),
+        _step16;
+      try {
+        for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
+          var _item = _step16.value;
+          var _keys = this.getProductIdentityKeys(_item);
+          if (_keys.length === 0 || _keys.some(function (key) {
+            return seenKeys.has(key);
+          })) continue;
+          var _iterator18 = _createForOfIteratorHelper(_keys),
+            _step18;
+          try {
+            for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
+              var _key = _step18.value;
+              seenKeys.add(_key);
+            }
+          } catch (err) {
+            _iterator18.e(err);
+          } finally {
+            _iterator18.f();
+          }
+          result.push(cloneDeep(_item));
+        }
+      } catch (err) {
+        _iterator16.e(err);
+      } finally {
+        _iterator16.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 _this16 = 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;
+      try {
+        for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
+          var payment = _step19.value;
+          var key = this.getPaymentMergeKey(payment);
+          if (!key) continue;
+          existingByKey.set(key, payment);
+        }
+      } catch (err) {
+        _iterator19.e(err);
+      } finally {
+        _iterator19.f();
+      }
+      return incomingList.map(function (payment) {
+        var incomingPayment = payment;
+        var key = _this16.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) {
+    value: function mergeOrderRecords(existing, incoming, options) {
       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', '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', 'products', 'bookings', '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 childUidRemaps = [];
-      for (var _i4 = 0, _fieldsToPreserve = fieldsToPreserve; _i4 < _fieldsToPreserve.length; _i4++) {
-        var field = _fieldsToPreserve[_i4];
+      var previousRecord = preferred === incoming ? secondaryRecord : preferredRecord;
+      for (var _i3 = 0, _fieldsToPreserve = fieldsToPreserve; _i3 < _fieldsToPreserve.length; _i3++) {
+        var field = _fieldsToPreserve[_i3];
         if (!this.isBlankIdentityValue(preferredRecord[field])) {
           mergedRecord[field] = preferredRecord[field];
           continue;
@@ -2126,61 +2136,56 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           mergedRecord[field] = secondaryRecord[field];
         }
       }
-      for (var _i5 = 0, _incomingPatchFields = incomingPatchFields; _i5 < _incomingPatchFields.length; _i5++) {
-        var _field = _incomingPatchFields[_i5];
+      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];
         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]);
       }
-
-      // 子项数组遵循完整快照语义：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];
+      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);
         }
       }
       if (!this.isPendingSyncOrder(preferred) || !this.isPendingSyncOrder(secondary)) {
         merged.need_sync = 0;
       }
-      return this.normalizeOrderCollectionsForIngress(applyOrderCollectionUidRemaps(merged, childUidRemaps), 'mergeOrderRecords');
+      return merged;
     }
   }, {
     key: "summarizeDuplicateOrders",
     value: function summarizeDuplicateOrders(orders) {
       var groups = new Map();
-      var _iterator16 = _createForOfIteratorHelper(orders),
-        _step16;
+      var _iterator20 = _createForOfIteratorHelper(orders),
+        _step20;
       try {
-        for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
-          var order = _step16.value;
-          var _iterator17 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(order)),
-            _step17;
+        for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
+          var order = _step20.value;
+          var _iterator21 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(order)),
+            _step21;
           try {
-            for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
-              var key = _step17.value;
+            for (_iterator21.s(); !(_step21 = _iterator21.n()).done;) {
+              var key = _step21.value;
               var group = groups.get(key) || [];
               group.push(order);
               groups.set(key, group);
             }
           } catch (err) {
-            _iterator17.e(err);
+            _iterator21.e(err);
           } finally {
-            _iterator17.f();
+            _iterator21.f();
           }
         }
       } catch (err) {
-        _iterator16.e(err);
+        _iterator20.e(err);
       } finally {
-        _iterator16.f();
+        _iterator20.f();
       }
       return _toConsumableArray(groups.entries()).filter(function (_ref4) {
         var _ref5 = _slicedToArray(_ref4, 2),
@@ -2194,10 +2199,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           key: key,
           count: group.length,
           orders: group.map(function (order) {
-            var _order$order_id3, _external_sale_number3, _shop_order_number, _shop_full_order_numb, _order$need_sync;
+            var _order$order_id2, _external_sale_number2, _shop_order_number, _shop_full_order_numb, _order$need_sync;
             return {
-              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,
+              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,
               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
@@ -2222,24 +2227,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function compactOrderListByIdentity(orders, source) {
       var list = [];
       var removedCount = 0;
-      var _iterator18 = _createForOfIteratorHelper(orders),
-        _step18;
+      var _iterator22 = _createForOfIteratorHelper(orders),
+        _step22;
       try {
-        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);
+        for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
+          var order = _step22.value;
+          var matchIndex = this.findOrderIndexByIdentity(list, order);
           if (matchIndex < 0) {
-            list.push(normalizedOrder);
+            list.push(order);
             continue;
           }
-          list[matchIndex] = this.mergeOrderRecords(list[matchIndex], normalizedOrder);
+          list[matchIndex] = this.mergeOrderRecords(list[matchIndex], order);
           removedCount += 1;
         }
       } catch (err) {
-        _iterator18.e(err);
+        _iterator22.e(err);
       } finally {
-        _iterator18.f();
+        _iterator22.f();
       }
       if (removedCount > 0) {
         this.logWarning('订单列表重复项已压缩', {
@@ -2338,7 +2342,6 @@ 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) {
@@ -2354,9 +2357,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               return this.dbManager.getAll(INDEXDB_STORE_NAME);
             case 5:
               orders = _context17.sent;
-              return _context17.abrupt("return", (orders || []).map(function (order) {
-                return _this18.normalizeOrderCollectionsForIngress(order, 'loadOrdersFromSQLite');
-              }));
+              return _context17.abrupt("return", orders || []);
             case 9:
               _context17.prev = 9;
               _context17.t0 = _context17["catch"](2);
@@ -2380,25 +2381,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeRemoteSyncedOrder",
     value: function normalizeRemoteSyncedOrder(order) {
-      var normalizedOrder = this.normalizeOrderCollectionsForIngress(order, 'normalizeRemoteSyncedOrder');
-      if (this.isPendingSyncOrder(normalizedOrder)) return normalizedOrder;
-      return _objectSpread(_objectSpread({}, normalizedOrder), {}, {
+      if (this.isPendingSyncOrder(order)) return order;
+      return _objectSpread(_objectSpread({}, order), {}, {
         need_sync: 0
       });
     }
   }, {
     key: "mergeRemoteSnapshotWithPendingOrders",
     value: function mergeRemoteSnapshotWithPendingOrders(remoteOrders, existingOrders) {
-      var _this19 = this;
+      var _this17 = this;
       var merged = remoteOrders.map(function (order) {
-        return _this19.normalizeRemoteSyncedOrder(order);
+        return _this17.normalizeRemoteSyncedOrder(order);
       });
-      var _iterator19 = _createForOfIteratorHelper(existingOrders),
-        _step19;
+      var _iterator23 = _createForOfIteratorHelper(existingOrders),
+        _step23;
       try {
-        for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
-          var rawOrder = _step19.value;
-          var order = this.normalizeOrderCollectionsForIngress(rawOrder, 'mergeRemoteSnapshotWithPendingOrders.existingSQLite');
+        for (_iterator23.s(); !(_step23 = _iterator23.n()).done;) {
+          var order = _step23.value;
           if (!this.isPendingSyncOrder(order)) continue;
           var matchIndex = this.findOrderIndexByIdentity(merged, order);
           if (matchIndex >= 0) {
@@ -2409,9 +2408,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           merged.push(order);
         }
       } catch (err) {
-        _iterator19.e(err);
+        _iterator23.e(err);
       } finally {
-        _iterator19.f();
+        _iterator23.f();
       }
       return this.compactOrderListByIdentity(merged, 'mergeRemoteSnapshotWithPendingOrders').list;
     }
@@ -2461,7 +2460,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "patchOrdersInSQLite",
     value: (function () {
       var _patchOrdersInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(orders, source) {
-        var _this20 = this;
+        var _this18 = this;
         var mergeActions,
           ordersSnapshot,
           _this$filterRedundant2,
@@ -2479,10 +2478,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               return _context20.abrupt("return");
             case 3:
-              ordersSnapshot = cloneDeep(orders).map(function (order) {
-                return _this20.normalizeOrderCollectionsForIngress(order, "".concat(source, ".sqliteIngress"));
-              }).filter(function (order) {
-                return _this20.getOrderStorageKey(order);
+              ordersSnapshot = cloneDeep(orders).filter(function (order) {
+                return _this18.getOrderStorageKey(order);
               });
               if (!(ordersSnapshot.length === 0)) {
                 _context20.next = 6;
@@ -2507,54 +2504,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, _iterator20, _step20, order;
+                var writeMethod, _iterator24, _step24, order;
                 return _regeneratorRuntime().wrap(function _callee19$(_context19) {
                   while (1) switch (_context19.prev = _context19.next) {
                     case 0:
                       writeMethod = 'none';
-                      _this20.logInfo('patchOrdersInSQLite-开始', {
+                      _this18.logInfo('patchOrdersInSQLite-开始', {
                         source: source,
                         count: compactedToWrite.length,
                         dedupedCount: skipped.length
                       });
-                      if (!(typeof _this20.dbManager.bulkUpdate === 'function')) {
+                      if (!(typeof _this18.dbManager.bulkUpdate === 'function')) {
                         _context19.next = 8;
                         break;
                       }
                       writeMethod = 'bulkUpdate';
                       _context19.next = 6;
-                      return _this20.dbManager.bulkUpdate(INDEXDB_STORE_NAME, compactedToWrite);
+                      return _this18.dbManager.bulkUpdate(INDEXDB_STORE_NAME, compactedToWrite);
                     case 6:
                       _context19.next = 33;
                       break;
                     case 8:
-                      if (!(typeof _this20.dbManager.bulkAdd === 'function')) {
+                      if (!(typeof _this18.dbManager.bulkAdd === 'function')) {
                         _context19.next = 14;
                         break;
                       }
                       writeMethod = 'bulkAdd';
                       _context19.next = 12;
-                      return _this20.dbManager.bulkAdd(INDEXDB_STORE_NAME, compactedToWrite);
+                      return _this18.dbManager.bulkAdd(INDEXDB_STORE_NAME, compactedToWrite);
                     case 12:
                       _context19.next = 33;
                       break;
                     case 14:
-                      if (!(typeof _this20.dbManager.update === 'function')) {
+                      if (!(typeof _this18.dbManager.update === 'function')) {
                         _context19.next = 33;
                         break;
                       }
                       writeMethod = 'update';
-                      _iterator20 = _createForOfIteratorHelper(compactedToWrite);
+                      _iterator24 = _createForOfIteratorHelper(compactedToWrite);
                       _context19.prev = 17;
-                      _iterator20.s();
+                      _iterator24.s();
                     case 19:
-                      if ((_step20 = _iterator20.n()).done) {
+                      if ((_step24 = _iterator24.n()).done) {
                         _context19.next = 25;
                         break;
                       }
-                      order = _step20.value;
+                      order = _step24.value;
                       _context19.next = 23;
-                      return _this20.dbManager.update(INDEXDB_STORE_NAME, order);
+                      return _this18.dbManager.update(INDEXDB_STORE_NAME, order);
                     case 23:
                       _context19.next = 19;
                       break;
@@ -2564,14 +2561,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                     case 27:
                       _context19.prev = 27;
                       _context19.t0 = _context19["catch"](17);
-                      _iterator20.e(_context19.t0);
+                      _iterator24.e(_context19.t0);
                     case 30:
                       _context19.prev = 30;
-                      _iterator20.f();
+                      _iterator24.f();
                       return _context19.finish(30);
                     case 33:
-                      _this20.recordRecentSqliteWrite(source, compactedToWrite);
-                      _this20.logInfo('patchOrdersInSQLite-完成', {
+                      _this18.recordRecentSqliteWrite(source, compactedToWrite);
+                      _this18.logInfo('patchOrdersInSQLite-完成', {
                         source: source,
                         count: compactedToWrite.length,
                         writeMethod: writeMethod,
@@ -2615,7 +2612,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "updateOrderInSQLite",
     value: (function () {
       var _updateOrderInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(order, source) {
-        var _this21 = this;
+        var _this19 = this;
         var orderSnapshot, _orderSnapshot$order_3;
         return _regeneratorRuntime().wrap(function _callee22$(_context22) {
           while (1) switch (_context22.prev = _context22.next) {
@@ -2626,7 +2623,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               return _context22.abrupt("return");
             case 2:
-              orderSnapshot = this.normalizeOrderCollectionsForIngress(cloneDeep(order), "".concat(source, ".sqliteIngress"));
+              orderSnapshot = cloneDeep(order);
               _context22.prev = 3;
               _context22.next = 6;
               return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
@@ -2636,43 +2633,43 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   while (1) switch (_context21.prev = _context21.next) {
                     case 0:
                       writeMethod = 'none';
-                      _this21.logInfo('updateOrderInSQLite-开始', {
+                      _this19.logInfo('updateOrderInSQLite-开始', {
                         source: source,
                         orderId: (_orderSnapshot$order_ = orderSnapshot.order_id) !== null && _orderSnapshot$order_ !== void 0 ? _orderSnapshot$order_ : null,
-                        storageKey: _this21.getOrderStorageKey(orderSnapshot)
+                        storageKey: _this19.getOrderStorageKey(orderSnapshot)
                       });
-                      if (!(typeof _this21.dbManager.update === 'function')) {
+                      if (!(typeof _this19.dbManager.update === 'function')) {
                         _context21.next = 8;
                         break;
                       }
                       writeMethod = 'update';
                       _context21.next = 6;
-                      return _this21.dbManager.update(INDEXDB_STORE_NAME, orderSnapshot);
+                      return _this19.dbManager.update(INDEXDB_STORE_NAME, orderSnapshot);
                     case 6:
                       _context21.next = 18;
                       break;
                     case 8:
-                      if (!(typeof _this21.dbManager.bulkUpdate === 'function')) {
+                      if (!(typeof _this19.dbManager.bulkUpdate === 'function')) {
                         _context21.next = 14;
                         break;
                       }
                       writeMethod = 'bulkUpdate';
                       _context21.next = 12;
-                      return _this21.dbManager.bulkUpdate(INDEXDB_STORE_NAME, [orderSnapshot]);
+                      return _this19.dbManager.bulkUpdate(INDEXDB_STORE_NAME, [orderSnapshot]);
                     case 12:
                       _context21.next = 18;
                       break;
                     case 14:
-                      if (!(typeof _this21.dbManager.bulkAdd === 'function')) {
+                      if (!(typeof _this19.dbManager.bulkAdd === 'function')) {
                         _context21.next = 18;
                         break;
                       }
                       writeMethod = 'bulkAdd';
                       _context21.next = 18;
-                      return _this21.dbManager.bulkAdd(INDEXDB_STORE_NAME, [orderSnapshot]);
+                      return _this19.dbManager.bulkAdd(INDEXDB_STORE_NAME, [orderSnapshot]);
                     case 18:
-                      _this21.recordRecentSqliteWrite(source, [orderSnapshot]);
-                      _this21.logInfo('updateOrderInSQLite-完成', {
+                      _this19.recordRecentSqliteWrite(source, [orderSnapshot]);
+                      _this19.logInfo('updateOrderInSQLite-完成', {
                         source: source,
                         orderId: (_orderSnapshot$order_2 = orderSnapshot.order_id) !== null && _orderSnapshot$order_2 !== void 0 ? _orderSnapshot$order_2 : null,
                         writeMethod: writeMethod
@@ -2715,7 +2712,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "replaceOrdersSnapshotInSQLite",
     value: (function () {
       var _replaceOrdersSnapshotInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(orderList, source) {
-        var _this22 = this;
+        var _this20 = this;
         var remoteSnapshot, mergedSnapshot;
         return _regeneratorRuntime().wrap(function _callee24$(_context24) {
           while (1) switch (_context24.prev = _context24.next) {
@@ -2725,14 +2722,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 break;
               }
               return _context24.abrupt("return", this.compactOrderListByIdentity(orderList.map(function (order) {
-                return _this22.normalizeRemoteSyncedOrder(order);
+                return _this20.normalizeRemoteSyncedOrder(order);
               }), "".concat(source, ".snapshotNoDb")).list);
             case 2:
-              remoteSnapshot = cloneDeep(orderList).map(function (order) {
-                return _this22.normalizeOrderCollectionsForIngress(order, "".concat(source, ".remoteIngress"));
-              });
+              remoteSnapshot = cloneDeep(orderList);
               mergedSnapshot = this.compactOrderListByIdentity(remoteSnapshot.map(function (order) {
-                return _this22.normalizeRemoteSyncedOrder(order);
+                return _this20.normalizeRemoteSyncedOrder(order);
               }), "".concat(source, ".remoteSnapshot")).list;
               _context24.prev = 4;
               _context24.next = 7;
@@ -2741,12 +2736,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 return _regeneratorRuntime().wrap(function _callee23$(_context23) {
                   while (1) switch (_context23.prev = _context23.next) {
                     case 0:
-                      if (!(typeof _this22.dbManager.getAll === 'function')) {
+                      if (!(typeof _this20.dbManager.getAll === 'function')) {
                         _context23.next = 6;
                         break;
                       }
                       _context23.next = 3;
-                      return _this22.dbManager.getAll(INDEXDB_STORE_NAME);
+                      return _this20.dbManager.getAll(INDEXDB_STORE_NAME);
                     case 3:
                       _context23.t0 = _context23.sent;
                       _context23.next = 7;
@@ -2755,18 +2750,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       _context23.t0 = [];
                     case 7:
                       existingOrders = _context23.t0;
-                      orderListSnapshot = _this22.mergeRemoteSnapshotWithPendingOrders(remoteSnapshot, existingOrders || []);
-                      mergedSnapshot = _this22.compactOrderListByIdentity(orderListSnapshot, "".concat(source, ".sqliteSnapshot")).list;
-                      _this22.logInfo('replaceOrdersSnapshotInSQLite-开始', {
+                      orderListSnapshot = _this20.mergeRemoteSnapshotWithPendingOrders(remoteSnapshot, existingOrders || []);
+                      mergedSnapshot = _this20.compactOrderListByIdentity(orderListSnapshot, "".concat(source, ".sqliteSnapshot")).list;
+                      _this20.logInfo('replaceOrdersSnapshotInSQLite-开始', {
                         source: source,
                         count: mergedSnapshot.length,
                         remoteCount: remoteSnapshot.length,
                         preservedPendingCount: mergedSnapshot.length - remoteSnapshot.length
                       });
                       _context23.next = 13;
-                      return _this22.dbManager.clear(INDEXDB_STORE_NAME);
+                      return _this20.dbManager.clear(INDEXDB_STORE_NAME);
                     case 13:
-                      _this22.logInfo('replaceOrdersSnapshotInSQLite-clear完成', {
+                      _this20.logInfo('replaceOrdersSnapshotInSQLite-clear完成', {
                         count: mergedSnapshot.length
                       });
                       if (!(mergedSnapshot.length === 0)) {
@@ -2776,10 +2771,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       return _context23.abrupt("return");
                     case 16:
                       _context23.next = 18;
-                      return _this22.dbManager.bulkAdd(INDEXDB_STORE_NAME, mergedSnapshot);
+                      return _this20.dbManager.bulkAdd(INDEXDB_STORE_NAME, mergedSnapshot);
                     case 18:
-                      _this22.recordRecentSqliteWrite(source, mergedSnapshot);
-                      _this22.logInfo('replaceOrdersSnapshotInSQLite-bulkAdd完成', {
+                      _this20.recordRecentSqliteWrite(source, mergedSnapshot);
+                      _this20.logInfo('replaceOrdersSnapshotInSQLite-bulkAdd完成', {
                         source: source,
                         count: mergedSnapshot.length
                       });
@@ -2823,7 +2818,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "clear",
     value: (function () {
       var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26() {
-        var _this23 = this;
+        var _this21 = this;
         return _regeneratorRuntime().wrap(function _callee26$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
             case 0:
@@ -2839,7 +2834,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   while (1) switch (_context25.prev = _context25.next) {
                     case 0:
                       _context25.next = 2;
-                      return _this23.dbManager.clear(INDEXDB_STORE_NAME);
+                      return _this21.dbManager.clear(INDEXDB_STORE_NAME);
                     case 2:
                     case "end":
                       return _context25.stop();