@pisell/pisellos 2.2.277 → 2.2.800

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

@@ -35,7 +35,6 @@ import dayjs from 'dayjs';
 import { BaseModule } from "../../../modules/BaseModule";
 import { applyOrderCollectionUidRemaps, getOrderCollectionPersistentId, getOrderCollectionReferenceUid, getOrderCollectionUid, isSameOrderCollectionItem, mergeOrderCollectionItems, normalizeOrderCollections } from "../../../modules/Order/utils/orderCollectionIdentity";
 import { OrderHooks } from "./types";
-import { getOrderPaymentIdentityKeys, isIdentifiedPendingOrderPayment, isPendingOrderPayment, mergeOrderPaymentListsByIdentity, mergeOrderPaymentRecord, resolveOrderPaymentIdentity } from "../../../modules/Order/payment-utils";
 
 /**
  * SQLite 存储名称
@@ -49,7 +48,7 @@ var ORDER_SQLITE_DEDUPE_MS = 15000;
 /** silentRefresh 最小间隔，避免 preload 后立即全量重拉 */
 var ORDER_SILENT_REFRESH_MIN_INTERVAL_MS = 30000;
 /** 视为「业务侧刚写入」的来源，pubsub 回声可跳过 SQLite */
-var ORDER_BUSINESS_WRITE_SOURCES = new Set(['upsertOrdersFromRemote', 'upsertPendingSyncOrders', 'upsertLocalDraftOrders', 'overwriteExistingOrder', 'markOrderSyncedByExternalSaleNumber', 'updateLocalPayment']);
+var ORDER_BUSINESS_WRITE_SOURCES = new Set(['upsertOrdersFromRemote', 'upsertPendingSyncOrders', 'overwriteExistingOrder', 'markOrderSyncedByExternalSaleNumber']);
 
 /**
  * 合并热路径全表去重自检开关：默认关闭。
@@ -57,7 +56,6 @@ var ORDER_BUSINESS_WRITE_SOURCES = new Set(['upsertOrdersFromRemote', 'upsertPen
  * 仅用于排查增量身份索引是否遗漏了重复订单，不应在生产常开。
  */
 var ORDER_MERGE_SELF_CHECK = false;
-var PENDING_PAYMENT_WITHOUT_UNIQUE_MARKER = '__pisell_os_pending_payment_without_unique_number__';
 var ORDER_AUTHORITATIVE_COLLECTION_FIELDS = ['products', 'bookings', 'payments'];
 var ORDER_COLLECTION_KIND_BY_FIELD = {
   products: 'product',
@@ -135,77 +133,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         return _emitOrdersChanged.apply(this, arguments);
       }
       return emitOrdersChanged;
-    }()
-    /**
-     * 广播远端商品成员增删。监听器异常必须与订单落库和原有订单广播隔离。
-     */
-    )
-  }, {
-    key: "emitRemoteProductMembershipChanges",
-    value: (function () {
-      var _emitRemoteProductMembershipChanges = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(changes) {
-        var _iterator, _step, payload;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              _iterator = _createForOfIteratorHelper(changes);
-              _context2.prev = 1;
-              _iterator.s();
-            case 3:
-              if ((_step = _iterator.n()).done) {
-                _context2.next = 15;
-                break;
-              }
-              payload = _step.value;
-              _context2.prev = 5;
-              _context2.next = 8;
-              return this.core.effects.emit(OrderHooks.onRemoteProductMembershipChanged, payload);
-            case 8:
-              _context2.next = 13;
-              break;
-            case 10:
-              _context2.prev = 10;
-              _context2.t0 = _context2["catch"](5);
-              this.logError('广播远端订单商品成员变更失败', {
-                order_id: payload.order_id,
-                source: payload.source,
-                added_product_count: payload.added_product_keys.length,
-                removed_product_count: payload.removed_product_keys.length,
-                error: _context2.t0 instanceof Error ? _context2.t0.message : String(_context2.t0)
-              });
-            case 13:
-              _context2.next = 3;
-              break;
-            case 15:
-              _context2.next = 20;
-              break;
-            case 17:
-              _context2.prev = 17;
-              _context2.t1 = _context2["catch"](1);
-              _iterator.e(_context2.t1);
-            case 20:
-              _context2.prev = 20;
-              _iterator.f();
-              return _context2.finish(20);
-            case 23:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2, this, [[1, 17, 20, 23], [5, 10]]);
-      }));
-      function emitRemoteProductMembershipChanges(_x) {
-        return _emitRemoteProductMembershipChanges.apply(this, arguments);
-      }
-      return emitRemoteProductMembershipChanges;
     }())
   }, {
     key: "initialize",
     value: function () {
-      var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(core, options) {
-        var _options$initialState;
+      var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(core, options) {
+        var _options$initialState,
+          _this3 = this;
         var appPlugin, app;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
               this.core = core;
               this.store = options === null || options === void 0 ? void 0 : options.store;
@@ -219,7 +156,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 this.updateCreateStore();
               }
               if (Array.isArray(options === null || options === void 0 || (_options$initialState = options.initialState) === null || _options$initialState === void 0 ? void 0 : _options$initialState.list)) {
-                this.store.list = this.normalizeOrdersForMemoryList(options.initialState.list, 'initialState');
+                this.store.list = options.initialState.list.map(function (order) {
+                  return _this3.normalizeOrderForMemoryList(order);
+                });
                 this.syncOrdersMap();
                 this.emitOrdersChanged([], 'initialState');
               } else {
@@ -235,11 +174,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
             case 10:
             case "end":
-              return _context3.stop();
+              return _context2.stop();
           }
-        }, _callee3, this);
+        }, _callee2, this);
       }));
-      function initialize(_x2, _x3) {
+      function initialize(_x, _x2) {
         return _initialize.apply(this, arguments);
       }
       return initialize;
@@ -308,31 +247,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeOrderCollectionsForIngress",
     value: function normalizeOrderCollectionsForIngress(order, source) {
-      var sourceOrder = cloneDeep(order);
-      var sourceOrderRecord = sourceOrder;
-      if (Array.isArray(sourceOrderRecord.payments)) {
-        sourceOrderRecord.payments = sourceOrderRecord.payments.map(function (payment) {
-          if (!isPendingOrderPayment(payment) || getOrderPaymentIdentityKeys(payment).some(function (key) {
-            return key.startsWith('unique_payment_number:');
-          })) {
-            return payment;
-          }
-          return _objectSpread(_objectSpread({}, payment), {}, _defineProperty({}, PENDING_PAYMENT_WITHOUT_UNIQUE_MARKER, true));
-        });
-      }
-      var result = normalizeOrderCollections(sourceOrder);
-      var normalizedOrderRecord = result.order;
-      if (Array.isArray(normalizedOrderRecord.payments)) {
-        normalizedOrderRecord.payments = normalizedOrderRecord.payments.map(function (payment) {
-          if (!(payment !== null && payment !== void 0 && payment[PENDING_PAYMENT_WITHOUT_UNIQUE_MARKER])) return payment;
-          var nextPayment = _objectSpread({}, payment);
-          var metadata = _objectSpread({}, nextPayment.metadata || {});
-          delete metadata.unique_payment_number;
-          delete nextPayment[PENDING_PAYMENT_WITHOUT_UNIQUE_MARKER];
-          nextPayment.metadata = metadata;
-          return nextPayment;
-        });
-      }
+      var result = normalizeOrderCollections(order);
       var kinds = ['product', 'booking', 'payment'];
       var hasChanges = kinds.some(function (kind) {
         var stats = result.stats[kind];
@@ -376,14 +291,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "mergeAuthoritativeOrderCollection",
     value: function mergeAuthoritativeOrderCollection(field, existing, incoming) {
       var uidRemaps = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
-      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) {
-        return mergeOrderPaymentListsByIdentity(existingItems, incoming, {
-          preserveUnmatchedExistingWhen: isIdentifiedPendingOrderPayment
-        });
-      }
       return incoming.map(function (incomingItem) {
         var existingItem = existingItems.find(function (item) {
           return isSameOrderCollectionItem(kind, item, incomingItem);
@@ -392,11 +301,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         var mergedItem = mergeOrderCollectionItems(kind, existingItem, incomingItem);
         var mergedUid = getOrderCollectionUid(kind, mergedItem);
         if (mergedUid) {
-          var _iterator2 = _createForOfIteratorHelper(new Set([getOrderCollectionReferenceUid(kind, existingItem), getOrderCollectionReferenceUid(kind, incomingItem)])),
-            _step2;
+          var _iterator = _createForOfIteratorHelper(new Set([getOrderCollectionReferenceUid(kind, existingItem), getOrderCollectionReferenceUid(kind, incomingItem)])),
+            _step;
           try {
-            for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-              var from = _step2.value;
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              var from = _step.value;
               if (!from || from === mergedUid) continue;
               uidRemaps.push({
                 kind: kind,
@@ -406,9 +315,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
             }
           } catch (err) {
-            _iterator2.e(err);
+            _iterator.e(err);
           } finally {
-            _iterator2.f();
+            _iterator.f();
           }
         }
         return mergedItem;
@@ -439,11 +348,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "recordRecentSqliteWrite",
     value: function recordRecentSqliteWrite(source, orders) {
       var now = Date.now();
-      var _iterator3 = _createForOfIteratorHelper(orders),
-        _step3;
+      var _iterator2 = _createForOfIteratorHelper(orders),
+        _step2;
       try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          var order = _step3.value;
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var order = _step2.value;
           var storageKey = this.getOrderStorageKey(order);
           if (!storageKey) continue;
           this.recentSqliteWriteByStorageKey.set(storageKey, {
@@ -452,9 +361,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           });
         }
       } catch (err) {
-        _iterator3.e(err);
+        _iterator2.e(err);
       } finally {
-        _iterator3.f();
+        _iterator2.f();
       }
     }
 
@@ -467,7 +376,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "filterRedundantPatchOrders",
     value: function filterRedundantPatchOrders(source, orders, mergeActions) {
-      var forceWriteStorageKeys = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : new Set();
       var eligibleSkipSources = new Set(['pubsub.bodyUpsert', 'pubsub.httpRefresh']);
       if (!eligibleSkipSources.has(source)) {
         return {
@@ -478,11 +386,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var now = Date.now();
       var toWrite = [];
       var skipped = [];
-      var _iterator4 = _createForOfIteratorHelper(orders),
-        _step4;
+      var _iterator3 = _createForOfIteratorHelper(orders),
+        _step3;
       try {
-        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-          var order = _step4.value;
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var order = _step3.value;
           var storageKey = this.getOrderStorageKey(order);
           if (!storageKey) {
             toWrite.push(order);
@@ -496,12 +404,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             toWrite.push(order);
             continue;
           }
-
-          // 远端商品成员确实发生增删时必须落库，避免内存已更新但 SQLite 仍被回声窗口跳过。
-          if (forceWriteStorageKeys.has(storageKey)) {
-            toWrite.push(order);
-            continue;
-          }
           var recent = this.recentSqliteWriteByStorageKey.get(storageKey);
           if (recent && ORDER_BUSINESS_WRITE_SOURCES.has(recent.source) && now - recent.ts < ORDER_SQLITE_DEDUPE_MS) {
             var _order$order_id2;
@@ -517,9 +419,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           toWrite.push(order);
         }
       } catch (err) {
-        _iterator4.e(err);
+        _iterator3.e(err);
       } finally {
-        _iterator4.f();
+        _iterator3.f();
       }
       return {
         toWrite: toWrite,
@@ -539,11 +441,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var now = Date.now();
       var toFetch = [];
       var skipped = [];
-      var _iterator5 = _createForOfIteratorHelper(ids),
-        _step5;
+      var _iterator4 = _createForOfIteratorHelper(ids),
+        _step4;
       try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          var id = _step5.value;
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var id = _step4.value;
           var existing = this.getOrderByOrderId(id);
           if (!existing) {
             toFetch.push(id);
@@ -562,9 +464,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           toFetch.push(id);
         }
       } catch (err) {
-        _iterator5.e(err);
+        _iterator4.e(err);
       } finally {
-        _iterator5.f();
+        _iterator4.f();
       }
       return {
         toFetch: toFetch,
@@ -700,26 +602,61 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "preload",
     value: function () {
       var _preload = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-        var orders;
+        var _this4 = this;
+        var getData;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _context4.next = 2;
-              return this.loadOrdersByServer();
+              // const hasPulledInCurrentWindow = this.hasPulledOrdersToday()
+              // // 仅当缓存属于当前统计窗口时才直接复用，避免跨天/跨营业日窗口继续使用旧数据
+              // if (cachedOrders.length > 0 && hasPulledInCurrentWindow) {
+              //   this.store.list = cloneDeep(cachedOrders)
+              //   this.syncOrdersMap()
+              //   this.core.effects.emit(OrderHooks.onOrdersChanged, this.store.list)
+              //   return
+              // }
+              // if (hasPulledInCurrentWindow) {
+              //   this.logInfo('当天已完成全量订单拉取，跳过本次全量拉取', {
+              //     lastFullFetchAt: this.getStorageItem(ORDER_LAST_FULL_FETCH_AT_STORAGE_KEY),
+              //   })
+              //   return
+              // }
+              getData = /*#__PURE__*/function () {
+                var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+                  var orders;
+                  return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+                    while (1) switch (_context3.prev = _context3.next) {
+                      case 0:
+                        _context3.next = 2;
+                        return _this4.loadOrdersByServer();
+                      case 2:
+                        orders = _context3.sent;
+                        if (!(orders.length === 0)) {
+                          _context3.next = 5;
+                          break;
+                        }
+                        return _context3.abrupt("return");
+                      case 5:
+                        _this4.store.list = cloneDeep(orders);
+                        _this4.syncOrdersMap();
+                        _this4.emitOrdersChanged([], 'preload');
+                        _this4.core.effects.emit(OrderHooks.onOrdersSyncCompleted, null);
+                      case 9:
+                      case "end":
+                        return _context3.stop();
+                    }
+                  }, _callee3);
+                }));
+                return function getData() {
+                  return _ref.apply(this, arguments);
+                };
+              }();
+              getData();
             case 2:
-              orders = _context4.sent;
-              this.store.list = cloneDeep(orders);
-              this.syncOrdersMap();
-              _context4.next = 7;
-              return this.emitOrdersChanged([], 'preload');
-            case 7:
-              _context4.next = 9;
-              return this.core.effects.emit(OrderHooks.onOrdersSyncCompleted, null);
-            case 9:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this);
+        }, _callee4);
       }));
       function preload() {
         return _preload.apply(this, arguments);
@@ -743,38 +680,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function getOrderByOrderId(orderId) {
       return this.store.map.get(this.getIdKey(orderId));
     }
-  }, {
-    key: "buildLocalPaymentOrderLogContext",
-    value: function buildLocalPaymentOrderLogContext(order) {
-      var _order$order_id3, _order$external_sale_, _order$order_number, _order$shop_order_num, _order$shop_full_orde, _order$status, _order$payment_status, _order$platform, _order$business_code, _order$order_sales_ch, _order$sales_channel, _order$type;
-      if (!order) return {};
-      return {
-        order_id: (_order$order_id3 = order.order_id) !== null && _order$order_id3 !== void 0 ? _order$order_id3 : null,
-        external_sale_number: (_order$external_sale_ = order.external_sale_number) !== null && _order$external_sale_ !== void 0 ? _order$external_sale_ : null,
-        order_number: (_order$order_number = order.order_number) !== null && _order$order_number !== void 0 ? _order$order_number : null,
-        shop_order_number: (_order$shop_order_num = order.shop_order_number) !== null && _order$shop_order_num !== void 0 ? _order$shop_order_num : null,
-        shop_full_order_number: (_order$shop_full_orde = order.shop_full_order_number) !== null && _order$shop_full_orde !== void 0 ? _order$shop_full_orde : null,
-        order_status: (_order$status = order.status) !== null && _order$status !== void 0 ? _order$status : null,
-        payment_status: (_order$payment_status = order.payment_status) !== null && _order$payment_status !== void 0 ? _order$payment_status : null,
-        is_draft_order: Number(order.is_draft_order || 0),
-        need_sync: Number(order.need_sync || 0),
-        platform: (_order$platform = order.platform) !== null && _order$platform !== void 0 ? _order$platform : null,
-        business_code: (_order$business_code = order.business_code) !== null && _order$business_code !== void 0 ? _order$business_code : null,
-        order_sales_channel: (_order$order_sales_ch = order.order_sales_channel) !== null && _order$order_sales_ch !== void 0 ? _order$order_sales_ch : null,
-        sales_channel: (_order$sales_channel = order.sales_channel) !== null && _order$sales_channel !== void 0 ? _order$sales_channel : null,
-        order_type: (_order$type = order.type) !== null && _order$type !== void 0 ? _order$type : null,
-        payments_count: Array.isArray(order.payments) ? order.payments.length : 0
-      };
-    }
   }, {
     key: "getLocalOrderFromMemoryByLookup",
     value: function getLocalOrderFromMemoryByLookup(lookup) {
-      var _this3 = this;
+      var _this5 = this;
       var key = this.getIdKey(lookup);
       var memoryOrderById = this.store.map.get(key);
       if (memoryOrderById) return memoryOrderById;
       var memoryOrder = this.store.list.find(function (order) {
-        return _this3.isOrderLookupMatch(order, key);
+        return _this5.isOrderLookupMatch(order, key);
       });
       return memoryOrder || null;
     }
@@ -782,341 +696,118 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "getLocalOrderByLookup",
     value: function () {
       var _getLocalOrderByLookup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(lookup) {
-        var _this4 = this;
-        var options,
-          key,
-          logContext,
-          memoryOrderById,
-          memoryOrder,
-          orders,
-          localOrder,
-          normalizedOrder,
-          _args5 = arguments;
+        var _this6 = this;
+        var key, memoryOrderById, memoryOrder, orders, localOrder;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              options = _args5.length > 1 && _args5[1] !== undefined ? _args5[1] : {};
               key = this.getIdKey(lookup);
-              logContext = {
-                operation_id: options.operationId,
-                lookup: key,
-                memory_order_count: this.store.list.length
-              };
-              if (options.operationId) {
-                this.logInfo('getLocalOrderByLookup-localPayment-开始', logContext);
-              }
               memoryOrderById = this.store.map.get(key);
               if (!memoryOrderById) {
-                _context5.next = 8;
+                _context5.next = 4;
                 break;
               }
-              if (options.operationId) {
-                this.logInfo('getLocalOrderByLookup-localPayment-命中内存映射', _objectSpread(_objectSpread({}, logContext), this.buildLocalPaymentOrderLogContext(memoryOrderById)));
-              }
               return _context5.abrupt("return", memoryOrderById);
-            case 8:
+            case 4:
               memoryOrder = this.store.list.find(function (order) {
-                return _this4.isOrderLookupMatch(order, key);
+                return _this6.isOrderLookupMatch(order, key);
               });
               if (!memoryOrder) {
-                _context5.next = 12;
+                _context5.next = 7;
                 break;
               }
-              if (options.operationId) {
-                this.logInfo('getLocalOrderByLookup-localPayment-命中内存列表', _objectSpread(_objectSpread({}, logContext), this.buildLocalPaymentOrderLogContext(memoryOrder)));
-              }
               return _context5.abrupt("return", memoryOrder);
-            case 12:
-              if (options.operationId) {
-                this.logInfo('getLocalOrderByLookup-localPayment-开始读取SQLite', logContext);
-              }
-              _context5.next = 15;
+            case 7:
+              _context5.next = 9;
               return this.loadOrdersFromSQLite();
-            case 15:
+            case 9:
               orders = _context5.sent;
               localOrder = orders.find(function (order) {
-                return _this4.isOrderLookupMatch(order, key);
+                return _this6.isOrderLookupMatch(order, key);
               });
               if (localOrder) {
-                _context5.next = 20;
+                _context5.next = 13;
                 break;
               }
-              if (options.operationId) {
-                this.logWarning('getLocalOrderByLookup-localPayment-SQLite未命中', _objectSpread(_objectSpread({}, logContext), {}, {
-                  sqlite_order_count: orders.length
-                }));
-              }
               return _context5.abrupt("return", null);
-            case 20:
-              this.store.list = this.normalizeOrdersForMemoryList(orders, 'getLocalOrderByLookup.sqliteMemory');
+            case 13:
+              this.store.list = orders.map(function (order) {
+                return _this6.normalizeOrderForMemoryList(order);
+              });
               this.syncOrdersMap();
-              normalizedOrder = this.normalizeOrderForMemoryList(localOrder);
-              if (options.operationId) {
-                this.logInfo('getLocalOrderByLookup-localPayment-SQLite命中', _objectSpread(_objectSpread({}, logContext), {}, {
-                  sqlite_order_count: orders.length
-                }, this.buildLocalPaymentOrderLogContext(normalizedOrder)));
-              }
-              return _context5.abrupt("return", normalizedOrder);
-            case 25:
+              return _context5.abrupt("return", this.normalizeOrderForMemoryList(localOrder));
+            case 16:
             case "end":
               return _context5.stop();
           }
         }, _callee5, this);
       }));
