@pisell/pisellos 2.2.314 → 2.2.316

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

@@ -30,7 +30,8 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { cloneDeep } from 'lodash-es';
+import { cloneDeep, isEqual } from 'lodash-es';
+import { isLocalFinalizedPayment, LOCAL_EFTPOS_FINALIZED, LOCAL_EFTPOS_REFRESH_REQUIRED, requiresLocalPaymentRefresh } from "../../../modules/Order/localEftposState";
 import dayjs from 'dayjs';
 import { BaseModule } from "../../../modules/BaseModule";
 import { applyOrderCollectionUidRemaps, getOrderCollectionPersistentId, getOrderCollectionReferenceUid, getOrderCollectionUid, isSameOrderCollectionItem, mergeOrderCollectionItems, normalizeOrderCollections } from "../../../modules/Order/utils/orderCollectionIdentity";
@@ -387,9 +388,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
       var kind = ORDER_COLLECTION_KIND_BY_FIELD[field];
       var existingItems = Array.isArray(existing) ? existing : [];
-      if (field === 'payments' && options.preserveIdentifiedPendingPayments) {
+      if (field === 'payments' && (options.preserveIdentifiedPendingPayments || existingItems.some(isLocalFinalizedPayment))) {
         return mergeOrderPaymentListsByIdentity(existingItems, incoming, {
-          preserveUnmatchedExistingWhen: isIdentifiedPendingOrderPayment
+          preserveUnmatchedExistingWhen: function preserveUnmatchedExistingWhen(payment) {
+            return options.preserveIdentifiedPendingPayments === true && isIdentifiedPendingOrderPayment(payment) || isLocalFinalizedPayment(payment);
+          }
         });
       }
       return incoming.map(function (incomingItem) {
@@ -429,6 +432,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var existingRecord = existing;
       var incomingRecord = incoming;
       var uidRemaps = [];
+      this.applyHolderRelationsSnapshot(reconciled, existing, incoming);
       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;
@@ -537,7 +541,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             continue;
           }
 
-          // 远端商品成员确实发生增删时必须落库，避免内存已更新但 SQLite 仍被回声窗口跳过。
+          // 远端商品成员或 Holder 关系确实变化时必须落库，避免被回声窗口跳过。
           if (forceWriteStorageKeys.has(storageKey)) {
             toWrite.push(order);
             continue;
@@ -888,11 +892,91 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       });
       return memoryOrder || null;
     }
+
+    /** Read-only payment gate lookup; never hydrate the whole order list on a miss. */
+  }, {
+    key: "getLocalOrderForPaymentReadiness",
+    value: (function () {
+      var _getLocalOrderForPaymentReadiness = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(lookup) {
+        var _this$dbManager,
+          _this4 = this;
+        var memoryOrder, key, fields, candidates, _i2, _fields, column, rows;
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
+            case 0:
+              if (!(lookup === undefined || lookup === null || lookup === '')) {
+                _context5.next = 2;
+                break;
+              }
+              return _context5.abrupt("return", null);
+            case 2:
+              memoryOrder = this.getLocalOrderFromMemoryByLookup(lookup);
+              if (!memoryOrder) {
+                _context5.next = 5;
+                break;
+              }
+              return _context5.abrupt("return", memoryOrder);
+            case 5:
+              if (!(typeof ((_this$dbManager = this.dbManager) === null || _this$dbManager === void 0 ? void 0 : _this$dbManager.find) !== 'function')) {
+                _context5.next = 7;
+                break;
+              }
+              return _context5.abrupt("return", this.getLocalOrderByLookup(lookup));
+            case 7:
+              key = this.getIdKey(lookup);
+              fields = ['order_id', 'external_sale_number', 'order_number', 'shop_order_number', 'shop_full_order_number'];
+              candidates = [];
+              _i2 = 0, _fields = fields;
+            case 11:
+              if (!(_i2 < _fields.length)) {
+                _context5.next = 20;
+                break;
+              }
+              column = _fields[_i2];
+              _context5.next = 15;
+              return this.dbManager.find(INDEXDB_STORE_NAME, {
+                filters: [{
+                  column: column,
+                  op: '=',
+                  value: key
+                }],
+                orderBy: [{
+                  column: '__order_storage_key',
+                  dir: 'asc'
+                }],
+                limit: 1
+              });
+            case 15:
+              rows = _context5.sent;
+              if (rows !== null && rows !== void 0 && rows[0] && this.isOrderLookupMatch(rows[0], key)) candidates.push(rows[0]);
+            case 17:
+              _i2++;
+              _context5.next = 11;
+              break;
+            case 20:
+              candidates.sort(function (left, right) {
+                var _order_storage_key, _order_storage_key2;
+                var leftKey = String((_order_storage_key = left.__order_storage_key) !== null && _order_storage_key !== void 0 ? _order_storage_key : _this4.getOrderStorageKey(left));
+                var rightKey = String((_order_storage_key2 = right.__order_storage_key) !== null && _order_storage_key2 !== void 0 ? _order_storage_key2 : _this4.getOrderStorageKey(right));
+                return leftKey < rightKey ? -1 : leftKey > rightKey ? 1 : 0;
+              });
+              return _context5.abrupt("return", candidates.length ? this.normalizeOrderForMemoryList(candidates[0], 'paymentReadiness.sqlite') : null);
+            case 22:
+            case "end":
+              return _context5.stop();
+          }
+        }, _callee5, this);
+      }));
+      function getLocalOrderForPaymentReadiness(_x4) {
+        return _getLocalOrderForPaymentReadiness.apply(this, arguments);
+      }
+      return getLocalOrderForPaymentReadiness;
+    }())
   }, {
     key: "getLocalOrderByLookup",
     value: function () {
-      var _getLocalOrderByLookup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(lookup) {
-        var _this4 = this;
+      var _getLocalOrderByLookup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(lookup) {
+        var _this5 = this;
         var options,
           key,
           logContext,
@@ -901,11 +985,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           orders,
           localOrder,
           normalizedOrder,
-          _args5 = arguments;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+          _args6 = arguments;
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              options = _args5.length > 1 && _args5[1] !== undefined ? _args5[1] : {};
+              options = _args6.length > 1 && _args6[1] !== undefined ? _args6[1] : {};
               key = this.getIdKey(lookup);
               logContext = {
                 operation_id: options.operationId,
@@ -917,38 +1001,38 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               memoryOrderById = this.store.map.get(key);
               if (!memoryOrderById) {
-                _context5.next = 8;
+                _context6.next = 8;
                 break;
               }
               if (options.operationId) {
                 this.logInfo('getLocalOrderByLookup-localPayment-命中内存映射', _objectSpread(_objectSpread({}, logContext), this.buildLocalPaymentOrderLogContext(memoryOrderById)));
               }
-              return _context5.abrupt("return", memoryOrderById);
+              return _context6.abrupt("return", memoryOrderById);
             case 8:
               memoryOrder = this.store.list.find(function (order) {
-                return _this4.isOrderLookupMatch(order, key);
+                return _this5.isOrderLookupMatch(order, key);
               });
               if (!memoryOrder) {
-                _context5.next = 12;
+                _context6.next = 12;
                 break;
               }
               if (options.operationId) {
                 this.logInfo('getLocalOrderByLookup-localPayment-命中内存列表', _objectSpread(_objectSpread({}, logContext), this.buildLocalPaymentOrderLogContext(memoryOrder)));
               }
-              return _context5.abrupt("return", memoryOrder);
+              return _context6.abrupt("return", memoryOrder);
             case 12:
               if (options.operationId) {
                 this.logInfo('getLocalOrderByLookup-localPayment-开始读取SQLite', logContext);
               }
-              _context5.next = 15;
+              _context6.next = 15;
               return this.loadOrdersFromSQLite();
             case 15:
-              orders = _context5.sent;
+              orders = _context6.sent;
               localOrder = orders.find(function (order) {
-                return _this4.isOrderLookupMatch(order, key);
+                return _this5.isOrderLookupMatch(order, key);
               });
               if (localOrder) {
-                _context5.next = 20;
+                _context6.next = 20;
                 break;
               }
               if (options.operationId) {
@@ -956,7 +1040,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   sqlite_order_count: orders.length
                 }));
               }
-              return _context5.abrupt("return", null);
+              return _context6.abrupt("return", null);
             case 20:
               this.store.list = this.normalizeOrdersForMemoryList(orders, 'getLocalOrderByLookup.sqliteMemory');
               this.syncOrdersMap();
@@ -966,14 +1050,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   sqlite_order_count: orders.length
                 }, this.buildLocalPaymentOrderLogContext(normalizedOrder)));
               }
-              return _context5.abrupt("return", normalizedOrder);
+              return _context6.abrupt("return", normalizedOrder);
             case 25:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
-        }, _callee5, this);
+        }, _callee6, this);
       }));
-      function getLocalOrderByLookup(_x4) {
+      function getLocalOrderByLookup(_x5) {
         return _getLocalOrderByLookup.apply(this, arguments);
       }
       return getLocalOrderByLookup;
@@ -981,10 +1065,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getLocalPayment",
     value: function () {
-      var _getLocalPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(params) {
+      var _getLocalPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(params) {
         var logContext, order, payments, match;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
               logContext = {
                 operation_id: params.operationId,
@@ -992,56 +1076,56 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 payment_number: params.paymentNumber
               };
               this.logInfo('getLocalPayment-开始', logContext);
-              _context6.prev = 2;
-              _context6.next = 5;
+              _context7.prev = 2;
+              _context7.next = 5;
               return this.getLocalOrderByLookup(params.saleId, {
                 operationId: params.operationId
               });
             case 5:
-              order = _context6.sent;
+              order = _context7.sent;
               if (order) {
-                _context6.next = 9;
+                _context7.next = 9;
                 break;
               }
               this.logWarning('getLocalPayment-订单未命中', logContext);
-              return _context6.abrupt("return", null);
+              return _context7.abrupt("return", null);
             case 9:
               payments = order.payments || [];
               match = resolveOrderPaymentIdentity(payments, params.paymentNumber, 'compat');
               if (match) {
-                _context6.next = 14;
+                _context7.next = 14;
                 break;
               }
               this.logWarning('getLocalPayment-支付项未命中', _objectSpread(_objectSpread(_objectSpread({}, logContext), this.buildLocalPaymentOrderLogContext(order)), {}, {
                 payments: payments
               }));
-              return _context6.abrupt("return", null);
+              return _context7.abrupt("return", null);
             case 14:
               this.logInfo('getLocalPayment-支付项命中', _objectSpread(_objectSpread(_objectSpread({}, logContext), this.buildLocalPaymentOrderLogContext(order)), {}, {
                 matched_by: match.matchedBy,
                 payment_index: match.index,
                 payment: match.payment
               }));
-              return _context6.abrupt("return", {
+              return _context7.abrupt("return", {
                 order: order,
                 payment: match.payment,
                 paymentIndex: match.index,
                 matchedBy: match.matchedBy
               });
             case 18:
-              _context6.prev = 18;
-              _context6.t0 = _context6["catch"](2);
+              _context7.prev = 18;
+              _context7.t0 = _context7["catch"](2);
               this.logError('getLocalPayment-查询失败', _objectSpread(_objectSpread({}, logContext), {}, {
-                error: _context6.t0 instanceof Error ? _context6.t0.message : String(_context6.t0)
+                error: _context7.t0 instanceof Error ? _context7.t0.message : String(_context7.t0)
               }));
-              throw _context6.t0;
+              throw _context7.t0;
             case 22:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
-        }, _callee6, this, [[2, 18]]);
+        }, _callee7, this, [[2, 18]]);
       }));
-      function getLocalPayment(_x5) {
+      function getLocalPayment(_x6) {
         return _getLocalPayment.apply(this, arguments);
       }
       return getLocalPayment;
@@ -1049,10 +1133,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateLocalPayment",
     value: function () {
-      var _updateLocalPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(params) {
+      var _updateLocalPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(params) {
+        var _found$payment$metada;
         var logContext, found, previousPayment, nextPayment, nextOrder, paymentContext, targetIndex, shouldKeepInMemory, previousList, storageOrder, _storageOrder$order_i, _storageOrder$order_i2, _storageOrder$order_i3;
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
               logContext = {
                 operation_id: params.operationId,
@@ -1061,18 +1146,30 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 incoming_payment_update: params.updates
               };
               this.logInfo('updateLocalPayment-开始', logContext);
-              _context7.next = 4;
+              _context8.next = 4;
               return this.getLocalPayment(params);
             case 4:
-              found = _context7.sent;
+              found = _context8.sent;
               if (found) {
-                _context7.next = 8;
+                _context8.next = 8;
                 break;
               }
               this.logWarning('updateLocalPayment-支付项未命中', logContext);
-              return _context7.abrupt("return", null);
+              return _context8.abrupt("return", null);
             case 8:
               previousPayment = cloneDeep(found.payment);
+              if (!(params.finalizeUnsuccessful && (found.payment.status === 'paid' || (_found$payment$metada = found.payment.metadata) !== null && _found$payment$metada !== void 0 && (_found$payment$metada = _found$payment$metada.transactions) !== null && _found$payment$metada !== void 0 && _found$payment$metada.some(function (transaction) {
+                return transaction.status === 'success';
+              }) || isLocalFinalizedPayment(found.payment)))) {
+                _context8.next = 11;
+                break;
+              }
+              return _context8.abrupt("return", {
+                order: found.order,
+                payment: found.payment,
+                previousPayment: previousPayment
+              });
+            case 11:
               nextPayment = mergeOrderPaymentRecord(found.payment, _objectSpread(_objectSpread({}, params.updates), {}, {
                 updated_at: params.updates.updated_at || dayjs().format('YYYY-MM-DD HH:mm:ss')
               }));
@@ -1082,6 +1179,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }),
                 updated_at: dayjs().format('YYYY-MM-DD HH:mm:ss')
               });
+              if (params.finalizeUnsuccessful && this.hasRealOrderId(found.order) && Number(found.order.need_sync || 0) === 0 && !(nextOrder.payments || []).some(isPendingOrderPayment)) {
+                nextOrder.is_draft_order = 0;
+                nextOrder.metadata = _objectSpread(_objectSpread({}, nextOrder.metadata), {}, _defineProperty({}, LOCAL_EFTPOS_REFRESH_REQUIRED, true));
+              }
               paymentContext = _objectSpread(_objectSpread(_objectSpread({}, logContext), {}, {
                 matched_by: found.matchedBy,
                 payment_index: found.paymentIndex
@@ -1093,12 +1194,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               targetIndex = this.findOrderIndexByIdentity(this.store.list, found.order);
               shouldKeepInMemory = this.shouldKeepOrderInMemory(nextOrder);
               if (!(targetIndex < 0 && shouldKeepInMemory)) {
-                _context7.next = 18;
+                _context8.next = 21;
                 break;
               }
               this.logError('updateLocalPayment-订单Store索引未命中', paymentContext);
-              return _context7.abrupt("return", null);
-            case 18:
+              return _context8.abrupt("return", null);
+            case 21:
               previousList = this.store.list;
               this.store.list = shouldKeepInMemory ? this.store.list.map(function (order, index) {
                 return index === targetIndex ? nextOrder : order;
@@ -1107,60 +1208,189 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
               this.syncOrdersMap();
               storageOrder = this.withoutSyntheticDraftOrderId(nextOrder);
-              _context7.prev = 22;
+              _context8.prev = 25;
               this.logInfo('updateLocalPayment-SQLite写入开始', _objectSpread(_objectSpread({}, paymentContext), {}, {
                 storage_order_id: (_storageOrder$order_i = storageOrder.order_id) !== null && _storageOrder$order_i !== void 0 ? _storageOrder$order_i : null
               }));
-              _context7.next = 26;
+              _context8.next = 29;
               return this.updateOrderInSQLite(storageOrder, 'updateLocalPayment', {
                 throwOnError: true
               });
-            case 26:
+            case 29:
               this.logInfo('updateLocalPayment-SQLite写入完成', _objectSpread(_objectSpread({}, paymentContext), {}, {
                 storage_order_id: (_storageOrder$order_i2 = storageOrder.order_id) !== null && _storageOrder$order_i2 !== void 0 ? _storageOrder$order_i2 : null
               }));
-              _context7.next = 35;
+              _context8.next = 38;
               break;
-            case 29:
-              _context7.prev = 29;
-              _context7.t0 = _context7["catch"](22);
+            case 32:
+              _context8.prev = 32;
+              _context8.t0 = _context8["catch"](25);
               this.store.list = previousList;
               this.syncOrdersMap();
               this.logError('updateLocalPayment-SQLite写入失败并回滚内存', _objectSpread(_objectSpread({}, paymentContext), {}, {
                 storage_order_id: (_storageOrder$order_i3 = storageOrder.order_id) !== null && _storageOrder$order_i3 !== void 0 ? _storageOrder$order_i3 : null,
-                error: _context7.t0 instanceof Error ? _context7.t0.message : String(_context7.t0)
+                error: _context8.t0 instanceof Error ? _context8.t0.message : String(_context8.t0)
               }));
-              throw _context7.t0;
-            case 35:
+              throw _context8.t0;
+            case 38:
               if (!(shouldKeepInMemory || targetIndex >= 0)) {
-                _context7.next = 38;
+                _context8.next = 41;
                 break;
               }
-              _context7.next = 38;
+              _context8.next = 41;
               return this.emitOrdersChanged(shouldKeepInMemory ? [nextOrder] : [], shouldKeepInMemory ? 'updateLocalPayment' : 'updateLocalPayment.sqliteOnlyDraft');
-            case 38:
+            case 41:
               this.logInfo('updateLocalPayment-变更事件完成', paymentContext);
-              return _context7.abrupt("return", {
+              return _context8.abrupt("return", {
                 order: nextOrder,
                 payment: nextPayment,
                 previousPayment: previousPayment
               });
-            case 40:
+            case 43:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
-        }, _callee7, this, [[22, 29]]);
+        }, _callee8, this, [[25, 32]]);
       }));
