@pisell/pisellos 2.3.164 → 2.3.166

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

@@ -30,7 +30,7 @@ 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";
@@ -432,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;
@@ -540,7 +541,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             continue;
           }
 
-          // 远端商品成员确实发生增删时必须落库，避免内存已更新但 SQLite 仍被回声窗口跳过。
+          // 远端商品成员或 Holder 关系确实变化时必须落库，避免被回声窗口跳过。
           if (forceWriteStorageKeys.has(storageKey)) {
             toWrite.push(order);
             continue;
@@ -2190,17 +2191,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               _iterator12.s();
             case 38:
               if ((_step12 = _iterator12.n()).done) {
-                _context18.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)) {
-                _context18.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,
@@ -2211,46 +2213,46 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               draftMap.set(_storageKey2, reconciledDraftOrder);
               this.registerOrderIdentityKeys(identityKeyToIndex, nextOrder, matchIndex);
               mergeActions[_storageKey2] = 'update';
-              return _context18.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:
+            case 56:
               _context18.next = 38;
               break;
-            case 57:
-              _context18.next = 62;
+            case 58:
+              _context18.next = 63;
               break;
-            case 59:
-              _context18.prev = 59;
+            case 60:
+              _context18.prev = 60;
               _context18.t1 = _context18["catch"](36);
               _iterator12.e(_context18.t1);
-            case 62:
-              _context18.prev = 62;
+            case 63:
+              _context18.prev = 63;
               _iterator12.f();
-              return _context18.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();
-              _context18.prev = 69;
-              _context18.next = 72;
+              _context18.prev = 70;
+              _context18.next = 73;
               return this.patchOrdersInSQLite(patchedOrders, 'upsertLocalDraftOrders', mergeActions, {
                 throwOnError: true
               });
-            case 72:
-              _context18.next = 79;
+            case 73:
+              _context18.next = 80;
               break;
-            case 74:
-              _context18.prev = 74;
-              _context18.t2 = _context18["catch"](69);
+            case 75:
+              _context18.prev = 75;
+              _context18.t2 = _context18["catch"](70);
               this.store.list = previousList;
               this.syncOrdersMap();
               throw _context18.t2;
-            case 79:
+            case 80:
               this.logInfo('upsertLocalDraftOrders-结束', {
                 count: patchedOrders.length,
                 storeOrderCountAfter: this.store.list.length
@@ -2259,18 +2261,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 return !_this12.shouldKeepOrderInMemory(order);
               });
               if (!(memoryDraftMap.size > 0 || removedLegacyMemoryDraft)) {
-                _context18.next = 84;
+                _context18.next = 85;
                 break;
               }
-              _context18.next = 84;
+              _context18.next = 85;
               return this.emitOrdersChanged(patchedOrders.filter(function (order) {
                 return _this12.shouldKeepOrderInMemory(order);
               }), 'upsertLocalDraftOrders');
-            case 84:
+            case 85:
             case "end":
               return _context18.stop();
           }
-        }, _callee18, 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(_x14) {
         return _upsertLocalDraftOrders.apply(this, arguments);
@@ -2646,7 +2648,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 var hasSingleId = routeInfo.hasSingleId;
                 var normalizedBody = _this17.normalizeOrderSyncPayload(msg.body || msg.data);
                 if (routeInfo.route === 'bodyUpsert' && normalizedBody) {
-                  upsertOrders.set(_this17.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));
@@ -2873,7 +2878,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               _iterator17.s();
             case 40:
               if ((_step17 = _iterator17.n()).done) {
-                _context23.next = 100;
+                _context23.next = 101;
                 break;
               }
               fresh = _step17.value;
@@ -2882,7 +2887,7 @@ 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)) {
-                _context23.next = 92;
+                _context23.next = 93;
                 break;
               }
               existingOrder = updatedList[matchIndex];