-      function getLocalOrderByLookup(_x4) {
+      function getLocalOrderByLookup(_x3) {
         return _getLocalOrderByLookup.apply(this, arguments);
       }
       return getLocalOrderByLookup;
     }()
   }, {
-    key: "getLocalPayment",
+    key: "loadOrdersByServer",
     value: function () {
-      var _getLocalPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(params) {
-        var logContext, order, payments, match;
+      var _loadOrdersByServer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+        var _this$store,
+          _this7 = this;
+        var orderList, data, mergedOrders, memoryOrders;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
-            case 0:
-              logContext = {
-                operation_id: params.operationId,
-                sale_id: params.saleId,
-                payment_number: params.paymentNumber
-              };
-              this.logInfo('getLocalPayment-开始', logContext);
-              _context6.prev = 2;
-              _context6.next = 5;
-              return this.getLocalOrderByLookup(params.saleId, {
-                operationId: params.operationId
-              });
-            case 5:
-              order = _context6.sent;
-              if (order) {
-                _context6.next = 9;
-                break;
-              }
-              this.logWarning('getLocalPayment-订单未命中', logContext);
-              return _context6.abrupt("return", null);
-            case 9:
-              payments = order.payments || [];
-              match = resolveOrderPaymentIdentity(payments, params.paymentNumber, 'compat');
-              if (match) {
-                _context6.next = 14;
-                break;
-              }
-              this.logWarning('getLocalPayment-支付项未命中', _objectSpread(_objectSpread(_objectSpread({}, logContext), this.buildLocalPaymentOrderLogContext(order)), {}, {
-                payments: payments
-              }));
-              return _context6.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", {
-                order: order,
-                payment: match.payment,
-                paymentIndex: match.index,
-                matchedBy: match.matchedBy
-              });
-            case 18:
-              _context6.prev = 18;
-              _context6.t0 = _context6["catch"](2);
-              this.logError('getLocalPayment-查询失败', _objectSpread(_objectSpread({}, logContext), {}, {
-                error: _context6.t0 instanceof Error ? _context6.t0.message : String(_context6.t0)
-              }));
-              throw _context6.t0;
-            case 22:
-            case "end":
-              return _context6.stop();
-          }
-        }, _callee6, this, [[2, 18]]);
-      }));
-      function getLocalPayment(_x5) {
-        return _getLocalPayment.apply(this, arguments);
-      }
-      return getLocalPayment;
-    }()
-  }, {
-    key: "updateLocalPayment",
-    value: function () {
-      var _updateLocalPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(params) {
-        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) {
-            case 0:
-              logContext = {
-                operation_id: params.operationId,
-                sale_id: params.saleId,
-                payment_number: params.paymentNumber,
-                incoming_payment_update: params.updates
-              };
-              this.logInfo('updateLocalPayment-开始', logContext);
-              _context7.next = 4;
-              return this.getLocalPayment(params);
-            case 4:
-              found = _context7.sent;
-              if (found) {
-                _context7.next = 8;
-                break;
-              }
-              this.logWarning('updateLocalPayment-支付项未命中', logContext);
-              return _context7.abrupt("return", null);
-            case 8:
-              previousPayment = cloneDeep(found.payment);
-              nextPayment = mergeOrderPaymentRecord(found.payment, _objectSpread(_objectSpread({}, params.updates), {}, {
-                updated_at: params.updates.updated_at || dayjs().format('YYYY-MM-DD HH:mm:ss')
-              }));
-              nextOrder = _objectSpread(_objectSpread({}, found.order), {}, {
-                payments: (found.order.payments || []).map(function (payment, index) {
-                  return index === found.paymentIndex ? nextPayment : payment;
-                }),
-                updated_at: dayjs().format('YYYY-MM-DD HH:mm:ss')
-              });
-              paymentContext = _objectSpread(_objectSpread(_objectSpread({}, logContext), {}, {
-                matched_by: found.matchedBy,
-                payment_index: found.paymentIndex
-              }, this.buildLocalPaymentOrderLogContext(nextOrder)), {}, {
-                previous_payment: previousPayment,
-                payment: nextPayment
-              });
-              this.logInfo('updateLocalPayment-支付项合并完成', paymentContext);
-              targetIndex = this.findOrderIndexByIdentity(this.store.list, found.order);
-              shouldKeepInMemory = this.shouldKeepOrderInMemory(nextOrder);
-              if (!(targetIndex < 0 && shouldKeepInMemory)) {
-                _context7.next = 18;
-                break;
-              }
-              this.logError('updateLocalPayment-订单Store索引未命中', paymentContext);
-              return _context7.abrupt("return", null);
-            case 18:
-              previousList = this.store.list;
-              this.store.list = shouldKeepInMemory ? this.store.list.map(function (order, index) {
-                return index === targetIndex ? nextOrder : order;
-              }) : this.store.list.filter(function (_, index) {
-                return index !== targetIndex;
-              });
-              this.syncOrdersMap();
-              storageOrder = this.withoutSyntheticDraftOrderId(nextOrder);
-              _context7.prev = 22;
-              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;
-              return this.updateOrderInSQLite(storageOrder, 'updateLocalPayment', {
-                throwOnError: true
-              });
-            case 26:
-              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;
-              break;
-            case 29:
-              _context7.prev = 29;
-              _context7.t0 = _context7["catch"](22);
-              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)
-              }));
-              throw _context7.t0;
-            case 35:
-              if (!(shouldKeepInMemory || targetIndex >= 0)) {
-                _context7.next = 38;
-                break;
-              }
-              _context7.next = 38;
-              return this.emitOrdersChanged(shouldKeepInMemory ? [nextOrder] : [], shouldKeepInMemory ? 'updateLocalPayment' : 'updateLocalPayment.sqliteOnlyDraft');
-            case 38:
-              this.logInfo('updateLocalPayment-变更事件完成', paymentContext);
-              return _context7.abrupt("return", {
-                order: nextOrder,
-                payment: nextPayment,
-                previousPayment: previousPayment
-              });
-            case 40:
-            case "end":
-              return _context7.stop();
-          }
-        }, _callee7, this, [[22, 29]]);
-      }));
-      function updateLocalPayment(_x6) {
-        return _updateLocalPayment.apply(this, arguments);
-      }
-      return updateLocalPayment;
-    }()
-  }, {
-    key: "loadOrdersByServer",
-    value: function () {
-      var _loadOrdersByServer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-        var _this5 = this,
-          _this$store;
-        var orderList, protectedOrdersBeforeRemoteFetch, data, mergedOrders, memoryOrders;
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
             case 0:
               orderList = [];
-              _context8.next = 3;
-              return this.loadOrdersFromSQLite();
-            case 3:
-              protectedOrdersBeforeRemoteFetch = _context8.sent.filter(function (order) {
-                return _this5.shouldProtectLocalOrderFromRemoteSnapshot(order);
-              });
               this.logInfo('loadOrdersByServer-开始', {
                 hasOrderDataSource: !!this.orderDataSource,
-                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;
-                }, 0)
+                query: ((_this$store = this.store) === null || _this$store === void 0 ? void 0 : _this$store.createdAtQuery) || null
               });
               if (!this.orderDataSource) {
-                _context8.next = 20;
+                _context6.next = 17;
                 break;
               }
-              _context8.prev = 6;
-              _context8.next = 9;
+              _context6.prev = 3;
+              _context6.next = 6;
               return this.orderDataSource.run({
                 sse: {
                   query: this.store.createdAtQuery
                 }
               });
-            case 9:
-              data = _context8.sent;
+            case 6:
+              data = _context6.sent;
               orderList = data || [];
               this.logInfo('loadOrdersByServer-SSE拉取成功', {
                 count: orderList.length
               });
               this.markOrderPulledAtNow();
               this.lastServerFullFetchAtMs = Date.now();
-              _context8.next = 20;
+              _context6.next = 17;
               break;
-            case 16:
-              _context8.prev = 16;
-              _context8.t0 = _context8["catch"](6);
+            case 13:
+              _context6.prev = 13;
+              _context6.t0 = _context6["catch"](3);
               this.logInfo('loadOrdersByServer-SSE拉取失败，保持当前内存订单');
-              return _context8.abrupt("return", this.store.list);
-            case 20:
-              _context8.next = 22;
-              return this.replaceOrdersSnapshotInSQLite(orderList, 'loadOrdersByServer', protectedOrdersBeforeRemoteFetch);
-            case 22:
-              mergedOrders = _context8.sent;
-              memoryOrders = this.normalizeOrdersForMemoryList(mergedOrders, 'loadOrdersByServer.memory');
+              return _context6.abrupt("return", this.store.list);
+            case 17:
+              _context6.next = 19;
+              return this.replaceOrdersSnapshotInSQLite(orderList, 'loadOrdersByServer');
+            case 19:
+              mergedOrders = _context6.sent;
+              memoryOrders = mergedOrders.map(function (order) {
+                return _this7.normalizeOrderForMemoryList(order);
+              });
               this.logInfo('loadOrdersByServer-结束', {
-                count: memoryOrders.length,
-                persistedCount: mergedOrders.length,
-                sqliteOnlyDraftCount: mergedOrders.length - memoryOrders.length
+                count: memoryOrders.length
               });
-              _context8.next = 27;
+              _context6.next = 24;
               return this.core.effects.emit(OrderHooks.onOrdersLoaded, memoryOrders);
-            case 27:
-              return _context8.abrupt("return", memoryOrders);
-            case 28:
+            case 24:
+              return _context6.abrupt("return", memoryOrders);
+            case 25:
             case "end":
-              return _context8.stop();
+              return _context6.stop();
           }
-        }, _callee8, this, [[6, 16]]);
+        }, _callee6, this, [[3, 13]]);
       }));
       function loadOrdersByServer() {
         return _loadOrdersByServer.apply(this, arguments);
@@ -1131,54 +822,61 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "silentRefresh",
     value: (function () {
-      var _silentRefresh = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+      var _silentRefresh = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
         var startTime, elapsedSinceFullFetch, orders, errorMessage;
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
               startTime = Date.now();
               elapsedSinceFullFetch = Date.now() - this.lastServerFullFetchAtMs;
               if (!(this.lastServerFullFetchAtMs > 0 && elapsedSinceFullFetch < ORDER_SILENT_REFRESH_MIN_INTERVAL_MS)) {
-                _context9.next = 4;
+                _context7.next = 4;
                 break;
               }
-              return _context9.abrupt("return", this.store.list);
+              return _context7.abrupt("return", this.store.list);
             case 4:
               this.logInfo('silentRefresh 开始');
-              _context9.prev = 5;
+              _context7.prev = 5;
               // 刷新前，需要更新当前营业日边界（store.createdAtQuery）
               this.updateCreateStore();
-              _context9.next = 9;
+              _context7.next = 9;
               return this.loadOrdersByServer();
             case 9:
-              orders = _context9.sent;
+              orders = _context7.sent;
+              if (!(orders.length > 0)) {
+                _context7.next = 19;
+                break;
+              }
               this.store.list = cloneDeep(orders);
               this.syncOrdersMap();
-              _context9.next = 14;
-              return this.emitOrdersChanged([], 'silentRefresh');
-            case 14:
-              _context9.next = 16;
+              this.emitOrdersChanged([], 'silentRefresh');
+              _context7.next = 16;
               return this.core.effects.emit(OrderHooks.onOrdersSyncCompleted, null);
             case 16:
               this.logInfo('silentRefresh 完成', {
                 orderCount: orders.length,
                 duration: "".concat(Date.now() - startTime, "ms")
               });
-              return _context9.abrupt("return", this.store.list);
+              _context7.next = 20;
+              break;
+            case 19:
+              this.logInfo('silentRefresh: 服务器未返回数据');
             case 20:
-              _context9.prev = 20;
-              _context9.t0 = _context9["catch"](5);
-              errorMessage = _context9.t0 instanceof Error ? _context9.t0.message : String(_context9.t0);
+              return _context7.abrupt("return", this.store.list);
+            case 23:
+              _context7.prev = 23;
+              _context7.t0 = _context7["catch"](5);
+              errorMessage = _context7.t0 instanceof Error ? _context7.t0.message : String(_context7.t0);
               this.logError('silentRefresh 失败', {
                 duration: "".concat(Date.now() - startTime, "ms"),
                 error: errorMessage
               });
-              return _context9.abrupt("return", this.store.list);
-            case 25:
+              return _context7.abrupt("return", this.store.list);
+            case 28:
             case "end":
-              return _context9.stop();
+              return _context7.stop();
           }
-        }, _callee9, this, [[5, 20]]);
+        }, _callee7, this, [[5, 23]]);
       }));
       function silentRefresh() {
         return _silentRefresh.apply(this, arguments);
@@ -1191,9 +889,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var source = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'normalizeOrderForMemoryList';
       var normalizedOrder = this.normalizeOrderCollectionsForIngress(order, source);
       var externalSaleNumber = normalizedOrder === null || normalizedOrder === void 0 ? void 0 : normalizedOrder.external_sale_number;
-      if (this.isDraftOrder(normalizedOrder) && !this.hasRealOrderId(normalizedOrder)) {
-        return normalizedOrder;
-      }
       if ((normalizedOrder === null || normalizedOrder === void 0 ? void 0 : normalizedOrder.order_id) !== undefined && (normalizedOrder === null || normalizedOrder === void 0 ? void 0 : normalizedOrder.order_id) !== null && (normalizedOrder === null || normalizedOrder === void 0 ? void 0 : normalizedOrder.order_id) !== '') {
         return normalizedOrder;
       }
@@ -1204,39 +899,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         order_id: externalSaleNumber
       });
     }