-      function updateLocalPayment(_x6) {
+      function updateLocalPayment(_x7) {
         return _updateLocalPayment.apply(this, arguments);
       }
       return updateLocalPayment;
     }()
+  }, {
+    key: "finalizeLocalEftposPayment",
+    value: function () {
+      var _finalizeLocalEftposPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(params) {
+        var _found$payment$metada2;
+        var found, transactions;
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
+            case 0:
+              _context9.next = 2;
+              return this.getLocalPayment(params);
+            case 2:
+              found = _context9.sent;
+              if (found) {
+                _context9.next = 5;
+                break;
+              }
+              throw new Error('未找到本地支付记录');
+            case 5:
+              transactions = ((_found$payment$metada2 = found.payment.metadata) === null || _found$payment$metada2 === void 0 ? void 0 : _found$payment$metada2.transactions) || [];
+              if (!transactions.some(function (transaction) {
+                return transaction.status !== 'fail' && transaction.status !== 'success' && !params.failedTransactionNumbers.includes(String(transaction.number));
+              })) {
+                _context9.next = 8;
+                break;
+              }
+              throw new Error('仍有结果未知的交易，保留待确认支付');
+            case 8:
+              if (!(params.result === 'not_started' && transactions.length > 0 && !isLocalFinalizedPayment(found.payment) && found.payment.status !== 'paid')) {
+                _context9.next = 10;
+                break;
+              }
+              throw new Error('支付已有交易记录，不能按未发起交易结束');
+            case 10:
+              return _context9.abrupt("return", this.updateLocalPayment(_objectSpread(_objectSpread({}, params), {}, {
+                finalizeUnsuccessful: true,
+                updates: {
+                  status: 'voided',
+                  metadata: _defineProperty(_defineProperty({}, LOCAL_EFTPOS_FINALIZED, true), "transactions", params.failedTransactionNumbers.map(function (number) {
+                    return {
+                      number: number,
+                      status: 'fail'
+                    };
+                  }))
+                }
+              })));
+            case 11:
+            case "end":
+              return _context9.stop();
+          }
+        }, _callee9, this);
+      }));
+      function finalizeLocalEftposPayment(_x8) {
+        return _finalizeLocalEftposPayment.apply(this, arguments);
+      }
+      return finalizeLocalEftposPayment;
+    }() /** Only a successful full detail GET may release the persisted payment gate. */
+  }, {
+    key: "completeLocalPaymentRefresh",
+    value: (function () {
+      var _completeLocalPaymentRefresh = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(fresh) {
+        var existing, nextOrder, index;
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
+            case 0:
+              _context10.next = 2;
+              return this.getLocalOrderByLookup(fresh.order_id);
+            case 2:
+              existing = _context10.sent;
+              if (!(!existing || !requiresLocalPaymentRefresh(existing))) {
+                _context10.next = 12;
+                break;
+              }
+              _context10.next = 6;
+              return this.upsertOrdersFromRemote([fresh]);
+            case 6:
+              _context10.next = 8;
+              return this.getLocalOrderByLookup(fresh.order_id);
+            case 8:
+              _context10.t0 = _context10.sent;
+              if (_context10.t0) {
+                _context10.next = 11;
+                break;
+              }
+              _context10.t0 = fresh;
+            case 11:
+              return _context10.abrupt("return", _context10.t0);
+            case 12:
+              if (!(this.isPendingSyncOrder(existing) || this.isDraftOrder(existing) || (existing.payments || []).some(isPendingOrderPayment))) {
+                _context10.next = 14;
+                break;
+              }
+              throw new Error('订单仍有未结束支付或待同步改动，暂不能刷新');
+            case 14:
+              if (!(!Array.isArray(fresh.products) || !fresh.summary)) {
+                _context10.next = 16;
+                break;
+              }
+              throw new Error('远端订单详情不完整，请重新刷新');
+            case 16:
+              nextOrder = this.mergeOrderRecords(existing, this.normalizeRemoteSyncedOrder(fresh));
+              nextOrder.metadata = _objectSpread({}, nextOrder.metadata);
+              delete nextOrder.metadata[LOCAL_EFTPOS_REFRESH_REQUIRED];
+              // Do not publish/clear the gate in memory until SQLite has accepted the full snapshot.
+              _context10.next = 21;
+              return this.updateOrderInSQLite(nextOrder, 'completeLocalPaymentRefresh', {
+                throwOnError: true
+              });
+            case 21:
+              index = this.findOrderIndexByIdentity(this.store.list, existing);
+              this.store.list = index < 0 ? [].concat(_toConsumableArray(this.store.list), [nextOrder]) : this.store.list.map(function (order, i) {
+                return i === index ? nextOrder : order;
+              });
+              this.syncOrdersMap();
+              _context10.next = 26;
+              return this.emitOrdersChanged([nextOrder], 'completeLocalPaymentRefresh');
+            case 26:
+              return _context10.abrupt("return", nextOrder);
+            case 27:
+            case "end":
+              return _context10.stop();
+          }
+        }, _callee10, this);
+      }));
+      function completeLocalPaymentRefresh(_x9) {
+        return _completeLocalPaymentRefresh.apply(this, arguments);
+      }
+      return completeLocalPaymentRefresh;
+    }())
   }, {
     key: "loadOrdersByServer",
     value: function () {
-      var _loadOrdersByServer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-        var _this5 = this,
+      var _loadOrdersByServer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
+        var _this6 = this,
           _this$store;
         var options,
           orderList,
@@ -1172,19 +1402,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           mergedOrders,
           isRemoteSnapshotPersisted,
           memoryOrders,
-          _args8 = arguments;
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+          _args11 = arguments;
+        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              options = _args8.length > 0 && _args8[0] !== undefined ? _args8[0] : {};
+              options = _args11.length > 0 && _args11[0] !== undefined ? _args11[0] : {};
               orderList = [];
               hasFetchedRemoteSnapshot = false;
               trigger = options.trigger || 'unknown';
-              _context8.next = 6;
+              _context11.next = 6;
               return this.loadOrdersFromSQLite();
             case 6:
-              protectedOrdersBeforeRemoteFetch = _context8.sent.filter(function (order) {
-                return _this5.shouldProtectLocalOrderFromRemoteSnapshot(order);
+              protectedOrdersBeforeRemoteFetch = _context11.sent.filter(function (order) {
+                return _this6.shouldProtectLocalOrderFromRemoteSnapshot(order);
               });
               this.logInfo('loadOrdersByServer-开始', {
                 trigger: trigger,
@@ -1192,22 +1422,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 query: ((_this$store = this.store) === null || _this$store === void 0 ? void 0 : _this$store.createdAtQuery) || null,
                 protectedLocalOrderCount: protectedOrdersBeforeRemoteFetch.length,
                 protectedPendingPaymentCount: protectedOrdersBeforeRemoteFetch.reduce(function (count, order) {
-                  return count + _this5.getIdentifiedPendingPayments(order).length;
+                  return count + _this6.getIdentifiedPendingPayments(order).length;
                 }, 0)
               });
               if (!this.orderDataSource) {
-                _context8.next = 23;
+                _context11.next = 23;
                 break;
               }
-              _context8.prev = 9;
-              _context8.next = 12;
+              _context11.prev = 9;
+              _context11.next = 12;
               return this.orderDataSource.run({
                 sse: {
                   query: this.store.createdAtQuery
                 }
               });
             case 12:
-              data = _context8.sent;
+              data = _context11.sent;
               orderList = data || [];
               this.logInfo('loadOrdersByServer-SSE拉取成功', {
                 trigger: trigger,
@@ -1215,21 +1445,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
               hasFetchedRemoteSnapshot = true;
               this.lastServerFullFetchAtMs = Date.now();
-              _context8.next = 23;
+              _context11.next = 23;
               break;
             case 19:
-              _context8.prev = 19;
-              _context8.t0 = _context8["catch"](9);
+              _context11.prev = 19;
+              _context11.t0 = _context11["catch"](9);
               this.logInfo('loadOrdersByServer-SSE拉取失败，保持当前内存订单');
-              return _context8.abrupt("return", this.store.list);
+              return _context11.abrupt("return", this.store.list);
             case 23:
               if (hasFetchedRemoteSnapshot) {
                 this.clearOrderSnapshotMarker();
               }
-              _context8.next = 26;
+              _context11.next = 26;
               return this.replaceOrdersSnapshotInSQLite(orderList, 'loadOrdersByServer', protectedOrdersBeforeRemoteFetch);
             case 26:
-              _yield$this$replaceOr = _context8.sent;
+              _yield$this$replaceOr = _context11.sent;
               mergedOrders = _yield$this$replaceOr.orders;
               isRemoteSnapshotPersisted = _yield$this$replaceOr.persisted;
               if (hasFetchedRemoteSnapshot && isRemoteSnapshotPersisted) {
@@ -1242,15 +1472,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 persistedCount: mergedOrders.length,
                 sqliteOnlyDraftCount: mergedOrders.length - memoryOrders.length
               });
-              _context8.next = 34;
+              _context11.next = 34;
               return this.core.effects.emit(OrderHooks.onOrdersLoaded, memoryOrders);
             case 34:
-              return _context8.abrupt("return", memoryOrders);
+              return _context11.abrupt("return", memoryOrders);
             case 35:
             case "end":
-              return _context8.stop();
+              return _context11.stop();
           }
-        }, _callee8, this, [[9, 19]]);
+        }, _callee11, this, [[9, 19]]);
       }));
       function loadOrdersByServer() {
         return _loadOrdersByServer.apply(this, arguments);
@@ -1264,25 +1494,25 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "refreshOrdersForCurrentBusinessDay",
     value: (function () {
-      var _refreshOrdersForCurrentBusinessDay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+      var _refreshOrdersForCurrentBusinessDay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
         var options,
           refreshPromise,
-          _args9 = arguments;
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+          _args12 = arguments;
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              options = _args9.length > 0 && _args9[0] !== undefined ? _args9[0] : {};
+              options = _args12.length > 0 && _args12[0] !== undefined ? _args12[0] : {};
               if (!this.businessDayRefreshPromise) {
-                _context9.next = 3;
+                _context12.next = 3;
                 break;
               }
-              return _context9.abrupt("return", this.businessDayRefreshPromise);
+              return _context12.abrupt("return", this.businessDayRefreshPromise);
             case 3:
               if (!(!this.orderDataSource || !this.getCurrentShopId() || this.hasPulledOrdersToday())) {
-                _context9.next = 5;
+                _context12.next = 5;
                 break;
               }
-              return _context9.abrupt("return");
+              return _context12.abrupt("return");
             case 5:
               refreshPromise = this.silentRefresh({
                 trigger: options.trigger || 'business_day_rollover'
@@ -1290,18 +1520,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 return undefined;
               });
               this.businessDayRefreshPromise = refreshPromise;
-              _context9.prev = 7;
-              _context9.next = 10;
+              _context12.prev = 7;
+              _context12.next = 10;
               return refreshPromise;
             case 10:
-              _context9.prev = 10;
+              _context12.prev = 10;
               this.businessDayRefreshPromise = null;
-              return _context9.finish(10);
+              return _context12.finish(10);
             case 13:
             case "end":
-              return _context9.stop();
+              return _context12.stop();
           }
-        }, _callee9, this, [[7,, 10, 13]]);
+        }, _callee12, this, [[7,, 10, 13]]);
       }));
       function refreshOrdersForCurrentBusinessDay() {
         return _refreshOrdersForCurrentBusinessDay.apply(this, arguments);
@@ -1317,23 +1547,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "silentRefresh",
     value: (function () {
-      var _silentRefresh = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
+      var _silentRefresh = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
         var options,
           startTime,
           trigger,
           elapsedSinceFullFetch,
           orders,
           errorMessage,
-          _args10 = arguments;
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+          _args13 = arguments;
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
-              options = _args10.length > 0 && _args10[0] !== undefined ? _args10[0] : {};
+              options = _args13.length > 0 && _args13[0] !== undefined ? _args13[0] : {};
               startTime = Date.now();
               trigger = options.trigger || 'background';
               elapsedSinceFullFetch = Date.now() - this.lastServerFullFetchAtMs;
               if (!(this.lastServerFullFetchAtMs > 0 && elapsedSinceFullFetch < ORDER_SILENT_REFRESH_MIN_INTERVAL_MS)) {
-                _context10.next = 7;
+                _context13.next = 7;
                 break;
               }
               this.logInfo('silentRefresh 跳过全量 SSE', {
@@ -1343,28 +1573,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 elapsedSinceFullFetchMs: elapsedSinceFullFetch,
                 orderCount: this.store.list.length
               });
-              return _context10.abrupt("return", this.store.list);
+              return _context13.abrupt("return", this.store.list);
             case 7:
               this.logInfo('silentRefresh 开始', {
                 trigger: trigger,
                 elapsedSinceFullFetchMs: elapsedSinceFullFetch,
                 orderCount: this.store.list.length
               });
-              _context10.prev = 8;
+              _context13.prev = 8;
               // 刷新前，需要更新当前营业日边界（store.createdAtQuery）
               this.updateCreateStore();
-              _context10.next = 12;
+              _context13.next = 12;
               return this.loadOrdersByServer({
                 trigger: trigger
               });
             case 12:
-              orders = _context10.sent;
+              orders = _context13.sent;
               this.store.list = cloneDeep(orders);
               this.syncOrdersMap();
-              _context10.next = 17;
+              _context13.next = 17;
               return this.emitOrdersChanged([], 'silentRefresh');
             case 17:
-              _context10.next = 19;
+              _context13.next = 19;
               return this.core.effects.emit(OrderHooks.onOrdersSyncCompleted, null);
             case 19:
               this.logInfo('silentRefresh 完成', {
@@ -1372,22 +1602,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 orderCount: orders.length,
                 duration: "".concat(Date.now() - startTime, "ms")
               });
-              return _context10.abrupt("return", this.store.list);
+              return _context13.abrupt("return", this.store.list);
             case 23:
-              _context10.prev = 23;
-              _context10.t0 = _context10["catch"](8);
-              errorMessage = _context10.t0 instanceof Error ? _context10.t0.message : String(_context10.t0);
+              _context13.prev = 23;
+              _context13.t0 = _context13["catch"](8);
+              errorMessage = _context13.t0 instanceof Error ? _context13.t0.message : String(_context13.t0);
               this.logError('silentRefresh 失败', {
                 trigger: trigger,
                 duration: "".concat(Date.now() - startTime, "ms"),
                 error: errorMessage
               });
-              return _context10.abrupt("return", this.store.list);
+              return _context13.abrupt("return", this.store.list);
             case 28:
             case "end":
-              return _context10.stop();
+              return _context13.stop();
           }
-        }, _callee10, this, [[8, 23]]);
+        }, _callee13, this, [[8, 23]]);
       }));
       function silentRefresh() {
         return _silentRefresh.apply(this, arguments);
@@ -1425,21 +1655,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "prepareNormalizedOrdersForMemoryList",
     value: function prepareNormalizedOrdersForMemoryList(orders) {
-      var _this6 = this;
+      var _this7 = this;
       return orders.map(function (order) {
-        return _this6.prepareNormalizedOrderForMemoryList(order);
+        return _this7.prepareNormalizedOrderForMemoryList(order);
       }).filter(function (order) {
-        return _this6.shouldKeepOrderInMemory(order);
+        return _this7.shouldKeepOrderInMemory(order);
       });
     }
   }, {
     key: "normalizeOrdersForMemoryList",
     value: function normalizeOrdersForMemoryList(orders, source) {
-      var _this7 = this;
+      var _this8 = this;
       return orders.map(function (order) {
-        return _this7.normalizeOrderForMemoryList(order, source);
+        return _this8.normalizeOrderForMemoryList(order, source);
       }).filter(function (order) {
-        return _this7.shouldKeepOrderInMemory(order);
+        return _this8.shouldKeepOrderInMemory(order);
       });
     }
   }, {
@@ -1473,31 +1703,31 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "overwriteExistingOrder",
     value: (function () {
-      var _overwriteExistingOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(fresh) {
-        var _this8 = this;
+      var _overwriteExistingOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(fresh) {
+        var _this9 = this;
         var orderId, key, normalizedFresh, existingOrder, reconciledFresh;
-        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
               orderId = fresh === null || fresh === void 0 ? void 0 : fresh.order_id;
               if (!(orderId === undefined || orderId === null)) {
-                _context11.next = 4;
+                _context14.next = 4;
                 break;
               }
               this.logError('overwriteExistingOrder-入参缺少 order_id');
-              return _context11.abrupt("return", {
+              return _context14.abrupt("return", {
                 overwritten: false
               });
             case 4:
               key = this.getIdKey(orderId);
               if (this.store.map.has(key)) {
-                _context11.next = 8;
+                _context14.next = 8;
                 break;
               }
               this.logInfo('overwriteExistingOrder-本地不存在该订单，跳过', {
                 orderId: orderId
               });
-              return _context11.abrupt("return", {
+              return _context14.abrupt("return", {
                 overwritten: false
               });
             case 8:
@@ -1511,31 +1741,31 @@ 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 _this8.normalizeOrderForMemoryList(order, 'overwriteExistingOrder.existingMemory');
+                  return _this9.normalizeOrderForMemoryList(order, 'overwriteExistingOrder.existingMemory');
                 }
-                return _this8.getIdKey(id) === key ? reconciledFresh : _this8.normalizeOrderForMemoryList(order, 'overwriteExistingOrder.existingMemory');
+                return _this9.getIdKey(id) === key ? reconciledFresh : _this9.normalizeOrderForMemoryList(order, 'overwriteExistingOrder.existingMemory');
               });
               this.syncOrdersMap();
-              _context11.next = 16;
+              _context14.next = 16;
               return this.updateOrderInSQLite(reconciledFresh, 'overwriteExistingOrder');
             case 16:
               this.logInfo('overwriteExistingOrder-结束', {
                 orderId: orderId,
                 storeOrderCountAfter: this.store.list.length
               });
-              _context11.next = 19;
+              _context14.next = 19;
               return this.emitOrdersChanged([reconciledFresh], 'overwriteExistingOrder');
             case 19:
-              return _context11.abrupt("return", {
+              return _context14.abrupt("return", {
                 overwritten: true
               });
             case 20:
             case "end":
-              return _context11.stop();
+              return _context14.stop();
           }
-        }, _callee11, this);
+        }, _callee14, this);
       }));