@@ -2901,7 +2906,7 @@ 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 _context23.abrupt("continue", 98);
+              return _context23.abrupt("continue", 99);
             case 52:
               if (!(this.isDraftOrder(existingOrder) && this.shouldProtectDraftOrderFromIncoming(source))) {
                 _context23.next = 55;
@@ -2915,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 _context23.abrupt("continue", 98);
+              return _context23.abrupt("continue", 99);
             case 55:
               mergedOrder = this.mergeOrderRecords(existingOrder, fresh);
               freshOrderId = fresh.order_id;
@@ -3007,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 _context23.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:
+            case 99:
               _context23.next = 40;
               break;
-            case 100:
-              _context23.next = 105;
+            case 101:
+              _context23.next = 106;
               break;
-            case 102:
-              _context23.prev = 102;
+            case 103:
+              _context23.prev = 103;
               _context23.t2 = _context23["catch"](38);
               _iterator17.e(_context23.t2);
-            case 105:
-              _context23.prev = 105;
+            case 106:
+              _context23.prev = 106;
               _iterator17.f();
-              return _context23.finish(105);
-            case 108:
+              return _context23.finish(106);
+            case 109:
               insertCount = Object.values(mergeActions).filter(function (v) {
                 return v === 'insert';
               }).length;
@@ -3050,27 +3058,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               // 仅在自检开关开启时做一次兜底校验。
               this.store.list = this.runOrderStoreSelfCheck(updatedList, "".concat(source, ".store"));
               this.syncOrdersMap();
-              _context23.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
               });
-              _context23.next = 118;
+              _context23.next = 119;
               return this.emitRemoteProductMembershipChanges(remoteProductMembershipChanges);
-            case 118:
-              _context23.next = 120;
+            case 119:
+              _context23.next = 121;
               return this.emitOrdersChanged(patchedOrders, source);
-            case 120:
+            case 121:
             case "end":
               return _context23.stop();
           }