-  }, {
-    key: "normalizeOrdersForMemoryList",
-    value: function normalizeOrdersForMemoryList(orders, source) {
-      var _this6 = this;
-      return orders.map(function (order) {
-        return _this6.normalizeOrderForMemoryList(order, source);
-      }).filter(function (order) {
-        return _this6.shouldKeepOrderInMemory(order);
-      });
-    }
-  }, {
-    key: "hasRealOrderId",
-    value: function hasRealOrderId(order) {
-      if (!order || this.isBlankIdentityValue(order.order_id)) return false;
-      var externalSaleNumber = order.external_sale_number;
-      return !(this.isDraftOrder(order) && !this.isBlankIdentityValue(externalSaleNumber) && String(order.order_id) === String(externalSaleNumber));
-    }
-  }, {
-    key: "shouldKeepOrderInMemory",
-    value: function shouldKeepOrderInMemory(order) {
-      return !this.isDraftOrder(order) || this.hasRealOrderId(order);
-    }
-  }, {
-    key: "withoutSyntheticDraftOrderId",
-    value: function withoutSyntheticDraftOrderId(order) {
-      var externalSaleNumber = order.external_sale_number;
-      if (Number(order.is_draft_order || 0) !== 1 || order.order_id === undefined || externalSaleNumber === undefined || String(order.order_id) !== String(externalSaleNumber)) {
-        return order;
-      }
-      var next = _objectSpread({}, order);
-      delete next.order_id;
-      return next;
-    }
 
     /**
      * 仅覆盖本地已存在的订单；不存在则直接跳过，不落库、不 emit。
@@ -1245,31 +907,31 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "overwriteExistingOrder",
     value: (function () {
-      var _overwriteExistingOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(fresh) {
-        var _this7 = this;
+      var _overwriteExistingOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(fresh) {
+        var _this8 = this;
         var orderId, key, normalizedFresh, existingOrder, reconciledFresh;
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
               orderId = fresh === null || fresh === void 0 ? void 0 : fresh.order_id;
               if (!(orderId === undefined || orderId === null)) {
-                _context10.next = 4;
+                _context8.next = 4;
                 break;
               }
               this.logError('overwriteExistingOrder-入参缺少 order_id');
-              return _context10.abrupt("return", {
+              return _context8.abrupt("return", {
                 overwritten: false
               });
             case 4:
               key = this.getIdKey(orderId);
               if (this.store.map.has(key)) {
-                _context10.next = 8;
+                _context8.next = 8;
                 break;
               }
               this.logInfo('overwriteExistingOrder-本地不存在该订单，跳过', {
                 orderId: orderId
               });
-              return _context10.abrupt("return", {
+              return _context8.abrupt("return", {
                 overwritten: false
               });
             case 8:
@@ -1283,31 +945,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 _this7.normalizeOrderForMemoryList(order, 'overwriteExistingOrder.existingMemory');
+                  return _this8.normalizeOrderForMemoryList(order, 'overwriteExistingOrder.existingMemory');
                 }
-                return _this7.getIdKey(id) === key ? reconciledFresh : _this7.normalizeOrderForMemoryList(order, 'overwriteExistingOrder.existingMemory');
+                return _this8.getIdKey(id) === key ? reconciledFresh : _this8.normalizeOrderForMemoryList(order, 'overwriteExistingOrder.existingMemory');
               });
               this.syncOrdersMap();
-              _context10.next = 16;
+              _context8.next = 16;
               return this.updateOrderInSQLite(reconciledFresh, 'overwriteExistingOrder');
             case 16:
               this.logInfo('overwriteExistingOrder-结束', {
                 orderId: orderId,
                 storeOrderCountAfter: this.store.list.length
               });
-              _context10.next = 19;
+              _context8.next = 19;
               return this.emitOrdersChanged([reconciledFresh], 'overwriteExistingOrder');
             case 19:
-              return _context10.abrupt("return", {
+              return _context8.abrupt("return", {
                 overwritten: true
               });
             case 20:
             case "end":
-              return _context10.stop();
+              return _context8.stop();
           }
-        }, _callee10, this);
+        }, _callee8, this);
       }));
-      function overwriteExistingOrder(_x7) {
+      function overwriteExistingOrder(_x4) {
         return _overwriteExistingOrder.apply(this, arguments);
       }
       return overwriteExistingOrder;
@@ -1320,33 +982,29 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "upsertOrdersFromRemote",
     value: (function () {
-      var _upsertOrdersFromRemote = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(freshOrders) {
-        var source,
-          _args11 = arguments;
-        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+      var _upsertOrdersFromRemote = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(freshOrders) {
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              source = _args11.length > 1 && _args11[1] !== undefined ? _args11[1] : 'upsertOrdersFromRemote';
               if (freshOrders !== null && freshOrders !== void 0 && freshOrders.length) {
-                _context11.next = 4;
+                _context9.next = 3;
                 break;
               }
               this.logInfo('upsertOrdersFromRemote-订单列表为空', {});
-              return _context11.abrupt("return");
-            case 4:
+              return _context9.abrupt("return");
+            case 3:
               this.logInfo('upsertOrdersFromRemote-开始', {
-                count: freshOrders.length,
-                source: source
+                count: freshOrders.length
               });
-              _context11.next = 7;
-              return this.mergeOrdersToStore(freshOrders, source);
-            case 7:
+              _context9.next = 6;
+              return this.mergeOrdersToStore(freshOrders, 'upsertOrdersFromRemote');
+            case 6:
             case "end":
-              return _context11.stop();
+              return _context9.stop();
           }
-        }, _callee11, this);
+        }, _callee9, this);
       }));
-      function upsertOrdersFromRemote(_x8) {
+      function upsertOrdersFromRemote(_x5) {
         return _upsertOrdersFromRemote.apply(this, arguments);
       }
       return upsertOrdersFromRemote;
@@ -1354,21 +1012,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "markOrderSyncedByExternalSaleNumber",
     value: function () {
-      var _markOrderSyncedByExternalSaleNumber = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(params) {
-        var _this8 = this,
+      var _markOrderSyncedByExternalSaleNumber = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(params) {
+        var _this9 = this,
           _existing$external_sa,
           _nextOrder$order_id;
         var externalSaleNumber, key, targetIndex, existing, nextOrder, storageKey;
-        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
               externalSaleNumber = params.externalSaleNumber;
               if (!(externalSaleNumber === undefined || externalSaleNumber === null || externalSaleNumber === '')) {
-                _context12.next = 4;
+                _context10.next = 4;
                 break;
               }
               this.logError('markOrderSyncedByExternalSaleNumber-缺少 external_sale_number');
-              return _context12.abrupt("return", {
+              return _context10.abrupt("return", {
                 updated: false
               });
             case 4:
@@ -1376,24 +1034,23 @@ 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 _this8.getIdKey(value) === key;
+                return _this9.getIdKey(value) === key;
               });
               if (!(targetIndex < 0)) {
-                _context12.next = 9;
+                _context10.next = 9;
                 break;
               }
               this.logInfo('markOrderSyncedByExternalSaleNumber-本地订单不存在，跳过', {
                 external_sale_number: externalSaleNumber
               });
-              return _context12.abrupt("return", {
+              return _context10.abrupt("return", {
                 updated: false
               });
             case 9:
               existing = this.store.list[targetIndex];
               nextOrder = this.normalizeRemoteSyncedOrder(_objectSpread(_objectSpread(_objectSpread({}, existing), params.patch || {}), {}, {
                 external_sale_number: (_existing$external_sa = existing.external_sale_number) !== null && _existing$external_sa !== void 0 ? _existing$external_sa : externalSaleNumber,
-                need_sync: 0,
-                is_draft_order: 0
+                need_sync: 0
               }));
               storageKey = this.getOrderStorageKey(nextOrder) || key;
               this.store.list = this.store.list.map(function (order, index) {
@@ -1401,27 +1058,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 return nextOrder;
               });
               this.syncOrdersMap();
-              _context12.next = 16;
+              _context10.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
               });
-              _context12.next = 19;
+              _context10.next = 19;
               return this.emitOrdersChanged([nextOrder], 'markOrderSyncedByExternalSaleNumber');
             case 19:
-              return _context12.abrupt("return", {
+              return _context10.abrupt("return", {
                 updated: true,
                 order: nextOrder
               });
             case 20:
             case "end":
-              return _context12.stop();
+              return _context10.stop();
           }
-        }, _callee12, this);
+        }, _callee10, this);
       }));
-      function markOrderSyncedByExternalSaleNumber(_x9) {
+      function markOrderSyncedByExternalSaleNumber(_x6) {
         return _markOrderSyncedByExternalSaleNumber.apply(this, arguments);
       }
       return markOrderSyncedByExternalSaleNumber;
@@ -1433,391 +1090,155 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "upsertPendingSyncOrders",
     value: (function () {
-      var _upsertPendingSyncOrders = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(pendingOrders) {
-        var _this9 = this;
-        var options,
-          pendingMap,
-          memoryPendingMap,
-          _iterator6,
-          _step6,
-          order,
-          normalizedOrder,
-          pendingOrder,
-          storageKey,
-          mergeActions,
-          updatedList,
-          identityKeyToIndex,
-          index,
-          _iterator7,
-          _step7,
-          key,
-          _iterator8,
-          _step8,
-          _step8$value,
-          _storageKey,
-          _pendingOrder,
-          matchIndex,
-          existingOrder,
-          mergedOrder,
-          nextOrder,
-          pendingSnapshot,
-          insertIndex,
-          patchedOrders,
-          previousList,
-          _args13 = arguments;
-        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+      var _upsertPendingSyncOrders = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(pendingOrders) {
+        var _this10 = this;
+        var pendingMap, memoryPendingMap, _iterator5, _step5, order, normalizedOrder, storageKey, mergeActions, updatedList, identityKeyToIndex, index, _iterator6, _step6, key, _iterator7, _step7, _step7$value, _storageKey, pendingOrder, matchIndex, existingOrder, mergedOrder, pendingSnapshot, insertIndex, patchedOrders;
+        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              options = _args13.length > 1 && _args13[1] !== undefined ? _args13[1] : {};
               if (pendingOrders !== null && pendingOrders !== void 0 && pendingOrders.length) {
-                _context13.next = 4;
+                _context11.next = 3;
                 break;
               }
               this.logInfo('upsertPendingSyncOrders-订单列表为空', {});
-              return _context13.abrupt("return");
-            case 4:
+              return _context11.abrupt("return");
+            case 3:
               pendingMap = new Map();
               memoryPendingMap = new Map();
-              _iterator6 = _createForOfIteratorHelper(pendingOrders);
-              _context13.prev = 7;
-              _iterator6.s();
-            case 9:
-              if ((_step6 = _iterator6.n()).done) {
-                _context13.next = 20;
+              _iterator5 = _createForOfIteratorHelper(pendingOrders);
+              _context11.prev = 6;
+              _iterator5.s();
+            case 8:
+              if ((_step5 = _iterator5.n()).done) {
+                _context11.next = 18;
                 break;
               }
-              order = _step6.value;
+              order = _step5.value;
               normalizedOrder = this.normalizeOrderCollectionsForIngress(order, 'upsertPendingSyncOrders.incoming');
-              pendingOrder = _objectSpread(_objectSpread({}, normalizedOrder), {}, {
-                need_sync: 1,
-                is_draft_order: 0
-              });
-              storageKey = this.getOrderStorageKey(pendingOrder);
+              storageKey = this.getOrderStorageKey(normalizedOrder);
               if (storageKey) {
-                _context13.next = 16;
+                _context11.next = 14;
                 break;
               }
-              return _context13.abrupt("continue", 18);
+              return _context11.abrupt("continue", 16);
+            case 14:
+              pendingMap.set(storageKey, normalizedOrder);
+              memoryPendingMap.set(storageKey, this.normalizeOrderForMemoryList(normalizedOrder, 'upsertPendingSyncOrders.memory'));
             case 16:
-              pendingMap.set(storageKey, pendingOrder);
-              memoryPendingMap.set(storageKey, this.normalizeOrderForMemoryList(pendingOrder, 'upsertPendingSyncOrders.memory'));
+              _context11.next = 8;
+              break;
             case 18:
-              _context13.next = 9;
+              _context11.next = 23;
               break;
             case 20:
-              _context13.next = 25;
-              break;
-            case 22:
-              _context13.prev = 22;
-              _context13.t0 = _context13["catch"](7);
-              _iterator6.e(_context13.t0);
-            case 25:
-              _context13.prev = 25;
-              _iterator6.f();
-              return _context13.finish(25);
-            case 28:
+              _context11.prev = 20;
+              _context11.t0 = _context11["catch"](6);
+              _iterator5.e(_context11.t0);
+            case 23:
+              _context11.prev = 23;
+              _iterator5.f();
+              return _context11.finish(23);
+            case 26:
               if (!(pendingMap.size === 0)) {
-                _context13.next = 31;
+                _context11.next = 29;
                 break;
               }
               this.logError('upsertPendingSyncOrders-订单缺少可落库标识', {
                 count: pendingOrders.length
               });
-              return _context13.abrupt("return");
-            case 31:
+              return _context11.abrupt("return");
+            case 29:
               this.logInfo('upsertPendingSyncOrders-开始', {
                 count: pendingMap.size
               });
               mergeActions = {};
               updatedList = this.store.list.map(function (order) {
-                return _this9.normalizeOrderForMemoryList(order, 'upsertPendingSyncOrders.existingMemory');
+                return _this10.normalizeOrderForMemoryList(order, 'upsertPendingSyncOrders.existingMemory');
               }); // 与 mergeOrdersToStore 一致：基于身份键（field:value）建立索引，把「查找已存在订单」
               // 从 O(n) 线性扫描降为 O(1)，整体复杂度由 O(n^2) 降为 O(n + m)。
               identityKeyToIndex = new Map();
               for (index = 0; index < updatedList.length; index += 1) {
-                _iterator7 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(updatedList[index]));
+                _iterator6 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(updatedList[index]));
                 try {
-                  for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-                    key = _step7.value;
+                  for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+                    key = _step6.value;
                     // 同一 key 命中多张时保留最靠前的下标，与原 findIndex「取首个匹配」一致
                     if (!identityKeyToIndex.has(key)) identityKeyToIndex.set(key, index);
                   }
                 } catch (err) {
-                  _iterator7.e(err);
+                  _iterator6.e(err);
                 } finally {
-                  _iterator7.f();
+                  _iterator6.f();
                 }
               }
-              _iterator8 = _createForOfIteratorHelper(memoryPendingMap.entries());
-              _context13.prev = 37;
-              _iterator8.s();
-            case 39:
-              if ((_step8 = _iterator8.n()).done) {
-                _context13.next = 58;
+              _iterator7 = _createForOfIteratorHelper(memoryPendingMap.entries());
+              _context11.prev = 35;
+              _iterator7.s();
+            case 37:
+              if ((_step7 = _iterator7.n()).done) {
+                _context11.next = 55;
                 break;
               }
-              _step8$value = _slicedToArray(_step8.value, 2), _storageKey = _step8$value[0], _pendingOrder = _step8$value[1];
-              matchIndex = this.lookupOrderIndexByIdentityKeys(identityKeyToIndex, this.getOrderIdentityMatchKeys(_pendingOrder));
+              _step7$value = _slicedToArray(_step7.value, 2), _storageKey = _step7$value[0], pendingOrder = _step7$value[1];
+              matchIndex = this.lookupOrderIndexByIdentityKeys(identityKeyToIndex, this.getOrderIdentityMatchKeys(pendingOrder));
               if (!(matchIndex >= 0)) {
-                _context13.next = 52;
+                _context11.next = 49;
                 break;
               }
               existingOrder = updatedList[matchIndex];
-              mergedOrder = this.mergeOrderRecords(existingOrder, _pendingOrder);
-              nextOrder = _objectSpread(_objectSpread({}, mergedOrder), {}, {
-                need_sync: 1,
-                is_draft_order: 0
-              });
-              updatedList[matchIndex] = nextOrder;
+              mergedOrder = this.mergeOrderRecords(existingOrder, pendingOrder);
+              updatedList[matchIndex] = mergedOrder;
               pendingSnapshot = pendingMap.get(_storageKey);
               if (pendingSnapshot) {
                 pendingMap.set(_storageKey, this.reconcileOverwriteOrderCollections(existingOrder, pendingSnapshot));
               }
               // 合并后身份字段可能新增（如挂单拿到 order_id），同步登记，供同批后续 pending 命中同一槽位
-              this.registerOrderIdentityKeys(identityKeyToIndex, nextOrder, matchIndex);
+              this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, matchIndex);
               mergeActions[_storageKey] = 'update';
-              return _context13.abrupt("continue", 56);
-            case 52:
+              return _context11.abrupt("continue", 53);
+            case 49:
               insertIndex = updatedList.length;
-              updatedList.push(_pendingOrder);
-              this.registerOrderIdentityKeys(identityKeyToIndex, _pendingOrder, insertIndex);
+              updatedList.push(pendingOrder);
+              this.registerOrderIdentityKeys(identityKeyToIndex, pendingOrder, insertIndex);
               mergeActions[_storageKey] = 'insert';
-            case 56:
-              _context13.next = 39;
+            case 53:
+              _context11.next = 37;
               break;
-            case 58:
-              _context13.next = 63;
+            case 55:
+              _context11.next = 60;
               break;
+            case 57:
+              _context11.prev = 57;
+              _context11.t1 = _context11["catch"](35);
+              _iterator7.e(_context11.t1);
             case 60:
-              _context13.prev = 60;
-              _context13.t1 = _context13["catch"](37);
-              _iterator8.e(_context13.t1);
+              _context11.prev = 60;
+              _iterator7.f();
+              return _context11.finish(60);
             case 63:
-              _context13.prev = 63;
-              _iterator8.f();
-              return _context13.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();
-              _context13.prev = 70;
-              _context13.next = 73;
-              return this.patchOrdersInSQLite(patchedOrders, 'upsertPendingSyncOrders', mergeActions, options);
-            case 73:
-              _context13.next = 80;
-              break;
-            case 75:
-              _context13.prev = 75;
-              _context13.t2 = _context13["catch"](70);
-              this.store.list = previousList;
-              this.syncOrdersMap();
-              throw _context13.t2;
-            case 80:
+              _context11.next = 68;
+              return this.patchOrdersInSQLite(patchedOrders, 'upsertPendingSyncOrders', mergeActions);
+            case 68:
               this.logInfo('upsertPendingSyncOrders-结束', {
                 count: patchedOrders.length,
                 storeOrderCountAfter: this.store.list.length
               });
-              _context13.next = 83;
+              _context11.next = 71;
               return this.emitOrdersChanged(patchedOrders, 'upsertPendingSyncOrders');
-            case 83:
+            case 71:
             case "end":
-              return _context13.stop();
+              return _context11.stop();
           }
-        }, _callee13, this, [[7, 22, 25, 28], [37, 60, 63, 66], [70, 75]]);
+        }, _callee11, this, [[6, 20, 23, 26], [35, 57, 60, 63]]);
       }));
-      function upsertPendingSyncOrders(_x10) {
+      function upsertPendingSyncOrders(_x7) {
         return _upsertPendingSyncOrders.apply(this, arguments);
       }
       return upsertPendingSyncOrders;
     }()
-    /**
-     * 将 POS 草稿订单按 SQLite storage key 落库。
-     * 只有具备真实 order_id 的草稿进入 store；其余草稿仅供本地恢复查询。
-     */
-    )
-  }, {
-    key: "upsertLocalDraftOrders",
-    value: (function () {
-      var _upsertLocalDraftOrders = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(draftOrders) {
-        var _this10 = this;
-        var draftMap, memoryDraftMap, _iterator9, _step9, order, draftOrder, storageKey, memoryDraftOrder, mergeActions, updatedList, identityKeyToIndex, index, _iterator10, _step10, key, _iterator11, _step11, _step11$value, _storageKey2, _draftOrder, matchIndex, existingOrder, reconciledDraftOrder, mergedOrder, nextOrder, insertIndex, patchedOrders, previousList, removedLegacyMemoryDraft;
-        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
-            case 0:
-              if (draftOrders !== null && draftOrders !== void 0 && draftOrders.length) {
-                _context14.next = 3;
-                break;
-              }
-              this.logInfo('upsertLocalDraftOrders-订单列表为空', {});
-              return _context14.abrupt("return");
-            case 3:
-              draftMap = new Map();
-              memoryDraftMap = new Map();
-              _iterator9 = _createForOfIteratorHelper(draftOrders);
-              _context14.prev = 6;
-              _iterator9.s();
-            case 8:
-              if ((_step9 = _iterator9.n()).done) {
-                _context14.next = 19;
-                break;
-              }
-              order = _step9.value;
-              draftOrder = _objectSpread(_objectSpread({}, order), {}, {
-                need_sync: 0,
-                is_draft_order: 1
-              });
-              storageKey = this.getOrderStorageKey(draftOrder);
-              if (storageKey) {
-                _context14.next = 14;
-                break;
-              }
-              return _context14.abrupt("continue", 17);
-            case 14:
-              draftMap.set(storageKey, draftOrder);
-              memoryDraftOrder = this.normalizeOrderForMemoryList(draftOrder);
-              if (this.shouldKeepOrderInMemory(memoryDraftOrder)) {
-                memoryDraftMap.set(storageKey, memoryDraftOrder);
-              }
-            case 17:
-              _context14.next = 8;
-              break;
-            case 19:
-              _context14.next = 24;
-              break;
-            case 21:
-              _context14.prev = 21;
-              _context14.t0 = _context14["catch"](6);
-              _iterator9.e(_context14.t0);
-            case 24:
-              _context14.prev = 24;
-              _iterator9.f();
-              return _context14.finish(24);
-            case 27:
-              if (!(draftMap.size === 0)) {
-                _context14.next = 30;
-                break;
-              }
-              this.logError('upsertLocalDraftOrders-订单缺少可落库标识', {
-                count: draftOrders.length
-              });
-              return _context14.abrupt("return");
-            case 30:
-              this.logInfo('upsertLocalDraftOrders-开始', {
-                count: draftMap.size,
-                memoryDraftCount: memoryDraftMap.size,
-                sqliteOnlyDraftCount: draftMap.size - memoryDraftMap.size
-              });
-              mergeActions = {};
-              updatedList = this.store.list.filter(function (order) {
-                return _this10.shouldKeepOrderInMemory(order);
-              });
-              identityKeyToIndex = new Map();
-              for (index = 0; index < updatedList.length; index += 1) {
-                _iterator10 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(updatedList[index]));
-                try {
-                  for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-                    key = _step10.value;
-                    if (!identityKeyToIndex.has(key)) identityKeyToIndex.set(key, index);
-                  }
-                } catch (err) {
-                  _iterator10.e(err);
-                } finally {
-                  _iterator10.f();
-                }
-              }
-              _iterator11 = _createForOfIteratorHelper(memoryDraftMap.entries());
-              _context14.prev = 36;
-              _iterator11.s();
-            case 38:
-              if ((_step11 = _iterator11.n()).done) {
-                _context14.next = 57;
-                break;
-              }
-              _step11$value = _slicedToArray(_step11.value, 2), _storageKey2 = _step11$value[0], _draftOrder = _step11$value[1];
-              matchIndex = this.lookupOrderIndexByIdentityKeys(identityKeyToIndex, this.getOrderIdentityMatchKeys(_draftOrder));
-              if (!(matchIndex >= 0)) {
-                _context14.next = 51;
-                break;
-              }
-              existingOrder = updatedList[matchIndex];
-              reconciledDraftOrder = this.preserveExistingBusinessCodeForDraft(existingOrder, _draftOrder);
-              mergedOrder = this.mergeOrderRecords(existingOrder, reconciledDraftOrder);
-              nextOrder = _objectSpread(_objectSpread({}, mergedOrder), {}, {
-                need_sync: 0,
-                is_draft_order: 1
-              });
-              updatedList[matchIndex] = nextOrder;
-              // SQLite 必须与内存中的草稿保持同一份 business_code，避免下次 hydrate 再次丢失分类。
-              draftMap.set(_storageKey2, reconciledDraftOrder);
-              this.registerOrderIdentityKeys(identityKeyToIndex, nextOrder, matchIndex);
-              mergeActions[_storageKey2] = 'update';
-              return _context14.abrupt("continue", 55);
-            case 51:
-              insertIndex = updatedList.length;
-              updatedList.push(_draftOrder);
-              this.registerOrderIdentityKeys(identityKeyToIndex, _draftOrder, insertIndex);
-              mergeActions[_storageKey2] = 'insert';
-            case 55:
-              _context14.next = 38;
-              break;
-            case 57:
-              _context14.next = 62;
-              break;
-            case 59:
-              _context14.prev = 59;
-              _context14.t1 = _context14["catch"](36);
-              _iterator11.e(_context14.t1);
-            case 62:
-              _context14.prev = 62;
-              _iterator11.f();
-              return _context14.finish(62);
-            case 65:
-              patchedOrders = _toConsumableArray(draftMap.values());
-              previousList = this.store.list;
-              this.store.list = this.runOrderStoreSelfCheck(updatedList, 'upsertLocalDraftOrders.store');
-              this.syncOrdersMap();
-              _context14.prev = 69;
-              _context14.next = 72;
-              return this.patchOrdersInSQLite(patchedOrders, 'upsertLocalDraftOrders', mergeActions, {
-                throwOnError: true
-              });
-            case 72:
-              _context14.next = 79;
-              break;
-            case 74:
-              _context14.prev = 74;
-              _context14.t2 = _context14["catch"](69);
-              this.store.list = previousList;
-              this.syncOrdersMap();
-              throw _context14.t2;
-            case 79:
-              this.logInfo('upsertLocalDraftOrders-结束', {
-                count: patchedOrders.length,
-                storeOrderCountAfter: this.store.list.length
-              });
-              removedLegacyMemoryDraft = previousList.some(function (order) {
-                return !_this10.shouldKeepOrderInMemory(order);
-              });
-              if (!(memoryDraftMap.size > 0 || removedLegacyMemoryDraft)) {
-                _context14.next = 84;
-                break;
-              }
-              _context14.next = 84;
-              return this.emitOrdersChanged(patchedOrders.filter(function (order) {
-                return _this10.shouldKeepOrderInMemory(order);
-              }), 'upsertLocalDraftOrders');
-            case 84:
-            case "end":
-              return _context14.stop();
-          }
-        }, _callee14, this, [[6, 21, 24, 27], [36, 59, 62, 65], [69, 74]]);
-      }));
-      function upsertLocalDraftOrders(_x11) {
-        return _upsertLocalDraftOrders.apply(this, arguments);
-      }
-      return upsertLocalDraftOrders;
-    }()
     /**
      * 通过 SSE 按自定义 query 拉取订单（支持 select/with 精简字段）
      */