-      function overwriteExistingOrder(_x7) {
+      function overwriteExistingOrder(_x10) {
         return _overwriteExistingOrder.apply(this, arguments);
       }
       return overwriteExistingOrder;
@@ -1548,35 +1778,35 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "upsertOrdersFromRemote",
     value: (function () {
-      var _upsertOrdersFromRemote = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(freshOrders) {
+      var _upsertOrdersFromRemote = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(freshOrders) {
         var source,
-          _args12 = arguments;
-        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+          _args15 = arguments;
+        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
-              source = _args12.length > 1 && _args12[1] !== undefined ? _args12[1] : 'upsertOrdersFromRemote';
+              source = _args15.length > 1 && _args15[1] !== undefined ? _args15[1] : 'upsertOrdersFromRemote';
               if (freshOrders !== null && freshOrders !== void 0 && freshOrders.length) {
-                _context12.next = 4;
+                _context15.next = 4;
                 break;
               }
               this.logInfo('upsertOrdersFromRemote-订单列表为空', {
                 source: source
               });
-              return _context12.abrupt("return");
+              return _context15.abrupt("return");
             case 4:
               this.logInfo('upsertOrdersFromRemote-开始', {
                 count: freshOrders.length,
                 source: source
               });
-              _context12.next = 7;
+              _context15.next = 7;
               return this.mergeOrdersToStore(freshOrders, source);
             case 7:
             case "end":
-              return _context12.stop();
+              return _context15.stop();
           }
-        }, _callee12, this);
+        }, _callee15, this);
       }));
-      function upsertOrdersFromRemote(_x8) {
+      function upsertOrdersFromRemote(_x11) {
         return _upsertOrdersFromRemote.apply(this, arguments);
       }
       return upsertOrdersFromRemote;
@@ -1584,21 +1814,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "markOrderSyncedByExternalSaleNumber",
     value: function () {
-      var _markOrderSyncedByExternalSaleNumber = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(params) {
-        var _this9 = this,
+      var _markOrderSyncedByExternalSaleNumber = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(params) {
+        var _this10 = this,
           _existing$external_sa,
           _nextOrder$order_id;
         var externalSaleNumber, key, targetIndex, existing, nextOrder, storageKey;
-        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
               externalSaleNumber = params.externalSaleNumber;
               if (!(externalSaleNumber === undefined || externalSaleNumber === null || externalSaleNumber === '')) {
-                _context13.next = 4;
+                _context16.next = 4;
                 break;
               }
               this.logError('markOrderSyncedByExternalSaleNumber-缺少 external_sale_number');
-              return _context13.abrupt("return", {
+              return _context16.abrupt("return", {
                 updated: false
               });
             case 4:
@@ -1606,16 +1836,16 @@ 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)) {
-                _context13.next = 9;
+                _context16.next = 9;
                 break;
               }
               this.logInfo('markOrderSyncedByExternalSaleNumber-本地订单不存在，跳过', {
                 external_sale_number: externalSaleNumber
               });
-              return _context13.abrupt("return", {
+              return _context16.abrupt("return", {
                 updated: false
               });
             case 9:
@@ -1631,27 +1861,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 return nextOrder;
               });
               this.syncOrdersMap();
-              _context13.next = 16;
+              _context16.next = 16;
               return this.patchOrdersInSQLite([nextOrder], 'markOrderSyncedByExternalSaleNumber', _defineProperty({}, storageKey, 'update'));
             case 16:
               this.logInfo('markOrderSyncedByExternalSaleNumber-完成', {
                 external_sale_number: externalSaleNumber,
                 order_id: (_nextOrder$order_id = nextOrder.order_id) !== null && _nextOrder$order_id !== void 0 ? _nextOrder$order_id : null
               });
-              _context13.next = 19;
+              _context16.next = 19;
               return this.emitOrdersChanged([nextOrder], 'markOrderSyncedByExternalSaleNumber');
             case 19:
-              return _context13.abrupt("return", {
+              return _context16.abrupt("return", {
                 updated: true,
                 order: nextOrder
               });
             case 20:
             case "end":
-              return _context13.stop();
+              return _context16.stop();
           }
-        }, _callee13, this);
+        }, _callee16, this);
       }));
-      function markOrderSyncedByExternalSaleNumber(_x9) {
+      function markOrderSyncedByExternalSaleNumber(_x12) {
         return _markOrderSyncedByExternalSaleNumber.apply(this, arguments);
       }
       return markOrderSyncedByExternalSaleNumber;
@@ -1663,8 +1893,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "upsertPendingSyncOrders",
     value: (function () {
-      var _upsertPendingSyncOrders = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(pendingOrders) {
-        var _this10 = this;
+      var _upsertPendingSyncOrders = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(pendingOrders) {
+        var _this11 = this;
         var options,
           pendingMap,
           memoryPendingMap,
@@ -1694,26 +1924,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           insertIndex,
           patchedOrders,
           previousList,
-          _args14 = arguments;
-        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+          _args17 = arguments;
+        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
-              options = _args14.length > 1 && _args14[1] !== undefined ? _args14[1] : {};
+              options = _args17.length > 1 && _args17[1] !== undefined ? _args17[1] : {};
               if (pendingOrders !== null && pendingOrders !== void 0 && pendingOrders.length) {
-                _context14.next = 4;
+                _context17.next = 4;
                 break;
               }
               this.logInfo('upsertPendingSyncOrders-订单列表为空', {});
-              return _context14.abrupt("return");
+              return _context17.abrupt("return");
             case 4:
               pendingMap = new Map();
               memoryPendingMap = new Map();
               _iterator7 = _createForOfIteratorHelper(pendingOrders);
-              _context14.prev = 7;
+              _context17.prev = 7;
               _iterator7.s();
             case 9:
               if ((_step7 = _iterator7.n()).done) {
-                _context14.next = 20;
+                _context17.next = 20;
                 break;
               }
               order = _step7.value;
@@ -1724,43 +1954,43 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
               storageKey = this.getOrderStorageKey(pendingOrder);
               if (storageKey) {
-                _context14.next = 16;
+                _context17.next = 16;
                 break;
               }
-              return _context14.abrupt("continue", 18);
+              return _context17.abrupt("continue", 18);
             case 16:
               pendingMap.set(storageKey, pendingOrder);
               memoryPendingMap.set(storageKey, this.normalizeOrderForMemoryList(pendingOrder, 'upsertPendingSyncOrders.memory'));
             case 18:
-              _context14.next = 9;
+              _context17.next = 9;
               break;
             case 20:
-              _context14.next = 25;
+              _context17.next = 25;
               break;
             case 22:
-              _context14.prev = 22;
-              _context14.t0 = _context14["catch"](7);
-              _iterator7.e(_context14.t0);
+              _context17.prev = 22;
+              _context17.t0 = _context17["catch"](7);
+              _iterator7.e(_context17.t0);
             case 25:
-              _context14.prev = 25;
+              _context17.prev = 25;
               _iterator7.f();
-              return _context14.finish(25);
+              return _context17.finish(25);
             case 28:
               if (!(pendingMap.size === 0)) {
-                _context14.next = 31;
+                _context17.next = 31;
                 break;
               }
               this.logError('upsertPendingSyncOrders-订单缺少可落库标识', {
                 count: pendingOrders.length
               });
-              return _context14.abrupt("return");
+              return _context17.abrupt("return");
             case 31:
               this.logInfo('upsertPendingSyncOrders-开始', {
                 count: pendingMap.size
               });
               mergeActions = {};
               updatedList = this.store.list.map(function (order) {
-                return _this10.normalizeOrderForMemoryList(order, 'upsertPendingSyncOrders.existingMemory');
+                return _this11.normalizeOrderForMemoryList(order, 'upsertPendingSyncOrders.existingMemory');
               }); // 与 mergeOrdersToStore 一致：基于身份键（field:value）建立索引，把「查找已存在订单」
               // 从 O(n) 线性扫描降为 O(1)，整体复杂度由 O(n^2) 降为 O(n + m)。
               identityKeyToIndex = new Map();
@@ -1779,17 +2009,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               }
               _iterator9 = _createForOfIteratorHelper(memoryPendingMap.entries());
-              _context14.prev = 37;
+              _context17.prev = 37;
               _iterator9.s();
             case 39:
               if ((_step9 = _iterator9.n()).done) {
-                _context14.next = 58;
+                _context17.next = 58;
                 break;
               }
               _step9$value = _slicedToArray(_step9.value, 2), _storageKey = _step9$value[0], _pendingOrder = _step9$value[1];
               matchIndex = this.lookupOrderIndexByIdentityKeys(identityKeyToIndex, this.getOrderIdentityMatchKeys(_pendingOrder));
               if (!(matchIndex >= 0)) {
-                _context14.next = 52;
+                _context17.next = 52;
                 break;
               }
               existingOrder = updatedList[matchIndex];
@@ -1806,57 +2036,57 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               // 合并后身份字段可能新增（如挂单拿到 order_id），同步登记，供同批后续 pending 命中同一槽位
               this.registerOrderIdentityKeys(identityKeyToIndex, nextOrder, matchIndex);
               mergeActions[_storageKey] = 'update';
-              return _context14.abrupt("continue", 56);
+              return _context17.abrupt("continue", 56);
             case 52:
               insertIndex = updatedList.length;
               updatedList.push(_pendingOrder);
               this.registerOrderIdentityKeys(identityKeyToIndex, _pendingOrder, insertIndex);
               mergeActions[_storageKey] = 'insert';
             case 56:
-              _context14.next = 39;
+              _context17.next = 39;
               break;
             case 58:
-              _context14.next = 63;
+              _context17.next = 63;
               break;
             case 60:
-              _context14.prev = 60;
-              _context14.t1 = _context14["catch"](37);
-              _iterator9.e(_context14.t1);
+              _context17.prev = 60;
+              _context17.t1 = _context17["catch"](37);
+              _iterator9.e(_context17.t1);
             case 63:
-              _context14.prev = 63;
+              _context17.prev = 63;
               _iterator9.f();
-              return _context14.finish(63);
+              return _context17.finish(63);
             case 66:
               patchedOrders = _toConsumableArray(pendingMap.values()); // 增量索引已保证 store 去重不变量，无需再对全表做 O(n^2) 压缩；仅自检开关开启时兜底。
               previousList = this.store.list;
               this.store.list = this.runOrderStoreSelfCheck(updatedList, 'upsertPendingSyncOrders.store');
               this.syncOrdersMap();
-              _context14.prev = 70;
-              _context14.next = 73;
+              _context17.prev = 70;
+              _context17.next = 73;
               return this.patchOrdersInSQLite(patchedOrders, 'upsertPendingSyncOrders', mergeActions, options);
             case 73:
-              _context14.next = 80;
+              _context17.next = 80;
               break;
             case 75:
-              _context14.prev = 75;
-              _context14.t2 = _context14["catch"](70);
+              _context17.prev = 75;
+              _context17.t2 = _context17["catch"](70);
               this.store.list = previousList;
               this.syncOrdersMap();
-              throw _context14.t2;
+              throw _context17.t2;
             case 80:
               this.logInfo('upsertPendingSyncOrders-结束', {
                 count: patchedOrders.length,
                 storeOrderCountAfter: this.store.list.length
               });
-              _context14.next = 83;
+              _context17.next = 83;
               return this.emitOrdersChanged(patchedOrders, 'upsertPendingSyncOrders');
             case 83:
             case "end":
-              return _context14.stop();
+              return _context17.stop();
           }
-        }, _callee14, this, [[7, 22, 25, 28], [37, 60, 63, 66], [70, 75]]);
+        }, _callee17, this, [[7, 22, 25, 28], [37, 60, 63, 66], [70, 75]]);
       }));