-        }, _callee23, 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(_x16, _x17) {
         return _mergeOrdersToStore.apply(this, arguments);
@@ -3499,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) {
@@ -3539,6 +3602,7 @@ 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。
@@ -3579,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),
@@ -3645,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) {
@@ -3660,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('订单列表重复项已压缩', {
@@ -3795,7 +3859,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "loadOrdersFromSQLite",
     value: function () {
       var _loadOrdersFromSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24() {
-        var _this22 = this;
+        var _this23 = this;
         var options,
           _options$onTiming,
           loadStartedAt,
@@ -3826,7 +3890,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               sqliteRawReadMs = +(performance.now() - rawReadStartedAt).toFixed(2);
               normalizeStartedAt = performance.now();
               normalizedOrders = (orders || []).map(function (order) {
-                return _this22.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, {
@@ -3899,15 +3963,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "mergeRemoteSnapshotWithPendingOrders",
     value: function mergeRemoteSnapshotWithPendingOrders(remoteOrders, existingOrders) {
-      var _this23 = this;
+      var _this24 = this;
       var merged = remoteOrders.map(function (order) {
-        return _this23.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);
@@ -3923,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;
     }
@@ -3975,7 +4039,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "patchOrdersInSQLite",
     value: (function () {
       var _patchOrdersInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(orders, source) {
-        var _this24 = this;
+        var _this25 = this;
         var mergeActions,
           options,
           forceWriteStorageKeys,
@@ -3987,8 +4051,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           compactedToWrite,
           writtenStorageKeys,
           storageKeyMigrations,
-          _iterator33,
-          _step33,
+          _iterator35,
+          _step35,
           migration,
           _args27 = arguments;
         return _regeneratorRuntime().wrap(function _callee27$(_context27) {
@@ -4019,13 +4083,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 return migration.to;
               }));
               ordersSnapshot = cloneDeep(orders).map(function (order) {
-                return _this24.normalizeOrderCollectionsForIngress(order, "".concat(source, ".sqliteIngress"));
+                return _this25.normalizeOrderCollectionsForIngress(order, "".concat(source, ".sqliteIngress"));
               }).map(function (order) {
-                var storageKey = _this24.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 _this24.getOrderStorageKey(order);
+                return _this25.getOrderStorageKey(order);
               });
               if (!(ordersSnapshot.length === 0)) {
                 _context27.next = 13;
@@ -4048,18 +4112,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               return _context27.abrupt("return");
             case 19:
               writtenStorageKeys = new Set(compactedToWrite.map(function (order) {
-                return _this24.getOrderStorageKey(order);
+                return _this25.getOrderStorageKey(order);
               }).filter(Boolean));
               storageKeyMigrations = new Map();
-              _iterator33 = _createForOfIteratorHelper(options.storageKeyMigrations || []);
+              _iterator35 = _createForOfIteratorHelper(options.storageKeyMigrations || []);
               _context27.prev = 22;
-              _iterator33.s();
+              _iterator35.s();
             case 24:
-              if ((_step33 = _iterator33.n()).done) {
+              if ((_step35 = _iterator35.n()).done) {
                 _context27.next = 33;
                 break;
               }
-              migration = _step33.value;
+              migration = _step35.value;
               if (writtenStorageKeys.has(migration.to)) {
                 _context27.next = 28;
                 break;
@@ -4082,63 +4146,63 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 35:
               _context27.prev = 35;
               _context27.t0 = _context27["catch"](22);
-              _iterator33.e(_context27.t0);
+              _iterator35.e(_context27.t0);
             case 38:
               _context27.prev = 38;
-              _iterator33.f();
+              _iterator35.f();
               return _context27.finish(38);
             case 41:
               _context27.prev = 41;
               _context27.next = 44;
               return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26() {
-                var writeMethod, _iterator34, _step34, order, _iterator35, _step35, migration, _iterator36, _step36, _orderRecord$ORDER_ST, _order, orderRecord;
+                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';
-                      _this24.logInfo('patchOrdersInSQLite-开始', {
+                      _this25.logInfo('patchOrdersInSQLite-开始', {
                         source: source,
                         count: compactedToWrite.length,
                         dedupedCount: skipped.length
                       });
-                      if (!(typeof _this24.dbManager.bulkUpdate === 'function')) {
+                      if (!(typeof _this25.dbManager.bulkUpdate === 'function')) {
                         _context26.next = 8;
                         break;
                       }
                       writeMethod = 'bulkUpdate';
                       _context26.next = 6;
-                      return _this24.dbManager.bulkUpdate(INDEXDB_STORE_NAME, compactedToWrite);
+                      return _this25.dbManager.bulkUpdate(INDEXDB_STORE_NAME, compactedToWrite);
                     case 6:
                       _context26.next = 37;
                       break;
                     case 8:
-                      if (!(typeof _this24.dbManager.bulkAdd === 'function')) {
+                      if (!(typeof _this25.dbManager.bulkAdd === 'function')) {
                         _context26.next = 14;
                         break;
                       }
                       writeMethod = 'bulkAdd';
                       _context26.next = 12;
-                      return _this24.dbManager.bulkAdd(INDEXDB_STORE_NAME, compactedToWrite);
+                      return _this25.dbManager.bulkAdd(INDEXDB_STORE_NAME, compactedToWrite);
                     case 12:
                       _context26.next = 37;
                       break;
                     case 14:
-                      if (!(typeof _this24.dbManager.update === 'function')) {
+                      if (!(typeof _this25.dbManager.update === 'function')) {
                         _context26.next = 35;
                         break;
                       }
                       writeMethod = 'update';
-                      _iterator34 = _createForOfIteratorHelper(compactedToWrite);
+                      _iterator36 = _createForOfIteratorHelper(compactedToWrite);
                       _context26.prev = 17;
-                      _iterator34.s();
+                      _iterator36.s();
                     case 19:
-                      if ((_step34 = _iterator34.n()).done) {
+                      if ((_step36 = _iterator36.n()).done) {
                         _context26.next = 25;
                         break;
                       }
-                      order = _step34.value;
+                      order = _step36.value;
                       _context26.next = 23;
-                      return _this24.dbManager.update(INDEXDB_STORE_NAME, order);
+                      return _this25.dbManager.update(INDEXDB_STORE_NAME, order);
                     case 23:
                       _context26.next = 19;
                       break;
@@ -4148,10 +4212,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                     case 27:
                       _context26.prev = 27;
                       _context26.t0 = _context26["catch"](17);
-                      _iterator34.e(_context26.t0);
+                      _iterator36.e(_context26.t0);
                     case 30:
                       _context26.prev = 30;
-                      _iterator34.f();
+                      _iterator36.f();
                       return _context26.finish(30);
                     case 33:
                       _context26.next = 37;
@@ -4163,35 +4227,35 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       }
                       throw new Error('订单 SQLite 数据库不支持写入');
                     case 37:
-                      _this24.recordRecentSqliteWrite(source, compactedToWrite);
+                      _this25.recordRecentSqliteWrite(source, compactedToWrite);
                       if (!(writeMethod !== 'none')) {
                         _context26.next = 84;
                         break;
                       }
-                      _iterator35 = _createForOfIteratorHelper(storageKeyMigrations.values());
+                      _iterator37 = _createForOfIteratorHelper(storageKeyMigrations.values());
                       _context26.prev = 40;
-                      _iterator35.s();
+                      _iterator37.s();
                     case 42:
-                      if ((_step35 = _iterator35.n()).done) {
+                      if ((_step37 = _iterator37.n()).done) {
                         _context26.next = 76;
                         break;
                       }
-                      migration = _step35.value;
+                      migration = _step37.value;
                       _context26.prev = 44;
                       _context26.next = 47;
-                      return _this24.dbManager.delete(INDEXDB_STORE_NAME, migration.from);
+                      return _this25.dbManager.delete(INDEXDB_STORE_NAME, migration.from);
                     case 47:
-                      _this24.recentSqliteWriteByStorageKey.delete(migration.from);
-                      _iterator36 = _createForOfIteratorHelper(orders);
+                      _this25.recentSqliteWriteByStorageKey.delete(migration.from);
+                      _iterator38 = _createForOfIteratorHelper(orders);
                       _context26.prev = 49;
-                      _iterator36.s();
+                      _iterator38.s();
                     case 51:
-                      if ((_step36 = _iterator36.n()).done) {
+                      if ((_step38 = _iterator38.n()).done) {
                         _context26.next = 61;
                         break;
                       }
-                      _order = _step36.value;
-                      if (!(_this24.getOrderStorageKey(_order) !== migration.to)) {
+                      _order = _step38.value;
+                      if (!(_this25.getOrderStorageKey(_order) !== migration.to)) {
                         _context26.next = 55;
                         break;
                       }
@@ -4214,10 +4278,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                     case 63:
                       _context26.prev = 63;
                       _context26.t1 = _context26["catch"](49);
-                      _iterator36.e(_context26.t1);
+                      _iterator38.e(_context26.t1);
                     case 66:
                       _context26.prev = 66;
-                      _iterator36.f();
+                      _iterator38.f();
                       return _context26.finish(66);
                     case 69:
                       _context26.next = 74;
@@ -4225,7 +4289,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                     case 71:
                       _context26.prev = 71;
                       _context26.t2 = _context26["catch"](44);
-                      _this24.logError('删除订单旧 SQLite storage key 失败', {
+                      _this25.logError('删除订单旧 SQLite storage key 失败', {
                         source: source,
                         order_id: migration.orderId,
                         oldStorageKey: migration.from,
@@ -4241,13 +4305,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                     case 78:
                       _context26.prev = 78;
                       _context26.t3 = _context26["catch"](40);
-                      _iterator35.e(_context26.t3);
+                      _iterator37.e(_context26.t3);
                     case 81:
                       _context26.prev = 81;
-                      _iterator35.f();
+                      _iterator37.f();
                       return _context26.finish(81);
                     case 84:
-                      _this24.logInfo('patchOrdersInSQLite-完成', {
+                      _this25.logInfo('patchOrdersInSQLite-完成', {
                         source: source,
                         count: compactedToWrite.length,
                         writeMethod: writeMethod,
@@ -4296,7 +4360,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "updateOrderInSQLite",
     value: (function () {
       var _updateOrderInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(order, source) {
-        var _this25 = this;
+        var _this26 = this;
         var options,
           orderSnapshot,
           _orderSnapshot$order_3,
@@ -4339,40 +4403,40 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   while (1) switch (_context28.prev = _context28.next) {
                     case 0:
                       writeMethod = 'none';
-                      _this25.logInfo('updateOrderInSQLite-开始', {
+                      _this26.logInfo('updateOrderInSQLite-开始', {
                         source: source,
                         orderId: (_orderSnapshot$order_ = orderSnapshot.order_id) !== null && _orderSnapshot$order_ !== void 0 ? _orderSnapshot$order_ : null,
-                        storageKey: _this25.getOrderStorageKey(orderSnapshot)
+                        storageKey: _this26.getOrderStorageKey(orderSnapshot)
                       });
-                      if (!(typeof _this25.dbManager.update === 'function')) {
+                      if (!(typeof _this26.dbManager.update === 'function')) {
                         _context28.next = 8;
                         break;
                       }
                       writeMethod = 'update';
                       _context28.next = 6;
-                      return _this25.dbManager.update(INDEXDB_STORE_NAME, orderSnapshot);
+                      return _this26.dbManager.update(INDEXDB_STORE_NAME, orderSnapshot);
                     case 6:
                       _context28.next = 22;
                       break;
                     case 8:
-                      if (!(typeof _this25.dbManager.bulkUpdate === 'function')) {
+                      if (!(typeof _this26.dbManager.bulkUpdate === 'function')) {
                         _context28.next = 14;
                         break;
                       }
                       writeMethod = 'bulkUpdate';
                       _context28.next = 12;
-                      return _this25.dbManager.bulkUpdate(INDEXDB_STORE_NAME, [orderSnapshot]);
+                      return _this26.dbManager.bulkUpdate(INDEXDB_STORE_NAME, [orderSnapshot]);
                     case 12:
                       _context28.next = 22;
                       break;
                     case 14:
-                      if (!(typeof _this25.dbManager.bulkAdd === 'function')) {
+                      if (!(typeof _this26.dbManager.bulkAdd === 'function')) {
                         _context28.next = 20;
                         break;
                       }
                       writeMethod = 'bulkAdd';
                       _context28.next = 18;
-                      return _this25.dbManager.bulkAdd(INDEXDB_STORE_NAME, [orderSnapshot]);
+                      return _this26.dbManager.bulkAdd(INDEXDB_STORE_NAME, [orderSnapshot]);
                     case 18:
                       _context28.next = 22;
                       break;
@@ -4383,8 +4447,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       }
                       throw new Error('订单 SQLite 数据库不支持写入');
                     case 22:
-                      _this25.recordRecentSqliteWrite(source, [orderSnapshot]);
-                      _this25.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
@@ -4433,7 +4497,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "replaceOrdersSnapshotInSQLite",
     value: (function () {
       var _replaceOrdersSnapshotInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(orderList, source) {
-        var _this26 = this;
+        var _this27 = this;
         var protectedOrdersBeforeRemoteFetch,
           remoteSnapshot,
           mergedSnapshot,
@@ -4448,32 +4512,32 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 break;
               }
               return _context31.abrupt("return", {
-                orders: this.compactOrderListByIdentity(orderList.map(function (order) {
-                  return _this26.normalizeRemoteSyncedOrder(order);
+                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 _this26.normalizeOrderCollectionsForIngress(order, "".concat(source, ".remoteIngress"));
+                return _this27.normalizeOrderCollectionsForIngress(order, "".concat(source, ".remoteIngress"));
               });
               mergedSnapshot = this.compactOrderListByIdentity(remoteSnapshot.map(function (order) {
-                return _this26.normalizeRemoteSyncedOrder(order);
+                return _this27.normalizeRemoteSyncedOrder(order);
               }), "".concat(source, ".remoteSnapshot")).list;
               persisted = false;
               _context31.prev = 6;
               _context31.next = 9;
               return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30() {
-                var existingOrders, protectedLocalOrders, _iterator37, _step37, rawCurrentOrder, currentOrder, protectedIndex, currentNeedsProtection, orderListSnapshot;
+                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 _this26.dbManager.getAll === 'function')) {
+                      if (!(typeof _this27.dbManager.getAll === 'function')) {
                         _context30.next = 6;
                         break;
                       }
                       _context30.next = 3;
-                      return _this26.dbManager.getAll(INDEXDB_STORE_NAME);
+                      return _this27.dbManager.getAll(INDEXDB_STORE_NAME);
                     case 3:
                       _context30.t0 = _context30.sent;
                       _context30.next = 7;
@@ -4482,25 +4546,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       _context30.t0 = [];
                     case 7:
                       existingOrders = _context30.t0;
+                      remoteSnapshotWithHolderRelations = _this27.preserveOmittedHolderRelations(remoteSnapshot, [].concat(_toConsumableArray(protectedOrdersBeforeRemoteFetch), _toConsumableArray(existingOrders || [])));
                       protectedLocalOrders = protectedOrdersBeforeRemoteFetch.map(function (order) {
-                        return _this26.normalizeOrderCollectionsForIngress(order, "".concat(source, ".protectedBeforeRemoteFetch"));
+                        return _this27.normalizeOrderCollectionsForIngress(order, "".concat(source, ".protectedBeforeRemoteFetch"));
                       }).filter(function (order) {
-                        return _this26.shouldProtectLocalOrderFromRemoteSnapshot(order);
+                        return _this27.shouldProtectLocalOrderFromRemoteSnapshot(order);
                       });
-                      _iterator37 = _createForOfIteratorHelper(existingOrders || []);
-                      _context30.prev = 10;
-                      _iterator37.s();
-                    case 12:
-                      if ((_step37 = _iterator37.n()).done) {
-                        _context30.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 = _this26.normalizeOrderCollectionsForIngress(rawCurrentOrder, "".concat(source, ".currentSQLite"));
-                      protectedIndex = _this26.findOrderIndexByIdentity(protectedLocalOrders, currentOrder);
-                      currentNeedsProtection = _this26.shouldProtectLocalOrderFromRemoteSnapshot(currentOrder);
+                      rawCurrentOrder = _step39.value;
+                      currentOrder = _this27.normalizeOrderCollectionsForIngress(rawCurrentOrder, "".concat(source, ".currentSQLite"));
+                      protectedIndex = _this27.findOrderIndexByIdentity(protectedLocalOrders, currentOrder);
+                      currentNeedsProtection = _this27.shouldProtectLocalOrderFromRemoteSnapshot(currentOrder);
                       if (!(protectedIndex >= 0)) {
-                        _context30.next = 20;
+                        _context30.next = 21;
                         break;
                       }
                       if (currentNeedsProtection) {
@@ -4508,27 +4573,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       } else {
                         protectedLocalOrders.splice(protectedIndex, 1);
                       }
-                      return _context30.abrupt("continue", 21);
-                    case 20:
-                      if (currentNeedsProtection) protectedLocalOrders.push(currentOrder);
+                      return _context30.abrupt("continue", 22);
                     case 21:
-                      _context30.next = 12;
+                      if (currentNeedsProtection) protectedLocalOrders.push(currentOrder);
+                    case 22:
+                      _context30.next = 13;
                       break;
-                    case 23:
-                      _context30.next = 28;
+                    case 24:
+                      _context30.next = 29;
                       break;
-                    case 25:
-                      _context30.prev = 25;
-                      _context30.t1 = _context30["catch"](10);
-                      _iterator37.e(_context30.t1);
-                    case 28:
-                      _context30.prev = 28;
-                      _iterator37.f();
-                      return _context30.finish(28);
-                    case 31:
-                      orderListSnapshot = _this26.mergeRemoteSnapshotWithPendingOrders(remoteSnapshot, protectedLocalOrders);
-                      mergedSnapshot = _this26.compactOrderListByIdentity(orderListSnapshot, "".concat(source, ".sqliteSnapshot")).list;
-                      _this26.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,
@@ -4536,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 + _this26.getIdentifiedPendingPayments(order).length;
+                          return count + _this27.getIdentifiedPendingPayments(order).length;
                         }, 0),
                         protectedPendingPaymentIdentities: protectedLocalOrders.flatMap(function (order) {
-                          return _this26.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,
@@ -4549,31 +4614,31 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                           });
                         })
                       });
-                      _context30.next = 36;
-                      return _this26.dbManager.clear(INDEXDB_STORE_NAME);
-                    case 36:
-                      _this26.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)) {
-                        _context30.next = 39;
+                        _context30.next = 40;
                         break;
                       }
                       return _context30.abrupt("return");
-                    case 39:
-                      _context30.next = 41;
-                      return _this26.dbManager.bulkAdd(INDEXDB_STORE_NAME, mergedSnapshot);
-                    case 41:
-                      _this26.recordRecentSqliteWrite(source, mergedSnapshot);
-                      _this26.logInfo('replaceOrdersSnapshotInSQLite-bulkAdd完成', {
+                    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 _context30.stop();
                   }
-                }, _callee30, null, [[10, 25, 28, 31]]);
+                }, _callee30, null, [[11, 26, 29, 32]]);
               })));
             case 9:
               persisted = true;
@@ -4613,7 +4678,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "clear",
     value: (function () {
       var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33() {
-        var _this27 = this;
+        var _this28 = this;
         return _regeneratorRuntime().wrap(function _callee33$(_context33) {
           while (1) switch (_context33.prev = _context33.next) {
             case 0:
@@ -4629,7 +4694,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   while (1) switch (_context32.prev = _context32.next) {
                     case 0:
                       _context32.next = 2;
-                      return _this27.dbManager.clear(INDEXDB_STORE_NAME);
+                      return _this28.dbManager.clear(INDEXDB_STORE_NAME);
                     case 2:
                     case "end":
                       return _context32.stop();