@@ -1825,42 +1246,42 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "fetchOrdersBySSE",
     value: (function () {
-      var _fetchOrdersBySSE = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
+      var _fetchOrdersBySSE = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
         var query,
           data,
-          _args15 = arguments;
-        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+          _args12 = arguments;
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              query = _args15.length > 0 && _args15[0] !== undefined ? _args15[0] : {};
+              query = _args12.length > 0 && _args12[0] !== undefined ? _args12[0] : {};
               if (this.orderDataSource) {
-                _context15.next = 3;
+                _context12.next = 3;
                 break;
               }
-              return _context15.abrupt("return", []);
+              return _context12.abrupt("return", []);
             case 3:
-              _context15.prev = 3;
-              _context15.next = 6;
+              _context12.prev = 3;
+              _context12.next = 6;
               return this.orderDataSource.run({
                 sse: {
                   query: query
                 }
               });
             case 6:
-              data = _context15.sent;
-              return _context15.abrupt("return", data || []);
+              data = _context12.sent;
+              return _context12.abrupt("return", data || []);
             case 10:
-              _context15.prev = 10;
-              _context15.t0 = _context15["catch"](3);
+              _context12.prev = 10;
+              _context12.t0 = _context12["catch"](3);
               this.logError('fetchOrdersBySSE-失败', {
-                error: _context15.t0 instanceof Error ? _context15.t0.message : String(_context15.t0)
+                error: _context12.t0 instanceof Error ? _context12.t0.message : String(_context12.t0)
               });
-              return _context15.abrupt("return", []);
+              return _context12.abrupt("return", []);
             case 14:
             case "end":
-              return _context15.stop();
+              return _context12.stop();
           }
-        }, _callee15, this, [[3, 10]]);
+        }, _callee12, this, [[3, 10]]);
       }));
       function fetchOrdersBySSE() {
         return _fetchOrdersBySSE.apply(this, arguments);
@@ -1888,24 +1309,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncOrdersMap",
     value: function syncOrdersMap() {
-      var _this11 = this;
-      this.store.list = this.store.list.filter(function (order) {
-        return _this11.shouldKeepOrderInMemory(order);
-      });
       this.store.map.clear();
-      var _iterator12 = _createForOfIteratorHelper(this.store.list),
-        _step12;
+      var _iterator8 = _createForOfIteratorHelper(this.store.list),
+        _step8;
       try {
-        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
-          var order = _step12.value;
+        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+          var order = _step8.value;
           var primaryIdentity = this.getOrderMapKey(order);
           if (!primaryIdentity) continue;
           this.store.map.set(primaryIdentity, order);
         }
       } catch (err) {
-        _iterator12.e(err);
+        _iterator8.e(err);
       } finally {
-        _iterator12.f();
+        _iterator8.f();
       }
     }
   }, {
@@ -1926,27 +1343,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function isBlankIdentityValue(value) {
       return value === undefined || value === null || value === '';
     }
-
-    /**
-     * `/sales/draft` 的旧调用方可能把未设置的 business_code 传成空串。
-     * 对同一真实订单，空值不能覆盖已有的分类，否则 booking 查询会把该订单从 Party 列表过滤掉。
-     */
-  }, {
-    key: "preserveExistingBusinessCodeForDraft",
-    value: function preserveExistingBusinessCodeForDraft(existingOrder, draftOrder) {
-      var existingBusinessCode = existingOrder.business_code;
-      var draftBusinessCode = draftOrder.business_code;
-      var hasExistingBusinessCode = typeof existingBusinessCode === 'string' && existingBusinessCode.trim() !== '';
-      var hasDraftBusinessCode = typeof draftBusinessCode === 'string' && draftBusinessCode.trim() !== '';
-      if (!hasExistingBusinessCode || hasDraftBusinessCode) return draftOrder;
-      return _objectSpread(_objectSpread({}, draftOrder), {}, {
-        business_code: existingBusinessCode
-      });
-    }
   }, {
     key: "getOrderIdentityEntries",
     value: function getOrderIdentityEntries(order) {
-      var _this12 = this;
+      var _this11 = this;
       if (!order) return [];
       var record = order;
       var candidates = [{
@@ -1965,8 +1365,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var entries = [];
       var _loop = function _loop() {
           var candidate = _candidates[_i2];
-          if (_this12.isBlankIdentityValue(candidate.value)) return 0; // continue
-          var key = _this12.getIdKey(candidate.value);
+          if (_this11.isBlankIdentityValue(candidate.value)) return 0; // continue
+          var key = _this11.getIdKey(candidate.value);
           if (entries.some(function (entry) {
             return entry.field === candidate.field && entry.key === key;
           })) return 0; // continue
@@ -1986,17 +1386,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "getOrderIdentityKeys",
     value: function getOrderIdentityKeys(order) {
       var keys = [];
-      var _iterator13 = _createForOfIteratorHelper(this.getOrderIdentityEntries(order)),
-        _step13;
+      var _iterator9 = _createForOfIteratorHelper(this.getOrderIdentityEntries(order)),
+        _step9;
       try {
-        for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
-          var entry = _step13.value;
+        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+          var entry = _step9.value;
           if (!keys.includes(entry.key)) keys.push(entry.key);
         }
       } catch (err) {
-        _iterator13.e(err);
+        _iterator9.e(err);
       } finally {
-        _iterator13.f();
+        _iterator9.f();
       }
       return keys;
     }
@@ -2033,7 +1433,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setupOrderSync",
     value: function setupOrderSync() {
-      var _this13 = this;
+      var _this12 = this;
       if (!this.orderDataSource) return;
       this.orderDataSource.run({
         pubsub: {
@@ -2041,22 +1441,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             var _message$id, _message$order_id, _message$type;
             console.log('orderDataSource', res);
             var pubsubReceivedAt = Date.now();
-            var message = _this13.normalizeOrderSyncMessage(res);
+            var message = _this12.normalizeOrderSyncMessage(res);
             if (!message) return;
             message._pubsubReceivedAt = pubsubReceivedAt;
-            _this13.pendingSyncMessages.push(message);
-            var throttleMs = _this13.getOrderSyncThrottleMs();
-            var routeInfo = _this13.resolveSyncMessageRoute(message);
-            _this13.logInfo('orderSync-收到消息并入队', {
+            _this12.pendingSyncMessages.push(message);
+            var throttleMs = _this12.getOrderSyncThrottleMs();
+            var routeInfo = _this12.resolveSyncMessageRoute(message);
+            _this12.logInfo('orderSync-收到消息并入队', {
               id: (_message$id = message.id) !== null && _message$id !== void 0 ? _message$id : null,
               order_id: (_message$order_id = message.order_id) !== null && _message$order_id !== void 0 ? _message$order_id : null,
               type: (_message$type = message.type) !== null && _message$type !== void 0 ? _message$type : null,
-              pendingCount: _this13.pendingSyncMessages.length,
+              pendingCount: _this12.pendingSyncMessages.length,
               throttleMs: throttleMs,
               pubsubReceivedAt: new Date(pubsubReceivedAt).toISOString(),
               fullMessage: JSON.stringify(message)
             });
-            _this13.scheduleOrderSyncThrottle();
+            _this12.scheduleOrderSyncThrottle();
           }
         }
       }).catch(function () {
@@ -2073,7 +1473,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "scheduleOrderSyncThrottle",
     value: function scheduleOrderSyncThrottle() {
-      var _this14 = this;
+      var _this13 = this;
       if (this.isProcessingSyncBatch) return;
       if (this.isIdlePhase) {
         this.isIdlePhase = false;
@@ -2084,8 +1484,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (this.syncTimer) return;
       var throttleMs = this.getOrderSyncThrottleMs();
       this.syncTimer = setTimeout(function () {
-        _this14.syncTimer = undefined;
-        void _this14.flushOrderSyncMessagesByThrottle();
+        _this13.syncTimer = undefined;
+        void _this13.flushOrderSyncMessagesByThrottle();
       }, throttleMs);
     }
 
@@ -2096,41 +1496,41 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "flushOrderSyncMessagesByThrottle",
     value: (function () {
-      var _flushOrderSyncMessagesByThrottle = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
-        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+      var _flushOrderSyncMessagesByThrottle = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
               if (!this.isProcessingSyncBatch) {
-                _context16.next = 2;
+                _context13.next = 2;
                 break;
               }
-              return _context16.abrupt("return");
+              return _context13.abrupt("return");
             case 2:
               if (!(this.pendingSyncMessages.length === 0)) {
-                _context16.next = 5;
+                _context13.next = 5;
                 break;
               }
               this.isIdlePhase = true;
-              return _context16.abrupt("return");
+              return _context13.abrupt("return");
             case 5:
               this.isProcessingSyncBatch = true;
-              _context16.prev = 6;
-              _context16.next = 9;
+              _context13.prev = 6;
+              _context13.next = 9;
               return this.processOrderSyncMessages();
             case 9:
-              _context16.prev = 9;
+              _context13.prev = 9;
               this.isProcessingSyncBatch = false;
               if (this.pendingSyncMessages.length > 0) {
                 this.scheduleOrderSyncThrottle();
               } else {
                 this.isIdlePhase = true;
               }
-              return _context16.finish(9);
+              return _context13.finish(9);
             case 13:
             case "end":
-              return _context16.stop();
+              return _context13.stop();
           }
-        }, _callee16, this, [[6,, 9, 13]]);
+        }, _callee13, this, [[6,, 9, 13]]);
       }));
       function flushOrderSyncMessagesByThrottle() {
         return _flushOrderSyncMessagesByThrottle.apply(this, arguments);
@@ -2152,19 +1552,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "processOrderSyncMessages",
     value: (function () {
-      var _processOrderSyncMessages = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
-        var _this15 = this;
+      var _processOrderSyncMessages = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
+        var _this14 = this;
         var messages, batchProcessStartAt, earliestReceivedAt, upsertOrders, refreshIds, uniqueRefreshIds, upsertList, _this$filterRedundant, toFetch, skipped, freshOrders, batchProcessEndAt;
-        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
               messages = _toConsumableArray(this.pendingSyncMessages);
               this.pendingSyncMessages = [];
               if (!(messages.length === 0)) {
-                _context17.next = 4;
+                _context14.next = 4;
                 break;
               }
-              return _context17.abrupt("return");
+              return _context14.abrupt("return");
             case 4:
               batchProcessStartAt = Date.now();
               earliestReceivedAt = Math.min.apply(Math, _toConsumableArray(messages.map(function (m) {
@@ -2180,13 +1580,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               upsertOrders = new Map();
               refreshIds = [];
               messages.forEach(function (msg, msgIndex) {
-                var routeInfo = _this15.resolveSyncMessageRoute(msg);
+                var routeInfo = _this14.resolveSyncMessageRoute(msg);
                 var hasBatchIds = routeInfo.hasBatchIds;
                 var singleId = routeInfo.singleId;
                 var hasSingleId = routeInfo.hasSingleId;
-                var normalizedBody = _this15.normalizeOrderSyncPayload(msg.body || msg.data);
+                var normalizedBody = _this14.normalizeOrderSyncPayload(msg.body || msg.data);
                 if (routeInfo.route === 'bodyUpsert' && normalizedBody) {
-                  upsertOrders.set(_this15.getIdKey(normalizedBody.order_id), normalizedBody);
+                  upsertOrders.set(_this14.getIdKey(normalizedBody.order_id), normalizedBody);
                   return;
                 }
                 if (hasBatchIds) refreshIds.push.apply(refreshIds, _toConsumableArray(routeInfo.batchIds));else if (routeInfo.route === 'httpRefresh.singleId' && singleId !== null) refreshIds.push(singleId);else if (routeInfo.route === 'httpRefresh.relationIds') refreshIds.push.apply(refreshIds, _toConsumableArray(routeInfo.batchIds));
@@ -2198,41 +1598,41 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 refreshIdCount: uniqueRefreshIds.length
               });
               if (!(upsertList.length > 0)) {
-                _context17.next = 16;
+                _context14.next = 16;
                 break;
               }
-              _context17.next = 16;
+              _context14.next = 16;
               return this.mergeOrdersToStore(upsertList, 'pubsub.bodyUpsert');
             case 16:
               if (!(uniqueRefreshIds.length > 0)) {
-                _context17.next = 28;
+                _context14.next = 28;
                 break;
               }
               _this$filterRedundant = this.filterRedundantHttpRefreshIds(uniqueRefreshIds), toFetch = _this$filterRedundant.toFetch, skipped = _this$filterRedundant.skipped;
               if (skipped.length > 0) {}
               if (!(toFetch.length > 0)) {
-                _context17.next = 28;
+                _context14.next = 28;
                 break;
               }
-              _context17.next = 22;
+              _context14.next = 22;
               return this.fetchOrdersByHttp(toFetch);
             case 22:
-              freshOrders = _context17.sent;
+              freshOrders = _context14.sent;
               if (!(freshOrders.length > 0)) {
-                _context17.next = 28;
+                _context14.next = 28;
                 break;
               }
-              _context17.next = 26;
+              _context14.next = 26;
               return this.mergeOrdersToStore(freshOrders, 'pubsub.httpRefresh');
             case 26:
-              _context17.next = 28;
+              _context14.next = 28;
               break;
             case 28:
               if (!(upsertList.length === 0 && uniqueRefreshIds.length === 0)) {
-                _context17.next = 30;
+                _context14.next = 30;
                 break;
               }
-              return _context17.abrupt("return");
+              return _context14.abrupt("return");
             case 30:
               batchProcessEndAt = Date.now();
               this.logInfo('processOrderSyncMessages-结束', {
@@ -2241,13 +1641,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 batchProcessDurationMs: batchProcessEndAt - batchProcessStartAt,
                 totalFromPubsubToProcessedMs: batchProcessEndAt - earliestReceivedAt
               });
-              _context17.next = 34;
+              _context14.next = 34;
               return this.core.effects.emit(OrderHooks.onOrdersSyncCompleted, null);
             case 34:
             case "end":
-              return _context17.stop();
+              return _context14.stop();
           }
-        }, _callee17, this);
+        }, _callee14, this);
       }));
       function processOrderSyncMessages() {
         return _processOrderSyncMessages.apply(this, arguments);
@@ -2268,29 +1668,29 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "fetchOrdersByHttp",
     value: (function () {
-      var _fetchOrdersByHttp = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(ids) {
+      var _fetchOrdersByHttp = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(ids) {
         var _orderList, orderList;
-        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
               if (!(!this.orderDataSource || ids.length === 0)) {
-                _context18.next = 2;
+                _context15.next = 2;
                 break;
               }
-              return _context18.abrupt("return", []);
+              return _context15.abrupt("return", []);
             case 2:
-              _context18.prev = 2;
+              _context15.prev = 2;
               if (!(typeof this.orderDataSource.fetchOrdersByIds === 'function')) {
-                _context18.next = 8;
+                _context15.next = 8;
                 break;
               }
-              _context18.next = 6;
+              _context15.next = 6;
               return this.orderDataSource.fetchOrdersByIds(ids);
             case 6:
-              _orderList = _context18.sent;
-              return _context18.abrupt("return", _orderList || []);
+              _orderList = _context15.sent;
+              return _context15.abrupt("return", _orderList || []);
             case 8:
-              _context18.next = 10;
+              _context15.next = 10;
               return this.orderDataSource.run({
                 http: {
                   query: {
@@ -2299,19 +1699,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               });
             case 10:
-              orderList = _context18.sent;
-              return _context18.abrupt("return", orderList || []);
+              orderList = _context15.sent;
+              return _context15.abrupt("return", orderList || []);
             case 14:
-              _context18.prev = 14;
-              _context18.t0 = _context18["catch"](2);
-              return _context18.abrupt("return", []);
+              _context15.prev = 14;
+              _context15.t0 = _context15["catch"](2);
+              return _context15.abrupt("return", []);
             case 17:
             case "end":
-              return _context18.stop();
+              return _context15.stop();
           }
-        }, _callee18, this, [[2, 14]]);
+        }, _callee15, this, [[2, 14]]);
       }));
-      function fetchOrdersByHttp(_x12) {
+      function fetchOrdersByHttp(_x8) {
         return _fetchOrdersByHttp.apply(this, arguments);
       }
       return fetchOrdersByHttp;
@@ -2323,11 +1723,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "mergeOrdersToStore",
     value: (function () {
-      var _mergeOrdersToStore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(freshOrders, source) {
-        var _this16 = this;
-        var storeOrderCountBefore, normalizedFreshOrders, incomingProductsHaveStableIdentity, _iterator14, _step14, order, id, rawProducts, _incomingProductsHave, allProductsHaveStableIdentity, orderIdKey, uniqueFreshOrders, uniqueFreshCount, patchedOrders, remoteProductMembershipChanges, forceWriteStorageKeys, mergeActions, existingProductsHaveStableIdentity, updatedList, identityKeyToIndex, index, identityKeys, _iterator15, _step15, key, _iterator16, _step16, fresh, freshIdentityKeys, matchIndex, storageKey, mergeKey, existingOrder, _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, _iterator17, _step17, _key2, _duplicateIndex, _iterator18, _step18, duplicateIndex, _index, _iterator19, _step19, _key, mergedStorageKey, insertIndex, insertCount, updateCount;
-        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+      var _mergeOrdersToStore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(freshOrders, source) {
+        var _this15 = this;
+        var storeOrderCountBefore, normalizedFreshOrders, _iterator10, _step10, order, id, uniqueFreshOrders, uniqueFreshCount, patchedOrders, mergeActions, updatedList, identityKeyToIndex, index, identityKeys, _iterator11, _step11, key, _iterator12, _step12, fresh, freshIdentityKeys, matchIndex, storageKey, mergeKey, existingOrder, _ref2, _existingOrder$order_, _ref3, _external_sale_number2, _existingOrder$paymen, _fresh$payment_status, _existingOrder$need_s, _fresh$need_sync, mergedOrder, insertIndex, insertCount, updateCount;
+        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
               storeOrderCountBefore = this.store.list.length;
               this.logInfo('mergeOrdersToStore-开始', {
@@ -2337,234 +1737,127 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
               this.logDuplicateOrders("".concat(source, ".beforeMerge"), this.store.list);
               normalizedFreshOrders = [];
-              incomingProductsHaveStableIdentity = new Map();
-              _iterator14 = _createForOfIteratorHelper(freshOrders);
-              _context19.prev = 6;
-              _iterator14.s();
-            case 8:
-              if ((_step14 = _iterator14.n()).done) {
-                _context19.next = 18;
+              _iterator10 = _createForOfIteratorHelper(freshOrders);
+              _context16.prev = 5;
+              _iterator10.s();
+            case 7:
+              if ((_step10 = _iterator10.n()).done) {
+                _context16.next = 15;
                 break;
               }
-              order = _step14.value;
+              order = _step10.value;
               id = order === null || order === void 0 ? void 0 : order.order_id;
               if (!(id === undefined || id === null)) {
-                _context19.next = 13;
+                _context16.next = 12;
                 break;
               }
-              return _context19.abrupt("continue", 16);
-            case 13:
-              rawProducts = order.products;
-              if (Array.isArray(rawProducts)) {
-                allProductsHaveStableIdentity = this.doProductsHaveStableMembershipIdentity(rawProducts);
-                orderIdKey = this.getIdKey(id);
-                incomingProductsHaveStableIdentity.set(orderIdKey, ((_incomingProductsHave = incomingProductsHaveStableIdentity.get(orderIdKey)) !== null && _incomingProductsHave !== void 0 ? _incomingProductsHave : true) && allProductsHaveStableIdentity);
-              }
+              return _context16.abrupt("continue", 13);
+            case 12:
               normalizedFreshOrders.push(this.normalizeRemoteSyncedOrder(order));
-            case 16:
-              _context19.next = 8;
+            case 13:
+              _context16.next = 7;
               break;
-            case 18:
-              _context19.next = 23;
+            case 15:
+              _context16.next = 20;
               break;
+            case 17:
+              _context16.prev = 17;
+              _context16.t0 = _context16["catch"](5);
+              _iterator10.e(_context16.t0);
             case 20:
-              _context19.prev = 20;
-              _context19.t0 = _context19["catch"](6);
-              _iterator14.e(_context19.t0);
+              _context16.prev = 20;
+              _iterator10.f();
+              return _context16.finish(20);
             case 23:
-              _context19.prev = 23;
-              _iterator14.f();
-              return _context19.finish(23);
-            case 26:
               // 先对本批新单做去重（批内规模 m 很小），保证每条 fresh 身份唯一
               uniqueFreshOrders = this.compactOrderListByIdentity(normalizedFreshOrders, "".concat(source, ".incoming")).list;
               uniqueFreshCount = uniqueFreshOrders.length;
               patchedOrders = [];
-              remoteProductMembershipChanges = [];
-              forceWriteStorageKeys = new Set();
               mergeActions = {};
-              existingProductsHaveStableIdentity = this.store.list.map(function (order) {
-                return _this16.doProductsHaveStableMembershipIdentity(order.products);
-              });
               updatedList = this.store.list.map(function (order) {
-                return _this16.normalizeOrderForMemoryList(order, "".concat(source, ".existingMemory"));
+                return _this15.normalizeOrderForMemoryList(order, "".concat(source, ".existingMemory"));
               }); // 基于身份键（field:value）建立索引，把「查找已存在订单」从 O(n) 线性扫描降为 O(1)，
               // 整体合并复杂度由 O(n^2) 降为 O(n + m)。索引语义与 doOrdersShareIdentity 完全一致：
               // 任一身份字段（order_id/external_sale_number/order_number/shop_order_number）同值即同一单。
               identityKeyToIndex = new Map();
               for (index = 0; index < updatedList.length; index += 1) {
                 identityKeys = this.getOrderIdentityMatchKeys(updatedList[index]);
-                _iterator15 = _createForOfIteratorHelper(identityKeys);
+                _iterator11 = _createForOfIteratorHelper(identityKeys);
                 try {
-                  for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
-                    key = _step15.value;
+                  for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+                    key = _step11.value;
                     // 同一 key 命中多张时保留最靠前的下标，与原 findIndex「取首个匹配」一致
                     if (!identityKeyToIndex.has(key)) identityKeyToIndex.set(key, index);
                   }
                 } catch (err) {
-                  _iterator15.e(err);
+                  _iterator11.e(err);
                 } finally {
-                  _iterator15.f();
+                  _iterator11.f();
                 }
               }
-              _iterator16 = _createForOfIteratorHelper(uniqueFreshOrders);
-              _context19.prev = 37;
-              _iterator16.s();
-            case 39:
-              if ((_step16 = _iterator16.n()).done) {
-                _context19.next = 96;
+              _iterator12 = _createForOfIteratorHelper(uniqueFreshOrders);
+              _context16.prev = 31;
+              _iterator12.s();
+            case 33:
+              if ((_step12 = _iterator12.n()).done) {
+                _context16.next = 57;
                 break;
               }
-              fresh = _step16.value;
+              fresh = _step12.value;
               freshIdentityKeys = this.getOrderIdentityMatchKeys(fresh);
               matchIndex = this.lookupOrderIndexByIdentityKeys(identityKeyToIndex, freshIdentityKeys);
               storageKey = this.getOrderStorageKey(fresh);
               mergeKey = storageKey || (fresh.order_id !== undefined && fresh.order_id !== null ? this.getIdKey(fresh.order_id) : '');
               if (!(matchIndex >= 0)) {
-                _context19.next = 88;
+                _context16.next = 50;
                 break;
               }
               existingOrder = updatedList[matchIndex];
               if (!(this.isPendingSyncOrder(existingOrder) && this.isRemoteEchoMergeSource(source))) {
-                _context19.next = 50;
+                _context16.next = 44;
                 break;
               }
               this.logInfo('mergeOrdersToStore-跳过 pending 订单远端覆盖', {
                 source: source,
-                order_id: (_ref = (_existingOrder$order_ = existingOrder.order_id) !== null && _existingOrder$order_ !== void 0 ? _existingOrder$order_ : fresh.order_id) !== null && _ref !== void 0 ? _ref : null,
-                external_sale_number: (_ref2 = (_external_sale_number2 = existingOrder.external_sale_number) !== null && _external_sale_number2 !== void 0 ? _external_sale_number2 : fresh.external_sale_number) !== null && _ref2 !== void 0 ? _ref2 : null,
+                order_id: (_ref2 = (_existingOrder$order_ = existingOrder.order_id) !== null && _existingOrder$order_ !== void 0 ? _existingOrder$order_ : fresh.order_id) !== null && _ref2 !== void 0 ? _ref2 : null,
+                external_sale_number: (_ref3 = (_external_sale_number2 = existingOrder.external_sale_number) !== null && _external_sale_number2 !== void 0 ? _external_sale_number2 : fresh.external_sale_number) !== null && _ref3 !== void 0 ? _ref3 : null,
                 local_payment_status: (_existingOrder$paymen = existingOrder.payment_status) !== null && _existingOrder$paymen !== void 0 ? _existingOrder$paymen : null,
                 remote_payment_status: (_fresh$payment_status = fresh.payment_status) !== null && _fresh$payment_status !== void 0 ? _fresh$payment_status : null,
                 local_need_sync: (_existingOrder$need_s = existingOrder.need_sync) !== null && _existingOrder$need_s !== void 0 ? _existingOrder$need_s : null,
                 remote_need_sync: (_fresh$need_sync = fresh.need_sync) !== null && _fresh$need_sync !== void 0 ? _fresh$need_sync : null,
                 reason: 'protect_pending_sync_order_from_remote_echo'
               });
-              return _context19.abrupt("continue", 94);
-            case 50:
-              if (!(this.isDraftOrder(existingOrder) && this.shouldProtectDraftOrderFromIncoming(source))) {
-                _context19.next = 53;
-                break;
-              }
-              this.logInfo('mergeOrdersToStore-跳过 draft 订单远端覆盖', {
-                source: source,
-                order_id: (_ref3 = (_existingOrder$order_2 = existingOrder.order_id) !== null && _existingOrder$order_2 !== void 0 ? _existingOrder$order_2 : fresh.order_id) !== null && _ref3 !== void 0 ? _ref3 : null,
-                external_sale_number: (_ref4 = (_external_sale_number3 = existingOrder.external_sale_number) !== null && _external_sale_number3 !== void 0 ? _external_sale_number3 : fresh.external_sale_number) !== null && _ref4 !== void 0 ? _ref4 : null,
-                local_is_draft_order: (_existingOrder$is_dra = existingOrder.is_draft_order) !== null && _existingOrder$is_dra !== void 0 ? _existingOrder$is_dra : null,
-                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 _context19.abrupt("continue", 94);
-            case 53:
+              return _context16.abrupt("continue", 55);
+            case 44:
               mergedOrder = this.mergeOrderRecords(existingOrder, fresh);
-              freshOrderId = fresh.order_id;
-              incomingProductsAreStable = freshOrderId !== undefined && freshOrderId !== null && incomingProductsHaveStableIdentity.get(this.getIdKey(freshOrderId)) !== false;
-              membershipChange = null;
-              if (Array.isArray(fresh.products) && freshOrderId !== undefined && freshOrderId !== null && existingProductsHaveStableIdentity[matchIndex] !== false && incomingProductsAreStable) {
-                membershipChange = this.getRemoteProductMembershipChange(existingOrder, mergedOrder, source);
-              }
-              mergedProductsHaveStableIdentity = existingProductsHaveStableIdentity[matchIndex] !== false && incomingProductsAreStable;
-              adjustedMatchIndex = matchIndex;
-              duplicateIndexes = new Set();
-              _iterator17 = _createForOfIteratorHelper(freshIdentityKeys);
-              _context19.prev = 62;
-              _iterator17.s();
-            case 64:
-              if ((_step17 = _iterator17.n()).done) {
-                _context19.next = 72;
-                break;
-              }
-              _key2 = _step17.value;
-              _duplicateIndex = identityKeyToIndex.get(_key2);
-              if (!(_duplicateIndex === undefined || _duplicateIndex === matchIndex)) {
-                _context19.next = 69;
-                break;
-              }
-              return _context19.abrupt("continue", 70);
-            case 69:
-              duplicateIndexes.add(_duplicateIndex);
-            case 70:
-              _context19.next = 64;
-              break;
-            case 72:
-              _context19.next = 77;
-              break;
-            case 74:
-              _context19.prev = 74;
-              _context19.t1 = _context19["catch"](62);
-              _iterator17.e(_context19.t1);
-            case 77:
-              _context19.prev = 77;
-              _iterator17.f();
-              return _context19.finish(77);
-            case 80:
-              if (duplicateIndexes.size > 0) {
-                _iterator18 = _createForOfIteratorHelper(_toConsumableArray(duplicateIndexes).sort(function (left, right) {
-                  return right - left;
-                }));
-                try {
-                  for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
-                    duplicateIndex = _step18.value;
-                    mergedOrder = this.mergeOrderRecords(mergedOrder, updatedList[duplicateIndex]);
-                    mergedProductsHaveStableIdentity = mergedProductsHaveStableIdentity && existingProductsHaveStableIdentity[duplicateIndex] !== false;
-                    updatedList.splice(duplicateIndex, 1);
-                    existingProductsHaveStableIdentity.splice(duplicateIndex, 1);
-                    if (duplicateIndex < adjustedMatchIndex) adjustedMatchIndex -= 1;
-                  }
-                } catch (err) {
-                  _iterator18.e(err);
-                } finally {
-                  _iterator18.f();
-                }
-                identityKeyToIndex.clear();
-                for (_index = 0; _index < updatedList.length; _index += 1) {
-                  _iterator19 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(updatedList[_index]));
-                  try {
-                    for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
-                      _key = _step19.value;
-                      if (!identityKeyToIndex.has(_key)) identityKeyToIndex.set(_key, _index);
-                    }
-                  } catch (err) {
-                    _iterator19.e(err);
-                  } finally {
-                    _iterator19.f();
-                  }
-                }
-              }
-              updatedList[adjustedMatchIndex] = mergedOrder;
-              existingProductsHaveStableIdentity[adjustedMatchIndex] = mergedProductsHaveStableIdentity;
-              if (membershipChange) {
-                remoteProductMembershipChanges.push(membershipChange);
-                mergedStorageKey = this.getOrderStorageKey(mergedOrder);
-                if (mergedStorageKey) forceWriteStorageKeys.add(mergedStorageKey);
-              }
+              updatedList[matchIndex] = mergedOrder;
               // 合并后身份字段可能新增（如挂单拿到 order_id），同步登记到索引，
               // 供同批后续 fresh 命中同一槽位，避免重复插入
-              this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, adjustedMatchIndex);
+              this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, matchIndex);
               patchedOrders.push(mergedOrder);
               if (mergeKey) mergeActions[mergeKey] = 'update';
-              return _context19.abrupt("continue", 94);
-            case 88:
+              return _context16.abrupt("continue", 55);
+            case 50:
               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 94:
-              _context19.next = 39;
+            case 55:
+              _context16.next = 33;
               break;
-            case 96:
-              _context19.next = 101;
+            case 57:
+              _context16.next = 62;
               break;
-            case 98:
-              _context19.prev = 98;
-              _context19.t2 = _context19["catch"](37);
-              _iterator16.e(_context19.t2);
-            case 101:
-              _context19.prev = 101;
-              _iterator16.f();
-              return _context19.finish(101);
-            case 104:
+            case 59:
+              _context16.prev = 59;
+              _context16.t1 = _context16["catch"](31);
+              _iterator12.e(_context16.t1);
+            case 62:
+              _context16.prev = 62;
+              _iterator12.f();
+              return _context16.finish(62);
+            case 65:
               insertCount = Object.values(mergeActions).filter(function (v) {
                 return v === 'insert';
               }).length;
@@ -2580,27 +1873,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               // 仅在自检开关开启时做一次兜底校验。
               this.store.list = this.runOrderStoreSelfCheck(updatedList, "".concat(source, ".store"));
               this.syncOrdersMap();
-              _context19.next = 111;
-              return this.patchOrdersInSQLite(patchedOrders, source, mergeActions, {}, forceWriteStorageKeys);
-            case 111:
+              _context16.next = 72;
+              return this.patchOrdersInSQLite(patchedOrders, source, mergeActions);
+            case 72:
               this.logInfo('mergeOrdersToStore-结束', {
                 uniqueFreshCount: uniqueFreshCount,
                 storeOrderCountAfter: this.store.list.length,
                 insertCount: insertCount,
                 updateCount: updateCount
               });
-              _context19.next = 114;
-              return this.emitRemoteProductMembershipChanges(remoteProductMembershipChanges);
-            case 114:
-              _context19.next = 116;
+              _context16.next = 75;
               return this.emitOrdersChanged(patchedOrders, source);
-            case 116:
+            case 75:
             case "end":
-              return _context19.stop();
+              return _context16.stop();
           }
-        }, _callee19, this, [[6, 20, 23, 26], [37, 98, 101, 104], [62, 74, 77, 80]]);
+        }, _callee16, this, [[5, 17, 20, 23], [31, 59, 62, 65]]);
       }));