-      function upsertPendingSyncOrders(_x10) {
+      function upsertPendingSyncOrders(_x13) {
         return _upsertPendingSyncOrders.apply(this, arguments);
       }
       return upsertPendingSyncOrders;
@@ -1869,27 +2099,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "upsertLocalDraftOrders",
     value: (function () {
-      var _upsertLocalDraftOrders = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(draftOrders) {
-        var _this11 = this;
+      var _upsertLocalDraftOrders = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(draftOrders) {
+        var _this12 = this;
         var draftMap, memoryDraftMap, _iterator10, _step10, order, draftOrder, storageKey, memoryDraftOrder, mergeActions, updatedList, identityKeyToIndex, index, _iterator11, _step11, key, _iterator12, _step12, _step12$value, _storageKey2, _draftOrder, matchIndex, existingOrder, reconciledDraftOrder, mergedOrder, nextOrder, insertIndex, patchedOrders, previousList, removedLegacyMemoryDraft;
-        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
               if (draftOrders !== null && draftOrders !== void 0 && draftOrders.length) {
-                _context15.next = 3;
+                _context18.next = 3;
                 break;
               }
               this.logInfo('upsertLocalDraftOrders-订单列表为空', {});
-              return _context15.abrupt("return");
+              return _context18.abrupt("return");
             case 3:
               draftMap = new Map();
               memoryDraftMap = new Map();
               _iterator10 = _createForOfIteratorHelper(draftOrders);
-              _context15.prev = 6;
+              _context18.prev = 6;
               _iterator10.s();
             case 8:
               if ((_step10 = _iterator10.n()).done) {
-                _context15.next = 19;
+                _context18.next = 19;
                 break;
               }
               order = _step10.value;
@@ -1899,10 +2129,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
               storageKey = this.getOrderStorageKey(draftOrder);
               if (storageKey) {
-                _context15.next = 14;
+                _context18.next = 14;
                 break;
               }
-              return _context15.abrupt("continue", 17);
+              return _context18.abrupt("continue", 17);
             case 14:
               draftMap.set(storageKey, draftOrder);
               memoryDraftOrder = this.normalizeOrderForMemoryList(draftOrder);
@@ -1910,28 +2140,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 memoryDraftMap.set(storageKey, memoryDraftOrder);
               }
             case 17:
-              _context15.next = 8;
+              _context18.next = 8;
               break;
             case 19:
-              _context15.next = 24;
+              _context18.next = 24;
               break;
             case 21:
-              _context15.prev = 21;
-              _context15.t0 = _context15["catch"](6);
-              _iterator10.e(_context15.t0);
+              _context18.prev = 21;
+              _context18.t0 = _context18["catch"](6);
+              _iterator10.e(_context18.t0);
             case 24:
-              _context15.prev = 24;
+              _context18.prev = 24;
               _iterator10.f();
-              return _context15.finish(24);
+              return _context18.finish(24);
             case 27:
               if (!(draftMap.size === 0)) {
-                _context15.next = 30;
+                _context18.next = 30;
                 break;
               }
               this.logError('upsertLocalDraftOrders-订单缺少可落库标识', {
                 count: draftOrders.length
               });
-              return _context15.abrupt("return");
+              return _context18.abrupt("return");
             case 30:
               this.logInfo('upsertLocalDraftOrders-开始', {
                 count: draftMap.size,
@@ -1940,7 +2170,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
               mergeActions = {};
               updatedList = this.store.list.filter(function (order) {
-                return _this11.shouldKeepOrderInMemory(order);
+                return _this12.shouldKeepOrderInMemory(order);
               });
               identityKeyToIndex = new Map();
               for (index = 0; index < updatedList.length; index += 1) {
@@ -1957,21 +2187,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               }
               _iterator12 = _createForOfIteratorHelper(memoryDraftMap.entries());
-              _context15.prev = 36;
+              _context18.prev = 36;
               _iterator12.s();
             case 38:
               if ((_step12 = _iterator12.n()).done) {
-                _context15.next = 57;
+                _context18.next = 58;
                 break;
               }
               _step12$value = _slicedToArray(_step12.value, 2), _storageKey2 = _step12$value[0], _draftOrder = _step12$value[1];
               matchIndex = this.lookupOrderIndexByIdentityKeys(identityKeyToIndex, this.getOrderIdentityMatchKeys(_draftOrder));
               if (!(matchIndex >= 0)) {
-                _context15.next = 51;
+                _context18.next = 52;
                 break;
               }
               existingOrder = updatedList[matchIndex];
               reconciledDraftOrder = this.preserveExistingBusinessCodeForDraft(existingOrder, _draftOrder);
+              this.applyHolderRelationsSnapshot(reconciledDraftOrder, existingOrder, _draftOrder);
               mergedOrder = this.mergeOrderRecords(existingOrder, reconciledDraftOrder);
               nextOrder = _objectSpread(_objectSpread({}, mergedOrder), {}, {
                 need_sync: 0,
@@ -1982,68 +2213,68 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               draftMap.set(_storageKey2, reconciledDraftOrder);
               this.registerOrderIdentityKeys(identityKeyToIndex, nextOrder, matchIndex);
               mergeActions[_storageKey2] = 'update';
-              return _context15.abrupt("continue", 55);
-            case 51:
+              return _context18.abrupt("continue", 56);
+            case 52:
               insertIndex = updatedList.length;
               updatedList.push(_draftOrder);
               this.registerOrderIdentityKeys(identityKeyToIndex, _draftOrder, insertIndex);
               mergeActions[_storageKey2] = 'insert';
-            case 55:
-              _context15.next = 38;
+            case 56:
+              _context18.next = 38;
               break;
-            case 57:
-              _context15.next = 62;
+            case 58:
+              _context18.next = 63;
               break;
-            case 59:
-              _context15.prev = 59;
-              _context15.t1 = _context15["catch"](36);
-              _iterator12.e(_context15.t1);
-            case 62:
-              _context15.prev = 62;
+            case 60:
+              _context18.prev = 60;
+              _context18.t1 = _context18["catch"](36);
+              _iterator12.e(_context18.t1);
+            case 63:
+              _context18.prev = 63;
               _iterator12.f();
-              return _context15.finish(62);
-            case 65:
+              return _context18.finish(63);
+            case 66:
               patchedOrders = _toConsumableArray(draftMap.values());
               previousList = this.store.list;
               this.store.list = this.runOrderStoreSelfCheck(updatedList, 'upsertLocalDraftOrders.store');
               this.syncOrdersMap();
-              _context15.prev = 69;
-              _context15.next = 72;
+              _context18.prev = 70;
+              _context18.next = 73;
               return this.patchOrdersInSQLite(patchedOrders, 'upsertLocalDraftOrders', mergeActions, {
                 throwOnError: true
               });
-            case 72:
-              _context15.next = 79;
+            case 73:
+              _context18.next = 80;
               break;
-            case 74:
-              _context15.prev = 74;
-              _context15.t2 = _context15["catch"](69);
+            case 75:
+              _context18.prev = 75;
+              _context18.t2 = _context18["catch"](70);
               this.store.list = previousList;
               this.syncOrdersMap();
-              throw _context15.t2;
-            case 79:
+              throw _context18.t2;
+            case 80:
               this.logInfo('upsertLocalDraftOrders-结束', {
                 count: patchedOrders.length,
                 storeOrderCountAfter: this.store.list.length
               });
               removedLegacyMemoryDraft = previousList.some(function (order) {
-                return !_this11.shouldKeepOrderInMemory(order);
+                return !_this12.shouldKeepOrderInMemory(order);
               });
               if (!(memoryDraftMap.size > 0 || removedLegacyMemoryDraft)) {
-                _context15.next = 84;
+                _context18.next = 85;
                 break;
               }
-              _context15.next = 84;
+              _context18.next = 85;
               return this.emitOrdersChanged(patchedOrders.filter(function (order) {
-                return _this11.shouldKeepOrderInMemory(order);
+                return _this12.shouldKeepOrderInMemory(order);
               }), 'upsertLocalDraftOrders');
-            case 84:
+            case 85:
             case "end":
-              return _context15.stop();
+              return _context18.stop();
           }
-        }, _callee15, this, [[6, 21, 24, 27], [36, 59, 62, 65], [69, 74]]);
+        }, _callee18, this, [[6, 21, 24, 27], [36, 60, 63, 66], [70, 75]]);
       }));
-      function upsertLocalDraftOrders(_x11) {
+      function upsertLocalDraftOrders(_x14) {
         return _upsertLocalDraftOrders.apply(this, arguments);
       }
       return upsertLocalDraftOrders;
@@ -2055,42 +2286,42 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "fetchOrdersBySSE",
     value: (function () {
-      var _fetchOrdersBySSE = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
+      var _fetchOrdersBySSE = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
         var query,
           data,
-          _args16 = arguments;
-        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+          _args19 = arguments;
+        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
-              query = _args16.length > 0 && _args16[0] !== undefined ? _args16[0] : {};
+              query = _args19.length > 0 && _args19[0] !== undefined ? _args19[0] : {};
               if (this.orderDataSource) {
-                _context16.next = 3;
+                _context19.next = 3;
                 break;
               }
-              return _context16.abrupt("return", []);
+              return _context19.abrupt("return", []);
             case 3:
-              _context16.prev = 3;
-              _context16.next = 6;
+              _context19.prev = 3;
+              _context19.next = 6;
               return this.orderDataSource.run({
                 sse: {
                   query: query
                 }
               });
             case 6:
-              data = _context16.sent;
-              return _context16.abrupt("return", data || []);
+              data = _context19.sent;
+              return _context19.abrupt("return", data || []);
             case 10:
-              _context16.prev = 10;
-              _context16.t0 = _context16["catch"](3);
+              _context19.prev = 10;
+              _context19.t0 = _context19["catch"](3);
               this.logError('fetchOrdersBySSE-失败', {
-                error: _context16.t0 instanceof Error ? _context16.t0.message : String(_context16.t0)
+                error: _context19.t0 instanceof Error ? _context19.t0.message : String(_context19.t0)
               });
-              return _context16.abrupt("return", []);
+              return _context19.abrupt("return", []);
             case 14:
             case "end":
-              return _context16.stop();
+              return _context19.stop();
           }
-        }, _callee16, this, [[3, 10]]);
+        }, _callee19, this, [[3, 10]]);
       }));
       function fetchOrdersBySSE() {
         return _fetchOrdersBySSE.apply(this, arguments);
@@ -2120,9 +2351,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncOrdersMap",
     value: function syncOrdersMap() {
-      var _this12 = this;
+      var _this13 = this;
       this.store.list = this.store.list.filter(function (order) {
-        return _this12.shouldKeepOrderInMemory(order);
+        return _this13.shouldKeepOrderInMemory(order);
       });
       this.store.map.clear();
       var _iterator13 = _createForOfIteratorHelper(this.store.list),
@@ -2178,7 +2409,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderIdentityEntries",
     value: function getOrderIdentityEntries(order) {
-      var _this13 = this;
+      var _this14 = this;
       if (!order) return [];
       var record = order;
       var candidates = [{
@@ -2196,9 +2427,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }];
       var entries = [];
       var _loop = function _loop() {
-          var candidate = _candidates[_i2];
-          if (_this13.isBlankIdentityValue(candidate.value)) return 0; // continue
-          var key = _this13.getIdKey(candidate.value);
+          var candidate = _candidates[_i3];
+          if (_this14.isBlankIdentityValue(candidate.value)) return 0; // continue
+          var key = _this14.getIdKey(candidate.value);
           if (entries.some(function (entry) {
             return entry.field === candidate.field && entry.key === key;
           })) return 0; // continue
@@ -2208,7 +2439,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           });
         },
         _ret;
-      for (var _i2 = 0, _candidates = candidates; _i2 < _candidates.length; _i2++) {
+      for (var _i3 = 0, _candidates = candidates; _i3 < _candidates.length; _i3++) {
         _ret = _loop();
         if (_ret === 0) continue;
       }
@@ -2237,8 +2468,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 _i4 = 0, _candidates2 = candidates; _i4 < _candidates2.length; _i4++) {
+        var v = _candidates2[_i4];
         if (!v) continue;
         var text = String(v);
         if (!text) continue;
@@ -2265,29 +2496,29 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setupOrderSync",
     value: function setupOrderSync() {
-      var _this14 = this;
+      var _this15 = this;
       if (!this.orderDataSource) return;
       this.orderDataSource.run({
         pubsub: {
           callback: function callback(res) {
             var _message$id, _message$order_id, _message$type;
             var pubsubReceivedAt = Date.now();
-            var message = _this14.normalizeOrderSyncMessage(res);
+            var message = _this15.normalizeOrderSyncMessage(res);
             if (!message) return;
             message._pubsubReceivedAt = pubsubReceivedAt;
-            _this14.pendingSyncMessages.push(message);
-            var throttleMs = _this14.getOrderSyncThrottleMs();
-            var routeInfo = _this14.resolveSyncMessageRoute(message);
-            _this14.logInfo('orderSync-收到消息并入队', {
+            _this15.pendingSyncMessages.push(message);
+            var throttleMs = _this15.getOrderSyncThrottleMs();
+            var routeInfo = _this15.resolveSyncMessageRoute(message);
+            _this15.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: _this14.pendingSyncMessages.length,
+              pendingCount: _this15.pendingSyncMessages.length,
               throttleMs: throttleMs,
               pubsubReceivedAt: new Date(pubsubReceivedAt).toISOString(),
               fullMessage: JSON.stringify(message)
             });
-            _this14.scheduleOrderSyncThrottle();
+            _this15.scheduleOrderSyncThrottle();
           }
         }
       }).catch(function () {
@@ -2304,7 +2535,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "scheduleOrderSyncThrottle",
     value: function scheduleOrderSyncThrottle() {
-      var _this15 = this;
+      var _this16 = this;
       if (this.isProcessingSyncBatch) return;
       if (this.isIdlePhase) {
         this.isIdlePhase = false;
@@ -2315,8 +2546,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (this.syncTimer) return;
       var throttleMs = this.getOrderSyncThrottleMs();
       this.syncTimer = setTimeout(function () {
-        _this15.syncTimer = undefined;
-        void _this15.flushOrderSyncMessagesByThrottle();
+        _this16.syncTimer = undefined;
+        void _this16.flushOrderSyncMessagesByThrottle();
       }, throttleMs);
     }
 
@@ -2327,41 +2558,41 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "flushOrderSyncMessagesByThrottle",
     value: (function () {
-      var _flushOrderSyncMessagesByThrottle = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
-        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+      var _flushOrderSyncMessagesByThrottle = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20() {
+        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
               if (!this.isProcessingSyncBatch) {
-                _context17.next = 2;
+                _context20.next = 2;
                 break;
               }
-              return _context17.abrupt("return");
+              return _context20.abrupt("return");
             case 2:
               if (!(this.pendingSyncMessages.length === 0)) {
-                _context17.next = 5;
+                _context20.next = 5;
                 break;
               }
               this.isIdlePhase = true;
-              return _context17.abrupt("return");
+              return _context20.abrupt("return");
             case 5:
               this.isProcessingSyncBatch = true;
-              _context17.prev = 6;
-              _context17.next = 9;
+              _context20.prev = 6;
+              _context20.next = 9;
               return this.processOrderSyncMessages();
             case 9:
-              _context17.prev = 9;
+              _context20.prev = 9;
               this.isProcessingSyncBatch = false;
               if (this.pendingSyncMessages.length > 0) {
                 this.scheduleOrderSyncThrottle();
               } else {
                 this.isIdlePhase = true;
               }
-              return _context17.finish(9);
+              return _context20.finish(9);
             case 13:
             case "end":
-              return _context17.stop();
+              return _context20.stop();
           }
-        }, _callee17, this, [[6,, 9, 13]]);
+        }, _callee20, this, [[6,, 9, 13]]);
       }));
       function flushOrderSyncMessagesByThrottle() {
         return _flushOrderSyncMessagesByThrottle.apply(this, arguments);
@@ -2383,19 +2614,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "processOrderSyncMessages",
     value: (function () {
-      var _processOrderSyncMessages = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
-        var _this16 = this;
+      var _processOrderSyncMessages = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
+        var _this17 = this;
         var messages, batchProcessStartAt, earliestReceivedAt, upsertOrders, refreshIds, uniqueRefreshIds, upsertList, _this$filterRedundant, toFetch, skipped, freshOrders, batchProcessEndAt;
-        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
             case 0:
               messages = _toConsumableArray(this.pendingSyncMessages);
               this.pendingSyncMessages = [];
               if (!(messages.length === 0)) {
-                _context18.next = 4;
+                _context21.next = 4;
                 break;
               }
-              return _context18.abrupt("return");
+              return _context21.abrupt("return");
             case 4:
               batchProcessStartAt = Date.now();
               earliestReceivedAt = Math.min.apply(Math, _toConsumableArray(messages.map(function (m) {
@@ -2411,13 +2642,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               upsertOrders = new Map();
               refreshIds = [];
               messages.forEach(function (msg, msgIndex) {
-                var routeInfo = _this16.resolveSyncMessageRoute(msg);
+                var routeInfo = _this17.resolveSyncMessageRoute(msg);
                 var hasBatchIds = routeInfo.hasBatchIds;
                 var singleId = routeInfo.singleId;
                 var hasSingleId = routeInfo.hasSingleId;
-                var normalizedBody = _this16.normalizeOrderSyncPayload(msg.body || msg.data);
+                var normalizedBody = _this17.normalizeOrderSyncPayload(msg.body || msg.data);
                 if (routeInfo.route === 'bodyUpsert' && normalizedBody) {
-                  upsertOrders.set(_this16.getIdKey(normalizedBody.order_id), normalizedBody);
+                  var orderKey = _this17.getIdKey(normalizedBody.order_id);
+                  var previousBody = upsertOrders.get(orderKey);
+                  if (previousBody) _this17.applyHolderRelationsSnapshot(normalizedBody, previousBody, normalizedBody);
+                  upsertOrders.set(orderKey, 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));
@@ -2429,41 +2663,41 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 refreshIdCount: uniqueRefreshIds.length
               });
               if (!(upsertList.length > 0)) {
-                _context18.next = 16;
+                _context21.next = 16;
                 break;
               }
-              _context18.next = 16;
+              _context21.next = 16;
               return this.mergeOrdersToStore(upsertList, 'pubsub.bodyUpsert');
             case 16:
               if (!(uniqueRefreshIds.length > 0)) {
-                _context18.next = 28;
+                _context21.next = 28;
                 break;
               }
               _this$filterRedundant = this.filterRedundantHttpRefreshIds(uniqueRefreshIds), toFetch = _this$filterRedundant.toFetch, skipped = _this$filterRedundant.skipped;
               if (skipped.length > 0) {}
               if (!(toFetch.length > 0)) {
-                _context18.next = 28;
+                _context21.next = 28;
                 break;
               }
-              _context18.next = 22;
+              _context21.next = 22;
               return this.fetchOrdersByHttp(toFetch);
             case 22:
-              freshOrders = _context18.sent;
+              freshOrders = _context21.sent;
               if (!(freshOrders.length > 0)) {
-                _context18.next = 28;
+                _context21.next = 28;
                 break;
               }
-              _context18.next = 26;
+              _context21.next = 26;
               return this.mergeOrdersToStore(freshOrders, 'pubsub.httpRefresh');
             case 26:
-              _context18.next = 28;
+              _context21.next = 28;
               break;
             case 28:
               if (!(upsertList.length === 0 && uniqueRefreshIds.length === 0)) {
-                _context18.next = 30;
+                _context21.next = 30;
                 break;
               }
-              return _context18.abrupt("return");
+              return _context21.abrupt("return");
             case 30:
               batchProcessEndAt = Date.now();
               this.logInfo('processOrderSyncMessages-结束', {
@@ -2472,13 +2706,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 batchProcessDurationMs: batchProcessEndAt - batchProcessStartAt,
                 totalFromPubsubToProcessedMs: batchProcessEndAt - earliestReceivedAt
               });
-              _context18.next = 34;
+              _context21.next = 34;
               return this.core.effects.emit(OrderHooks.onOrdersSyncCompleted, null);
             case 34:
             case "end":
-              return _context18.stop();
+              return _context21.stop();
           }
-        }, _callee18, this);
+        }, _callee21, this);
       }));
       function processOrderSyncMessages() {
         return _processOrderSyncMessages.apply(this, arguments);
@@ -2499,29 +2733,29 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "fetchOrdersByHttp",
     value: (function () {
-      var _fetchOrdersByHttp = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(ids) {
+      var _fetchOrdersByHttp = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(ids) {
         var _orderList, orderList;
-        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
               if (!(!this.orderDataSource || ids.length === 0)) {
-                _context19.next = 2;
+                _context22.next = 2;
                 break;
               }
-              return _context19.abrupt("return", []);
+              return _context22.abrupt("return", []);
             case 2:
-              _context19.prev = 2;
+              _context22.prev = 2;
               if (!(typeof this.orderDataSource.fetchOrdersByIds === 'function')) {
-                _context19.next = 8;
+                _context22.next = 8;
                 break;
               }
-              _context19.next = 6;
+              _context22.next = 6;
               return this.orderDataSource.fetchOrdersByIds(ids);
             case 6:
-              _orderList = _context19.sent;
-              return _context19.abrupt("return", _orderList || []);
+              _orderList = _context22.sent;
+              return _context22.abrupt("return", _orderList || []);
             case 8:
-              _context19.next = 10;
+              _context22.next = 10;
               return this.orderDataSource.run({
                 http: {
                   query: {
@@ -2530,19 +2764,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               });
             case 10:
-              orderList = _context19.sent;
-              return _context19.abrupt("return", orderList || []);
+              orderList = _context22.sent;
+              return _context22.abrupt("return", orderList || []);
             case 14:
-              _context19.prev = 14;
-              _context19.t0 = _context19["catch"](2);
-              return _context19.abrupt("return", []);
+              _context22.prev = 14;
+              _context22.t0 = _context22["catch"](2);
+              return _context22.abrupt("return", []);
             case 17:
             case "end":
-              return _context19.stop();
+              return _context22.stop();
           }
-        }, _callee19, this, [[2, 14]]);
+        }, _callee22, this, [[2, 14]]);
       }));