-      function mergeOrdersToStore(_x13, _x14) {
+      function mergeOrdersToStore(_x9, _x10) {
         return _mergeOrdersToStore.apply(this, arguments);
       }
       return mergeOrdersToStore;
@@ -2617,19 +1907,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "lookupOrderIndexByIdentityKeys",
     value: function lookupOrderIndexByIdentityKeys(identityKeyToIndex, identityKeys) {
       var matchIndex = -1;
-      var _iterator20 = _createForOfIteratorHelper(identityKeys),
-        _step20;
+      var _iterator13 = _createForOfIteratorHelper(identityKeys),
+        _step13;
       try {
-        for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
-          var key = _step20.value;
+        for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
+          var key = _step13.value;
           var index = identityKeyToIndex.get(key);
           if (index === undefined) continue;
           if (matchIndex < 0 || index < matchIndex) matchIndex = index;
         }
       } catch (err) {
-        _iterator20.e(err);
+        _iterator13.e(err);
       } finally {
-        _iterator20.f();
+        _iterator13.f();
       }
       return matchIndex;
     }
@@ -2638,92 +1928,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function isRemoteEchoMergeSource(source) {
       return source === 'pubsub.bodyUpsert' || source === 'pubsub.httpRefresh';
     }
-  }, {
-    key: "getProductMembershipKey",
-    value: function getProductMembershipKey(product) {
-      var persistentId = getOrderCollectionPersistentId('product', product);
-      if (persistentId) return "order_detail_id:".concat(persistentId);
-      var uid = getOrderCollectionUid('product', product);
-      return uid ? "unique_identification_number:".concat(uid) : '';
-    }
-  }, {
-    key: "doProductsHaveStableMembershipIdentity",
-    value: function doProductsHaveStableMembershipIdentity(products) {
-      if (!Array.isArray(products)) return true;
-      return products.every(function (product) {
-        return Boolean(getOrderCollectionPersistentId('product', product) || getOrderCollectionUid('product', product));
-      });
-    }
-
-    /**
-     * 冲突提示关注逻辑商品行，而不是服务端 checkout 过程中可能被重建的 detail 记录。
-     * 通用集合合并仍以 order_detail_id 为事实主键；这里只允许相同稳定 UID 跨 detail id 对齐，
-     * 避免本机 checkout 回声被误判成“一删一增”。
-     */
-  }, {
-    key: "isSameProductMembershipItem",
-    value: function isSameProductMembershipItem(left, right) {
-      if (isSameOrderCollectionItem('product', left, right)) return true;
-      var leftUid = getOrderCollectionUid('product', left);
-      var rightUid = getOrderCollectionUid('product', right);
-      return Boolean(leftUid && rightUid && leftUid === rightUid);
-    }
-
-    /**
-     * 对比合并前后的商品成员集合。商品字段修改与数组重排不会产生 diff。
-     */
-  }, {
-    key: "getRemoteProductMembershipChange",
-    value: function getRemoteProductMembershipChange(existingOrder, mergedOrder, source) {
-      var _this17 = this,
-        _mergedOrder$order_id;
-      if (!this.isRemoteEchoMergeSource(source)) return null;
-      var previousProducts = Array.isArray(existingOrder.products) ? existingOrder.products : [];
-      var currentProducts = Array.isArray(mergedOrder.products) ? mergedOrder.products : [];
-      var unmatchedCurrentIndexes = new Set(currentProducts.map(function (_, index) {
-        return index;
-      }));
-      var removedProductKeys = [];
-      var _iterator21 = _createForOfIteratorHelper(previousProducts),
-        _step21;
-      try {
-        var _loop2 = function _loop2() {
-          var previousProduct = _step21.value;
-          var matchedIndex = currentProducts.findIndex(function (currentProduct, index) {
-            return unmatchedCurrentIndexes.has(index) && _this17.isSameProductMembershipItem(previousProduct, currentProduct);
-          });
-          if (matchedIndex >= 0) {
-            unmatchedCurrentIndexes.delete(matchedIndex);
-            return 1; // continue
-          }
-          var productKey = _this17.getProductMembershipKey(previousProduct);
-          if (productKey) removedProductKeys.push(productKey);
-        };
-        for (_iterator21.s(); !(_step21 = _iterator21.n()).done;) {
-          if (_loop2()) continue;
-        }
-      } catch (err) {
-        _iterator21.e(err);
-      } finally {
-        _iterator21.f();
-      }
-      var addedProductKeys = _toConsumableArray(unmatchedCurrentIndexes).map(function (index) {
-        return _this17.getProductMembershipKey(currentProducts[index]);
-      }).filter(Boolean);
-      if (addedProductKeys.length === 0 && removedProductKeys.length === 0) {
-        return null;
-      }
-      var orderId = (_mergedOrder$order_id = mergedOrder.order_id) !== null && _mergedOrder$order_id !== void 0 ? _mergedOrder$order_id : existingOrder.order_id;
-      if (orderId === undefined || orderId === null) return null;
-      return {
-        order_id: orderId,
-        source: source,
-        added_product_keys: addedProductKeys,
-        removed_product_keys: removedProductKeys,
-        previous_product_count: previousProducts.length,
-        current_product_count: currentProducts.length
-      };
-    }
 
     /**
      * 将订单的全部身份键登记到索引并指向其在列表中的下标。
@@ -2736,17 +1940,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "registerOrderIdentityKeys",
     value: function registerOrderIdentityKeys(identityKeyToIndex, order, index) {
       var identityKeys = this.getOrderIdentityMatchKeys(order);
-      var _iterator22 = _createForOfIteratorHelper(identityKeys),
-        _step22;
+      var _iterator14 = _createForOfIteratorHelper(identityKeys),
+        _step14;
       try {
-        for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
-          var key = _step22.value;
+        for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+          var key = _step14.value;
           identityKeyToIndex.set(key, index);
         }
       } catch (err) {
-        _iterator22.e(err);
+        _iterator14.e(err);
       } finally {
-        _iterator22.f();
+        _iterator14.f();
       }
     }
 
@@ -2801,17 +2005,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "uniqueOrderIds",
     value: function uniqueOrderIds(ids) {
       var idMap = new Map();
-      var _iterator23 = _createForOfIteratorHelper(ids),
-        _step23;
+      var _iterator15 = _createForOfIteratorHelper(ids),
+        _step15;
       try {
-        for (_iterator23.s(); !(_step23 = _iterator23.n()).done;) {
-          var id = _step23.value;
+        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+          var id = _step15.value;
           idMap.set(this.getIdKey(id), id);
         }
       } catch (err) {
-        _iterator23.e(err);
+        _iterator15.e(err);
       } finally {
-        _iterator23.f();
+        _iterator15.f();
       }
       return _toConsumableArray(idMap.values());
     }
@@ -2823,12 +2027,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "isOrderLookupMatch",
     value: function isOrderLookupMatch(order, lookupKey) {
-      var _this18 = this;
+      var _this16 = this;
       if (!order || !lookupKey) return false;
       var candidates = [order.order_id, order.external_sale_number, order.order_number, order.shop_order_number, order.shop_full_order_number];
       return candidates.some(function (value) {
         if (value === undefined || value === null || value === '') return false;
-        return _this18.getIdKey(value) === lookupKey;
+        return _this16.getIdKey(value) === lookupKey;
       });
     }
 
@@ -2871,10 +2075,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "findOrderIndexByIdentity",
     value: function findOrderIndexByIdentity(orders, target) {
-      var _this19 = this;
+      var _this17 = this;
       if (this.getOrderIdentityMatchKeys(target).length === 0) return -1;
       return orders.findIndex(function (order) {
-        return _this19.doOrdersShareIdentity(order, target);
+        return _this17.doOrdersShareIdentity(order, target);
       });
     }
   }, {
@@ -2898,121 +2102,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (rightScore >= leftScore) return right;
       return left;
     }
-  }, {
-    key: "getProductIdentityKeys",
-    value: function getProductIdentityKeys(product) {
-      var _record$metadata;
-      var record = product;
-      if (!record) return [];
-      var keys = [];
-      var metadataUid = (_record$metadata = record.metadata) === null || _record$metadata === void 0 ? void 0 : _record$metadata.unique_identification_number;
-      if (!this.isBlankIdentityValue(metadataUid)) keys.push("uid:".concat(String(metadataUid)));
-      var topLevelUid = record.unique_identification_number;
-      if (!this.isBlankIdentityValue(topLevelUid)) keys.push("uid:".concat(String(topLevelUid)));
-      var orderDetailId = record.order_detail_id;
-      if (!this.isBlankIdentityValue(orderDetailId)) keys.push("detail:".concat(String(orderDetailId)));
-      var bookingUid = record.booking_uid;
-      if (!this.isBlankIdentityValue(bookingUid)) keys.push("booking:".concat(String(bookingUid)));
-      return keys;
-    }
-  }, {
-    key: "mergeOrderProductLists",
-    value: function mergeOrderProductLists(preferred, secondary) {
-      var preferredList = Array.isArray(preferred) ? preferred : [];
-      var secondaryList = Array.isArray(secondary) ? secondary : [];
-      if (secondaryList.length === 0) return preferredList;
-      if (preferredList.length === 0) return secondaryList;
-      var seenKeys = new Set();
-      var _iterator24 = _createForOfIteratorHelper(preferredList),
-        _step24;
-      try {
-        for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
-          var item = _step24.value;
-          var keys = this.getProductIdentityKeys(item);
-          var _iterator26 = _createForOfIteratorHelper(keys),
-            _step26;
-          try {
-            for (_iterator26.s(); !(_step26 = _iterator26.n()).done;) {
-              var key = _step26.value;
-              seenKeys.add(key);
-            }
-          } catch (err) {
-            _iterator26.e(err);
-          } finally {
-            _iterator26.f();
-          }
-        }
-      } catch (err) {
-        _iterator24.e(err);
-      } finally {
-        _iterator24.f();
-      }
-      var result = _toConsumableArray(preferredList);
-      var _iterator25 = _createForOfIteratorHelper(secondaryList),
-        _step25;
-      try {
-        for (_iterator25.s(); !(_step25 = _iterator25.n()).done;) {
-          var _item = _step25.value;
-          var _keys = this.getProductIdentityKeys(_item);
-          if (_keys.length === 0 || _keys.some(function (key) {
-            return seenKeys.has(key);
-          })) continue;
-          var _iterator27 = _createForOfIteratorHelper(_keys),
-            _step27;
-          try {
-            for (_iterator27.s(); !(_step27 = _iterator27.n()).done;) {
-              var _key3 = _step27.value;
-              seenKeys.add(_key3);
-            }
-          } catch (err) {
-            _iterator27.e(err);
-          } finally {
-            _iterator27.f();
-          }
-          result.push(cloneDeep(_item));
-        }
-      } catch (err) {
-        _iterator25.e(err);
-      } finally {
-        _iterator25.f();
-      }
-      return result;
-    }
-  }, {
-    key: "mergeOrderPaymentLists",
-    value: function mergeOrderPaymentLists(existing, incoming) {
-      var existingList = Array.isArray(existing) ? existing : [];
-      var incomingList = Array.isArray(incoming) ? incoming : [];
-      if (incomingList.length === 0) return cloneDeep(existingList);
-      return mergeOrderPaymentListsByIdentity(existingList, incomingList);
-    }
-  }, {
-    key: "getIdentifiedPendingPayments",
-    value: function getIdentifiedPendingPayments(order) {
-      var payments = Array.isArray(order === null || order === void 0 ? void 0 : order.payments) ? order.payments : [];
-      return payments.filter(function (payment) {
-        return isIdentifiedPendingOrderPayment(payment);
-      });
-    }
-  }, {
-    key: "shouldProtectLocalOrderFromRemoteSnapshot",
-    value: function shouldProtectLocalOrderFromRemoteSnapshot(order) {
-      return this.isPendingSyncOrder(order) || this.isDraftOrder(order) || this.getIdentifiedPendingPayments(order).length > 0;
-    }
-  }, {
-    key: "getUnmatchedIdentifiedPendingPayments",
-    value: function getUnmatchedIdentifiedPendingPayments(existing, incoming) {
-      var existingPayments = Array.isArray(existing) ? existing : [];
-      var incomingPayments = Array.isArray(incoming) ? incoming : [];
-      var incomingIdentityKeys = new Set(incomingPayments.flatMap(function (payment) {
-        return getOrderPaymentIdentityKeys(payment);
-      }));
-      return existingPayments.filter(function (payment) {
-        return isIdentifiedPendingOrderPayment(payment) && !getOrderPaymentIdentityKeys(payment).some(function (key) {
-          return incomingIdentityKeys.has(key);
-        });
-      });
-    }
   }, {
     key: "mergeOrderRecords",
     value: function mergeOrderRecords(existing, incoming) {
@@ -3020,7 +2109,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var secondary = preferred === existing ? incoming : existing;
       var merged = _objectSpread(_objectSpread({}, secondary), preferred);
       var fieldsToPreserve = ['order_id', 'external_sale_number', 'order_number', 'shop_order_number', 'shop_full_order_number'];
-      var incomingPatchFields = ['payment_status', 'status', 'shipping_status', 'updated_at', 'shop_discount', 'summary', 'note', 'customer_id', 'customer_name', 'customer', 'holder', 'contacts_info', 'phone', 'email', 'relation_forms', 'is_draft_order'];
+      var incomingPatchFields = ['payment_status', 'status', 'shipping_status', 'updated_at', 'shop_discount', 'summary', 'note', 'customer_id', 'customer_name', 'customer', 'holder', 'contacts_info', 'phone', 'email', 'relation_forms'];
       var mergedRecord = merged;
       var preferredRecord = preferred;
       var secondaryRecord = secondary;
@@ -3050,23 +2139,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       for (var _i6 = 0, _ORDER_AUTHORITATIVE_2 = ORDER_AUTHORITATIVE_COLLECTION_FIELDS; _i6 < _ORDER_AUTHORITATIVE_2.length; _i6++) {
         var _field2 = _ORDER_AUTHORITATIVE_2[_i6];
         if (Array.isArray(incomingRecord[_field2])) {
-          if (_field2 === 'payments') {
-            var preservedPending = this.getUnmatchedIdentifiedPendingPayments(existingRecord[_field2], incomingRecord[_field2]);
-            if (preservedPending.length > 0) {
-              var _ref5, _existing$order_id, _ref6, _existingRecord$exter;
-              this.logInfo('mergeOrderRecords-保留本地 pending 支付项', {
-                order_id: (_ref5 = (_existing$order_id = existing.order_id) !== null && _existing$order_id !== void 0 ? _existing$order_id : incoming.order_id) !== null && _ref5 !== void 0 ? _ref5 : null,
-                external_sale_number: (_ref6 = (_existingRecord$exter = existingRecord.external_sale_number) !== null && _existingRecord$exter !== void 0 ? _existingRecord$exter : incomingRecord.external_sale_number) !== null && _ref6 !== void 0 ? _ref6 : null,
-                preserved_pending_count: preservedPending.length,
-                preserved_payment_identities: preservedPending.map(function (payment) {
-                  return getOrderPaymentIdentityKeys(payment);
-                })
-              });
-            }
-          }
-          mergedRecord[_field2] = this.mergeAuthoritativeOrderCollection(_field2, existingRecord[_field2], incomingRecord[_field2], childUidRemaps, {
-            preserveIdentifiedPendingPayments: _field2 === 'payments'
-          });
+          mergedRecord[_field2] = this.mergeAuthoritativeOrderCollection(_field2, existingRecord[_field2], incomingRecord[_field2], childUidRemaps);
           continue;
         }
         if (Object.prototype.hasOwnProperty.call(existingRecord, _field2)) {
@@ -3084,51 +2157,50 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "summarizeDuplicateOrders",
     value: function summarizeDuplicateOrders(orders) {
       var groups = new Map();
-      var _iterator28 = _createForOfIteratorHelper(orders),
-        _step28;
+      var _iterator16 = _createForOfIteratorHelper(orders),
+        _step16;
       try {
-        for (_iterator28.s(); !(_step28 = _iterator28.n()).done;) {
-          var order = _step28.value;
-          var _iterator29 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(order)),
-            _step29;
+        for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
+          var order = _step16.value;
+          var _iterator17 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(order)),
+            _step17;
           try {
-            for (_iterator29.s(); !(_step29 = _iterator29.n()).done;) {
-              var key = _step29.value;
+            for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
+              var key = _step17.value;
               var group = groups.get(key) || [];
               group.push(order);
               groups.set(key, group);
             }
           } catch (err) {
-            _iterator29.e(err);
+            _iterator17.e(err);
           } finally {
-            _iterator29.f();
+            _iterator17.f();
           }
         }
       } catch (err) {
-        _iterator28.e(err);
+        _iterator16.e(err);
       } finally {
-        _iterator28.f();
+        _iterator16.f();
       }
-      return _toConsumableArray(groups.entries()).filter(function (_ref7) {
-        var _ref8 = _slicedToArray(_ref7, 2),
-          group = _ref8[1];
+      return _toConsumableArray(groups.entries()).filter(function (_ref4) {
+        var _ref5 = _slicedToArray(_ref4, 2),
+          group = _ref5[1];
         return group.length > 1;
-      }).slice(0, 20).map(function (_ref9) {
-        var _ref10 = _slicedToArray(_ref9, 2),
-          key = _ref10[0],
-          group = _ref10[1];
+      }).slice(0, 20).map(function (_ref6) {
+        var _ref7 = _slicedToArray(_ref6, 2),
+          key = _ref7[0],
+          group = _ref7[1];
         return {
           key: key,
           count: group.length,
           orders: group.map(function (order) {
-            var _order$order_id4, _external_sale_number4, _shop_order_number, _shop_full_order_numb, _order$need_sync, _order$is_draft_order;
+            var _order$order_id3, _external_sale_number3, _shop_order_number, _shop_full_order_numb, _order$need_sync;
             return {
-              order_id: (_order$order_id4 = order.order_id) !== null && _order$order_id4 !== void 0 ? _order$order_id4 : null,
-              external_sale_number: (_external_sale_number4 = order.external_sale_number) !== null && _external_sale_number4 !== void 0 ? _external_sale_number4 : null,
+              order_id: (_order$order_id3 = order.order_id) !== null && _order$order_id3 !== void 0 ? _order$order_id3 : null,
+              external_sale_number: (_external_sale_number3 = order.external_sale_number) !== null && _external_sale_number3 !== void 0 ? _external_sale_number3 : null,
               shop_order_number: (_shop_order_number = order.shop_order_number) !== null && _shop_order_number !== void 0 ? _shop_order_number : null,
               shop_full_order_number: (_shop_full_order_numb = order.shop_full_order_number) !== null && _shop_full_order_numb !== void 0 ? _shop_full_order_numb : null,
-              need_sync: (_order$need_sync = order.need_sync) !== null && _order$need_sync !== void 0 ? _order$need_sync : null,
-              is_draft_order: (_order$is_draft_order = order.is_draft_order) !== null && _order$is_draft_order !== void 0 ? _order$is_draft_order : null
+              need_sync: (_order$need_sync = order.need_sync) !== null && _order$need_sync !== void 0 ? _order$need_sync : null
             };
           })
         };
@@ -3150,11 +2222,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function compactOrderListByIdentity(orders, source) {
       var list = [];
       var removedCount = 0;
-      var _iterator30 = _createForOfIteratorHelper(orders),
-        _step30;
+      var _iterator18 = _createForOfIteratorHelper(orders),
+        _step18;
       try {
-        for (_iterator30.s(); !(_step30 = _iterator30.n()).done;) {
-          var order = _step30.value;
+        for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
+          var order = _step18.value;
           var normalizedOrder = this.normalizeOrderCollectionsForIngress(order, "".concat(source, ".order"));
           var matchIndex = this.findOrderIndexByIdentity(list, normalizedOrder);
           if (matchIndex < 0) {
@@ -3165,9 +2237,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           removedCount += 1;
         }
       } catch (err) {
-        _iterator30.e(err);
+        _iterator18.e(err);
       } finally {
-        _iterator30.f();
+        _iterator18.f();
       }
       if (removedCount > 0) {
         this.logWarning('订单列表重复项已压缩', {
@@ -3265,35 +2337,35 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadOrdersFromSQLite",
     value: function () {
-      var _loadOrdersFromSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20() {
-        var _this20 = this;
+      var _loadOrdersFromSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
+        var _this18 = this;
         var orders;
-        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
               if (this.dbManager) {
-                _context20.next = 2;
+                _context17.next = 2;
                 break;
               }
-              return _context20.abrupt("return", []);
+              return _context17.abrupt("return", []);
             case 2:
-              _context20.prev = 2;
-              _context20.next = 5;
+              _context17.prev = 2;
+              _context17.next = 5;
               return this.dbManager.getAll(INDEXDB_STORE_NAME);
             case 5:
-              orders = _context20.sent;
-              return _context20.abrupt("return", (orders || []).map(function (order) {
-                return _this20.normalizeOrderCollectionsForIngress(order, 'loadOrdersFromSQLite');
+              orders = _context17.sent;
+              return _context17.abrupt("return", (orders || []).map(function (order) {
+                return _this18.normalizeOrderCollectionsForIngress(order, 'loadOrdersFromSQLite');
               }));
             case 9:
-              _context20.prev = 9;
-              _context20.t0 = _context20["catch"](2);
-              return _context20.abrupt("return", []);
+              _context17.prev = 9;
+              _context17.t0 = _context17["catch"](2);
+              return _context17.abrupt("return", []);
             case 12:
             case "end":
-              return _context20.stop();
+              return _context17.stop();
           }
-        }, _callee20, this, [[2, 9]]);
+        }, _callee17, this, [[2, 9]]);
       }));
       function loadOrdersFromSQLite() {
         return _loadOrdersFromSQLite.apply(this, arguments);
@@ -3305,71 +2377,41 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function isPendingSyncOrder(order) {
       return Number(order === null || order === void 0 ? void 0 : order.need_sync) === 1;
     }
-  }, {
-    key: "isDraftOrder",
-    value: function isDraftOrder(order) {
-      return Number(order === null || order === void 0 ? void 0 : order.is_draft_order) === 1;
-    }
-  }, {
-    key: "shouldProtectDraftOrderFromIncoming",
-    value: function shouldProtectDraftOrderFromIncoming(source) {
-      return source !== 'checkoutSync';
-    }
   }, {
     key: "normalizeRemoteSyncedOrder",
     value: function normalizeRemoteSyncedOrder(order) {
       var normalizedOrder = this.normalizeOrderCollectionsForIngress(order, 'normalizeRemoteSyncedOrder');
-      if (this.isPendingSyncOrder(normalizedOrder)) return _objectSpread(_objectSpread({}, normalizedOrder), {}, {
-        is_draft_order: 0
-      });
+      if (this.isPendingSyncOrder(normalizedOrder)) return normalizedOrder;
       return _objectSpread(_objectSpread({}, normalizedOrder), {}, {
-        need_sync: 0,
-        is_draft_order: 0
+        need_sync: 0
       });
     }
-  }, {
-    key: "mergeRemoteIdentityIntoDraftOrder",
-    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];
-        if (this.isBlankIdentityValue(merged[field]) && !this.isBlankIdentityValue(remote[field])) {
-          merged[field] = remote[field];
-        }
-      }
-      return this.normalizeOrderCollectionsForIngress(merged, 'mergeRemoteIdentityIntoDraftOrder');
-    }
   }, {
     key: "mergeRemoteSnapshotWithPendingOrders",
     value: function mergeRemoteSnapshotWithPendingOrders(remoteOrders, existingOrders) {
-      var _this21 = this;
+      var _this19 = this;
       var merged = remoteOrders.map(function (order) {
-        return _this21.normalizeRemoteSyncedOrder(order);
+        return _this19.normalizeRemoteSyncedOrder(order);
       });
-      var _iterator31 = _createForOfIteratorHelper(existingOrders),
-        _step31;
+      var _iterator19 = _createForOfIteratorHelper(existingOrders),
+        _step19;
       try {
-        for (_iterator31.s(); !(_step31 = _iterator31.n()).done;) {
-          var rawOrder = _step31.value;
+        for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
+          var rawOrder = _step19.value;
           var order = this.normalizeOrderCollectionsForIngress(rawOrder, 'mergeRemoteSnapshotWithPendingOrders.existingSQLite');
-          if (!this.shouldProtectLocalOrderFromRemoteSnapshot(order)) continue;
+          if (!this.isPendingSyncOrder(order)) continue;
           var matchIndex = this.findOrderIndexByIdentity(merged, order);
           if (matchIndex >= 0) {
-            if (this.isDraftOrder(order)) {
-              merged[matchIndex] = this.mergeRemoteIdentityIntoDraftOrder(order, merged[matchIndex]);
-            } else {
-              merged[matchIndex] = this.mergeOrderRecords(order, merged[matchIndex]);
-            }
+            merged[matchIndex] = this.mergeOrderRecords(order, merged[matchIndex]);
             continue;
           }
           if (!this.getOrderStorageKey(order)) continue;
           merged.push(order);
         }
       } catch (err) {
-        _iterator31.e(err);
+        _iterator19.e(err);
       } finally {
-        _iterator31.f();
+        _iterator19.f();
       }
       return this.compactOrderListByIdentity(merged, 'mergeRemoteSnapshotWithPendingOrders').list;
     }
@@ -3385,10 +2427,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "runInOrderSQLiteSaveQueue",
     value: (function () {
-      var _runInOrderSQLiteSaveQueue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(task) {
+      var _runInOrderSQLiteSaveQueue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(task) {
         var queuedTask;
-        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
               queuedTask = this.orderSQLiteSaveQueue.then(task, task);
               this.orderSQLiteSaveQueue = queuedTask.then(function () {
@@ -3396,14 +2438,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }, function () {
                 return undefined;
               });
-              return _context21.abrupt("return", queuedTask);
+              return _context18.abrupt("return", queuedTask);
             case 3:
             case "end":
-              return _context21.stop();
+              return _context18.stop();
           }
-        }, _callee21, this);
+        }, _callee18, this);
       }));
-      function runInOrderSQLiteSaveQueue(_x15) {
+      function runInOrderSQLiteSaveQueue(_x11) {
         return _runInOrderSQLiteSaveQueue.apply(this, arguments);
       }
       return runInOrderSQLiteSaveQueue;
@@ -3418,176 +2460,146 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "patchOrdersInSQLite",
     value: (function () {
-      var _patchOrdersInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(orders, source) {
-        var _this22 = this;
+      var _patchOrdersInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(orders, source) {
+        var _this20 = this;
         var mergeActions,
-          options,
-          forceWriteStorageKeys,
           ordersSnapshot,
           _this$filterRedundant2,
           toWrite,
           skipped,
           compactedToWrite,
-          _args23 = arguments;
-        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+          _args20 = arguments;
+        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
-              mergeActions = _args23.length > 2 && _args23[2] !== undefined ? _args23[2] : {};
-              options = _args23.length > 3 && _args23[3] !== undefined ? _args23[3] : {};
-              forceWriteStorageKeys = _args23.length > 4 && _args23[4] !== undefined ? _args23[4] : new Set();
-              if (!(orders.length === 0)) {
-                _context23.next = 5;
-                break;
-              }
-              return _context23.abrupt("return");
-            case 5:
-              if (this.dbManager) {
-                _context23.next = 9;
-                break;
-              }
-              if (!options.throwOnError) {
-                _context23.next = 8;
+              mergeActions = _args20.length > 2 && _args20[2] !== undefined ? _args20[2] : {};
+              if (!(!this.dbManager || orders.length === 0)) {
+                _context20.next = 3;
                 break;
               }
-              throw new Error('订单 SQLite 数据库未初始化');
-            case 8:
-              return _context23.abrupt("return");
-            case 9:
+              return _context20.abrupt("return");
+            case 3:
               ordersSnapshot = cloneDeep(orders).map(function (order) {
-                return _this22.normalizeOrderCollectionsForIngress(order, "".concat(source, ".sqliteIngress"));
+                return _this20.normalizeOrderCollectionsForIngress(order, "".concat(source, ".sqliteIngress"));
               }).filter(function (order) {
-                return _this22.getOrderStorageKey(order);
+                return _this20.getOrderStorageKey(order);
               });
               if (!(ordersSnapshot.length === 0)) {
-                _context23.next = 12;
+                _context20.next = 6;
                 break;
               }
-              return _context23.abrupt("return");
-            case 12:
-              _this$filterRedundant2 = this.filterRedundantPatchOrders(source, ordersSnapshot, mergeActions, forceWriteStorageKeys), toWrite = _this$filterRedundant2.toWrite, skipped = _this$filterRedundant2.skipped;
+              return _context20.abrupt("return");
+            case 6:
+              _this$filterRedundant2 = this.filterRedundantPatchOrders(source, ordersSnapshot, mergeActions), toWrite = _this$filterRedundant2.toWrite, skipped = _this$filterRedundant2.skipped;
               if (!(toWrite.length === 0)) {
-                _context23.next = 15;
+                _context20.next = 9;
                 break;
               }
-              return _context23.abrupt("return");
-            case 15:
+              return _context20.abrupt("return");
+            case 9:
               compactedToWrite = this.compactOrderListByIdentity(toWrite, "".concat(source, ".sqlitePatch")).list;
               if (!(compactedToWrite.length === 0)) {
-                _context23.next = 18;
+                _context20.next = 12;
                 break;
               }
-              return _context23.abrupt("return");
-            case 18:
-              _context23.prev = 18;
-              _context23.next = 21;
-              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22() {
-                var writeMethod, _iterator32, _step32, order;
-                return _regeneratorRuntime().wrap(function _callee22$(_context22) {
-                  while (1) switch (_context22.prev = _context22.next) {
+              return _context20.abrupt("return");
+            case 12:
+              _context20.prev = 12;
+              _context20.next = 15;
+              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
+                var writeMethod, _iterator20, _step20, order;
+                return _regeneratorRuntime().wrap(function _callee19$(_context19) {
+                  while (1) switch (_context19.prev = _context19.next) {
                     case 0:
                       writeMethod = 'none';
-                      _this22.logInfo('patchOrdersInSQLite-开始', {
+                      _this20.logInfo('patchOrdersInSQLite-开始', {
                         source: source,
                         count: compactedToWrite.length,
                         dedupedCount: skipped.length
                       });
-                      if (!(typeof _this22.dbManager.bulkUpdate === 'function')) {
-                        _context22.next = 8;
+                      if (!(typeof _this20.dbManager.bulkUpdate === 'function')) {
+                        _context19.next = 8;
                         break;
                       }
                       writeMethod = 'bulkUpdate';
-                      _context22.next = 6;
-                      return _this22.dbManager.bulkUpdate(INDEXDB_STORE_NAME, compactedToWrite);
+                      _context19.next = 6;
+                      return _this20.dbManager.bulkUpdate(INDEXDB_STORE_NAME, compactedToWrite);
                     case 6:
-                      _context22.next = 37;
+                      _context19.next = 33;
                       break;
                     case 8:
-                      if (!(typeof _this22.dbManager.bulkAdd === 'function')) {
-                        _context22.next = 14;
+                      if (!(typeof _this20.dbManager.bulkAdd === 'function')) {
+                        _context19.next = 14;
                         break;
                       }
                       writeMethod = 'bulkAdd';
-                      _context22.next = 12;
-                      return _this22.dbManager.bulkAdd(INDEXDB_STORE_NAME, compactedToWrite);
+                      _context19.next = 12;
+                      return _this20.dbManager.bulkAdd(INDEXDB_STORE_NAME, compactedToWrite);
                     case 12:
-                      _context22.next = 37;
+                      _context19.next = 33;
                       break;
                     case 14:
-                      if (!(typeof _this22.dbManager.update === 'function')) {
-                        _context22.next = 35;
+                      if (!(typeof _this20.dbManager.update === 'function')) {
+                        _context19.next = 33;
                         break;
                       }
                       writeMethod = 'update';
-                      _iterator32 = _createForOfIteratorHelper(compactedToWrite);
-                      _context22.prev = 17;
-                      _iterator32.s();
+                      _iterator20 = _createForOfIteratorHelper(compactedToWrite);
+                      _context19.prev = 17;
+                      _iterator20.s();
                     case 19:
-                      if ((_step32 = _iterator32.n()).done) {
-                        _context22.next = 25;
+                      if ((_step20 = _iterator20.n()).done) {
+                        _context19.next = 25;
                         break;
                       }
-                      order = _step32.value;
-                      _context22.next = 23;
-                      return _this22.dbManager.update(INDEXDB_STORE_NAME, order);
+                      order = _step20.value;
+                      _context19.next = 23;
+                      return _this20.dbManager.update(INDEXDB_STORE_NAME, order);
                     case 23:
-                      _context22.next = 19;
+                      _context19.next = 19;
                       break;
                     case 25:
-                      _context22.next = 30;
+                      _context19.next = 30;
                       break;
                     case 27:
-                      _context22.prev = 27;
-                      _context22.t0 = _context22["catch"](17);
-                      _iterator32.e(_context22.t0);
+                      _context19.prev = 27;
+                      _context19.t0 = _context19["catch"](17);
+                      _iterator20.e(_context19.t0);
                     case 30:
-                      _context22.prev = 30;
-                      _iterator32.f();
-                      return _context22.finish(30);
+                      _context19.prev = 30;
+                      _iterator20.f();
+                      return _context19.finish(30);
                     case 33:
-                      _context22.next = 37;
-                      break;
-                    case 35:
-                      if (!options.throwOnError) {
-                        _context22.next = 37;
-                        break;
-                      }
-                      throw new Error('订单 SQLite 数据库不支持写入');
-                    case 37:
-                      _this22.recordRecentSqliteWrite(source, compactedToWrite);
-                      _this22.logInfo('patchOrdersInSQLite-完成', {
+                      _this20.recordRecentSqliteWrite(source, compactedToWrite);
+                      _this20.logInfo('patchOrdersInSQLite-完成', {
                         source: source,
                         count: compactedToWrite.length,
                         writeMethod: writeMethod,
                         dedupedCount: skipped.length
                       });
-                    case 39:
+                    case 35:
                     case "end":
-                      return _context22.stop();
+                      return _context19.stop();
                   }
-                }, _callee22, null, [[17, 27, 30, 33]]);
+                }, _callee19, null, [[17, 27, 30, 33]]);
               })));
-            case 21:
-              _context23.next = 28;
+            case 15:
+              _context20.next = 20;
               break;
-            case 23:
-              _context23.prev = 23;
-              _context23.t0 = _context23["catch"](18);
+            case 17:
+              _context20.prev = 17;
+              _context20.t0 = _context20["catch"](12);
               this.logError('增量保存订单到 SQLite 失败', {
-                error: _context23.t0 instanceof Error ? _context23.t0.message : String(_context23.t0),
+                error: _context20.t0 instanceof Error ? _context20.t0.message : String(_context20.t0),
                 orderCount: ordersSnapshot.length
               });
-              if (!options.throwOnError) {
-                _context23.next = 28;
-                break;
-              }
-              throw _context23.t0;
-            case 28:
+            case 20:
             case "end":
-              return _context23.stop();
+              return _context20.stop();
           }
-        }, _callee23, this, [[18, 23]]);
+        }, _callee20, this, [[12, 17]]);
       }));
-      function patchOrdersInSQLite(_x16, _x17) {
+      function patchOrdersInSQLite(_x12, _x13) {
         return _patchOrdersInSQLite.apply(this, arguments);
       }
       return patchOrdersInSQLite;
@@ -3602,135 +2614,98 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderInSQLite",
     value: (function () {
-      var _updateOrderInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(order, source) {
-        var _this23 = this;
-        var options,
-          orderSnapshot,
-          _orderSnapshot$order_3,
-          _args25 = arguments;
-        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
-          while (1) switch (_context25.prev = _context25.next) {
+      var _updateOrderInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(order, source) {
+        var _this21 = this;
+        var orderSnapshot, _orderSnapshot$order_3;
+        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
-              options = _args25.length > 2 && _args25[2] !== undefined ? _args25[2] : {};
-              if (this.getOrderStorageKey(order)) {
-                _context25.next = 5;
+              if (!(!this.dbManager || !this.getOrderStorageKey(order))) {
+                _context22.next = 2;
                 break;
               }
-              if (!options.throwOnError) {
-                _context25.next = 4;
-                break;
-              }
-              throw new Error('订单缺少可用的 SQLite 存储主键');
-            case 4:
-              return _context25.abrupt("return");
-            case 5:
-              if (this.dbManager) {
-                _context25.next = 9;
-                break;
-              }
-              if (!options.throwOnError) {
-                _context25.next = 8;
-                break;
-              }
-              throw new Error('订单 SQLite 数据库未初始化');
-            case 8:
-              return _context25.abrupt("return");
-            case 9:
+              return _context22.abrupt("return");
+            case 2:
               orderSnapshot = this.normalizeOrderCollectionsForIngress(cloneDeep(order), "".concat(source, ".sqliteIngress"));
-              _context25.prev = 10;
-              _context25.next = 13;
-              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24() {
+              _context22.prev = 3;
+              _context22.next = 6;
+              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
                 var _orderSnapshot$order_, _orderSnapshot$order_2;
                 var writeMethod;
-                return _regeneratorRuntime().wrap(function _callee24$(_context24) {
-                  while (1) switch (_context24.prev = _context24.next) {
+                return _regeneratorRuntime().wrap(function _callee21$(_context21) {
+                  while (1) switch (_context21.prev = _context21.next) {
                     case 0:
                       writeMethod = 'none';
-                      _this23.logInfo('updateOrderInSQLite-开始', {
+                      _this21.logInfo('updateOrderInSQLite-开始', {
                         source: source,
                         orderId: (_orderSnapshot$order_ = orderSnapshot.order_id) !== null && _orderSnapshot$order_ !== void 0 ? _orderSnapshot$order_ : null,
-                        storageKey: _this23.getOrderStorageKey(orderSnapshot)
+                        storageKey: _this21.getOrderStorageKey(orderSnapshot)
                       });
-                      if (!(typeof _this23.dbManager.update === 'function')) {
-                        _context24.next = 8;
+                      if (!(typeof _this21.dbManager.update === 'function')) {
+                        _context21.next = 8;
                         break;
                       }
                       writeMethod = 'update';
-                      _context24.next = 6;
-                      return _this23.dbManager.update(INDEXDB_STORE_NAME, orderSnapshot);
+                      _context21.next = 6;
+                      return _this21.dbManager.update(INDEXDB_STORE_NAME, orderSnapshot);
                     case 6:
-                      _context24.next = 22;
+                      _context21.next = 18;
                       break;
                     case 8:
-                      if (!(typeof _this23.dbManager.bulkUpdate === 'function')) {
-                        _context24.next = 14;
+                      if (!(typeof _this21.dbManager.bulkUpdate === 'function')) {
+                        _context21.next = 14;
                         break;
                       }
                       writeMethod = 'bulkUpdate';
-                      _context24.next = 12;
-                      return _this23.dbManager.bulkUpdate(INDEXDB_STORE_NAME, [orderSnapshot]);
+                      _context21.next = 12;
+                      return _this21.dbManager.bulkUpdate(INDEXDB_STORE_NAME, [orderSnapshot]);
                     case 12:
-                      _context24.next = 22;
+                      _context21.next = 18;
                       break;
                     case 14:
-                      if (!(typeof _this23.dbManager.bulkAdd === 'function')) {
-                        _context24.next = 20;
+                      if (!(typeof _this21.dbManager.bulkAdd === 'function')) {
+                        _context21.next = 18;
                         break;
                       }
                       writeMethod = 'bulkAdd';
-                      _context24.next = 18;
-                      return _this23.dbManager.bulkAdd(INDEXDB_STORE_NAME, [orderSnapshot]);
+                      _context21.next = 18;
+                      return _this21.dbManager.bulkAdd(INDEXDB_STORE_NAME, [orderSnapshot]);
                     case 18:
-                      _context24.next = 22;
-                      break;
-                    case 20:
-                      if (!options.throwOnError) {
-                        _context24.next = 22;
-                        break;
-                      }
-                      throw new Error('订单 SQLite 数据库不支持写入');
-                    case 22:
-                      _this23.recordRecentSqliteWrite(source, [orderSnapshot]);
-                      _this23.logInfo('updateOrderInSQLite-完成', {
+                      _this21.recordRecentSqliteWrite(source, [orderSnapshot]);
+                      _this21.logInfo('updateOrderInSQLite-完成', {
                         source: source,
                         orderId: (_orderSnapshot$order_2 = orderSnapshot.order_id) !== null && _orderSnapshot$order_2 !== void 0 ? _orderSnapshot$order_2 : null,
                         writeMethod: writeMethod
                       });
-                    case 24:
+                    case 20:
                     case "end":
-                      return _context24.stop();
+                      return _context21.stop();
                   }
-                }, _callee24);
+                }, _callee21);
               })));
-            case 13:
-              _context25.next = 20;
+            case 6:
+              _context22.next = 11;
               break;
-            case 15:
-              _context25.prev = 15;
-              _context25.t0 = _context25["catch"](10);
+            case 8:
+              _context22.prev = 8;
+              _context22.t0 = _context22["catch"](3);
               this.logError('单条保存订单到 SQLite 失败', {
-                error: _context25.t0 instanceof Error ? _context25.t0.message : String(_context25.t0),
+                error: _context22.t0 instanceof Error ? _context22.t0.message : String(_context22.t0),
                 orderId: (_orderSnapshot$order_3 = orderSnapshot.order_id) !== null && _orderSnapshot$order_3 !== void 0 ? _orderSnapshot$order_3 : null
               });
-              if (!options.throwOnError) {
-                _context25.next = 20;
-                break;
-              }
-              throw _context25.t0;
-            case 20:
+            case 11:
             case "end":
-              return _context25.stop();
+              return _context22.stop();
           }
-        }, _callee25, this, [[10, 15]]);
+        }, _callee22, this, [[3, 8]]);
       }));
-      function updateOrderInSQLite(_x18, _x19) {
+      function updateOrderInSQLite(_x14, _x15) {
         return _updateOrderInSQLite.apply(this, arguments);
       }
       return updateOrderInSQLite;
     }()
     /**
-     * 全量快照替换 orders 表（clear + bulkAdd），并保留本地 draft / need_sync / pending 支付订单。
-     * 用于 SSE 全量拉取与营业日窗口裁剪。
+     * 全量快照替换 orders 表（clear + bulkAdd），用于 SSE 全量拉取与营业日窗口裁剪。
      *
      * @example
      * await this.replaceOrdersSnapshotInSQLite(orderList)
@@ -3739,163 +2714,100 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "replaceOrdersSnapshotInSQLite",
     value: (function () {
-      var _replaceOrdersSnapshotInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(orderList, source) {
-        var _this24 = this;
-        var protectedOrdersBeforeRemoteFetch,
-          remoteSnapshot,
-          mergedSnapshot,
-          _args27 = arguments;
-        return _regeneratorRuntime().wrap(function _callee27$(_context27) {
-          while (1) switch (_context27.prev = _context27.next) {
+      var _replaceOrdersSnapshotInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(orderList, source) {
+        var _this22 = this;
+        var remoteSnapshot, mergedSnapshot;
+        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
             case 0:
-              protectedOrdersBeforeRemoteFetch = _args27.length > 2 && _args27[2] !== undefined ? _args27[2] : [];
               if (this.dbManager) {
-                _context27.next = 3;
+                _context24.next = 2;
                 break;
               }
-              return _context27.abrupt("return", this.compactOrderListByIdentity(orderList.map(function (order) {
-                return _this24.normalizeRemoteSyncedOrder(order);
+              return _context24.abrupt("return", this.compactOrderListByIdentity(orderList.map(function (order) {
+                return _this22.normalizeRemoteSyncedOrder(order);
               }), "".concat(source, ".snapshotNoDb")).list);
-            case 3:
+            case 2:
               remoteSnapshot = cloneDeep(orderList).map(function (order) {
-                return _this24.normalizeOrderCollectionsForIngress(order, "".concat(source, ".remoteIngress"));
+                return _this22.normalizeOrderCollectionsForIngress(order, "".concat(source, ".remoteIngress"));
               });
               mergedSnapshot = this.compactOrderListByIdentity(remoteSnapshot.map(function (order) {
-                return _this24.normalizeRemoteSyncedOrder(order);
+                return _this22.normalizeRemoteSyncedOrder(order);
               }), "".concat(source, ".remoteSnapshot")).list;
-              _context27.prev = 5;
-              _context27.next = 8;
-              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26() {
-                var existingOrders, protectedLocalOrders, _iterator33, _step33, rawCurrentOrder, currentOrder, protectedIndex, currentNeedsProtection, orderListSnapshot;
-                return _regeneratorRuntime().wrap(function _callee26$(_context26) {
-                  while (1) switch (_context26.prev = _context26.next) {
+              _context24.prev = 4;
+              _context24.next = 7;
+              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
+                var existingOrders, orderListSnapshot;
+                return _regeneratorRuntime().wrap(function _callee23$(_context23) {
+                  while (1) switch (_context23.prev = _context23.next) {
                     case 0:
-                      if (!(typeof _this24.dbManager.getAll === 'function')) {
-                        _context26.next = 6;
+                      if (!(typeof _this22.dbManager.getAll === 'function')) {
+                        _context23.next = 6;
                         break;
                       }
-                      _context26.next = 3;
-                      return _this24.dbManager.getAll(INDEXDB_STORE_NAME);
+                      _context23.next = 3;
+                      return _this22.dbManager.getAll(INDEXDB_STORE_NAME);
                     case 3:
-                      _context26.t0 = _context26.sent;
-                      _context26.next = 7;
+                      _context23.t0 = _context23.sent;
+                      _context23.next = 7;
                       break;
                     case 6:
-                      _context26.t0 = [];
+                      _context23.t0 = [];
                     case 7:
-                      existingOrders = _context26.t0;
-                      protectedLocalOrders = protectedOrdersBeforeRemoteFetch.map(function (order) {
-                        return _this24.normalizeOrderCollectionsForIngress(order, "".concat(source, ".protectedBeforeRemoteFetch"));
-                      }).filter(function (order) {
-                        return _this24.shouldProtectLocalOrderFromRemoteSnapshot(order);
-                      });
-                      _iterator33 = _createForOfIteratorHelper(existingOrders || []);
-                      _context26.prev = 10;
-                      _iterator33.s();
-                    case 12:
-                      if ((_step33 = _iterator33.n()).done) {
-                        _context26.next = 23;
-                        break;
-                      }
-                      rawCurrentOrder = _step33.value;
-                      currentOrder = _this24.normalizeOrderCollectionsForIngress(rawCurrentOrder, "".concat(source, ".currentSQLite"));
-                      protectedIndex = _this24.findOrderIndexByIdentity(protectedLocalOrders, currentOrder);
-                      currentNeedsProtection = _this24.shouldProtectLocalOrderFromRemoteSnapshot(currentOrder);
-                      if (!(protectedIndex >= 0)) {
-                        _context26.next = 20;
-                        break;
-                      }
-                      if (currentNeedsProtection) {
-                        protectedLocalOrders[protectedIndex] = currentOrder;
-                      } else {
-                        protectedLocalOrders.splice(protectedIndex, 1);
-                      }
-                      return _context26.abrupt("continue", 21);
-                    case 20:
-                      if (currentNeedsProtection) protectedLocalOrders.push(currentOrder);
-                    case 21:
-                      _context26.next = 12;
-                      break;
-                    case 23:
-                      _context26.next = 28;
-                      break;
-                    case 25:
-                      _context26.prev = 25;
-                      _context26.t1 = _context26["catch"](10);
-                      _iterator33.e(_context26.t1);
-                    case 28:
-                      _context26.prev = 28;
-                      _iterator33.f();
-                      return _context26.finish(28);
-                    case 31:
-                      orderListSnapshot = _this24.mergeRemoteSnapshotWithPendingOrders(remoteSnapshot, protectedLocalOrders);
-                      mergedSnapshot = _this24.compactOrderListByIdentity(orderListSnapshot, "".concat(source, ".sqliteSnapshot")).list;
-                      _this24.logInfo('replaceOrdersSnapshotInSQLite-开始', {
+                      existingOrders = _context23.t0;
+                      orderListSnapshot = _this22.mergeRemoteSnapshotWithPendingOrders(remoteSnapshot, existingOrders || []);
+                      mergedSnapshot = _this22.compactOrderListByIdentity(orderListSnapshot, "".concat(source, ".sqliteSnapshot")).list;
+                      _this22.logInfo('replaceOrdersSnapshotInSQLite-开始', {
                         source: source,
                         count: mergedSnapshot.length,
                         remoteCount: remoteSnapshot.length,
-                        protectedBeforeRemoteFetchCount: protectedOrdersBeforeRemoteFetch.length,
-                        protectedLocalOrderCount: protectedLocalOrders.length,
-                        preservedLocalUnsyncedCount: mergedSnapshot.length - remoteSnapshot.length,
-                        protectedPendingPaymentCount: protectedLocalOrders.reduce(function (count, order) {
-                          return count + _this24.getIdentifiedPendingPayments(order).length;
-                        }, 0),
-                        protectedPendingPaymentIdentities: protectedLocalOrders.flatMap(function (order) {
-                          return _this24.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,
-                              external_sale_number: (_external_sale_number5 = order.external_sale_number) !== null && _external_sale_number5 !== void 0 ? _external_sale_number5 : null,
-                              payment_identities: getOrderPaymentIdentityKeys(payment)
-                            };
-                          });
-                        })
+                        preservedPendingCount: mergedSnapshot.length - remoteSnapshot.length
                       });
-                      _context26.next = 36;
-                      return _this24.dbManager.clear(INDEXDB_STORE_NAME);
-                    case 36:
-                      _this24.logInfo('replaceOrdersSnapshotInSQLite-clear完成', {
+                      _context23.next = 13;
+                      return _this22.dbManager.clear(INDEXDB_STORE_NAME);
+                    case 13:
+                      _this22.logInfo('replaceOrdersSnapshotInSQLite-clear完成', {
                         count: mergedSnapshot.length
                       });
                       if (!(mergedSnapshot.length === 0)) {
-                        _context26.next = 39;
+                        _context23.next = 16;
                         break;
                       }
-                      return _context26.abrupt("return");
-                    case 39:
-                      _context26.next = 41;
-                      return _this24.dbManager.bulkAdd(INDEXDB_STORE_NAME, mergedSnapshot);
-                    case 41:
-                      _this24.recordRecentSqliteWrite(source, mergedSnapshot);
-                      _this24.logInfo('replaceOrdersSnapshotInSQLite-bulkAdd完成', {
+                      return _context23.abrupt("return");
+                    case 16:
+                      _context23.next = 18;
+                      return _this22.dbManager.bulkAdd(INDEXDB_STORE_NAME, mergedSnapshot);
+                    case 18:
+                      _this22.recordRecentSqliteWrite(source, mergedSnapshot);
+                      _this22.logInfo('replaceOrdersSnapshotInSQLite-bulkAdd完成', {
                         source: source,
                         count: mergedSnapshot.length
                       });
-                    case 43:
+                    case 20:
                     case "end":
-                      return _context26.stop();
+                      return _context23.stop();
                   }
-                }, _callee26, null, [[10, 25, 28, 31]]);
+                }, _callee23);
               })));
-            case 8:
-              _context27.next = 13;
+            case 7:
+              _context24.next = 12;
               break;
-            case 10:
-              _context27.prev = 10;
-              _context27.t0 = _context27["catch"](5);
+            case 9:
+              _context24.prev = 9;
+              _context24.t0 = _context24["catch"](4);
               this.logError('全量保存订单到 SQLite 失败', {
-                error: _context27.t0 instanceof Error ? _context27.t0.message : String(_context27.t0),
+                error: _context24.t0 instanceof Error ? _context24.t0.message : String(_context24.t0),
                 orderList: remoteSnapshot.length
               });
+            case 12:
+              return _context24.abrupt("return", mergedSnapshot);
             case 13:
-              return _context27.abrupt("return", mergedSnapshot);
-            case 14:
             case "end":
-              return _context27.stop();
+              return _context24.stop();
           }
-        }, _callee27, this, [[5, 10]]);
+        }, _callee24, this, [[4, 9]]);
       }));
-      function replaceOrdersSnapshotInSQLite(_x20, _x21) {
+      function replaceOrdersSnapshotInSQLite(_x16, _x17) {
         return _replaceOrdersSnapshotInSQLite.apply(this, arguments);
       }
       return replaceOrdersSnapshotInSQLite;
@@ -3910,38 +2822,38 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "clear",
     value: (function () {
-      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29() {
-        var _this25 = this;
-        return _regeneratorRuntime().wrap(function _callee29$(_context29) {
-          while (1) switch (_context29.prev = _context29.next) {
+      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26() {
+        var _this23 = this;
+        return _regeneratorRuntime().wrap(function _callee26$(_context26) {
+          while (1) switch (_context26.prev = _context26.next) {
             case 0:
               this.store.list = [];
               this.store.map = new Map();
               if (!this.dbManager) {
-                _context29.next = 5;
+                _context26.next = 5;
                 break;
               }
-              _context29.next = 5;
-              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28() {
-                return _regeneratorRuntime().wrap(function _callee28$(_context28) {
-                  while (1) switch (_context28.prev = _context28.next) {
+              _context26.next = 5;
+              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25() {
+                return _regeneratorRuntime().wrap(function _callee25$(_context25) {
+                  while (1) switch (_context25.prev = _context25.next) {
                     case 0:
-                      _context28.next = 2;
-                      return _this25.dbManager.clear(INDEXDB_STORE_NAME);
+                      _context25.next = 2;
+                      return _this23.dbManager.clear(INDEXDB_STORE_NAME);
                     case 2:
                     case "end":
-                      return _context28.stop();
+                      return _context25.stop();
                   }
-                }, _callee28);
+                }, _callee25);
               })));
             case 5:
               this.setStorageItem(ORDER_LAST_FULL_FETCH_AT_STORAGE_KEY, '');
               this.emitOrdersChanged([], 'clear');
             case 7:
             case "end":
-              return _context29.stop();
+              return _context26.stop();
           }
-        }, _callee29, this);
+        }, _callee26, this);
       }));
       function clear() {
         return _clear.apply(this, arguments);