-      function fetchOrdersByHttp(_x12) {
+      function fetchOrdersByHttp(_x15) {
         return _fetchOrdersByHttp.apply(this, arguments);
       }
       return fetchOrdersByHttp;
@@ -2554,11 +2788,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "mergeOrdersToStore",
     value: (function () {
-      var _mergeOrdersToStore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(freshOrders, source) {
-        var _this17 = this;
+      var _mergeOrdersToStore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(freshOrders, source) {
+        var _this18 = this;
         var storeOrderCountBefore, normalizedFreshOrders, incomingProductsHaveStableIdentity, _iterator15, _step15, order, id, rawProducts, _incomingProductsHave, allProductsHaveStableIdentity, orderIdKey, uniqueFreshOrders, uniqueFreshCount, patchedOrders, remoteProductMembershipChanges, forceWriteStorageKeys, storageKeyMigrations, mergeActions, existingProductsHaveStableIdentity, updatedList, identityKeyToIndex, index, identityKeys, _iterator16, _step16, key, _iterator17, _step17, fresh, freshIdentityKeys, matchIndex, storageKey, mergeKey, existingOrder, previousStorageKey, _ref, _existingOrder$order_, _ref2, _external_sale_number2, _existingOrder$paymen, _fresh$payment_status, _existingOrder$need_s, _fresh$need_sync, _ref3, _existingOrder$order_2, _ref4, _external_sale_number3, _existingOrder$is_dra, _fresh$is_draft_order, mergedOrder, freshOrderId, incomingProductsAreStable, membershipChange, mergedProductsHaveStableIdentity, adjustedMatchIndex, duplicateIndexes, _iterator18, _step18, _key2, _duplicateIndex, _iterator19, _step19, duplicateIndex, _index, _iterator20, _step20, _key, nextStorageKey, _ref5, _ref6, _mergedOrder$order_id, mergedStorageKey, insertIndex, insertCount, updateCount;
-        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
+          while (1) switch (_context23.prev = _context23.next) {
             case 0:
               storeOrderCountBefore = this.store.list.length;
               this.logInfo('mergeOrdersToStore-开始', {
@@ -2570,20 +2804,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               normalizedFreshOrders = [];
               incomingProductsHaveStableIdentity = new Map();
               _iterator15 = _createForOfIteratorHelper(freshOrders);
-              _context20.prev = 6;
+              _context23.prev = 6;
               _iterator15.s();
             case 8:
               if ((_step15 = _iterator15.n()).done) {
-                _context20.next = 18;
+                _context23.next = 18;
                 break;
               }
               order = _step15.value;
               id = order === null || order === void 0 ? void 0 : order.order_id;
               if (!(id === undefined || id === null)) {
-                _context20.next = 13;
+                _context23.next = 13;
                 break;
               }
-              return _context20.abrupt("continue", 16);
+              return _context23.abrupt("continue", 16);
             case 13:
               rawProducts = order.products;
               if (Array.isArray(rawProducts)) {
@@ -2593,19 +2827,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               normalizedFreshOrders.push(this.normalizeRemoteSyncedOrder(order));
             case 16:
-              _context20.next = 8;
+              _context23.next = 8;
               break;
             case 18:
-              _context20.next = 23;
+              _context23.next = 23;
               break;
             case 20:
-              _context20.prev = 20;
-              _context20.t0 = _context20["catch"](6);
-              _iterator15.e(_context20.t0);
+              _context23.prev = 20;
+              _context23.t0 = _context23["catch"](6);
+              _iterator15.e(_context23.t0);
             case 23:
-              _context20.prev = 23;
+              _context23.prev = 23;
               _iterator15.f();
-              return _context20.finish(23);
+              return _context23.finish(23);
             case 26:
               // 先对本批新单做去重（批内规模 m 很小），保证每条 fresh 身份唯一
               uniqueFreshOrders = this.compactOrderListByIdentity(normalizedFreshOrders, "".concat(source, ".incoming")).list;
@@ -2616,10 +2850,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               storageKeyMigrations = [];
               mergeActions = {};
               existingProductsHaveStableIdentity = this.store.list.map(function (order) {
-                return _this17.doProductsHaveStableMembershipIdentity(order.products);
+                return _this18.doProductsHaveStableMembershipIdentity(order.products);
               });
               updatedList = this.store.list.map(function (order) {
-                return _this17.normalizeOrderForMemoryList(order, "".concat(source, ".existingMemory"));
+                return _this18.normalizeOrderForMemoryList(order, "".concat(source, ".existingMemory"));
               }); // 基于身份键（field:value）建立索引，把「查找已存在订单」从 O(n) 线性扫描降为 O(1)，
               // 整体合并复杂度由 O(n^2) 降为 O(n + m)。索引语义与 doOrdersShareIdentity 完全一致：
               // 任一身份字段（order_id/external_sale_number/order_number/shop_order_number）同值即同一单。
@@ -2640,11 +2874,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               }
               _iterator17 = _createForOfIteratorHelper(uniqueFreshOrders);
-              _context20.prev = 38;
+              _context23.prev = 38;
               _iterator17.s();
             case 40:
               if ((_step17 = _iterator17.n()).done) {
-                _context20.next = 100;
+                _context23.next = 101;
                 break;
               }
               fresh = _step17.value;
@@ -2653,13 +2887,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               storageKey = this.getOrderStorageKey(fresh);
               mergeKey = storageKey || (fresh.order_id !== undefined && fresh.order_id !== null ? this.getIdKey(fresh.order_id) : '');
               if (!(matchIndex >= 0)) {
-                _context20.next = 92;
+                _context23.next = 93;
                 break;
               }
               existingOrder = updatedList[matchIndex];
               previousStorageKey = this.getPersistedOrderStorageKey(existingOrder);
               if (!(this.isPendingSyncOrder(existingOrder) && this.isRemoteEchoMergeSource(source))) {
-                _context20.next = 52;
+                _context23.next = 52;
                 break;
               }
               this.logInfo('mergeOrdersToStore-跳过 pending 订单远端覆盖', {
@@ -2672,10 +2906,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 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 _context20.abrupt("continue", 98);
+              return _context23.abrupt("continue", 99);
             case 52:
               if (!(this.isDraftOrder(existingOrder) && this.shouldProtectDraftOrderFromIncoming(source))) {
-                _context20.next = 55;
+                _context23.next = 55;
                 break;
               }
               this.logInfo('mergeOrdersToStore-跳过 draft 订单远端覆盖', {
@@ -2686,7 +2920,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 remote_is_draft_order: (_fresh$is_draft_order = fresh.is_draft_order) !== null && _fresh$is_draft_order !== void 0 ? _fresh$is_draft_order : null,
                 reason: 'protect_draft_order_from_remote_echo'
               });
-              return _context20.abrupt("continue", 98);
+              return _context23.abrupt("continue", 99);
             case 55:
               mergedOrder = this.mergeOrderRecords(existingOrder, fresh);
               freshOrderId = fresh.order_id;
@@ -2699,36 +2933,36 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               adjustedMatchIndex = matchIndex;
               duplicateIndexes = new Set();
               _iterator18 = _createForOfIteratorHelper(freshIdentityKeys);
-              _context20.prev = 64;
+              _context23.prev = 64;
               _iterator18.s();
             case 66:
               if ((_step18 = _iterator18.n()).done) {
-                _context20.next = 74;
+                _context23.next = 74;
                 break;
               }
               _key2 = _step18.value;
               _duplicateIndex = identityKeyToIndex.get(_key2);
               if (!(_duplicateIndex === undefined || _duplicateIndex === matchIndex)) {
-                _context20.next = 71;
+                _context23.next = 71;
                 break;
               }
-              return _context20.abrupt("continue", 72);
+              return _context23.abrupt("continue", 72);
             case 71:
               duplicateIndexes.add(_duplicateIndex);
             case 72:
-              _context20.next = 66;
+              _context23.next = 66;
               break;
             case 74:
-              _context20.next = 79;
+              _context23.next = 79;
               break;
             case 76:
-              _context20.prev = 76;
-              _context20.t1 = _context20["catch"](64);
-              _iterator18.e(_context20.t1);
+              _context23.prev = 76;
+              _context23.t1 = _context23["catch"](64);
+              _iterator18.e(_context23.t1);
             case 79:
-              _context20.prev = 79;
+              _context23.prev = 79;
               _iterator18.f();
-              return _context20.finish(79);
+              return _context23.finish(79);
             case 82:
               if (duplicateIndexes.size > 0) {
                 _iterator19 = _createForOfIteratorHelper(_toConsumableArray(duplicateIndexes).sort(function (left, right) {
@@ -2778,34 +3012,37 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 mergedStorageKey = this.getOrderStorageKey(mergedOrder);
                 if (mergedStorageKey) forceWriteStorageKeys.add(mergedStorageKey);
               }
+              if (nextStorageKey && !isEqual(existingOrder.holder_relations, mergedOrder.holder_relations)) {
+                forceWriteStorageKeys.add(nextStorageKey);
+              }
               // 合并后身份字段可能新增（如挂单拿到 order_id），同步登记到索引，
               // 供同批后续 fresh 命中同一槽位，避免重复插入
               this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, adjustedMatchIndex);
               patchedOrders.push(mergedOrder);
               if (mergeKey) mergeActions[mergeKey] = 'update';
-              return _context20.abrupt("continue", 98);
-            case 92:
+              return _context23.abrupt("continue", 99);
+            case 93:
               insertIndex = updatedList.length;
               updatedList.push(fresh);
               existingProductsHaveStableIdentity.push(fresh.order_id !== undefined && fresh.order_id !== null && incomingProductsHaveStableIdentity.get(this.getIdKey(fresh.order_id)) !== false);
               this.registerOrderIdentityKeys(identityKeyToIndex, fresh, insertIndex);
               patchedOrders.push(fresh);
               if (mergeKey) mergeActions[mergeKey] = 'insert';
-            case 98:
-              _context20.next = 40;
+            case 99:
+              _context23.next = 40;
               break;
-            case 100:
-              _context20.next = 105;
+            case 101:
+              _context23.next = 106;
               break;
-            case 102:
-              _context20.prev = 102;
-              _context20.t2 = _context20["catch"](38);
-              _iterator17.e(_context20.t2);
-            case 105:
-              _context20.prev = 105;
+            case 103:
+              _context23.prev = 103;
+              _context23.t2 = _context23["catch"](38);
+              _iterator17.e(_context23.t2);
+            case 106:
+              _context23.prev = 106;
               _iterator17.f();
-              return _context20.finish(105);
-            case 108:
+              return _context23.finish(106);
+            case 109:
               insertCount = Object.values(mergeActions).filter(function (v) {
                 return v === 'insert';
               }).length;
@@ -2821,29 +3058,29 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               // 仅在自检开关开启时做一次兜底校验。
               this.store.list = this.runOrderStoreSelfCheck(updatedList, "".concat(source, ".store"));
               this.syncOrdersMap();
-              _context20.next = 115;
+              _context23.next = 116;
               return this.patchOrdersInSQLite(patchedOrders, source, mergeActions, {
                 storageKeyMigrations: storageKeyMigrations
               }, forceWriteStorageKeys);
-            case 115:
+            case 116:
               this.logInfo('mergeOrdersToStore-结束', {
                 uniqueFreshCount: uniqueFreshCount,
                 storeOrderCountAfter: this.store.list.length,
                 insertCount: insertCount,
                 updateCount: updateCount
               });
-              _context20.next = 118;
+              _context23.next = 119;
               return this.emitRemoteProductMembershipChanges(remoteProductMembershipChanges);
-            case 118:
-              _context20.next = 120;
+            case 119:
+              _context23.next = 121;
               return this.emitOrdersChanged(patchedOrders, source);
-            case 120:
+            case 121:
             case "end":
-              return _context20.stop();
+              return _context23.stop();
           }
-        }, _callee20, this, [[6, 20, 23, 26], [38, 102, 105, 108], [64, 76, 79, 82]]);
+        }, _callee23, this, [[6, 20, 23, 26], [38, 103, 106, 109], [64, 76, 79, 82]]);
       }));
-      function mergeOrdersToStore(_x13, _x14) {
+      function mergeOrdersToStore(_x16, _x17) {
         return _mergeOrdersToStore.apply(this, arguments);
       }
       return mergeOrdersToStore;
@@ -2923,7 +3160,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getRemoteProductMembershipChange",
     value: function getRemoteProductMembershipChange(existingOrder, mergedOrder, source) {
-      var _this18 = this,
+      var _this19 = this,
         _mergedOrder$order_id2;
       if (!this.isRemoteProductMembershipChangeSource(source)) return null;
       var previousProducts = Array.isArray(existingOrder.products) ? existingOrder.products : [];
@@ -2938,13 +3175,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         var _loop2 = function _loop2() {
           var previousProduct = _step22.value;
           var matchedIndex = currentProducts.findIndex(function (currentProduct, index) {
-            return unmatchedCurrentIndexes.has(index) && _this18.isSameProductMembershipItem(previousProduct, currentProduct);
+            return unmatchedCurrentIndexes.has(index) && _this19.isSameProductMembershipItem(previousProduct, currentProduct);
           });
           if (matchedIndex >= 0) {
             unmatchedCurrentIndexes.delete(matchedIndex);
             return 1; // continue
           }
-          var productKey = _this18.getProductMembershipKey(previousProduct);
+          var productKey = _this19.getProductMembershipKey(previousProduct);
           if (productKey) removedProductKeys.push(productKey);
         };
         for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
@@ -2956,7 +3193,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _iterator22.f();
       }
       var addedProductKeys = _toConsumableArray(unmatchedCurrentIndexes).map(function (index) {
-        return _this18.getProductMembershipKey(currentProducts[index]);
+        return _this19.getProductMembershipKey(currentProducts[index]);
       }).filter(Boolean);
       if (addedProductKeys.length === 0 && removedProductKeys.length === 0) {
         return null;
@@ -3071,12 +3308,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "isOrderLookupMatch",
     value: function isOrderLookupMatch(order, lookupKey) {
-      var _this19 = this;
+      var _this20 = 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 _this19.getIdKey(value) === lookupKey;
+        return _this20.getIdKey(value) === lookupKey;
       });
     }
 
@@ -3128,10 +3365,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "findOrderIndexByIdentity",
     value: function findOrderIndexByIdentity(orders, target) {
-      var _this20 = this;
+      var _this21 = this;
       if (this.getOrderIdentityMatchKeys(target).length === 0) return -1;
       return orders.findIndex(function (order) {
-        return _this20.doOrdersShareIdentity(order, target);
+        return _this21.doOrdersShareIdentity(order, target);
       });
     }
   }, {
@@ -3254,7 +3491,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "shouldProtectLocalOrderFromRemoteSnapshot",
     value: function shouldProtectLocalOrderFromRemoteSnapshot(order) {
-      return this.isPendingSyncOrder(order) || this.isDraftOrder(order) || this.getIdentifiedPendingPayments(order).length > 0;
+      return this.isPendingSyncOrder(order) || this.isDraftOrder(order) || this.getIdentifiedPendingPayments(order).length > 0 || requiresLocalPaymentRefresh(order) || (order.payments || []).some(isLocalFinalizedPayment);
     }
   }, {
     key: "getUnmatchedIdentifiedPendingPayments",
@@ -3270,6 +3507,61 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         });
       });
     }
+
+    /** 关系数组是完整快照，不能拼接或按商品子项生成 UID；扩展字段整体保留。 */
+  }, {
+    key: "applyHolderRelationsSnapshot",
+    value: function applyHolderRelationsSnapshot(target, existing, incoming) {
+      if (Array.isArray(incoming.holder_relations)) {
+        target.holder_relations = cloneDeep(incoming.holder_relations);
+      } else if (Array.isArray(existing.holder_relations)) {
+        target.holder_relations = cloneDeep(existing.holder_relations);
+      } else {
+        delete target.holder_relations;
+      }
+    }
+
+    /** 全量拉取缺少关系字段时，仍保留同一订单已有的关系快照。 */
+  }, {
+    key: "preserveOmittedHolderRelations",
+    value: function preserveOmittedHolderRelations(incomingOrders, existingOrders) {
+      var _this22 = this;
+      var existingByIdentity = new Map();
+      var _iterator29 = _createForOfIteratorHelper(existingOrders),
+        _step29;
+      try {
+        for (_iterator29.s(); !(_step29 = _iterator29.n()).done;) {
+          var order = _step29.value;
+          if (!Array.isArray(order.holder_relations)) continue;
+          var _iterator30 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(order)),
+            _step30;
+          try {
+            for (_iterator30.s(); !(_step30 = _iterator30.n()).done;) {
+              var key = _step30.value;
+              existingByIdentity.set(key, order);
+            }
+          } catch (err) {
+            _iterator30.e(err);
+          } finally {
+            _iterator30.f();
+          }
+        }
+      } catch (err) {
+        _iterator29.e(err);
+      } finally {
+        _iterator29.f();
+      }
+      return incomingOrders.map(function (order) {
+        if (Array.isArray(order.holder_relations)) return order;
+        var existingOrder = _this22.getOrderIdentityMatchKeys(order).map(function (key) {
+          return existingByIdentity.get(key);
+        }).find(Boolean);
+        if (!existingOrder) return order;
+        var nextOrder = _objectSpread({}, order);
+        _this22.applyHolderRelationsSnapshot(nextOrder, existingOrder, order);
+        return nextOrder;
+      });
+    }
   }, {
     key: "mergeOrderRecords",
     value: function mergeOrderRecords(existing, incoming) {
@@ -3283,9 +3575,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var secondaryRecord = secondary;
       var existingRecord = existing;
       var incomingRecord = incoming;
+      if (requiresLocalPaymentRefresh(existing)) {
+        mergedRecord.metadata = _objectSpread(_objectSpread({}, mergedRecord.metadata), {}, _defineProperty({}, LOCAL_EFTPOS_REFRESH_REQUIRED, true));
+      }
       var childUidRemaps = [];
-      for (var _i4 = 0, _fieldsToPreserve = fieldsToPreserve; _i4 < _fieldsToPreserve.length; _i4++) {
-        var field = _fieldsToPreserve[_i4];
+      for (var _i5 = 0, _fieldsToPreserve = fieldsToPreserve; _i5 < _fieldsToPreserve.length; _i5++) {
+        var field = _fieldsToPreserve[_i5];
         if (!this.isBlankIdentityValue(preferredRecord[field])) {
           mergedRecord[field] = preferredRecord[field];
           continue;
@@ -3294,8 +3589,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           mergedRecord[field] = secondaryRecord[field];
         }
       }
-      for (var _i5 = 0, _incomingPatchFields = incomingPatchFields; _i5 < _incomingPatchFields.length; _i5++) {
-        var _field = _incomingPatchFields[_i5];
+      for (var _i6 = 0, _incomingPatchFields = incomingPatchFields; _i6 < _incomingPatchFields.length; _i6++) {
+        var _field = _incomingPatchFields[_i6];
         if (!Object.prototype.hasOwnProperty.call(incomingRecord, _field)) continue;
         if (incomingRecord[_field] === undefined || incomingRecord[_field] === null) continue;
         if (typeof incomingRecord[_field] === 'string' && incomingRecord[_field] === '') continue;
@@ -3307,11 +3602,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (Object.prototype.hasOwnProperty.call(incomingRecord, 'order_meta_list')) {
         mergedRecord.order_meta_list = cloneDeep(incomingRecord.order_meta_list);
       }
+      this.applyHolderRelationsSnapshot(merged, existing, incoming);
 
       // 子项数组遵循完整快照语义：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];
+      for (var _i7 = 0, _ORDER_AUTHORITATIVE_2 = ORDER_AUTHORITATIVE_COLLECTION_FIELDS; _i7 < _ORDER_AUTHORITATIVE_2.length; _i7++) {
+        var _field2 = _ORDER_AUTHORITATIVE_2[_i7];
         if (Array.isArray(incomingRecord[_field2])) {
           if (_field2 === 'payments') {
             var preservedPending = this.getUnmatchedIdentifiedPendingPayments(existingRecord[_field2], incomingRecord[_field2]);
@@ -3347,30 +3643,30 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "summarizeDuplicateOrders",
     value: function summarizeDuplicateOrders(orders) {
       var groups = new Map();
-      var _iterator29 = _createForOfIteratorHelper(orders),
-        _step29;
+      var _iterator31 = _createForOfIteratorHelper(orders),
+        _step31;
       try {
-        for (_iterator29.s(); !(_step29 = _iterator29.n()).done;) {
-          var order = _step29.value;
-          var _iterator30 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(order)),
-            _step30;
+        for (_iterator31.s(); !(_step31 = _iterator31.n()).done;) {
+          var order = _step31.value;
+          var _iterator32 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(order)),
+            _step32;
           try {
-            for (_iterator30.s(); !(_step30 = _iterator30.n()).done;) {
-              var key = _step30.value;
+            for (_iterator32.s(); !(_step32 = _iterator32.n()).done;) {
+              var key = _step32.value;
               var group = groups.get(key) || [];
               group.push(order);
               groups.set(key, group);
             }
           } catch (err) {
-            _iterator30.e(err);
+            _iterator32.e(err);
           } finally {
-            _iterator30.f();
+            _iterator32.f();
           }
         }
       } catch (err) {
-        _iterator29.e(err);
+        _iterator31.e(err);
       } finally {
-        _iterator29.f();
+        _iterator31.f();
       }
       return _toConsumableArray(groups.entries()).filter(function (_ref9) {
         var _ref10 = _slicedToArray(_ref9, 2),
@@ -3413,11 +3709,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function compactOrderListByIdentity(orders, source) {
       var list = [];
       var removedCount = 0;
-      var _iterator31 = _createForOfIteratorHelper(orders),
-        _step31;
+      var _iterator33 = _createForOfIteratorHelper(orders),
+        _step33;
       try {
-        for (_iterator31.s(); !(_step31 = _iterator31.n()).done;) {
-          var order = _step31.value;
+        for (_iterator33.s(); !(_step33 = _iterator33.n()).done;) {
+          var order = _step33.value;
           var normalizedOrder = this.normalizeOrderCollectionsForIngress(order, "".concat(source, ".order"));
           var matchIndex = this.findOrderIndexByIdentity(list, normalizedOrder);
           if (matchIndex < 0) {
@@ -3428,9 +3724,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           removedCount += 1;
         }
       } catch (err) {
-        _iterator31.e(err);
+        _iterator33.e(err);
       } finally {
-        _iterator31.f();
+        _iterator33.f();
       }
       if (removedCount > 0) {
         this.logWarning('订单列表重复项已压缩', {
@@ -3562,8 +3858,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadOrdersFromSQLite",
     value: function () {
-      var _loadOrdersFromSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
-        var _this21 = this;
+      var _loadOrdersFromSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24() {
+        var _this23 = this;
         var options,
           _options$onTiming,
           loadStartedAt,
@@ -3573,28 +3869,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           normalizeStartedAt,
           normalizedOrders,
           sqliteNormalizeMs,
-          _args21 = arguments;
-        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+          _args24 = arguments;
+        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
             case 0:
-              options = _args21.length > 0 && _args21[0] !== undefined ? _args21[0] : {};
+              options = _args24.length > 0 && _args24[0] !== undefined ? _args24[0] : {};
               if (this.dbManager) {
-                _context21.next = 3;
+                _context24.next = 3;
                 break;
               }
-              return _context21.abrupt("return", []);
+              return _context24.abrupt("return", []);
             case 3:
-              _context21.prev = 3;
+              _context24.prev = 3;
               loadStartedAt = performance.now();
               rawReadStartedAt = performance.now();
-              _context21.next = 8;
+              _context24.next = 8;
               return this.dbManager.getAll(INDEXDB_STORE_NAME);
             case 8:
-              orders = _context21.sent;
+              orders = _context24.sent;
               sqliteRawReadMs = +(performance.now() - rawReadStartedAt).toFixed(2);
               normalizeStartedAt = performance.now();
               normalizedOrders = (orders || []).map(function (order) {
-                return _this21.normalizeOrderCollectionsForIngress(order, 'loadOrdersFromSQLite');
+                return _this23.normalizeOrderCollectionsForIngress(order, 'loadOrdersFromSQLite');
               });
               sqliteNormalizeMs = +(performance.now() - normalizeStartedAt).toFixed(2);
               (_options$onTiming = options.onTiming) === null || _options$onTiming === void 0 || _options$onTiming.call(options, {
@@ -3602,22 +3898,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 sqliteNormalizeMs: sqliteNormalizeMs,
                 sqliteLoadTotalMs: +(performance.now() - loadStartedAt).toFixed(2)
               });
-              return _context21.abrupt("return", normalizedOrders);
+              return _context24.abrupt("return", normalizedOrders);
             case 17:
-              _context21.prev = 17;
-              _context21.t0 = _context21["catch"](3);
+              _context24.prev = 17;
+              _context24.t0 = _context24["catch"](3);
               if (!options.throwOnError) {
-                _context21.next = 21;
+                _context24.next = 21;
                 break;
               }
-              throw _context21.t0;
+              throw _context24.t0;
             case 21:
-              return _context21.abrupt("return", []);
+              return _context24.abrupt("return", []);
             case 22:
             case "end":
-              return _context21.stop();
+              return _context24.stop();
           }
-        }, _callee21, this, [[3, 17]]);
+        }, _callee24, this, [[3, 17]]);
       }));
       function loadOrdersFromSQLite() {
         return _loadOrdersFromSQLite.apply(this, arguments);
@@ -3656,8 +3952,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function mergeRemoteIdentityIntoDraftOrder(draftOrder, remoteOrder) {
       var merged = _objectSpread({}, this.withoutSyntheticDraftOrderId(draftOrder));
       var remote = remoteOrder;
-      for (var _i7 = 0, _arr = ['order_id', 'order_number', 'shop_order_number', 'shop_full_order_number']; _i7 < _arr.length; _i7++) {
-        var field = _arr[_i7];
+      for (var _i8 = 0, _arr = ['order_id', 'order_number', 'shop_order_number', 'shop_full_order_number']; _i8 < _arr.length; _i8++) {
+        var field = _arr[_i8];
         if (this.isBlankIdentityValue(merged[field]) && !this.isBlankIdentityValue(remote[field])) {
           merged[field] = remote[field];
         }
@@ -3667,15 +3963,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "mergeRemoteSnapshotWithPendingOrders",
     value: function mergeRemoteSnapshotWithPendingOrders(remoteOrders, existingOrders) {
-      var _this22 = this;
+      var _this24 = this;
       var merged = remoteOrders.map(function (order) {
-        return _this22.normalizeRemoteSyncedOrder(order);
+        return _this24.normalizeRemoteSyncedOrder(order);
       });
-      var _iterator32 = _createForOfIteratorHelper(existingOrders),
-        _step32;
+      var _iterator34 = _createForOfIteratorHelper(existingOrders),
+        _step34;
       try {
-        for (_iterator32.s(); !(_step32 = _iterator32.n()).done;) {
-          var rawOrder = _step32.value;
+        for (_iterator34.s(); !(_step34 = _iterator34.n()).done;) {
+          var rawOrder = _step34.value;
           var order = this.normalizeOrderCollectionsForIngress(rawOrder, 'mergeRemoteSnapshotWithPendingOrders.existingSQLite');
           if (!this.shouldProtectLocalOrderFromRemoteSnapshot(order)) continue;
           var matchIndex = this.findOrderIndexByIdentity(merged, order);
@@ -3691,9 +3987,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           merged.push(order);
         }
       } catch (err) {
-        _iterator32.e(err);
+        _iterator34.e(err);
       } finally {
-        _iterator32.f();
+        _iterator34.f();
       }
       return this.compactOrderListByIdentity(merged, 'mergeRemoteSnapshotWithPendingOrders').list;
     }
@@ -3709,10 +4005,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "runInOrderSQLiteSaveQueue",
     value: (function () {
-      var _runInOrderSQLiteSaveQueue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(task) {
+      var _runInOrderSQLiteSaveQueue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(task) {
         var queuedTask;
-        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
+        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
             case 0:
               queuedTask = this.orderSQLiteSaveQueue.then(task, task);
               this.orderSQLiteSaveQueue = queuedTask.then(function () {
@@ -3720,14 +4016,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }, function () {
                 return undefined;
               });
-              return _context22.abrupt("return", queuedTask);
+              return _context25.abrupt("return", queuedTask);
             case 3:
             case "end":
-              return _context22.stop();
+              return _context25.stop();
           }
-        }, _callee22, this);
+        }, _callee25, this);
       }));
-      function runInOrderSQLiteSaveQueue(_x15) {
+      function runInOrderSQLiteSaveQueue(_x18) {
         return _runInOrderSQLiteSaveQueue.apply(this, arguments);
       }
       return runInOrderSQLiteSaveQueue;
@@ -3742,8 +4038,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "patchOrdersInSQLite",
     value: (function () {
-      var _patchOrdersInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(orders, source) {
-        var _this23 = this;
+      var _patchOrdersInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(orders, source) {
+        var _this25 = this;
         var mergeActions,
           options,
           forceWriteStorageKeys,
@@ -3755,267 +4051,267 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           compactedToWrite,
           writtenStorageKeys,
           storageKeyMigrations,
-          _iterator33,
-          _step33,
+          _iterator35,
+          _step35,
           migration,
-          _args24 = arguments;
-        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
+          _args27 = arguments;
+        return _regeneratorRuntime().wrap(function _callee27$(_context27) {
+          while (1) switch (_context27.prev = _context27.next) {
             case 0:
-              mergeActions = _args24.length > 2 && _args24[2] !== undefined ? _args24[2] : {};
-              options = _args24.length > 3 && _args24[3] !== undefined ? _args24[3] : {};
-              forceWriteStorageKeys = _args24.length > 4 && _args24[4] !== undefined ? _args24[4] : new Set();
+              mergeActions = _args27.length > 2 && _args27[2] !== undefined ? _args27[2] : {};
+              options = _args27.length > 3 && _args27[3] !== undefined ? _args27[3] : {};
+              forceWriteStorageKeys = _args27.length > 4 && _args27[4] !== undefined ? _args27[4] : new Set();
               if (!(orders.length === 0)) {
-                _context24.next = 5;
+                _context27.next = 5;
                 break;
               }
-              return _context24.abrupt("return");
+              return _context27.abrupt("return");
             case 5:
               if (this.dbManager) {
-                _context24.next = 9;
+                _context27.next = 9;
                 break;
               }
               if (!options.throwOnError) {
-                _context24.next = 8;
+                _context27.next = 8;
                 break;
               }
               throw new Error('订单 SQLite 数据库未初始化');
             case 8:
-              return _context24.abrupt("return");
+              return _context27.abrupt("return");
             case 9:
               migrationTargetStorageKeys = new Set((options.storageKeyMigrations || []).map(function (migration) {
                 return migration.to;
               }));
               ordersSnapshot = cloneDeep(orders).map(function (order) {
-                return _this23.normalizeOrderCollectionsForIngress(order, "".concat(source, ".sqliteIngress"));
+                return _this25.normalizeOrderCollectionsForIngress(order, "".concat(source, ".sqliteIngress"));
               }).map(function (order) {
-                var storageKey = _this23.getOrderStorageKey(order);
+                var storageKey = _this25.getOrderStorageKey(order);
                 if (!storageKey || !migrationTargetStorageKeys.has(storageKey)) return order;
                 return _objectSpread(_objectSpread({}, order), {}, _defineProperty({}, ORDER_STORAGE_KEY_FIELD, storageKey));
               }).filter(function (order) {
-                return _this23.getOrderStorageKey(order);
+                return _this25.getOrderStorageKey(order);
               });
               if (!(ordersSnapshot.length === 0)) {
-                _context24.next = 13;
+                _context27.next = 13;
                 break;
               }
-              return _context24.abrupt("return");
+              return _context27.abrupt("return");
             case 13:
               _this$filterRedundant2 = this.filterRedundantPatchOrders(source, ordersSnapshot, mergeActions, forceWriteStorageKeys), toWrite = _this$filterRedundant2.toWrite, skipped = _this$filterRedundant2.skipped;
               if (!(toWrite.length === 0)) {
-                _context24.next = 16;
+                _context27.next = 16;
                 break;
               }
-              return _context24.abrupt("return");
+              return _context27.abrupt("return");
             case 16:
               compactedToWrite = this.compactOrderListByIdentity(toWrite, "".concat(source, ".sqlitePatch")).list;
               if (!(compactedToWrite.length === 0)) {
-                _context24.next = 19;
+                _context27.next = 19;
                 break;
               }
-              return _context24.abrupt("return");
+              return _context27.abrupt("return");
             case 19:
               writtenStorageKeys = new Set(compactedToWrite.map(function (order) {
-                return _this23.getOrderStorageKey(order);
+                return _this25.getOrderStorageKey(order);
               }).filter(Boolean));
               storageKeyMigrations = new Map();
-              _iterator33 = _createForOfIteratorHelper(options.storageKeyMigrations || []);
-              _context24.prev = 22;
-              _iterator33.s();
+              _iterator35 = _createForOfIteratorHelper(options.storageKeyMigrations || []);
+              _context27.prev = 22;
+              _iterator35.s();
             case 24:
-              if ((_step33 = _iterator33.n()).done) {
-                _context24.next = 33;
+              if ((_step35 = _iterator35.n()).done) {
+                _context27.next = 33;
                 break;
               }
-              migration = _step33.value;
+              migration = _step35.value;
               if (writtenStorageKeys.has(migration.to)) {
-                _context24.next = 28;
+                _context27.next = 28;
                 break;
               }
-              return _context24.abrupt("continue", 31);
+              return _context27.abrupt("continue", 31);
             case 28:
               if (!writtenStorageKeys.has(migration.from)) {
-                _context24.next = 30;
+                _context27.next = 30;
                 break;
               }
-              return _context24.abrupt("continue", 31);
+              return _context27.abrupt("continue", 31);
             case 30:
               storageKeyMigrations.set(migration.from, migration);
             case 31:
-              _context24.next = 24;
+              _context27.next = 24;
               break;
             case 33:
-              _context24.next = 38;
+              _context27.next = 38;
               break;
             case 35:
-              _context24.prev = 35;
-              _context24.t0 = _context24["catch"](22);
-              _iterator33.e(_context24.t0);
+              _context27.prev = 35;
+              _context27.t0 = _context27["catch"](22);
+              _iterator35.e(_context27.t0);
             case 38:
-              _context24.prev = 38;
-              _iterator33.f();
-              return _context24.finish(38);
+              _context27.prev = 38;
+              _iterator35.f();
+              return _context27.finish(38);
             case 41:
-              _context24.prev = 41;
-              _context24.next = 44;
-              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
-                var writeMethod, _iterator34, _step34, order, _iterator35, _step35, migration, _iterator36, _step36, _orderRecord$ORDER_ST, _order, orderRecord;
-                return _regeneratorRuntime().wrap(function _callee23$(_context23) {
-                  while (1) switch (_context23.prev = _context23.next) {
+              _context27.prev = 41;
+              _context27.next = 44;
+              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26() {
+                var writeMethod, _iterator36, _step36, order, _iterator37, _step37, migration, _iterator38, _step38, _orderRecord$ORDER_ST, _order, orderRecord;
+                return _regeneratorRuntime().wrap(function _callee26$(_context26) {
+                  while (1) switch (_context26.prev = _context26.next) {
                     case 0:
                       writeMethod = 'none';
-                      _this23.logInfo('patchOrdersInSQLite-开始', {
+                      _this25.logInfo('patchOrdersInSQLite-开始', {
                         source: source,
                         count: compactedToWrite.length,
                         dedupedCount: skipped.length
                       });
-                      if (!(typeof _this23.dbManager.bulkUpdate === 'function')) {
-                        _context23.next = 8;
+                      if (!(typeof _this25.dbManager.bulkUpdate === 'function')) {
+                        _context26.next = 8;
                         break;
                       }
                       writeMethod = 'bulkUpdate';
-                      _context23.next = 6;
-                      return _this23.dbManager.bulkUpdate(INDEXDB_STORE_NAME, compactedToWrite);
+                      _context26.next = 6;
+                      return _this25.dbManager.bulkUpdate(INDEXDB_STORE_NAME, compactedToWrite);
                     case 6:
-                      _context23.next = 37;
+                      _context26.next = 37;
                       break;
                     case 8:
-                      if (!(typeof _this23.dbManager.bulkAdd === 'function')) {
-                        _context23.next = 14;
+                      if (!(typeof _this25.dbManager.bulkAdd === 'function')) {
+                        _context26.next = 14;
                         break;
                       }
                       writeMethod = 'bulkAdd';
-                      _context23.next = 12;
-                      return _this23.dbManager.bulkAdd(INDEXDB_STORE_NAME, compactedToWrite);
+                      _context26.next = 12;
+                      return _this25.dbManager.bulkAdd(INDEXDB_STORE_NAME, compactedToWrite);
                     case 12:
-                      _context23.next = 37;
+                      _context26.next = 37;
                       break;
                     case 14:
-                      if (!(typeof _this23.dbManager.update === 'function')) {
-                        _context23.next = 35;
+                      if (!(typeof _this25.dbManager.update === 'function')) {
+                        _context26.next = 35;
                         break;
                       }
                       writeMethod = 'update';
-                      _iterator34 = _createForOfIteratorHelper(compactedToWrite);
-                      _context23.prev = 17;
-                      _iterator34.s();
+                      _iterator36 = _createForOfIteratorHelper(compactedToWrite);
+                      _context26.prev = 17;
+                      _iterator36.s();
                     case 19:
-                      if ((_step34 = _iterator34.n()).done) {
-                        _context23.next = 25;
+                      if ((_step36 = _iterator36.n()).done) {
+                        _context26.next = 25;
                         break;
                       }
-                      order = _step34.value;
-                      _context23.next = 23;
-                      return _this23.dbManager.update(INDEXDB_STORE_NAME, order);
+                      order = _step36.value;
+                      _context26.next = 23;
+                      return _this25.dbManager.update(INDEXDB_STORE_NAME, order);
                     case 23:
-                      _context23.next = 19;
+                      _context26.next = 19;
                       break;
                     case 25:
-                      _context23.next = 30;
+                      _context26.next = 30;
                       break;
                     case 27:
-                      _context23.prev = 27;
-                      _context23.t0 = _context23["catch"](17);
-                      _iterator34.e(_context23.t0);
+                      _context26.prev = 27;
+                      _context26.t0 = _context26["catch"](17);
+                      _iterator36.e(_context26.t0);
                     case 30:
-                      _context23.prev = 30;
-                      _iterator34.f();
-                      return _context23.finish(30);
+                      _context26.prev = 30;
+                      _iterator36.f();
+                      return _context26.finish(30);
                     case 33:
-                      _context23.next = 37;
+                      _context26.next = 37;
                       break;
                     case 35:
                       if (!options.throwOnError) {
-                        _context23.next = 37;
+                        _context26.next = 37;
                         break;
                       }
                       throw new Error('订单 SQLite 数据库不支持写入');
                     case 37:
-                      _this23.recordRecentSqliteWrite(source, compactedToWrite);
+                      _this25.recordRecentSqliteWrite(source, compactedToWrite);
                       if (!(writeMethod !== 'none')) {
-                        _context23.next = 84;
+                        _context26.next = 84;
                         break;
                       }
-                      _iterator35 = _createForOfIteratorHelper(storageKeyMigrations.values());
-                      _context23.prev = 40;
-                      _iterator35.s();
+                      _iterator37 = _createForOfIteratorHelper(storageKeyMigrations.values());
+                      _context26.prev = 40;
+                      _iterator37.s();
                     case 42:
-                      if ((_step35 = _iterator35.n()).done) {
-                        _context23.next = 76;
+                      if ((_step37 = _iterator37.n()).done) {
+                        _context26.next = 76;
                         break;
                       }
-                      migration = _step35.value;
-                      _context23.prev = 44;
-                      _context23.next = 47;
-                      return _this23.dbManager.delete(INDEXDB_STORE_NAME, migration.from);
+                      migration = _step37.value;
+                      _context26.prev = 44;
+                      _context26.next = 47;
+                      return _this25.dbManager.delete(INDEXDB_STORE_NAME, migration.from);
                     case 47:
-                      _this23.recentSqliteWriteByStorageKey.delete(migration.from);
-                      _iterator36 = _createForOfIteratorHelper(orders);
-                      _context23.prev = 49;
-                      _iterator36.s();
+                      _this25.recentSqliteWriteByStorageKey.delete(migration.from);
+                      _iterator38 = _createForOfIteratorHelper(orders);
+                      _context26.prev = 49;
+                      _iterator38.s();
                     case 51:
-                      if ((_step36 = _iterator36.n()).done) {
-                        _context23.next = 61;
+                      if ((_step38 = _iterator38.n()).done) {
+                        _context26.next = 61;
                         break;
                       }
-                      _order = _step36.value;
-                      if (!(_this23.getOrderStorageKey(_order) !== migration.to)) {
-                        _context23.next = 55;
+                      _order = _step38.value;
+                      if (!(_this25.getOrderStorageKey(_order) !== migration.to)) {
+                        _context26.next = 55;
                         break;
                       }
-                      return _context23.abrupt("continue", 59);
+                      return _context26.abrupt("continue", 59);
                     case 55:
                       orderRecord = _order;
                       if (!(String((_orderRecord$ORDER_ST = orderRecord[ORDER_STORAGE_KEY_FIELD]) !== null && _orderRecord$ORDER_ST !== void 0 ? _orderRecord$ORDER_ST : '') !== migration.from)) {
-                        _context23.next = 58;
+                        _context26.next = 58;
                         break;
                       }
-                      return _context23.abrupt("continue", 59);
+                      return _context26.abrupt("continue", 59);
                     case 58:
                       orderRecord[ORDER_STORAGE_KEY_FIELD] = migration.to;
                     case 59:
-                      _context23.next = 51;
+                      _context26.next = 51;
                       break;
                     case 61:
-                      _context23.next = 66;
+                      _context26.next = 66;
                       break;
                     case 63:
-                      _context23.prev = 63;
-                      _context23.t1 = _context23["catch"](49);
-                      _iterator36.e(_context23.t1);
+                      _context26.prev = 63;
+                      _context26.t1 = _context26["catch"](49);
+                      _iterator38.e(_context26.t1);
                     case 66:
-                      _context23.prev = 66;
-                      _iterator36.f();
-                      return _context23.finish(66);
+                      _context26.prev = 66;
+                      _iterator38.f();
+                      return _context26.finish(66);
                     case 69:
-                      _context23.next = 74;
+                      _context26.next = 74;
                       break;
                     case 71:
-                      _context23.prev = 71;
-                      _context23.t2 = _context23["catch"](44);
-                      _this23.logError('删除订单旧 SQLite storage key 失败', {
+                      _context26.prev = 71;
+                      _context26.t2 = _context26["catch"](44);
+                      _this25.logError('删除订单旧 SQLite storage key 失败', {
                         source: source,
                         order_id: migration.orderId,
                         oldStorageKey: migration.from,
                         newStorageKey: migration.to,
-                        error: _context23.t2 instanceof Error ? _context23.t2.message : String(_context23.t2)
+                        error: _context26.t2 instanceof Error ? _context26.t2.message : String(_context26.t2)
                       });
                     case 74:
-                      _context23.next = 42;
+                      _context26.next = 42;
                       break;
                     case 76:
-                      _context23.next = 81;
+                      _context26.next = 81;
                       break;
                     case 78:
-                      _context23.prev = 78;
-                      _context23.t3 = _context23["catch"](40);
-                      _iterator35.e(_context23.t3);
+                      _context26.prev = 78;
+                      _context26.t3 = _context26["catch"](40);
+                      _iterator37.e(_context26.t3);
                     case 81:
-                      _context23.prev = 81;
-                      _iterator35.f();
-                      return _context23.finish(81);
+                      _context26.prev = 81;
+                      _iterator37.f();
+                      return _context26.finish(81);
                     case 84:
-                      _this23.logInfo('patchOrdersInSQLite-完成', {
+                      _this25.logInfo('patchOrdersInSQLite-完成', {
                         source: source,
                         count: compactedToWrite.length,
                         writeMethod: writeMethod,
@@ -4023,32 +4319,32 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       });
                     case 85:
                     case "end":
-                      return _context23.stop();
+                      return _context26.stop();
                   }
-                }, _callee23, null, [[17, 27, 30, 33], [40, 78, 81, 84], [44, 71], [49, 63, 66, 69]]);
+                }, _callee26, null, [[17, 27, 30, 33], [40, 78, 81, 84], [44, 71], [49, 63, 66, 69]]);
               })));
             case 44:
-              _context24.next = 51;
+              _context27.next = 51;
               break;
             case 46:
-              _context24.prev = 46;
-              _context24.t1 = _context24["catch"](41);
+              _context27.prev = 46;
+              _context27.t1 = _context27["catch"](41);
               this.logError('增量保存订单到 SQLite 失败', {
-                error: _context24.t1 instanceof Error ? _context24.t1.message : String(_context24.t1),
+                error: _context27.t1 instanceof Error ? _context27.t1.message : String(_context27.t1),
                 orderCount: ordersSnapshot.length
               });
               if (!options.throwOnError) {
-                _context24.next = 51;
+                _context27.next = 51;
                 break;
               }
-              throw _context24.t1;
+              throw _context27.t1;
             case 51:
             case "end":
-              return _context24.stop();
+              return _context27.stop();
           }
-        }, _callee24, this, [[22, 35, 38, 41], [41, 46]]);
+        }, _callee27, this, [[22, 35, 38, 41], [41, 46]]);
       }));
-      function patchOrdersInSQLite(_x16, _x17) {
+      function patchOrdersInSQLite(_x19, _x20) {
         return _patchOrdersInSQLite.apply(this, arguments);
       }
       return patchOrdersInSQLite;
@@ -4063,128 +4359,128 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderInSQLite",
     value: (function () {
-      var _updateOrderInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(order, source) {
-        var _this24 = this;
+      var _updateOrderInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(order, source) {
+        var _this26 = this;
         var options,
           orderSnapshot,
           _orderSnapshot$order_3,
-          _args26 = arguments;
-        return _regeneratorRuntime().wrap(function _callee26$(_context26) {
-          while (1) switch (_context26.prev = _context26.next) {
+          _args29 = arguments;
+        return _regeneratorRuntime().wrap(function _callee29$(_context29) {
+          while (1) switch (_context29.prev = _context29.next) {
             case 0:
-              options = _args26.length > 2 && _args26[2] !== undefined ? _args26[2] : {};
+              options = _args29.length > 2 && _args29[2] !== undefined ? _args29[2] : {};
               if (this.getOrderStorageKey(order)) {
-                _context26.next = 5;
+                _context29.next = 5;
                 break;
               }
               if (!options.throwOnError) {
-                _context26.next = 4;
+                _context29.next = 4;
                 break;
               }
               throw new Error('订单缺少可用的 SQLite 存储主键');
             case 4:
-              return _context26.abrupt("return");
+              return _context29.abrupt("return");
             case 5:
               if (this.dbManager) {
-                _context26.next = 9;
+                _context29.next = 9;
                 break;
               }
               if (!options.throwOnError) {
-                _context26.next = 8;
+                _context29.next = 8;
                 break;
               }
               throw new Error('订单 SQLite 数据库未初始化');
             case 8:
-              return _context26.abrupt("return");
+              return _context29.abrupt("return");
             case 9:
               orderSnapshot = this.normalizeOrderCollectionsForIngress(cloneDeep(order), "".concat(source, ".sqliteIngress"));
-              _context26.prev = 10;
-              _context26.next = 13;
-              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25() {
+              _context29.prev = 10;
+              _context29.next = 13;
+              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28() {
                 var _orderSnapshot$order_, _orderSnapshot$order_2;
                 var writeMethod;
-                return _regeneratorRuntime().wrap(function _callee25$(_context25) {
-                  while (1) switch (_context25.prev = _context25.next) {
+                return _regeneratorRuntime().wrap(function _callee28$(_context28) {
+                  while (1) switch (_context28.prev = _context28.next) {
                     case 0:
                       writeMethod = 'none';
-                      _this24.logInfo('updateOrderInSQLite-开始', {
+                      _this26.logInfo('updateOrderInSQLite-开始', {
                         source: source,
                         orderId: (_orderSnapshot$order_ = orderSnapshot.order_id) !== null && _orderSnapshot$order_ !== void 0 ? _orderSnapshot$order_ : null,
-                        storageKey: _this24.getOrderStorageKey(orderSnapshot)
+                        storageKey: _this26.getOrderStorageKey(orderSnapshot)
                       });
-                      if (!(typeof _this24.dbManager.update === 'function')) {
-                        _context25.next = 8;
+                      if (!(typeof _this26.dbManager.update === 'function')) {
+                        _context28.next = 8;
                         break;
                       }
                       writeMethod = 'update';
-                      _context25.next = 6;
-                      return _this24.dbManager.update(INDEXDB_STORE_NAME, orderSnapshot);
+                      _context28.next = 6;
+                      return _this26.dbManager.update(INDEXDB_STORE_NAME, orderSnapshot);
                     case 6:
-                      _context25.next = 22;
+                      _context28.next = 22;
                       break;
                     case 8:
-                      if (!(typeof _this24.dbManager.bulkUpdate === 'function')) {
-                        _context25.next = 14;
+                      if (!(typeof _this26.dbManager.bulkUpdate === 'function')) {
+                        _context28.next = 14;
                         break;
                       }
                       writeMethod = 'bulkUpdate';
-                      _context25.next = 12;
-                      return _this24.dbManager.bulkUpdate(INDEXDB_STORE_NAME, [orderSnapshot]);
+                      _context28.next = 12;
+                      return _this26.dbManager.bulkUpdate(INDEXDB_STORE_NAME, [orderSnapshot]);
                     case 12:
-                      _context25.next = 22;
+                      _context28.next = 22;
                       break;
                     case 14:
-                      if (!(typeof _this24.dbManager.bulkAdd === 'function')) {
-                        _context25.next = 20;
+                      if (!(typeof _this26.dbManager.bulkAdd === 'function')) {
+                        _context28.next = 20;
                         break;
                       }
                       writeMethod = 'bulkAdd';
-                      _context25.next = 18;
-                      return _this24.dbManager.bulkAdd(INDEXDB_STORE_NAME, [orderSnapshot]);
+                      _context28.next = 18;
+                      return _this26.dbManager.bulkAdd(INDEXDB_STORE_NAME, [orderSnapshot]);
                     case 18:
-                      _context25.next = 22;
+                      _context28.next = 22;
                       break;
                     case 20:
                       if (!options.throwOnError) {
-                        _context25.next = 22;
+                        _context28.next = 22;
                         break;
                       }
                       throw new Error('订单 SQLite 数据库不支持写入');
                     case 22:
-                      _this24.recordRecentSqliteWrite(source, [orderSnapshot]);
-                      _this24.logInfo('updateOrderInSQLite-完成', {
+                      _this26.recordRecentSqliteWrite(source, [orderSnapshot]);
+                      _this26.logInfo('updateOrderInSQLite-完成', {
                         source: source,
                         orderId: (_orderSnapshot$order_2 = orderSnapshot.order_id) !== null && _orderSnapshot$order_2 !== void 0 ? _orderSnapshot$order_2 : null,
                         writeMethod: writeMethod
                       });
                     case 24:
                     case "end":
-                      return _context25.stop();
+                      return _context28.stop();
                   }
-                }, _callee25);
+                }, _callee28);
               })));
             case 13:
-              _context26.next = 20;
+              _context29.next = 20;
               break;
             case 15:
-              _context26.prev = 15;
-              _context26.t0 = _context26["catch"](10);
+              _context29.prev = 15;
+              _context29.t0 = _context29["catch"](10);
               this.logError('单条保存订单到 SQLite 失败', {
-                error: _context26.t0 instanceof Error ? _context26.t0.message : String(_context26.t0),
+                error: _context29.t0 instanceof Error ? _context29.t0.message : String(_context29.t0),
                 orderId: (_orderSnapshot$order_3 = orderSnapshot.order_id) !== null && _orderSnapshot$order_3 !== void 0 ? _orderSnapshot$order_3 : null
               });
               if (!options.throwOnError) {
-                _context26.next = 20;
+                _context29.next = 20;
                 break;
               }
-              throw _context26.t0;
+              throw _context29.t0;
             case 20:
             case "end":
-              return _context26.stop();
+              return _context29.stop();
           }
-        }, _callee26, this, [[10, 15]]);
+        }, _callee29, this, [[10, 15]]);
       }));
-      function updateOrderInSQLite(_x18, _x19) {
+      function updateOrderInSQLite(_x21, _x22) {
         return _updateOrderInSQLite.apply(this, arguments);
       }
       return updateOrderInSQLite;
@@ -4200,75 +4496,76 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "replaceOrdersSnapshotInSQLite",
     value: (function () {
-      var _replaceOrdersSnapshotInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(orderList, source) {
-        var _this25 = this;
+      var _replaceOrdersSnapshotInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(orderList, source) {
+        var _this27 = this;
         var protectedOrdersBeforeRemoteFetch,
           remoteSnapshot,
           mergedSnapshot,
           persisted,
-          _args28 = arguments;
-        return _regeneratorRuntime().wrap(function _callee28$(_context28) {
-          while (1) switch (_context28.prev = _context28.next) {
+          _args31 = arguments;
+        return _regeneratorRuntime().wrap(function _callee31$(_context31) {
+          while (1) switch (_context31.prev = _context31.next) {
             case 0:
-              protectedOrdersBeforeRemoteFetch = _args28.length > 2 && _args28[2] !== undefined ? _args28[2] : [];
+              protectedOrdersBeforeRemoteFetch = _args31.length > 2 && _args31[2] !== undefined ? _args31[2] : [];
               if (this.dbManager) {
-                _context28.next = 3;
+                _context31.next = 3;
                 break;
               }
-              return _context28.abrupt("return", {
-                orders: this.compactOrderListByIdentity(orderList.map(function (order) {
-                  return _this25.normalizeRemoteSyncedOrder(order);
+              return _context31.abrupt("return", {
+                orders: this.compactOrderListByIdentity(this.preserveOmittedHolderRelations(orderList, this.store.list).map(function (order) {
+                  return _this27.normalizeRemoteSyncedOrder(order);
                 }), "".concat(source, ".snapshotNoDb")).list,
                 persisted: false
               });
             case 3:
               remoteSnapshot = cloneDeep(orderList).map(function (order) {
-                return _this25.normalizeOrderCollectionsForIngress(order, "".concat(source, ".remoteIngress"));
+                return _this27.normalizeOrderCollectionsForIngress(order, "".concat(source, ".remoteIngress"));
               });
               mergedSnapshot = this.compactOrderListByIdentity(remoteSnapshot.map(function (order) {
-                return _this25.normalizeRemoteSyncedOrder(order);
+                return _this27.normalizeRemoteSyncedOrder(order);
               }), "".concat(source, ".remoteSnapshot")).list;
               persisted = false;
-              _context28.prev = 6;
-              _context28.next = 9;
-              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27() {
-                var existingOrders, protectedLocalOrders, _iterator37, _step37, rawCurrentOrder, currentOrder, protectedIndex, currentNeedsProtection, orderListSnapshot;
-                return _regeneratorRuntime().wrap(function _callee27$(_context27) {
-                  while (1) switch (_context27.prev = _context27.next) {
+              _context31.prev = 6;
+              _context31.next = 9;
+              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30() {
+                var existingOrders, remoteSnapshotWithHolderRelations, protectedLocalOrders, _iterator39, _step39, rawCurrentOrder, currentOrder, protectedIndex, currentNeedsProtection, orderListSnapshot;
+                return _regeneratorRuntime().wrap(function _callee30$(_context30) {
+                  while (1) switch (_context30.prev = _context30.next) {
                     case 0:
-                      if (!(typeof _this25.dbManager.getAll === 'function')) {
-                        _context27.next = 6;
+                      if (!(typeof _this27.dbManager.getAll === 'function')) {
+                        _context30.next = 6;
                         break;
                       }
-                      _context27.next = 3;
-                      return _this25.dbManager.getAll(INDEXDB_STORE_NAME);
+                      _context30.next = 3;
+                      return _this27.dbManager.getAll(INDEXDB_STORE_NAME);
                     case 3:
-                      _context27.t0 = _context27.sent;
-                      _context27.next = 7;
+                      _context30.t0 = _context30.sent;
+                      _context30.next = 7;
                       break;
                     case 6:
-                      _context27.t0 = [];
+                      _context30.t0 = [];
                     case 7:
-                      existingOrders = _context27.t0;
+                      existingOrders = _context30.t0;
+                      remoteSnapshotWithHolderRelations = _this27.preserveOmittedHolderRelations(remoteSnapshot, [].concat(_toConsumableArray(protectedOrdersBeforeRemoteFetch), _toConsumableArray(existingOrders || [])));
                       protectedLocalOrders = protectedOrdersBeforeRemoteFetch.map(function (order) {
-                        return _this25.normalizeOrderCollectionsForIngress(order, "".concat(source, ".protectedBeforeRemoteFetch"));
+                        return _this27.normalizeOrderCollectionsForIngress(order, "".concat(source, ".protectedBeforeRemoteFetch"));
                       }).filter(function (order) {
-                        return _this25.shouldProtectLocalOrderFromRemoteSnapshot(order);
+                        return _this27.shouldProtectLocalOrderFromRemoteSnapshot(order);
                       });
-                      _iterator37 = _createForOfIteratorHelper(existingOrders || []);
-                      _context27.prev = 10;
-                      _iterator37.s();
-                    case 12:
-                      if ((_step37 = _iterator37.n()).done) {
-                        _context27.next = 23;
+                      _iterator39 = _createForOfIteratorHelper(existingOrders || []);
+                      _context30.prev = 11;
+                      _iterator39.s();
+                    case 13:
+                      if ((_step39 = _iterator39.n()).done) {
+                        _context30.next = 24;
                         break;
                       }
-                      rawCurrentOrder = _step37.value;
-                      currentOrder = _this25.normalizeOrderCollectionsForIngress(rawCurrentOrder, "".concat(source, ".currentSQLite"));
-                      protectedIndex = _this25.findOrderIndexByIdentity(protectedLocalOrders, currentOrder);
-                      currentNeedsProtection = _this25.shouldProtectLocalOrderFromRemoteSnapshot(currentOrder);
+                      rawCurrentOrder = _step39.value;
+                      currentOrder = _this27.normalizeOrderCollectionsForIngress(rawCurrentOrder, "".concat(source, ".currentSQLite"));
+                      protectedIndex = _this27.findOrderIndexByIdentity(protectedLocalOrders, currentOrder);
+                      currentNeedsProtection = _this27.shouldProtectLocalOrderFromRemoteSnapshot(currentOrder);
                       if (!(protectedIndex >= 0)) {
-                        _context27.next = 20;
+                        _context30.next = 21;
                         break;
                       }
                       if (currentNeedsProtection) {
@@ -4276,27 +4573,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       } else {
                         protectedLocalOrders.splice(protectedIndex, 1);
                       }
-                      return _context27.abrupt("continue", 21);
-                    case 20:
-                      if (currentNeedsProtection) protectedLocalOrders.push(currentOrder);
+                      return _context30.abrupt("continue", 22);
                     case 21:
-                      _context27.next = 12;
+                      if (currentNeedsProtection) protectedLocalOrders.push(currentOrder);
+                    case 22:
+                      _context30.next = 13;
                       break;
-                    case 23:
-                      _context27.next = 28;
+                    case 24:
+                      _context30.next = 29;
                       break;
-                    case 25:
-                      _context27.prev = 25;
-                      _context27.t1 = _context27["catch"](10);
-                      _iterator37.e(_context27.t1);
-                    case 28:
-                      _context27.prev = 28;
-                      _iterator37.f();
-                      return _context27.finish(28);
-                    case 31:
-                      orderListSnapshot = _this25.mergeRemoteSnapshotWithPendingOrders(remoteSnapshot, protectedLocalOrders);
-                      mergedSnapshot = _this25.compactOrderListByIdentity(orderListSnapshot, "".concat(source, ".sqliteSnapshot")).list;
-                      _this25.logInfo('replaceOrdersSnapshotInSQLite-开始', {
+                    case 26:
+                      _context30.prev = 26;
+                      _context30.t1 = _context30["catch"](11);
+                      _iterator39.e(_context30.t1);
+                    case 29:
+                      _context30.prev = 29;
+                      _iterator39.f();
+                      return _context30.finish(29);
+                    case 32:
+                      orderListSnapshot = _this27.mergeRemoteSnapshotWithPendingOrders(remoteSnapshotWithHolderRelations, protectedLocalOrders);
+                      mergedSnapshot = _this27.compactOrderListByIdentity(orderListSnapshot, "".concat(source, ".sqliteSnapshot")).list;
+                      _this27.logInfo('replaceOrdersSnapshotInSQLite-开始', {
                         source: source,
                         count: mergedSnapshot.length,
                         remoteCount: remoteSnapshot.length,
@@ -4304,10 +4601,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                         protectedLocalOrderCount: protectedLocalOrders.length,
                         preservedLocalUnsyncedCount: mergedSnapshot.length - remoteSnapshot.length,
                         protectedPendingPaymentCount: protectedLocalOrders.reduce(function (count, order) {
-                          return count + _this25.getIdentifiedPendingPayments(order).length;
+                          return count + _this27.getIdentifiedPendingPayments(order).length;
                         }, 0),
                         protectedPendingPaymentIdentities: protectedLocalOrders.flatMap(function (order) {
-                          return _this25.getIdentifiedPendingPayments(order).map(function (payment) {
+                          return _this27.getIdentifiedPendingPayments(order).map(function (payment) {
                             var _order$order_id5, _external_sale_number5;
                             return {
                               order_id: (_order$order_id5 = order.order_id) !== null && _order$order_id5 !== void 0 ? _order$order_id5 : null,
@@ -4317,55 +4614,55 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                           });
                         })
                       });
-                      _context27.next = 36;
-                      return _this25.dbManager.clear(INDEXDB_STORE_NAME);
-                    case 36:
-                      _this25.logInfo('replaceOrdersSnapshotInSQLite-clear完成', {
+                      _context30.next = 37;
+                      return _this27.dbManager.clear(INDEXDB_STORE_NAME);
+                    case 37:
+                      _this27.logInfo('replaceOrdersSnapshotInSQLite-clear完成', {
                         count: mergedSnapshot.length
                       });
                       if (!(mergedSnapshot.length === 0)) {
-                        _context27.next = 39;
+                        _context30.next = 40;
                         break;
                       }
-                      return _context27.abrupt("return");
-                    case 39:
-                      _context27.next = 41;
-                      return _this25.dbManager.bulkAdd(INDEXDB_STORE_NAME, mergedSnapshot);
-                    case 41:
-                      _this25.recordRecentSqliteWrite(source, mergedSnapshot);
-                      _this25.logInfo('replaceOrdersSnapshotInSQLite-bulkAdd完成', {
+                      return _context30.abrupt("return");
+                    case 40:
+                      _context30.next = 42;
+                      return _this27.dbManager.bulkAdd(INDEXDB_STORE_NAME, mergedSnapshot);
+                    case 42:
+                      _this27.recordRecentSqliteWrite(source, mergedSnapshot);
+                      _this27.logInfo('replaceOrdersSnapshotInSQLite-bulkAdd完成', {
                         source: source,
                         count: mergedSnapshot.length
                       });
-                    case 43:
+                    case 44:
                     case "end":
-                      return _context27.stop();
+                      return _context30.stop();
                   }
-                }, _callee27, null, [[10, 25, 28, 31]]);
+                }, _callee30, null, [[11, 26, 29, 32]]);
               })));
             case 9:
               persisted = true;
-              _context28.next = 15;
+              _context31.next = 15;
               break;
             case 12:
-              _context28.prev = 12;
-              _context28.t0 = _context28["catch"](6);
+              _context31.prev = 12;
+              _context31.t0 = _context31["catch"](6);
               this.logError('全量保存订单到 SQLite 失败', {
-                error: _context28.t0 instanceof Error ? _context28.t0.message : String(_context28.t0),
+                error: _context31.t0 instanceof Error ? _context31.t0.message : String(_context31.t0),
                 orderList: remoteSnapshot.length
               });
             case 15:
-              return _context28.abrupt("return", {
+              return _context31.abrupt("return", {
                 orders: mergedSnapshot,
                 persisted: persisted
               });
             case 16:
             case "end":
-              return _context28.stop();
+              return _context31.stop();
           }
-        }, _callee28, this, [[6, 12]]);
+        }, _callee31, this, [[6, 12]]);
       }));
-      function replaceOrdersSnapshotInSQLite(_x20, _x21) {
+      function replaceOrdersSnapshotInSQLite(_x23, _x24) {
         return _replaceOrdersSnapshotInSQLite.apply(this, arguments);
       }
       return replaceOrdersSnapshotInSQLite;
@@ -4380,38 +4677,38 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "clear",
     value: (function () {
-      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30() {
-        var _this26 = this;
-        return _regeneratorRuntime().wrap(function _callee30$(_context30) {
-          while (1) switch (_context30.prev = _context30.next) {
+      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33() {
+        var _this28 = this;
+        return _regeneratorRuntime().wrap(function _callee33$(_context33) {
+          while (1) switch (_context33.prev = _context33.next) {
             case 0:
               this.store.list = [];
               this.store.map = new Map();
               if (!this.dbManager) {
-                _context30.next = 5;
+                _context33.next = 5;
                 break;
               }
-              _context30.next = 5;
-              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29() {
-                return _regeneratorRuntime().wrap(function _callee29$(_context29) {
-                  while (1) switch (_context29.prev = _context29.next) {
+              _context33.next = 5;
+              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32() {
+                return _regeneratorRuntime().wrap(function _callee32$(_context32) {
+                  while (1) switch (_context32.prev = _context32.next) {
                     case 0:
-                      _context29.next = 2;
-                      return _this26.dbManager.clear(INDEXDB_STORE_NAME);
+                      _context32.next = 2;
+                      return _this28.dbManager.clear(INDEXDB_STORE_NAME);
                     case 2:
                     case "end":
-                      return _context29.stop();
+                      return _context32.stop();
                   }
-                }, _callee29);
+                }, _callee32);
               })));
             case 5:
               this.clearOrderSnapshotMarker();
               this.emitOrdersChanged([], 'clear');
             case 7:
             case "end":
-              return _context30.stop();
+              return _context33.stop();
           }
-        }, _callee30, this);
+        }, _callee33, this);
       }));
       function clear() {
         return _clear.apply(this, arguments);