@pisell/pisellos 2.3.30 → 2.3.32

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

@@ -139,8 +139,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(core, options) {
-        var _options$initialState,
-          _this3 = this;
+        var _options$initialState;
         var appPlugin, app;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
@@ -157,9 +156,7 @@ 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 = options.initialState.list.map(function (order) {
-                  return _this3.normalizeOrderForMemoryList(order);
-                });
+                this.store.list = this.normalizeOrdersForMemoryList(options.initialState.list, 'initialState');
                 this.syncOrdersMap();
                 this.emitOrdersChanged([], 'initialState');
               } else {
@@ -602,62 +599,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "preload",
     value: function () {
-      var _preload = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-        var _this4 = this;
-        var getData;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+      var _preload = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+        var orders;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              // 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();
+              _context3.next = 2;
+              return this.loadOrdersByServer();
             case 2:
+              orders = _context3.sent;
+              this.store.list = cloneDeep(orders);
+              this.syncOrdersMap();
+              _context3.next = 7;
+              return this.emitOrdersChanged([], 'preload');
+            case 7:
+              _context3.next = 9;
+              return this.core.effects.emit(OrderHooks.onOrdersSyncCompleted, null);
+            case 9:
             case "end":
-              return _context4.stop();
+              return _context3.stop();
           }
-        }, _callee4);
+        }, _callee3, this);
       }));
       function preload() {
         return _preload.apply(this, arguments);
@@ -707,20 +669,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getLocalOrderFromMemoryByLookup",
     value: function getLocalOrderFromMemoryByLookup(lookup) {
-      var _this5 = this;
+      var _this3 = 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 _this5.isOrderLookupMatch(order, key);
+        return _this3.isOrderLookupMatch(order, key);
       });
       return memoryOrder || null;
     }
   }, {
     key: "getLocalOrderByLookup",
     value: function () {
-      var _getLocalOrderByLookup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(lookup) {
-        var _this6 = this;
+      var _getLocalOrderByLookup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(lookup) {
+        var _this4 = this;
         var options,
           key,
           logContext,
@@ -729,11 +691,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           orders,
           localOrder,
           normalizedOrder,
-          _args5 = arguments;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+          _args4 = arguments;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              options = _args5.length > 1 && _args5[1] !== undefined ? _args5[1] : {};
+              options = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : {};
               key = this.getIdKey(lookup);
               logContext = {
                 operation_id: options.operationId,
@@ -745,38 +707,38 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               memoryOrderById = this.store.map.get(key);
               if (!memoryOrderById) {
-                _context5.next = 8;
+                _context4.next = 8;
                 break;
               }
               if (options.operationId) {
                 this.logInfo('getLocalOrderByLookup-localPayment-命中内存映射', _objectSpread(_objectSpread({}, logContext), this.buildLocalPaymentOrderLogContext(memoryOrderById)));
               }
-              return _context5.abrupt("return", memoryOrderById);
+              return _context4.abrupt("return", memoryOrderById);
             case 8:
               memoryOrder = this.store.list.find(function (order) {
-                return _this6.isOrderLookupMatch(order, key);
+                return _this4.isOrderLookupMatch(order, key);
               });
               if (!memoryOrder) {
-                _context5.next = 12;
+                _context4.next = 12;
                 break;
               }
               if (options.operationId) {
                 this.logInfo('getLocalOrderByLookup-localPayment-命中内存列表', _objectSpread(_objectSpread({}, logContext), this.buildLocalPaymentOrderLogContext(memoryOrder)));
               }
-              return _context5.abrupt("return", memoryOrder);
+              return _context4.abrupt("return", memoryOrder);
             case 12:
               if (options.operationId) {
                 this.logInfo('getLocalOrderByLookup-localPayment-开始读取SQLite', logContext);
               }
-              _context5.next = 15;
+              _context4.next = 15;
               return this.loadOrdersFromSQLite();
             case 15:
-              orders = _context5.sent;
+              orders = _context4.sent;
               localOrder = orders.find(function (order) {
-                return _this6.isOrderLookupMatch(order, key);
+                return _this4.isOrderLookupMatch(order, key);
               });
               if (localOrder) {
-                _context5.next = 20;
+                _context4.next = 20;
                 break;
               }
               if (options.operationId) {
@@ -784,11 +746,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   sqlite_order_count: orders.length
                 }));
               }
-              return _context5.abrupt("return", null);
+              return _context4.abrupt("return", null);
             case 20:
-              this.store.list = orders.map(function (order) {
-                return _this6.normalizeOrderForMemoryList(order);
-              });
+              this.store.list = this.normalizeOrdersForMemoryList(orders, 'getLocalOrderByLookup.sqliteMemory');
               this.syncOrdersMap();
               normalizedOrder = this.normalizeOrderForMemoryList(localOrder);
               if (options.operationId) {
@@ -796,12 +756,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   sqlite_order_count: orders.length
                 }, this.buildLocalPaymentOrderLogContext(normalizedOrder)));
               }
-              return _context5.abrupt("return", normalizedOrder);
+              return _context4.abrupt("return", normalizedOrder);
             case 25:
             case "end":
-              return _context5.stop();
+              return _context4.stop();
           }
-        }, _callee5, this);
+        }, _callee4, this);
       }));
       function getLocalOrderByLookup(_x3) {
         return _getLocalOrderByLookup.apply(this, arguments);
@@ -811,10 +771,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getLocalPayment",
     value: function () {
-      var _getLocalPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(params) {
+      var _getLocalPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(params) {
         var logContext, order, payments, match;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
               logContext = {
                 operation_id: params.operationId,
@@ -822,54 +782,54 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 payment_number: params.paymentNumber
               };
               this.logInfo('getLocalPayment-开始', logContext);
-              _context6.prev = 2;
-              _context6.next = 5;
+              _context5.prev = 2;
+              _context5.next = 5;
               return this.getLocalOrderByLookup(params.saleId, {
                 operationId: params.operationId
               });
             case 5:
-              order = _context6.sent;
+              order = _context5.sent;
               if (order) {
-                _context6.next = 9;
+                _context5.next = 9;
                 break;
               }
               this.logWarning('getLocalPayment-订单未命中', logContext);
-              return _context6.abrupt("return", null);
+              return _context5.abrupt("return", null);
             case 9:
               payments = order.payments || [];
               match = resolveOrderPaymentIdentity(payments, params.paymentNumber, 'compat');
               if (match) {
-                _context6.next = 14;
+                _context5.next = 14;
                 break;
               }
               this.logWarning('getLocalPayment-支付项未命中', _objectSpread(_objectSpread(_objectSpread({}, logContext), this.buildLocalPaymentOrderLogContext(order)), {}, {
                 payments: payments
               }));
-              return _context6.abrupt("return", null);
+              return _context5.abrupt("return", null);
             case 14:
               this.logInfo('getLocalPayment-支付项命中', _objectSpread(_objectSpread(_objectSpread({}, logContext), this.buildLocalPaymentOrderLogContext(order)), {}, {
                 matched_by: match.matchedBy,
                 payment_index: match.index,
                 payment: match.payment
               }));
-              return _context6.abrupt("return", {
+              return _context5.abrupt("return", {
                 order: order,
                 payment: match.payment,
                 paymentIndex: match.index,
                 matchedBy: match.matchedBy
               });
             case 18:
-              _context6.prev = 18;
-              _context6.t0 = _context6["catch"](2);
+              _context5.prev = 18;
+              _context5.t0 = _context5["catch"](2);
               this.logError('getLocalPayment-查询失败', _objectSpread(_objectSpread({}, logContext), {}, {
-                error: _context6.t0 instanceof Error ? _context6.t0.message : String(_context6.t0)
+                error: _context5.t0 instanceof Error ? _context5.t0.message : String(_context5.t0)
               }));
-              throw _context6.t0;
+              throw _context5.t0;
             case 22:
             case "end":
-              return _context6.stop();
+              return _context5.stop();
           }
-        }, _callee6, this, [[2, 18]]);
+        }, _callee5, this, [[2, 18]]);
       }));
       function getLocalPayment(_x4) {
         return _getLocalPayment.apply(this, arguments);
@@ -879,10 +839,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateLocalPayment",
     value: function () {
-      var _updateLocalPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(params) {
-        var logContext, found, previousPayment, nextPayment, nextOrder, paymentContext, targetIndex, previousList, storageOrder, _storageOrder$order_i, _storageOrder$order_i2, _storageOrder$order_i3;
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+      var _updateLocalPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(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 _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
               logContext = {
                 operation_id: params.operationId,
@@ -891,16 +851,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 incoming_payment_update: params.updates
               };
               this.logInfo('updateLocalPayment-开始', logContext);
-              _context7.next = 4;
+              _context6.next = 4;
               return this.getLocalPayment(params);
             case 4:
-              found = _context7.sent;
+              found = _context6.sent;
               if (found) {
-                _context7.next = 8;
+                _context6.next = 8;
                 break;
               }
               this.logWarning('updateLocalPayment-支付项未命中', logContext);
-              return _context7.abrupt("return", null);
+              return _context6.abrupt("return", null);
             case 8:
               previousPayment = cloneDeep(found.payment);
               nextPayment = mergeOrderPaymentRecord(found.payment, _objectSpread(_objectSpread({}, params.updates), {}, {
@@ -921,58 +881,65 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
               this.logInfo('updateLocalPayment-支付项合并完成', paymentContext);
               targetIndex = this.findOrderIndexByIdentity(this.store.list, found.order);
-              if (!(targetIndex < 0)) {
-                _context7.next = 17;
+              shouldKeepInMemory = this.shouldKeepOrderInMemory(nextOrder);
+              if (!(targetIndex < 0 && shouldKeepInMemory)) {
+                _context6.next = 18;
                 break;
               }
               this.logError('updateLocalPayment-订单Store索引未命中', paymentContext);
-              return _context7.abrupt("return", null);
-            case 17:
+              return _context6.abrupt("return", null);
+            case 18:
               previousList = this.store.list;
-              this.store.list = this.store.list.map(function (order, index) {
+              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 = 21;
+              _context6.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 = 25;
+              _context6.next = 26;
               return this.updateOrderInSQLite(storageOrder, 'updateLocalPayment', {
                 throwOnError: true
               });
-            case 25:
+            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 = 34;
+              _context6.next = 35;
               break;
-            case 28:
-              _context7.prev = 28;
-              _context7.t0 = _context7["catch"](21);
+            case 29:
+              _context6.prev = 29;
+              _context6.t0 = _context6["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)
+                error: _context6.t0 instanceof Error ? _context6.t0.message : String(_context6.t0)
               }));
-              throw _context7.t0;
-            case 34:
-              _context7.next = 36;
-              return this.emitOrdersChanged([nextOrder], 'updateLocalPayment');
-            case 36:
+              throw _context6.t0;
+            case 35:
+              if (!(shouldKeepInMemory || targetIndex >= 0)) {
+                _context6.next = 38;
+                break;
+              }
+              _context6.next = 38;
+              return this.emitOrdersChanged(shouldKeepInMemory ? [nextOrder] : [], shouldKeepInMemory ? 'updateLocalPayment' : 'updateLocalPayment.sqliteOnlyDraft');
+            case 38:
               this.logInfo('updateLocalPayment-变更事件完成', paymentContext);
-              return _context7.abrupt("return", {
+              return _context6.abrupt("return", {
                 order: nextOrder,
                 payment: nextPayment,
                 previousPayment: previousPayment
               });
-            case 38:
+            case 40:
             case "end":
-              return _context7.stop();
+              return _context6.stop();
           }
-        }, _callee7, this, [[21, 28]]);
+        }, _callee6, this, [[22, 29]]);
       }));
       function updateLocalPayment(_x5) {
         return _updateLocalPayment.apply(this, arguments);
@@ -982,64 +949,71 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadOrdersByServer",
     value: function () {
-      var _loadOrdersByServer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-        var _this$store,
-          _this7 = this;
-        var orderList, data, mergedOrders, memoryOrders;
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+      var _loadOrdersByServer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+        var _this5 = this,
+          _this$store;
+        var orderList, protectedOrdersBeforeRemoteFetch, data, mergedOrders, memoryOrders;
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
               orderList = [];
+              _context7.next = 3;
+              return this.loadOrdersFromSQLite();
+            case 3:
+              protectedOrdersBeforeRemoteFetch = _context7.sent.filter(function (order) {
+                return _this5.isPendingSyncOrder(order) || _this5.isDraftOrder(order);
+              });
               this.logInfo('loadOrdersByServer-开始', {
                 hasOrderDataSource: !!this.orderDataSource,
-                query: ((_this$store = this.store) === null || _this$store === void 0 ? void 0 : _this$store.createdAtQuery) || null
+                query: ((_this$store = this.store) === null || _this$store === void 0 ? void 0 : _this$store.createdAtQuery) || null,
+                protectedLocalOrderCount: protectedOrdersBeforeRemoteFetch.length
               });
               if (!this.orderDataSource) {
-                _context8.next = 17;
+                _context7.next = 20;
                 break;
               }
-              _context8.prev = 3;
-              _context8.next = 6;
+              _context7.prev = 6;
+              _context7.next = 9;
               return this.orderDataSource.run({
                 sse: {
                   query: this.store.createdAtQuery
                 }
               });
-            case 6:
-              data = _context8.sent;
+            case 9:
+              data = _context7.sent;
               orderList = data || [];
               this.logInfo('loadOrdersByServer-SSE拉取成功', {
                 count: orderList.length
               });
               this.markOrderPulledAtNow();
               this.lastServerFullFetchAtMs = Date.now();
-              _context8.next = 17;
+              _context7.next = 20;
               break;
-            case 13:
-              _context8.prev = 13;
-              _context8.t0 = _context8["catch"](3);
+            case 16:
+              _context7.prev = 16;
+              _context7.t0 = _context7["catch"](6);
               this.logInfo('loadOrdersByServer-SSE拉取失败，保持当前内存订单');
-              return _context8.abrupt("return", this.store.list);
-            case 17:
-              _context8.next = 19;
-              return this.replaceOrdersSnapshotInSQLite(orderList, 'loadOrdersByServer');
-            case 19:
-              mergedOrders = _context8.sent;
-              memoryOrders = mergedOrders.map(function (order) {
-                return _this7.normalizeOrderForMemoryList(order);
-              });
+              return _context7.abrupt("return", this.store.list);
+            case 20:
+              _context7.next = 22;
+              return this.replaceOrdersSnapshotInSQLite(orderList, 'loadOrdersByServer', protectedOrdersBeforeRemoteFetch);
+            case 22:
+              mergedOrders = _context7.sent;
+              memoryOrders = this.normalizeOrdersForMemoryList(mergedOrders, 'loadOrdersByServer.memory');
               this.logInfo('loadOrdersByServer-结束', {
-                count: memoryOrders.length
+                count: memoryOrders.length,
+                persistedCount: mergedOrders.length,
+                sqliteOnlyDraftCount: mergedOrders.length - memoryOrders.length
               });
-              _context8.next = 24;
+              _context7.next = 27;
               return this.core.effects.emit(OrderHooks.onOrdersLoaded, memoryOrders);
-            case 24:
-              return _context8.abrupt("return", memoryOrders);
-            case 25:
+            case 27:
+              return _context7.abrupt("return", memoryOrders);
+            case 28:
             case "end":
-              return _context8.stop();
+              return _context7.stop();
           }
-        }, _callee8, this, [[3, 13]]);
+        }, _callee7, this, [[6, 16]]);
       }));
       function loadOrdersByServer() {
         return _loadOrdersByServer.apply(this, arguments);
@@ -1054,61 +1028,54 @@ 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 _callee8() {
         var startTime, elapsedSinceFullFetch, orders, errorMessage;
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.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;
+                _context8.next = 4;
                 break;
               }
-              return _context9.abrupt("return", this.store.list);
+              return _context8.abrupt("return", this.store.list);
             case 4:
               this.logInfo('silentRefresh 开始');
-              _context9.prev = 5;
+              _context8.prev = 5;
               // 刷新前，需要更新当前营业日边界（store.createdAtQuery）
               this.updateCreateStore();
-              _context9.next = 9;
+              _context8.next = 9;
               return this.loadOrdersByServer();
             case 9:
-              orders = _context9.sent;
-              if (!(orders.length > 0)) {
-                _context9.next = 19;
-                break;
-              }
+              orders = _context8.sent;
               this.store.list = cloneDeep(orders);
               this.syncOrdersMap();
-              this.emitOrdersChanged([], 'silentRefresh');
-              _context9.next = 16;
+              _context8.next = 14;
+              return this.emitOrdersChanged([], 'silentRefresh');
+            case 14:
+              _context8.next = 16;
               return this.core.effects.emit(OrderHooks.onOrdersSyncCompleted, null);
             case 16:
               this.logInfo('silentRefresh 完成', {
                 orderCount: orders.length,
                 duration: "".concat(Date.now() - startTime, "ms")
               });
-              _context9.next = 20;
-              break;
-            case 19:
-              this.logInfo('silentRefresh: 服务器未返回数据');
+              return _context8.abrupt("return", this.store.list);
             case 20:
-              return _context9.abrupt("return", this.store.list);
-            case 23:
-              _context9.prev = 23;
-              _context9.t0 = _context9["catch"](5);
-              errorMessage = _context9.t0 instanceof Error ? _context9.t0.message : String(_context9.t0);
+              _context8.prev = 20;
+              _context8.t0 = _context8["catch"](5);
+              errorMessage = _context8.t0 instanceof Error ? _context8.t0.message : String(_context8.t0);
               this.logError('silentRefresh 失败', {
                 duration: "".concat(Date.now() - startTime, "ms"),
                 error: errorMessage
               });
-              return _context9.abrupt("return", this.store.list);
-            case 28:
+              return _context8.abrupt("return", this.store.list);
+            case 25:
             case "end":
-              return _context9.stop();
+              return _context8.stop();
           }
-        }, _callee9, this, [[5, 23]]);
+        }, _callee8, this, [[5, 20]]);
       }));
       function silentRefresh() {
         return _silentRefresh.apply(this, arguments);
@@ -1121,6 +1088,9 @@ 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;
       }
@@ -1131,6 +1101,28 @@ 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) {
@@ -1150,31 +1142,31 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "overwriteExistingOrder",
     value: (function () {
-      var _overwriteExistingOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(fresh) {
-        var _this8 = this;
+      var _overwriteExistingOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(fresh) {
+        var _this7 = this;
         var orderId, key, normalizedFresh, existingOrder, reconciledFresh;
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
               orderId = fresh === null || fresh === void 0 ? void 0 : fresh.order_id;
               if (!(orderId === undefined || orderId === null)) {
-                _context10.next = 4;
+                _context9.next = 4;
                 break;
               }
               this.logError('overwriteExistingOrder-入参缺少 order_id');
-              return _context10.abrupt("return", {
+              return _context9.abrupt("return", {
                 overwritten: false
               });
             case 4:
               key = this.getIdKey(orderId);
               if (this.store.map.has(key)) {
-                _context10.next = 8;
+                _context9.next = 8;
                 break;
               }
               this.logInfo('overwriteExistingOrder-本地不存在该订单，跳过', {
                 orderId: orderId
               });
-              return _context10.abrupt("return", {
+              return _context9.abrupt("return", {
                 overwritten: false
               });
             case 8:
@@ -1188,29 +1180,29 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.store.list = this.store.list.map(function (order) {
                 var id = order === null || order === void 0 ? void 0 : order.order_id;
                 if (id === undefined || id === null) {
-                  return _this8.normalizeOrderForMemoryList(order, 'overwriteExistingOrder.existingMemory');
+                  return _this7.normalizeOrderForMemoryList(order, 'overwriteExistingOrder.existingMemory');
                 }
-                return _this8.getIdKey(id) === key ? reconciledFresh : _this8.normalizeOrderForMemoryList(order, 'overwriteExistingOrder.existingMemory');
+                return _this7.getIdKey(id) === key ? reconciledFresh : _this7.normalizeOrderForMemoryList(order, 'overwriteExistingOrder.existingMemory');
               });
               this.syncOrdersMap();
-              _context10.next = 16;
+              _context9.next = 16;
               return this.updateOrderInSQLite(reconciledFresh, 'overwriteExistingOrder');
             case 16:
               this.logInfo('overwriteExistingOrder-结束', {
                 orderId: orderId,
                 storeOrderCountAfter: this.store.list.length
               });
-              _context10.next = 19;
+              _context9.next = 19;
               return this.emitOrdersChanged([reconciledFresh], 'overwriteExistingOrder');
             case 19:
-              return _context10.abrupt("return", {
+              return _context9.abrupt("return", {
                 overwritten: true
               });
             case 20:
             case "end":
-              return _context10.stop();
+              return _context9.stop();
           }
-        }, _callee10, this);
+        }, _callee9, this);
       }));
       function overwriteExistingOrder(_x6) {
         return _overwriteExistingOrder.apply(this, arguments);
@@ -1225,31 +1217,31 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "upsertOrdersFromRemote",
     value: (function () {
-      var _upsertOrdersFromRemote = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(freshOrders) {
+      var _upsertOrdersFromRemote = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(freshOrders) {
         var source,
-          _args11 = arguments;
-        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+          _args10 = arguments;
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
-              source = _args11.length > 1 && _args11[1] !== undefined ? _args11[1] : 'upsertOrdersFromRemote';
+              source = _args10.length > 1 && _args10[1] !== undefined ? _args10[1] : 'upsertOrdersFromRemote';
               if (freshOrders !== null && freshOrders !== void 0 && freshOrders.length) {
-                _context11.next = 4;
+                _context10.next = 4;
                 break;
               }
               this.logInfo('upsertOrdersFromRemote-订单列表为空', {});
-              return _context11.abrupt("return");
+              return _context10.abrupt("return");
             case 4:
               this.logInfo('upsertOrdersFromRemote-开始', {
                 count: freshOrders.length,
                 source: source
               });
-              _context11.next = 7;
+              _context10.next = 7;
               return this.mergeOrdersToStore(freshOrders, source);
             case 7:
             case "end":
-              return _context11.stop();
+              return _context10.stop();
           }
-        }, _callee11, this);
+        }, _callee10, this);
       }));
       function upsertOrdersFromRemote(_x7) {
         return _upsertOrdersFromRemote.apply(this, arguments);
@@ -1259,21 +1251,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "markOrderSyncedByExternalSaleNumber",
     value: function () {
-      var _markOrderSyncedByExternalSaleNumber = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(params) {
-        var _this9 = this,
+      var _markOrderSyncedByExternalSaleNumber = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(params) {
+        var _this8 = 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 _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
               externalSaleNumber = params.externalSaleNumber;
               if (!(externalSaleNumber === undefined || externalSaleNumber === null || externalSaleNumber === '')) {
-                _context12.next = 4;
+                _context11.next = 4;
                 break;
               }
               this.logError('markOrderSyncedByExternalSaleNumber-缺少 external_sale_number');
-              return _context12.abrupt("return", {
+              return _context11.abrupt("return", {
                 updated: false
               });
             case 4:
@@ -1281,16 +1273,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               targetIndex = this.store.list.findIndex(function (order) {
                 var value = order === null || order === void 0 ? void 0 : order.external_sale_number;
                 if (value === undefined || value === null || value === '') return false;
-                return _this9.getIdKey(value) === key;
+                return _this8.getIdKey(value) === key;
               });
               if (!(targetIndex < 0)) {
-                _context12.next = 9;
+                _context11.next = 9;
                 break;
               }
               this.logInfo('markOrderSyncedByExternalSaleNumber-本地订单不存在，跳过', {
                 external_sale_number: externalSaleNumber
               });
-              return _context12.abrupt("return", {
+              return _context11.abrupt("return", {
                 updated: false
               });
             case 9:
@@ -1306,25 +1298,25 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 return nextOrder;
               });
               this.syncOrdersMap();
-              _context12.next = 16;
+              _context11.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;
+              _context11.next = 19;
               return this.emitOrdersChanged([nextOrder], 'markOrderSyncedByExternalSaleNumber');
             case 19:
-              return _context12.abrupt("return", {
+              return _context11.abrupt("return", {
                 updated: true,
                 order: nextOrder
               });
             case 20:
             case "end":
-              return _context12.stop();
+              return _context11.stop();
           }
-        }, _callee12, this);
+        }, _callee11, this);
       }));
       function markOrderSyncedByExternalSaleNumber(_x8) {
         return _markOrderSyncedByExternalSaleNumber.apply(this, arguments);
@@ -1338,8 +1330,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "upsertPendingSyncOrders",
     value: (function () {
-      var _upsertPendingSyncOrders = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(pendingOrders) {
-        var _this10 = this;
+      var _upsertPendingSyncOrders = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(pendingOrders) {
+        var _this9 = this;
         var options,
           pendingMap,
           memoryPendingMap,
@@ -1369,26 +1361,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           insertIndex,
           patchedOrders,
           previousList,
-          _args13 = arguments;
-        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+          _args12 = arguments;
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              options = _args13.length > 1 && _args13[1] !== undefined ? _args13[1] : {};
+              options = _args12.length > 1 && _args12[1] !== undefined ? _args12[1] : {};
               if (pendingOrders !== null && pendingOrders !== void 0 && pendingOrders.length) {
-                _context13.next = 4;
+                _context12.next = 4;
                 break;
               }
               this.logInfo('upsertPendingSyncOrders-订单列表为空', {});
-              return _context13.abrupt("return");
+              return _context12.abrupt("return");
             case 4:
               pendingMap = new Map();
               memoryPendingMap = new Map();
               _iterator5 = _createForOfIteratorHelper(pendingOrders);
-              _context13.prev = 7;
+              _context12.prev = 7;
               _iterator5.s();
             case 9:
               if ((_step5 = _iterator5.n()).done) {
-                _context13.next = 20;
+                _context12.next = 20;
                 break;
               }
               order = _step5.value;
@@ -1399,43 +1391,43 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
               storageKey = this.getOrderStorageKey(pendingOrder);
               if (storageKey) {
-                _context13.next = 16;
+                _context12.next = 16;
                 break;
               }
-              return _context13.abrupt("continue", 18);
+              return _context12.abrupt("continue", 18);
             case 16:
               pendingMap.set(storageKey, pendingOrder);
               memoryPendingMap.set(storageKey, this.normalizeOrderForMemoryList(pendingOrder, 'upsertPendingSyncOrders.memory'));
             case 18:
-              _context13.next = 9;
+              _context12.next = 9;
               break;
             case 20:
-              _context13.next = 25;
+              _context12.next = 25;
               break;
             case 22:
-              _context13.prev = 22;
-              _context13.t0 = _context13["catch"](7);
-              _iterator5.e(_context13.t0);
+              _context12.prev = 22;
+              _context12.t0 = _context12["catch"](7);
+              _iterator5.e(_context12.t0);
             case 25:
-              _context13.prev = 25;
+              _context12.prev = 25;
               _iterator5.f();
-              return _context13.finish(25);
+              return _context12.finish(25);
             case 28:
               if (!(pendingMap.size === 0)) {
-                _context13.next = 31;
+                _context12.next = 31;
                 break;
               }
               this.logError('upsertPendingSyncOrders-订单缺少可落库标识', {
                 count: pendingOrders.length
               });
-              return _context13.abrupt("return");
+              return _context12.abrupt("return");
             case 31:
               this.logInfo('upsertPendingSyncOrders-开始', {
                 count: pendingMap.size
               });
               mergeActions = {};
               updatedList = this.store.list.map(function (order) {
-                return _this10.normalizeOrderForMemoryList(order, 'upsertPendingSyncOrders.existingMemory');
+                return _this9.normalizeOrderForMemoryList(order, 'upsertPendingSyncOrders.existingMemory');
               }); // 与 mergeOrdersToStore 一致：基于身份键（field:value）建立索引，把「查找已存在订单」
               // 从 O(n) 线性扫描降为 O(1)，整体复杂度由 O(n^2) 降为 O(n + m)。
               identityKeyToIndex = new Map();
@@ -1454,17 +1446,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               }
               _iterator7 = _createForOfIteratorHelper(memoryPendingMap.entries());
-              _context13.prev = 37;
+              _context12.prev = 37;
               _iterator7.s();
             case 39:
               if ((_step7 = _iterator7.n()).done) {
-                _context13.next = 58;
+                _context12.next = 58;
                 break;
               }
               _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;
+                _context12.next = 52;
                 break;
               }
               existingOrder = updatedList[matchIndex];
@@ -1481,55 +1473,55 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               // 合并后身份字段可能新增（如挂单拿到 order_id），同步登记，供同批后续 pending 命中同一槽位
               this.registerOrderIdentityKeys(identityKeyToIndex, nextOrder, matchIndex);
               mergeActions[_storageKey] = 'update';
-              return _context13.abrupt("continue", 56);
+              return _context12.abrupt("continue", 56);
             case 52:
               insertIndex = updatedList.length;
               updatedList.push(_pendingOrder);
               this.registerOrderIdentityKeys(identityKeyToIndex, _pendingOrder, insertIndex);
               mergeActions[_storageKey] = 'insert';
             case 56:
-              _context13.next = 39;
+              _context12.next = 39;
               break;
             case 58:
-              _context13.next = 63;
+              _context12.next = 63;
               break;
             case 60:
-              _context13.prev = 60;
-              _context13.t1 = _context13["catch"](37);
-              _iterator7.e(_context13.t1);
+              _context12.prev = 60;
+              _context12.t1 = _context12["catch"](37);
+              _iterator7.e(_context12.t1);
             case 63:
-              _context13.prev = 63;
+              _context12.prev = 63;
               _iterator7.f();
-              return _context13.finish(63);
+              return _context12.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;
+              _context12.prev = 70;
+              _context12.next = 73;
               return this.patchOrdersInSQLite(patchedOrders, 'upsertPendingSyncOrders', mergeActions, options);
             case 73:
-              _context13.next = 80;
+              _context12.next = 80;
               break;
             case 75:
-              _context13.prev = 75;
-              _context13.t2 = _context13["catch"](70);
+              _context12.prev = 75;
+              _context12.t2 = _context12["catch"](70);
               this.store.list = previousList;
               this.syncOrdersMap();
-              throw _context13.t2;
+              throw _context12.t2;
             case 80:
               this.logInfo('upsertPendingSyncOrders-结束', {
                 count: patchedOrders.length,
                 storeOrderCountAfter: this.store.list.length
               });
-              _context13.next = 83;
+              _context12.next = 83;
               return this.emitOrdersChanged(patchedOrders, 'upsertPendingSyncOrders');
             case 83:
             case "end":
-              return _context13.stop();
+              return _context12.stop();
           }
-        }, _callee13, this, [[7, 22, 25, 28], [37, 60, 63, 66], [70, 75]]);
+        }, _callee12, this, [[7, 22, 25, 28], [37, 60, 63, 66], [70, 75]]);
       }));
       function upsertPendingSyncOrders(_x9) {
         return _upsertPendingSyncOrders.apply(this, arguments);
@@ -1537,33 +1529,34 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       return upsertPendingSyncOrders;
     }()
     /**
-     * 将 POS 草稿订单按 SQLite storage key 合并进 store 并落库。
-     * 草稿只表示本地可恢复快照，不进入同步队列。
+     * 将 POS 草稿订单按 SQLite storage key 落库。
+     * 只有具备真实 order_id 的草稿进入 store；其余草稿仅供本地恢复查询。
      */
     )
   }, {
     key: "upsertLocalDraftOrders",
     value: (function () {
-      var _upsertLocalDraftOrders = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(draftOrders) {
-        var draftMap, memoryDraftMap, _iterator8, _step8, order, draftOrder, storageKey, patchedOrders, mergeActions, updatedList, identityKeyToIndex, index, _iterator9, _step9, key, _iterator10, _step10, _step10$value, _storageKey2, _draftOrder, matchIndex, mergedOrder, nextOrder, insertIndex;
-        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+      var _upsertLocalDraftOrders = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(draftOrders) {
+        var _this10 = this;
+        var draftMap, memoryDraftMap, _iterator8, _step8, order, draftOrder, storageKey, memoryDraftOrder, patchedOrders, mergeActions, updatedList, identityKeyToIndex, index, _iterator9, _step9, key, _iterator10, _step10, _step10$value, _storageKey2, _draftOrder, matchIndex, mergedOrder, nextOrder, insertIndex, previousList, removedLegacyMemoryDraft;
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
               if (draftOrders !== null && draftOrders !== void 0 && draftOrders.length) {
-                _context14.next = 3;
+                _context13.next = 3;
                 break;
               }
               this.logInfo('upsertLocalDraftOrders-订单列表为空', {});
-              return _context14.abrupt("return");
+              return _context13.abrupt("return");
             case 3:
               draftMap = new Map();
               memoryDraftMap = new Map();
               _iterator8 = _createForOfIteratorHelper(draftOrders);
-              _context14.prev = 6;
+              _context13.prev = 6;
               _iterator8.s();
             case 8:
               if ((_step8 = _iterator8.n()).done) {
-                _context14.next = 18;
+                _context13.next = 19;
                 break;
               }
               order = _step8.value;
@@ -1573,43 +1566,50 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
               storageKey = this.getOrderStorageKey(draftOrder);
               if (storageKey) {
-                _context14.next = 14;
+                _context13.next = 14;
                 break;
               }
-              return _context14.abrupt("continue", 16);
+              return _context13.abrupt("continue", 17);
             case 14:
               draftMap.set(storageKey, draftOrder);
-              memoryDraftMap.set(storageKey, this.normalizeOrderForMemoryList(draftOrder));
-            case 16:
-              _context14.next = 8;
+              memoryDraftOrder = this.normalizeOrderForMemoryList(draftOrder);
+              if (this.shouldKeepOrderInMemory(memoryDraftOrder)) {
+                memoryDraftMap.set(storageKey, memoryDraftOrder);
+              }
+            case 17:
+              _context13.next = 8;
               break;
-            case 18:
-              _context14.next = 23;
+            case 19:
+              _context13.next = 24;
               break;
-            case 20:
-              _context14.prev = 20;
-              _context14.t0 = _context14["catch"](6);
-              _iterator8.e(_context14.t0);
-            case 23:
-              _context14.prev = 23;
+            case 21:
+              _context13.prev = 21;
+              _context13.t0 = _context13["catch"](6);
+              _iterator8.e(_context13.t0);
+            case 24:
+              _context13.prev = 24;
               _iterator8.f();
-              return _context14.finish(23);
-            case 26:
+              return _context13.finish(24);
+            case 27:
               if (!(draftMap.size === 0)) {
-                _context14.next = 29;
+                _context13.next = 30;
                 break;
               }
               this.logError('upsertLocalDraftOrders-订单缺少可落库标识', {
                 count: draftOrders.length
               });
-              return _context14.abrupt("return");
-            case 29:
+              return _context13.abrupt("return");
+            case 30:
               this.logInfo('upsertLocalDraftOrders-开始', {
-                count: draftMap.size
+                count: draftMap.size,
+                memoryDraftCount: memoryDraftMap.size,
+                sqliteOnlyDraftCount: draftMap.size - memoryDraftMap.size
               });
               patchedOrders = _toConsumableArray(draftMap.values());
               mergeActions = {};
-              updatedList = _toConsumableArray(this.store.list);
+              updatedList = this.store.list.filter(function (order) {
+                return _this10.shouldKeepOrderInMemory(order);
+              });
               identityKeyToIndex = new Map();
               for (index = 0; index < updatedList.length; index += 1) {
                 _iterator9 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(updatedList[index]));
@@ -1625,17 +1625,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               }
               _iterator10 = _createForOfIteratorHelper(memoryDraftMap.entries());
-              _context14.prev = 36;
+              _context13.prev = 37;
               _iterator10.s();
-            case 38:
+            case 39:
               if ((_step10 = _iterator10.n()).done) {
-                _context14.next = 54;
+                _context13.next = 55;
                 break;
               }
               _step10$value = _slicedToArray(_step10.value, 2), _storageKey2 = _step10$value[0], _draftOrder = _step10$value[1];
               matchIndex = this.lookupOrderIndexByIdentityKeys(identityKeyToIndex, this.getOrderIdentityMatchKeys(_draftOrder));
               if (!(matchIndex >= 0)) {
-                _context14.next = 48;
+                _context13.next = 49;
                 break;
               }
               mergedOrder = this.mergeOrderRecords(updatedList[matchIndex], _draftOrder);
@@ -1646,43 +1646,65 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               updatedList[matchIndex] = nextOrder;
               this.registerOrderIdentityKeys(identityKeyToIndex, nextOrder, matchIndex);
               mergeActions[_storageKey2] = 'update';
-              return _context14.abrupt("continue", 52);
-            case 48:
+              return _context13.abrupt("continue", 53);
+            case 49:
               insertIndex = updatedList.length;
               updatedList.push(_draftOrder);
               this.registerOrderIdentityKeys(identityKeyToIndex, _draftOrder, insertIndex);
               mergeActions[_storageKey2] = 'insert';
-            case 52:
-              _context14.next = 38;
+            case 53:
+              _context13.next = 39;
               break;
-            case 54:
-              _context14.next = 59;
+            case 55:
+              _context13.next = 60;
               break;
-            case 56:
-              _context14.prev = 56;
-              _context14.t1 = _context14["catch"](36);
-              _iterator10.e(_context14.t1);
-            case 59:
-              _context14.prev = 59;
+            case 57:
+              _context13.prev = 57;
+              _context13.t1 = _context13["catch"](37);
+              _iterator10.e(_context13.t1);
+            case 60:
+              _context13.prev = 60;
               _iterator10.f();
-              return _context14.finish(59);
-            case 62:
+              return _context13.finish(60);
+            case 63:
+              previousList = this.store.list;
               this.store.list = this.runOrderStoreSelfCheck(updatedList, 'upsertLocalDraftOrders.store');
               this.syncOrdersMap();
-              _context14.next = 66;
-              return this.patchOrdersInSQLite(patchedOrders, 'upsertLocalDraftOrders', mergeActions);
-            case 66:
+              _context13.prev = 66;
+              _context13.next = 69;
+              return this.patchOrdersInSQLite(patchedOrders, 'upsertLocalDraftOrders', mergeActions, {
+                throwOnError: true
+              });
+            case 69:
+              _context13.next = 76;
+              break;
+            case 71:
+              _context13.prev = 71;
+              _context13.t2 = _context13["catch"](66);
+              this.store.list = previousList;
+              this.syncOrdersMap();
+              throw _context13.t2;
+            case 76:
               this.logInfo('upsertLocalDraftOrders-结束', {
                 count: patchedOrders.length,
                 storeOrderCountAfter: this.store.list.length
               });
-              _context14.next = 69;
-              return this.emitOrdersChanged(patchedOrders, 'upsertLocalDraftOrders');
-            case 69:
+              removedLegacyMemoryDraft = previousList.some(function (order) {
+                return !_this10.shouldKeepOrderInMemory(order);
+              });
+              if (!(memoryDraftMap.size > 0 || removedLegacyMemoryDraft)) {
+                _context13.next = 81;
+                break;
+              }
+              _context13.next = 81;
+              return this.emitOrdersChanged(patchedOrders.filter(function (order) {
+                return _this10.shouldKeepOrderInMemory(order);
+              }), 'upsertLocalDraftOrders');
+            case 81:
             case "end":
-              return _context14.stop();
+              return _context13.stop();
           }
-        }, _callee14, this, [[6, 20, 23, 26], [36, 56, 59, 62]]);
+        }, _callee13, this, [[6, 21, 24, 27], [37, 57, 60, 63], [66, 71]]);
       }));
       function upsertLocalDraftOrders(_x10) {
         return _upsertLocalDraftOrders.apply(this, arguments);
@@ -1696,42 +1718,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 _callee14() {
         var query,
           data,
-          _args15 = arguments;
-        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+          _args14 = arguments;
+        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
-              query = _args15.length > 0 && _args15[0] !== undefined ? _args15[0] : {};
+              query = _args14.length > 0 && _args14[0] !== undefined ? _args14[0] : {};
               if (this.orderDataSource) {
-                _context15.next = 3;
+                _context14.next = 3;
                 break;
               }
-              return _context15.abrupt("return", []);
+              return _context14.abrupt("return", []);
             case 3:
-              _context15.prev = 3;
-              _context15.next = 6;
+              _context14.prev = 3;
+              _context14.next = 6;
               return this.orderDataSource.run({
                 sse: {
                   query: query
                 }
               });
             case 6:
-              data = _context15.sent;
-              return _context15.abrupt("return", data || []);
+              data = _context14.sent;
+              return _context14.abrupt("return", data || []);
             case 10:
-              _context15.prev = 10;
-              _context15.t0 = _context15["catch"](3);
+              _context14.prev = 10;
+              _context14.t0 = _context14["catch"](3);
               this.logError('fetchOrdersBySSE-失败', {
-                error: _context15.t0 instanceof Error ? _context15.t0.message : String(_context15.t0)
+                error: _context14.t0 instanceof Error ? _context14.t0.message : String(_context14.t0)
               });
-              return _context15.abrupt("return", []);
+              return _context14.abrupt("return", []);
             case 14:
             case "end":
-              return _context15.stop();
+              return _context14.stop();
           }
-        }, _callee15, this, [[3, 10]]);
+        }, _callee14, this, [[3, 10]]);
       }));
       function fetchOrdersBySSE() {
         return _fetchOrdersBySSE.apply(this, arguments);
@@ -1759,6 +1781,10 @@ 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 _iterator11 = _createForOfIteratorHelper(this.store.list),
         _step11;
@@ -1796,7 +1822,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderIdentityEntries",
     value: function getOrderIdentityEntries(order) {
-      var _this11 = this;
+      var _this12 = this;
       if (!order) return [];
       var record = order;
       var candidates = [{
@@ -1815,8 +1841,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var entries = [];
       var _loop = function _loop() {
           var candidate = _candidates[_i2];
-          if (_this11.isBlankIdentityValue(candidate.value)) return 0; // continue
-          var key = _this11.getIdKey(candidate.value);
+          if (_this12.isBlankIdentityValue(candidate.value)) return 0; // continue
+          var key = _this12.getIdKey(candidate.value);
           if (entries.some(function (entry) {
             return entry.field === candidate.field && entry.key === key;
           })) return 0; // continue
@@ -1883,7 +1909,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setupOrderSync",
     value: function setupOrderSync() {
-      var _this12 = this;
+      var _this13 = this;
       if (!this.orderDataSource) return;
       this.orderDataSource.run({
         pubsub: {
@@ -1891,22 +1917,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             var _message$id, _message$order_id, _message$type;
             console.log('orderDataSource', res);
             var pubsubReceivedAt = Date.now();
-            var message = _this12.normalizeOrderSyncMessage(res);
+            var message = _this13.normalizeOrderSyncMessage(res);
             if (!message) return;
             message._pubsubReceivedAt = pubsubReceivedAt;
-            _this12.pendingSyncMessages.push(message);
-            var throttleMs = _this12.getOrderSyncThrottleMs();
-            var routeInfo = _this12.resolveSyncMessageRoute(message);
-            _this12.logInfo('orderSync-收到消息并入队', {
+            _this13.pendingSyncMessages.push(message);
+            var throttleMs = _this13.getOrderSyncThrottleMs();
+            var routeInfo = _this13.resolveSyncMessageRoute(message);
+            _this13.logInfo('orderSync-收到消息并入队', {
               id: (_message$id = message.id) !== null && _message$id !== void 0 ? _message$id : null,
               order_id: (_message$order_id = message.order_id) !== null && _message$order_id !== void 0 ? _message$order_id : null,
               type: (_message$type = message.type) !== null && _message$type !== void 0 ? _message$type : null,
-              pendingCount: _this12.pendingSyncMessages.length,
+              pendingCount: _this13.pendingSyncMessages.length,
               throttleMs: throttleMs,
               pubsubReceivedAt: new Date(pubsubReceivedAt).toISOString(),
               fullMessage: JSON.stringify(message)
             });
-            _this12.scheduleOrderSyncThrottle();
+            _this13.scheduleOrderSyncThrottle();
           }
         }
       }).catch(function () {
@@ -1923,7 +1949,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "scheduleOrderSyncThrottle",
     value: function scheduleOrderSyncThrottle() {
-      var _this13 = this;
+      var _this14 = this;
       if (this.isProcessingSyncBatch) return;
       if (this.isIdlePhase) {
         this.isIdlePhase = false;
@@ -1934,8 +1960,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (this.syncTimer) return;
       var throttleMs = this.getOrderSyncThrottleMs();
       this.syncTimer = setTimeout(function () {
-        _this13.syncTimer = undefined;
-        void _this13.flushOrderSyncMessagesByThrottle();
+        _this14.syncTimer = undefined;
+        void _this14.flushOrderSyncMessagesByThrottle();
       }, throttleMs);
     }
 
@@ -1946,41 +1972,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 _callee15() {
+        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
               if (!this.isProcessingSyncBatch) {
-                _context16.next = 2;
+                _context15.next = 2;
                 break;
               }
-              return _context16.abrupt("return");
+              return _context15.abrupt("return");
             case 2:
               if (!(this.pendingSyncMessages.length === 0)) {
-                _context16.next = 5;
+                _context15.next = 5;
                 break;
               }
               this.isIdlePhase = true;
-              return _context16.abrupt("return");
+              return _context15.abrupt("return");
             case 5:
               this.isProcessingSyncBatch = true;
-              _context16.prev = 6;
-              _context16.next = 9;
+              _context15.prev = 6;
+              _context15.next = 9;
               return this.processOrderSyncMessages();
             case 9:
-              _context16.prev = 9;
+              _context15.prev = 9;
               this.isProcessingSyncBatch = false;
               if (this.pendingSyncMessages.length > 0) {
                 this.scheduleOrderSyncThrottle();
               } else {
                 this.isIdlePhase = true;
               }
-              return _context16.finish(9);
+              return _context15.finish(9);
             case 13:
             case "end":
-              return _context16.stop();
+              return _context15.stop();
           }
-        }, _callee16, this, [[6,, 9, 13]]);
+        }, _callee15, this, [[6,, 9, 13]]);
       }));
       function flushOrderSyncMessagesByThrottle() {
         return _flushOrderSyncMessagesByThrottle.apply(this, arguments);
@@ -2002,19 +2028,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "processOrderSyncMessages",
     value: (function () {
-      var _processOrderSyncMessages = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
-        var _this14 = this;
+      var _processOrderSyncMessages = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
+        var _this15 = 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 _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
               messages = _toConsumableArray(this.pendingSyncMessages);
               this.pendingSyncMessages = [];
               if (!(messages.length === 0)) {
-                _context17.next = 4;
+                _context16.next = 4;
                 break;
               }
-              return _context17.abrupt("return");
+              return _context16.abrupt("return");
             case 4:
               batchProcessStartAt = Date.now();
               earliestReceivedAt = Math.min.apply(Math, _toConsumableArray(messages.map(function (m) {
@@ -2030,13 +2056,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               upsertOrders = new Map();
               refreshIds = [];
               messages.forEach(function (msg, msgIndex) {
-                var routeInfo = _this14.resolveSyncMessageRoute(msg);
+                var routeInfo = _this15.resolveSyncMessageRoute(msg);
                 var hasBatchIds = routeInfo.hasBatchIds;
                 var singleId = routeInfo.singleId;
                 var hasSingleId = routeInfo.hasSingleId;
-                var normalizedBody = _this14.normalizeOrderSyncPayload(msg.body || msg.data);
+                var normalizedBody = _this15.normalizeOrderSyncPayload(msg.body || msg.data);
                 if (routeInfo.route === 'bodyUpsert' && normalizedBody) {
-                  upsertOrders.set(_this14.getIdKey(normalizedBody.order_id), normalizedBody);
+                  upsertOrders.set(_this15.getIdKey(normalizedBody.order_id), normalizedBody);
                   return;
                 }
                 if (hasBatchIds) refreshIds.push.apply(refreshIds, _toConsumableArray(routeInfo.batchIds));else if (routeInfo.route === 'httpRefresh.singleId' && singleId !== null) refreshIds.push(singleId);else if (routeInfo.route === 'httpRefresh.relationIds') refreshIds.push.apply(refreshIds, _toConsumableArray(routeInfo.batchIds));
@@ -2048,41 +2074,41 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 refreshIdCount: uniqueRefreshIds.length
               });
               if (!(upsertList.length > 0)) {
-                _context17.next = 16;
+                _context16.next = 16;
                 break;
               }
-              _context17.next = 16;
+              _context16.next = 16;
               return this.mergeOrdersToStore(upsertList, 'pubsub.bodyUpsert');
             case 16:
               if (!(uniqueRefreshIds.length > 0)) {
-                _context17.next = 28;
+                _context16.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;
+                _context16.next = 28;
                 break;
               }
-              _context17.next = 22;
+              _context16.next = 22;
               return this.fetchOrdersByHttp(toFetch);
             case 22:
-              freshOrders = _context17.sent;
+              freshOrders = _context16.sent;
               if (!(freshOrders.length > 0)) {
-                _context17.next = 28;
+                _context16.next = 28;
                 break;
               }
-              _context17.next = 26;
+              _context16.next = 26;
               return this.mergeOrdersToStore(freshOrders, 'pubsub.httpRefresh');
             case 26:
-              _context17.next = 28;
+              _context16.next = 28;
               break;
             case 28:
               if (!(upsertList.length === 0 && uniqueRefreshIds.length === 0)) {
-                _context17.next = 30;
+                _context16.next = 30;
                 break;
               }
-              return _context17.abrupt("return");
+              return _context16.abrupt("return");
             case 30:
               batchProcessEndAt = Date.now();
               this.logInfo('processOrderSyncMessages-结束', {
@@ -2091,13 +2117,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 batchProcessDurationMs: batchProcessEndAt - batchProcessStartAt,
                 totalFromPubsubToProcessedMs: batchProcessEndAt - earliestReceivedAt
               });
-              _context17.next = 34;
+              _context16.next = 34;
               return this.core.effects.emit(OrderHooks.onOrdersSyncCompleted, null);
             case 34:
             case "end":
-              return _context17.stop();
+              return _context16.stop();
           }
-        }, _callee17, this);
+        }, _callee16, this);
       }));
       function processOrderSyncMessages() {
         return _processOrderSyncMessages.apply(this, arguments);
@@ -2118,29 +2144,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 _callee17(ids) {
         var _orderList, orderList;
-        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
               if (!(!this.orderDataSource || ids.length === 0)) {
-                _context18.next = 2;
+                _context17.next = 2;
                 break;
               }
-              return _context18.abrupt("return", []);
+              return _context17.abrupt("return", []);
             case 2:
-              _context18.prev = 2;
+              _context17.prev = 2;
               if (!(typeof this.orderDataSource.fetchOrdersByIds === 'function')) {
-                _context18.next = 8;
+                _context17.next = 8;
                 break;
               }
-              _context18.next = 6;
+              _context17.next = 6;
               return this.orderDataSource.fetchOrdersByIds(ids);
             case 6:
-              _orderList = _context18.sent;
-              return _context18.abrupt("return", _orderList || []);
+              _orderList = _context17.sent;
+              return _context17.abrupt("return", _orderList || []);
             case 8:
-              _context18.next = 10;
+              _context17.next = 10;
               return this.orderDataSource.run({
                 http: {
                   query: {
@@ -2149,17 +2175,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               });
             case 10:
-              orderList = _context18.sent;
-              return _context18.abrupt("return", orderList || []);
+              orderList = _context17.sent;
+              return _context17.abrupt("return", orderList || []);
             case 14:
-              _context18.prev = 14;
-              _context18.t0 = _context18["catch"](2);
-              return _context18.abrupt("return", []);
+              _context17.prev = 14;
+              _context17.t0 = _context17["catch"](2);
+              return _context17.abrupt("return", []);
             case 17:
             case "end":
-              return _context18.stop();
+              return _context17.stop();
           }
-        }, _callee18, this, [[2, 14]]);
+        }, _callee17, this, [[2, 14]]);
       }));
       function fetchOrdersByHttp(_x11) {
         return _fetchOrdersByHttp.apply(this, arguments);
@@ -2173,11 +2199,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "mergeOrdersToStore",
     value: (function () {
-      var _mergeOrdersToStore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(freshOrders, source) {
-        var _this15 = this;
-        var storeOrderCountBefore, normalizedFreshOrders, _iterator13, _step13, order, id, uniqueFreshOrders, uniqueFreshCount, patchedOrders, mergeActions, updatedList, identityKeyToIndex, index, identityKeys, _iterator14, _step14, key, _iterator15, _step15, fresh, freshIdentityKeys, matchIndex, storageKey, mergeKey, existingOrder, _ref2, _existingOrder$order_, _ref3, _external_sale_number2, _existingOrder$paymen, _fresh$payment_status, _existingOrder$need_s, _fresh$need_sync, _ref4, _existingOrder$order_2, _ref5, _external_sale_number3, _existingOrder$is_dra, _fresh$is_draft_order, mergedOrder, adjustedMatchIndex, duplicateIndexes, _iterator16, _step16, _key2, _duplicateIndex, _iterator17, _step17, duplicateIndex, _index, _iterator18, _step18, _key, insertIndex, insertCount, updateCount;
-        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+      var _mergeOrdersToStore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(freshOrders, source) {
+        var _this16 = this;
+        var storeOrderCountBefore, normalizedFreshOrders, _iterator13, _step13, order, id, uniqueFreshOrders, uniqueFreshCount, patchedOrders, mergeActions, updatedList, identityKeyToIndex, index, identityKeys, _iterator14, _step14, key, _iterator15, _step15, 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, adjustedMatchIndex, duplicateIndexes, _iterator16, _step16, _key2, _duplicateIndex, _iterator17, _step17, duplicateIndex, _index, _iterator18, _step18, _key, insertIndex, insertCount, updateCount;
+        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
               storeOrderCountBefore = this.store.list.length;
               this.logInfo('mergeOrdersToStore-开始', {
@@ -2188,36 +2214,36 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.logDuplicateOrders("".concat(source, ".beforeMerge"), this.store.list);
               normalizedFreshOrders = [];
               _iterator13 = _createForOfIteratorHelper(freshOrders);
-              _context19.prev = 5;
+              _context18.prev = 5;
               _iterator13.s();
             case 7:
               if ((_step13 = _iterator13.n()).done) {
-                _context19.next = 15;
+                _context18.next = 15;
                 break;
               }
               order = _step13.value;
               id = order === null || order === void 0 ? void 0 : order.order_id;
               if (!(id === undefined || id === null)) {
-                _context19.next = 12;
+                _context18.next = 12;
                 break;
               }
-              return _context19.abrupt("continue", 13);
+              return _context18.abrupt("continue", 13);
             case 12:
               normalizedFreshOrders.push(this.normalizeRemoteSyncedOrder(order));
             case 13:
-              _context19.next = 7;
+              _context18.next = 7;
               break;
             case 15:
-              _context19.next = 20;
+              _context18.next = 20;
               break;
             case 17:
-              _context19.prev = 17;
-              _context19.t0 = _context19["catch"](5);
-              _iterator13.e(_context19.t0);
+              _context18.prev = 17;
+              _context18.t0 = _context18["catch"](5);
+              _iterator13.e(_context18.t0);
             case 20:
-              _context19.prev = 20;
+              _context18.prev = 20;
               _iterator13.f();
-              return _context19.finish(20);
+              return _context18.finish(20);
             case 23:
               // 先对本批新单做去重（批内规模 m 很小），保证每条 fresh 身份唯一
               uniqueFreshOrders = this.compactOrderListByIdentity(normalizedFreshOrders, "".concat(source, ".incoming")).list;
@@ -2225,7 +2251,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               patchedOrders = [];
               mergeActions = {};
               updatedList = this.store.list.map(function (order) {
-                return _this15.normalizeOrderForMemoryList(order, "".concat(source, ".existingMemory"));
+                return _this16.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）同值即同一单。
@@ -2246,11 +2272,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               }
               _iterator15 = _createForOfIteratorHelper(uniqueFreshOrders);
-              _context19.prev = 31;
+              _context18.prev = 31;
               _iterator15.s();
             case 33:
               if ((_step15 = _iterator15.n()).done) {
-                _context19.next = 82;
+                _context18.next = 82;
                 break;
               }
               fresh = _step15.value;
@@ -2259,74 +2285,74 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               storageKey = this.getOrderStorageKey(fresh);
               mergeKey = storageKey || (fresh.order_id !== undefined && fresh.order_id !== null ? this.getIdKey(fresh.order_id) : '');
               if (!(matchIndex >= 0)) {
-                _context19.next = 75;
+                _context18.next = 75;
                 break;
               }
               existingOrder = updatedList[matchIndex];
               if (!(this.isPendingSyncOrder(existingOrder) && this.isRemoteEchoMergeSource(source))) {
-                _context19.next = 44;
+                _context18.next = 44;
                 break;
               }
               this.logInfo('mergeOrdersToStore-跳过 pending 订单远端覆盖', {
                 source: source,
-                order_id: (_ref2 = (_existingOrder$order_ = existingOrder.order_id) !== null && _existingOrder$order_ !== void 0 ? _existingOrder$order_ : fresh.order_id) !== null && _ref2 !== void 0 ? _ref2 : null,
-                external_sale_number: (_ref3 = (_external_sale_number2 = existingOrder.external_sale_number) !== null && _external_sale_number2 !== void 0 ? _external_sale_number2 : fresh.external_sale_number) !== null && _ref3 !== void 0 ? _ref3 : null,
+                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,
                 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", 80);
+              return _context18.abrupt("continue", 80);
             case 44:
               if (!(this.isDraftOrder(existingOrder) && this.shouldProtectDraftOrderFromIncoming(source))) {
-                _context19.next = 47;
+                _context18.next = 47;
                 break;
               }
               this.logInfo('mergeOrdersToStore-跳过 draft 订单远端覆盖', {
                 source: source,
-                order_id: (_ref4 = (_existingOrder$order_2 = existingOrder.order_id) !== null && _existingOrder$order_2 !== void 0 ? _existingOrder$order_2 : fresh.order_id) !== null && _ref4 !== void 0 ? _ref4 : null,
-                external_sale_number: (_ref5 = (_external_sale_number3 = existingOrder.external_sale_number) !== null && _external_sale_number3 !== void 0 ? _external_sale_number3 : fresh.external_sale_number) !== null && _ref5 !== void 0 ? _ref5 : null,
+                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", 80);
+              return _context18.abrupt("continue", 80);
             case 47:
               mergedOrder = this.mergeOrderRecords(existingOrder, fresh);
               adjustedMatchIndex = matchIndex;
               duplicateIndexes = new Set();
               _iterator16 = _createForOfIteratorHelper(freshIdentityKeys);
-              _context19.prev = 51;
+              _context18.prev = 51;
               _iterator16.s();
             case 53:
               if ((_step16 = _iterator16.n()).done) {
-                _context19.next = 61;
+                _context18.next = 61;
                 break;
               }
               _key2 = _step16.value;
               _duplicateIndex = identityKeyToIndex.get(_key2);
               if (!(_duplicateIndex === undefined || _duplicateIndex === matchIndex)) {
-                _context19.next = 58;
+                _context18.next = 58;
                 break;
               }
-              return _context19.abrupt("continue", 59);
+              return _context18.abrupt("continue", 59);
             case 58:
               duplicateIndexes.add(_duplicateIndex);
             case 59:
-              _context19.next = 53;
+              _context18.next = 53;
               break;
             case 61:
-              _context19.next = 66;
+              _context18.next = 66;
               break;
             case 63:
-              _context19.prev = 63;
-              _context19.t1 = _context19["catch"](51);
-              _iterator16.e(_context19.t1);
+              _context18.prev = 63;
+              _context18.t1 = _context18["catch"](51);
+              _iterator16.e(_context18.t1);
             case 66:
-              _context19.prev = 66;
+              _context18.prev = 66;
               _iterator16.f();
-              return _context19.finish(66);
+              return _context18.finish(66);
             case 69:
               if (duplicateIndexes.size > 0) {
                 _iterator17 = _createForOfIteratorHelper(_toConsumableArray(duplicateIndexes).sort(function (left, right) {
@@ -2365,7 +2391,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, adjustedMatchIndex);
               patchedOrders.push(mergedOrder);
               if (mergeKey) mergeActions[mergeKey] = 'update';
-              return _context19.abrupt("continue", 80);
+              return _context18.abrupt("continue", 80);
             case 75:
               insertIndex = updatedList.length;
               updatedList.push(fresh);
@@ -2373,19 +2399,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               patchedOrders.push(fresh);
               if (mergeKey) mergeActions[mergeKey] = 'insert';
             case 80:
-              _context19.next = 33;
+              _context18.next = 33;
               break;
             case 82:
-              _context19.next = 87;
+              _context18.next = 87;
               break;
             case 84:
-              _context19.prev = 84;
-              _context19.t2 = _context19["catch"](31);
-              _iterator15.e(_context19.t2);
+              _context18.prev = 84;
+              _context18.t2 = _context18["catch"](31);
+              _iterator15.e(_context18.t2);
             case 87:
-              _context19.prev = 87;
+              _context18.prev = 87;
               _iterator15.f();
-              return _context19.finish(87);
+              return _context18.finish(87);
             case 90:
               insertCount = Object.values(mergeActions).filter(function (v) {
                 return v === 'insert';
@@ -2402,7 +2428,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               // 仅在自检开关开启时做一次兜底校验。
               this.store.list = this.runOrderStoreSelfCheck(updatedList, "".concat(source, ".store"));
               this.syncOrdersMap();
-              _context19.next = 97;
+              _context18.next = 97;
               return this.patchOrdersInSQLite(patchedOrders, source, mergeActions);
             case 97:
               this.logInfo('mergeOrdersToStore-结束', {
@@ -2411,13 +2437,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 insertCount: insertCount,
                 updateCount: updateCount
               });
-              _context19.next = 100;
+              _context18.next = 100;
               return this.emitOrdersChanged(patchedOrders, source);
             case 100:
             case "end":
-              return _context19.stop();
+              return _context18.stop();
           }
-        }, _callee19, this, [[5, 17, 20, 23], [31, 84, 87, 90], [51, 63, 66, 69]]);
+        }, _callee18, this, [[5, 17, 20, 23], [31, 84, 87, 90], [51, 63, 66, 69]]);
       }));
       function mergeOrdersToStore(_x12, _x13) {
         return _mergeOrdersToStore.apply(this, arguments);
@@ -2556,12 +2582,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "isOrderLookupMatch",
     value: function isOrderLookupMatch(order, lookupKey) {
-      var _this16 = this;
+      var _this17 = this;
       if (!order || !lookupKey) return false;
       var candidates = [order.order_id, order.external_sale_number, order.order_number, order.shop_order_number, order.shop_full_order_number];
       return candidates.some(function (value) {
         if (value === undefined || value === null || value === '') return false;
-        return _this16.getIdKey(value) === lookupKey;
+        return _this17.getIdKey(value) === lookupKey;
       });
     }
 
@@ -2604,10 +2630,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "findOrderIndexByIdentity",
     value: function findOrderIndexByIdentity(orders, target) {
-      var _this17 = this;
+      var _this18 = this;
       if (this.getOrderIdentityMatchKeys(target).length === 0) return -1;
       return orders.findIndex(function (order) {
-        return _this17.doOrdersShareIdentity(order, target);
+        return _this18.doOrdersShareIdentity(order, target);
       });
     }
   }, {
@@ -2799,14 +2825,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       } finally {
         _iterator26.f();
       }
-      return _toConsumableArray(groups.entries()).filter(function (_ref6) {
-        var _ref7 = _slicedToArray(_ref6, 2),
-          group = _ref7[1];
+      return _toConsumableArray(groups.entries()).filter(function (_ref5) {
+        var _ref6 = _slicedToArray(_ref5, 2),
+          group = _ref6[1];
         return group.length > 1;
-      }).slice(0, 20).map(function (_ref8) {
-        var _ref9 = _slicedToArray(_ref8, 2),
-          key = _ref9[0],
-          group = _ref9[1];
+      }).slice(0, 20).map(function (_ref7) {
+        var _ref8 = _slicedToArray(_ref7, 2),
+          key = _ref8[0],
+          group = _ref8[1];
         return {
           key: key,
           count: group.length,
@@ -2955,35 +2981,35 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadOrdersFromSQLite",
     value: function () {
-      var _loadOrdersFromSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20() {
-        var _this18 = this;
+      var _loadOrdersFromSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
+        var _this19 = this;
         var orders;
-        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
               if (this.dbManager) {
-                _context20.next = 2;
+                _context19.next = 2;
                 break;
               }
-              return _context20.abrupt("return", []);
+              return _context19.abrupt("return", []);
             case 2:
-              _context20.prev = 2;
-              _context20.next = 5;
+              _context19.prev = 2;
+              _context19.next = 5;
               return this.dbManager.getAll(INDEXDB_STORE_NAME);
             case 5:
-              orders = _context20.sent;
-              return _context20.abrupt("return", (orders || []).map(function (order) {
-                return _this18.normalizeOrderCollectionsForIngress(order, 'loadOrdersFromSQLite');
+              orders = _context19.sent;
+              return _context19.abrupt("return", (orders || []).map(function (order) {
+                return _this19.normalizeOrderCollectionsForIngress(order, 'loadOrdersFromSQLite');
               }));
             case 9:
-              _context20.prev = 9;
-              _context20.t0 = _context20["catch"](2);
-              return _context20.abrupt("return", []);
+              _context19.prev = 9;
+              _context19.t0 = _context19["catch"](2);
+              return _context19.abrupt("return", []);
             case 12:
             case "end":
-              return _context20.stop();
+              return _context19.stop();
           }
-        }, _callee20, this, [[2, 9]]);
+        }, _callee19, this, [[2, 9]]);
       }));
       function loadOrdersFromSQLite() {
         return _loadOrdersFromSQLite.apply(this, arguments);
@@ -3017,12 +3043,25 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         is_draft_order: 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 _this19 = this;
+      var _this20 = this;
       var merged = remoteOrders.map(function (order) {
-        return _this19.normalizeRemoteSyncedOrder(order);
+        return _this20.normalizeRemoteSyncedOrder(order);
       });
       var _iterator29 = _createForOfIteratorHelper(existingOrders),
         _step29;
@@ -3034,7 +3073,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           var matchIndex = this.findOrderIndexByIdentity(merged, order);
           if (matchIndex >= 0) {
             if (this.isDraftOrder(order)) {
-              merged[matchIndex] = order;
+              merged[matchIndex] = this.mergeRemoteIdentityIntoDraftOrder(order, merged[matchIndex]);
             } else {
               merged[matchIndex] = this.mergeOrderRecords(order, merged[matchIndex]);
             }
@@ -3062,10 +3101,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 _callee20(task) {
         var queuedTask;
-        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
               queuedTask = this.orderSQLiteSaveQueue.then(task, task);
               this.orderSQLiteSaveQueue = queuedTask.then(function () {
@@ -3073,12 +3112,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }, function () {
                 return undefined;
               });
-              return _context21.abrupt("return", queuedTask);
+              return _context20.abrupt("return", queuedTask);
             case 3:
             case "end":
-              return _context21.stop();
+              return _context20.stop();
           }
-        }, _callee21, this);
+        }, _callee20, this);
       }));
       function runInOrderSQLiteSaveQueue(_x14) {
         return _runInOrderSQLiteSaveQueue.apply(this, arguments);
@@ -3095,8 +3134,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "patchOrdersInSQLite",
     value: (function () {
-      var _patchOrdersInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(orders, source) {
-        var _this20 = this;
+      var _patchOrdersInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(orders, source) {
+        var _this21 = this;
         var mergeActions,
           options,
           ordersSnapshot,
@@ -3104,132 +3143,132 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           toWrite,
           skipped,
           compactedToWrite,
-          _args23 = arguments;
-        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+          _args22 = arguments;
+        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
-              mergeActions = _args23.length > 2 && _args23[2] !== undefined ? _args23[2] : {};
-              options = _args23.length > 3 && _args23[3] !== undefined ? _args23[3] : {};
+              mergeActions = _args22.length > 2 && _args22[2] !== undefined ? _args22[2] : {};
+              options = _args22.length > 3 && _args22[3] !== undefined ? _args22[3] : {};
               if (!(orders.length === 0)) {
-                _context23.next = 4;
+                _context22.next = 4;
                 break;
               }
-              return _context23.abrupt("return");
+              return _context22.abrupt("return");
             case 4:
               if (this.dbManager) {
-                _context23.next = 8;
+                _context22.next = 8;
                 break;
               }
               if (!options.throwOnError) {
-                _context23.next = 7;
+                _context22.next = 7;
                 break;
               }
               throw new Error('订单 SQLite 数据库未初始化');
             case 7:
-              return _context23.abrupt("return");
+              return _context22.abrupt("return");
             case 8:
               ordersSnapshot = cloneDeep(orders).map(function (order) {
-                return _this20.normalizeOrderCollectionsForIngress(order, "".concat(source, ".sqliteIngress"));
+                return _this21.normalizeOrderCollectionsForIngress(order, "".concat(source, ".sqliteIngress"));
               }).filter(function (order) {
-                return _this20.getOrderStorageKey(order);
+                return _this21.getOrderStorageKey(order);
               });
               if (!(ordersSnapshot.length === 0)) {
-                _context23.next = 11;
+                _context22.next = 11;
                 break;
               }
-              return _context23.abrupt("return");
+              return _context22.abrupt("return");
             case 11:
               _this$filterRedundant2 = this.filterRedundantPatchOrders(source, ordersSnapshot, mergeActions), toWrite = _this$filterRedundant2.toWrite, skipped = _this$filterRedundant2.skipped;
               if (!(toWrite.length === 0)) {
-                _context23.next = 14;
+                _context22.next = 14;
                 break;
               }
-              return _context23.abrupt("return");
+              return _context22.abrupt("return");
             case 14:
               compactedToWrite = this.compactOrderListByIdentity(toWrite, "".concat(source, ".sqlitePatch")).list;
               if (!(compactedToWrite.length === 0)) {
-                _context23.next = 17;
+                _context22.next = 17;
                 break;
               }
-              return _context23.abrupt("return");
+              return _context22.abrupt("return");
             case 17:
-              _context23.prev = 17;
-              _context23.next = 20;
-              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22() {
+              _context22.prev = 17;
+              _context22.next = 20;
+              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
                 var writeMethod, _iterator30, _step30, order;
-                return _regeneratorRuntime().wrap(function _callee22$(_context22) {
-                  while (1) switch (_context22.prev = _context22.next) {
+                return _regeneratorRuntime().wrap(function _callee21$(_context21) {
+                  while (1) switch (_context21.prev = _context21.next) {
                     case 0:
                       writeMethod = 'none';
-                      _this20.logInfo('patchOrdersInSQLite-开始', {
+                      _this21.logInfo('patchOrdersInSQLite-开始', {
                         source: source,
                         count: compactedToWrite.length,
                         dedupedCount: skipped.length
                       });
-                      if (!(typeof _this20.dbManager.bulkUpdate === 'function')) {
-                        _context22.next = 8;
+                      if (!(typeof _this21.dbManager.bulkUpdate === 'function')) {
+                        _context21.next = 8;
                         break;
                       }
                       writeMethod = 'bulkUpdate';
-                      _context22.next = 6;
-                      return _this20.dbManager.bulkUpdate(INDEXDB_STORE_NAME, compactedToWrite);
+                      _context21.next = 6;
+                      return _this21.dbManager.bulkUpdate(INDEXDB_STORE_NAME, compactedToWrite);
                     case 6:
-                      _context22.next = 37;
+                      _context21.next = 37;
                       break;
                     case 8:
-                      if (!(typeof _this20.dbManager.bulkAdd === 'function')) {
-                        _context22.next = 14;
+                      if (!(typeof _this21.dbManager.bulkAdd === 'function')) {
+                        _context21.next = 14;
                         break;
                       }
                       writeMethod = 'bulkAdd';
-                      _context22.next = 12;
-                      return _this20.dbManager.bulkAdd(INDEXDB_STORE_NAME, compactedToWrite);
+                      _context21.next = 12;
+                      return _this21.dbManager.bulkAdd(INDEXDB_STORE_NAME, compactedToWrite);
                     case 12:
-                      _context22.next = 37;
+                      _context21.next = 37;
                       break;
                     case 14:
-                      if (!(typeof _this20.dbManager.update === 'function')) {
-                        _context22.next = 35;
+                      if (!(typeof _this21.dbManager.update === 'function')) {
+                        _context21.next = 35;
                         break;
                       }
                       writeMethod = 'update';
                       _iterator30 = _createForOfIteratorHelper(compactedToWrite);
-                      _context22.prev = 17;
+                      _context21.prev = 17;
                       _iterator30.s();
                     case 19:
                       if ((_step30 = _iterator30.n()).done) {
-                        _context22.next = 25;
+                        _context21.next = 25;
                         break;
                       }
                       order = _step30.value;
-                      _context22.next = 23;
-                      return _this20.dbManager.update(INDEXDB_STORE_NAME, order);
+                      _context21.next = 23;
+                      return _this21.dbManager.update(INDEXDB_STORE_NAME, order);
                     case 23:
-                      _context22.next = 19;
+                      _context21.next = 19;
                       break;
                     case 25:
-                      _context22.next = 30;
+                      _context21.next = 30;
                       break;
                     case 27:
-                      _context22.prev = 27;
-                      _context22.t0 = _context22["catch"](17);
-                      _iterator30.e(_context22.t0);
+                      _context21.prev = 27;
+                      _context21.t0 = _context21["catch"](17);
+                      _iterator30.e(_context21.t0);
                     case 30:
-                      _context22.prev = 30;
+                      _context21.prev = 30;
                       _iterator30.f();
-                      return _context22.finish(30);
+                      return _context21.finish(30);
                     case 33:
-                      _context22.next = 37;
+                      _context21.next = 37;
                       break;
                     case 35:
                       if (!options.throwOnError) {
-                        _context22.next = 37;
+                        _context21.next = 37;
                         break;
                       }
                       throw new Error('订单 SQLite 数据库不支持写入');
                     case 37:
-                      _this20.recordRecentSqliteWrite(source, compactedToWrite);
-                      _this20.logInfo('patchOrdersInSQLite-完成', {
+                      _this21.recordRecentSqliteWrite(source, compactedToWrite);
+                      _this21.logInfo('patchOrdersInSQLite-完成', {
                         source: source,
                         count: compactedToWrite.length,
                         writeMethod: writeMethod,
@@ -3237,30 +3276,30 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       });
                     case 39:
                     case "end":
-                      return _context22.stop();
+                      return _context21.stop();
                   }
-                }, _callee22, null, [[17, 27, 30, 33]]);
+                }, _callee21, null, [[17, 27, 30, 33]]);
               })));
             case 20:
-              _context23.next = 27;
+              _context22.next = 27;
               break;
             case 22:
-              _context23.prev = 22;
-              _context23.t0 = _context23["catch"](17);
+              _context22.prev = 22;
+              _context22.t0 = _context22["catch"](17);
               this.logError('增量保存订单到 SQLite 失败', {
-                error: _context23.t0 instanceof Error ? _context23.t0.message : String(_context23.t0),
+                error: _context22.t0 instanceof Error ? _context22.t0.message : String(_context22.t0),
                 orderCount: ordersSnapshot.length
               });
               if (!options.throwOnError) {
-                _context23.next = 27;
+                _context22.next = 27;
                 break;
               }
-              throw _context23.t0;
+              throw _context22.t0;
             case 27:
             case "end":
-              return _context23.stop();
+              return _context22.stop();
           }
-        }, _callee23, this, [[17, 22]]);
+        }, _callee22, this, [[17, 22]]);
       }));
       function patchOrdersInSQLite(_x15, _x16) {
         return _patchOrdersInSQLite.apply(this, arguments);
@@ -3277,126 +3316,126 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderInSQLite",
     value: (function () {
-      var _updateOrderInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(order, source) {
-        var _this21 = this;
+      var _updateOrderInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(order, source) {
+        var _this22 = this;
         var options,
           orderSnapshot,
           _orderSnapshot$order_3,
-          _args25 = arguments;
-        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
-          while (1) switch (_context25.prev = _context25.next) {
+          _args24 = arguments;
+        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
             case 0:
-              options = _args25.length > 2 && _args25[2] !== undefined ? _args25[2] : {};
+              options = _args24.length > 2 && _args24[2] !== undefined ? _args24[2] : {};
               if (this.getOrderStorageKey(order)) {
-                _context25.next = 5;
+                _context24.next = 5;
                 break;
               }
               if (!options.throwOnError) {
-                _context25.next = 4;
+                _context24.next = 4;
                 break;
               }
               throw new Error('订单缺少可用的 SQLite 存储主键');
             case 4:
-              return _context25.abrupt("return");
+              return _context24.abrupt("return");
             case 5:
               if (this.dbManager) {
-                _context25.next = 9;
+                _context24.next = 9;
                 break;
               }
               if (!options.throwOnError) {
-                _context25.next = 8;
+                _context24.next = 8;
                 break;
               }
               throw new Error('订单 SQLite 数据库未初始化');
             case 8:
-              return _context25.abrupt("return");
+              return _context24.abrupt("return");
             case 9:
               orderSnapshot = this.normalizeOrderCollectionsForIngress(cloneDeep(order), "".concat(source, ".sqliteIngress"));
-              _context25.prev = 10;
-              _context25.next = 13;
-              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24() {
+              _context24.prev = 10;
+              _context24.next = 13;
+              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
                 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 _callee23$(_context23) {
+                  while (1) switch (_context23.prev = _context23.next) {
                     case 0:
                       writeMethod = 'none';
-                      _this21.logInfo('updateOrderInSQLite-开始', {
+                      _this22.logInfo('updateOrderInSQLite-开始', {
                         source: source,
                         orderId: (_orderSnapshot$order_ = orderSnapshot.order_id) !== null && _orderSnapshot$order_ !== void 0 ? _orderSnapshot$order_ : null,
-                        storageKey: _this21.getOrderStorageKey(orderSnapshot)
+                        storageKey: _this22.getOrderStorageKey(orderSnapshot)
                       });
-                      if (!(typeof _this21.dbManager.update === 'function')) {
-                        _context24.next = 8;
+                      if (!(typeof _this22.dbManager.update === 'function')) {
+                        _context23.next = 8;
                         break;
                       }
                       writeMethod = 'update';
-                      _context24.next = 6;
-                      return _this21.dbManager.update(INDEXDB_STORE_NAME, orderSnapshot);
+                      _context23.next = 6;
+                      return _this22.dbManager.update(INDEXDB_STORE_NAME, orderSnapshot);
                     case 6:
-                      _context24.next = 22;
+                      _context23.next = 22;
                       break;
                     case 8:
-                      if (!(typeof _this21.dbManager.bulkUpdate === 'function')) {
-                        _context24.next = 14;
+                      if (!(typeof _this22.dbManager.bulkUpdate === 'function')) {
+                        _context23.next = 14;
                         break;
                       }
                       writeMethod = 'bulkUpdate';
-                      _context24.next = 12;
-                      return _this21.dbManager.bulkUpdate(INDEXDB_STORE_NAME, [orderSnapshot]);
+                      _context23.next = 12;
+                      return _this22.dbManager.bulkUpdate(INDEXDB_STORE_NAME, [orderSnapshot]);
                     case 12:
-                      _context24.next = 22;
+                      _context23.next = 22;
                       break;
                     case 14:
-                      if (!(typeof _this21.dbManager.bulkAdd === 'function')) {
-                        _context24.next = 20;
+                      if (!(typeof _this22.dbManager.bulkAdd === 'function')) {
+                        _context23.next = 20;
                         break;
                       }
                       writeMethod = 'bulkAdd';
-                      _context24.next = 18;
-                      return _this21.dbManager.bulkAdd(INDEXDB_STORE_NAME, [orderSnapshot]);
+                      _context23.next = 18;
+                      return _this22.dbManager.bulkAdd(INDEXDB_STORE_NAME, [orderSnapshot]);
                     case 18:
-                      _context24.next = 22;
+                      _context23.next = 22;
                       break;
                     case 20:
                       if (!options.throwOnError) {
-                        _context24.next = 22;
+                        _context23.next = 22;
                         break;
                       }
                       throw new Error('订单 SQLite 数据库不支持写入');
                     case 22:
-                      _this21.recordRecentSqliteWrite(source, [orderSnapshot]);
-                      _this21.logInfo('updateOrderInSQLite-完成', {
+                      _this22.recordRecentSqliteWrite(source, [orderSnapshot]);
+                      _this22.logInfo('updateOrderInSQLite-完成', {
                         source: source,
                         orderId: (_orderSnapshot$order_2 = orderSnapshot.order_id) !== null && _orderSnapshot$order_2 !== void 0 ? _orderSnapshot$order_2 : null,
                         writeMethod: writeMethod
                       });
                     case 24:
                     case "end":
-                      return _context24.stop();
+                      return _context23.stop();
                   }
-                }, _callee24);
+                }, _callee23);
               })));
             case 13:
-              _context25.next = 20;
+              _context24.next = 20;
               break;
             case 15:
-              _context25.prev = 15;
-              _context25.t0 = _context25["catch"](10);
+              _context24.prev = 15;
+              _context24.t0 = _context24["catch"](10);
               this.logError('单条保存订单到 SQLite 失败', {
-                error: _context25.t0 instanceof Error ? _context25.t0.message : String(_context25.t0),
+                error: _context24.t0 instanceof Error ? _context24.t0.message : String(_context24.t0),
                 orderId: (_orderSnapshot$order_3 = orderSnapshot.order_id) !== null && _orderSnapshot$order_3 !== void 0 ? _orderSnapshot$order_3 : null
               });
               if (!options.throwOnError) {
-                _context25.next = 20;
+                _context24.next = 20;
                 break;
               }
-              throw _context25.t0;
+              throw _context24.t0;
             case 20:
             case "end":
-              return _context25.stop();
+              return _context24.stop();
           }
-        }, _callee25, this, [[10, 15]]);
+        }, _callee24, this, [[10, 15]]);
       }));
       function updateOrderInSQLite(_x17, _x18) {
         return _updateOrderInSQLite.apply(this, arguments);
@@ -3404,7 +3443,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       return updateOrderInSQLite;
     }()
     /**
-     * 全量快照替换 orders 表（clear + bulkAdd），用于 SSE 全量拉取与营业日窗口裁剪。
+     * 全量快照替换 orders 表（clear + bulkAdd），并保留本地 draft / need_sync 订单。
+     * 用于 SSE 全量拉取与营业日窗口裁剪。
      *
      * @example
      * await this.replaceOrdersSnapshotInSQLite(orderList)
@@ -3413,98 +3453,148 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "replaceOrdersSnapshotInSQLite",
     value: (function () {
-      var _replaceOrdersSnapshotInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(orderList, source) {
-        var _this22 = this;
-        var remoteSnapshot, mergedSnapshot;
-        return _regeneratorRuntime().wrap(function _callee27$(_context27) {
-          while (1) switch (_context27.prev = _context27.next) {
+      var _replaceOrdersSnapshotInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(orderList, source) {
+        var _this23 = this;
+        var protectedOrdersBeforeRemoteFetch,
+          remoteSnapshot,
+          mergedSnapshot,
+          _args26 = arguments;
+        return _regeneratorRuntime().wrap(function _callee26$(_context26) {
+          while (1) switch (_context26.prev = _context26.next) {
             case 0:
+              protectedOrdersBeforeRemoteFetch = _args26.length > 2 && _args26[2] !== undefined ? _args26[2] : [];
               if (this.dbManager) {
-                _context27.next = 2;
+                _context26.next = 3;
                 break;
               }
-              return _context27.abrupt("return", this.compactOrderListByIdentity(orderList.map(function (order) {
-                return _this22.normalizeRemoteSyncedOrder(order);
+              return _context26.abrupt("return", this.compactOrderListByIdentity(orderList.map(function (order) {
+                return _this23.normalizeRemoteSyncedOrder(order);
               }), "".concat(source, ".snapshotNoDb")).list);
-            case 2:
+            case 3:
               remoteSnapshot = cloneDeep(orderList).map(function (order) {
-                return _this22.normalizeOrderCollectionsForIngress(order, "".concat(source, ".remoteIngress"));
+                return _this23.normalizeOrderCollectionsForIngress(order, "".concat(source, ".remoteIngress"));
               });
               mergedSnapshot = this.compactOrderListByIdentity(remoteSnapshot.map(function (order) {
-                return _this22.normalizeRemoteSyncedOrder(order);
+                return _this23.normalizeRemoteSyncedOrder(order);
               }), "".concat(source, ".remoteSnapshot")).list;
-              _context27.prev = 4;
-              _context27.next = 7;
-              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26() {
-                var existingOrders, orderListSnapshot;
-                return _regeneratorRuntime().wrap(function _callee26$(_context26) {
-                  while (1) switch (_context26.prev = _context26.next) {
+              _context26.prev = 5;
+              _context26.next = 8;
+              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25() {
+                var existingOrders, protectedLocalOrders, _iterator31, _step31, rawCurrentOrder, currentOrder, protectedIndex, currentNeedsProtection, orderListSnapshot;
+                return _regeneratorRuntime().wrap(function _callee25$(_context25) {
+                  while (1) switch (_context25.prev = _context25.next) {
                     case 0:
-                      if (!(typeof _this22.dbManager.getAll === 'function')) {
-                        _context26.next = 6;
+                      if (!(typeof _this23.dbManager.getAll === 'function')) {
+                        _context25.next = 6;
                         break;
                       }
-                      _context26.next = 3;
-                      return _this22.dbManager.getAll(INDEXDB_STORE_NAME);
+                      _context25.next = 3;
+                      return _this23.dbManager.getAll(INDEXDB_STORE_NAME);
                     case 3:
-                      _context26.t0 = _context26.sent;
-                      _context26.next = 7;
+                      _context25.t0 = _context25.sent;
+                      _context25.next = 7;
                       break;
                     case 6:
-                      _context26.t0 = [];
+                      _context25.t0 = [];
                     case 7:
-                      existingOrders = _context26.t0;
-                      orderListSnapshot = _this22.mergeRemoteSnapshotWithPendingOrders(remoteSnapshot, existingOrders || []);
-                      mergedSnapshot = _this22.compactOrderListByIdentity(orderListSnapshot, "".concat(source, ".sqliteSnapshot")).list;
-                      _this22.logInfo('replaceOrdersSnapshotInSQLite-开始', {
+                      existingOrders = _context25.t0;
+                      protectedLocalOrders = protectedOrdersBeforeRemoteFetch.map(function (order) {
+                        return _this23.normalizeOrderCollectionsForIngress(order, "".concat(source, ".protectedBeforeRemoteFetch"));
+                      }).filter(function (order) {
+                        return _this23.isPendingSyncOrder(order) || _this23.isDraftOrder(order);
+                      });
+                      _iterator31 = _createForOfIteratorHelper(existingOrders || []);
+                      _context25.prev = 10;
+                      _iterator31.s();
+                    case 12:
+                      if ((_step31 = _iterator31.n()).done) {
+                        _context25.next = 23;
+                        break;
+                      }
+                      rawCurrentOrder = _step31.value;
+                      currentOrder = _this23.normalizeOrderCollectionsForIngress(rawCurrentOrder, "".concat(source, ".currentSQLite"));
+                      protectedIndex = _this23.findOrderIndexByIdentity(protectedLocalOrders, currentOrder);
+                      currentNeedsProtection = _this23.isPendingSyncOrder(currentOrder) || _this23.isDraftOrder(currentOrder);
+                      if (!(protectedIndex >= 0)) {
+                        _context25.next = 20;
+                        break;
+                      }
+                      if (currentNeedsProtection) {
+                        protectedLocalOrders[protectedIndex] = currentOrder;
+                      } else {
+                        protectedLocalOrders.splice(protectedIndex, 1);
+                      }
+                      return _context25.abrupt("continue", 21);
+                    case 20:
+                      if (currentNeedsProtection) protectedLocalOrders.push(currentOrder);
+                    case 21:
+                      _context25.next = 12;
+                      break;
+                    case 23:
+                      _context25.next = 28;
+                      break;
+                    case 25:
+                      _context25.prev = 25;
+                      _context25.t1 = _context25["catch"](10);
+                      _iterator31.e(_context25.t1);
+                    case 28:
+                      _context25.prev = 28;
+                      _iterator31.f();
+                      return _context25.finish(28);
+                    case 31:
+                      orderListSnapshot = _this23.mergeRemoteSnapshotWithPendingOrders(remoteSnapshot, protectedLocalOrders);
+                      mergedSnapshot = _this23.compactOrderListByIdentity(orderListSnapshot, "".concat(source, ".sqliteSnapshot")).list;
+                      _this23.logInfo('replaceOrdersSnapshotInSQLite-开始', {
                         source: source,
                         count: mergedSnapshot.length,
                         remoteCount: remoteSnapshot.length,
+                        protectedBeforeRemoteFetchCount: protectedOrdersBeforeRemoteFetch.length,
+                        protectedLocalOrderCount: protectedLocalOrders.length,
                         preservedLocalUnsyncedCount: mergedSnapshot.length - remoteSnapshot.length
                       });
-                      _context26.next = 13;
-                      return _this22.dbManager.clear(INDEXDB_STORE_NAME);
-                    case 13:
-                      _this22.logInfo('replaceOrdersSnapshotInSQLite-clear完成', {
+                      _context25.next = 36;
+                      return _this23.dbManager.clear(INDEXDB_STORE_NAME);
+                    case 36:
+                      _this23.logInfo('replaceOrdersSnapshotInSQLite-clear完成', {
                         count: mergedSnapshot.length
                       });
                       if (!(mergedSnapshot.length === 0)) {
-                        _context26.next = 16;
+                        _context25.next = 39;
                         break;
                       }
-                      return _context26.abrupt("return");
-                    case 16:
-                      _context26.next = 18;
-                      return _this22.dbManager.bulkAdd(INDEXDB_STORE_NAME, mergedSnapshot);
-                    case 18:
-                      _this22.recordRecentSqliteWrite(source, mergedSnapshot);
-                      _this22.logInfo('replaceOrdersSnapshotInSQLite-bulkAdd完成', {
+                      return _context25.abrupt("return");
+                    case 39:
+                      _context25.next = 41;
+                      return _this23.dbManager.bulkAdd(INDEXDB_STORE_NAME, mergedSnapshot);
+                    case 41:
+                      _this23.recordRecentSqliteWrite(source, mergedSnapshot);
+                      _this23.logInfo('replaceOrdersSnapshotInSQLite-bulkAdd完成', {
                         source: source,
                         count: mergedSnapshot.length
                       });
-                    case 20:
+                    case 43:
                     case "end":
-                      return _context26.stop();
+                      return _context25.stop();
                   }
-                }, _callee26);
+                }, _callee25, null, [[10, 25, 28, 31]]);
               })));
-            case 7:
-              _context27.next = 12;
+            case 8:
+              _context26.next = 13;
               break;
-            case 9:
-              _context27.prev = 9;
-              _context27.t0 = _context27["catch"](4);
+            case 10:
+              _context26.prev = 10;
+              _context26.t0 = _context26["catch"](5);
               this.logError('全量保存订单到 SQLite 失败', {
-                error: _context27.t0 instanceof Error ? _context27.t0.message : String(_context27.t0),
+                error: _context26.t0 instanceof Error ? _context26.t0.message : String(_context26.t0),
                 orderList: remoteSnapshot.length
               });
-            case 12:
-              return _context27.abrupt("return", mergedSnapshot);
             case 13:
+              return _context26.abrupt("return", mergedSnapshot);
+            case 14:
             case "end":
-              return _context27.stop();
+              return _context26.stop();
           }
-        }, _callee27, this, [[4, 9]]);
+        }, _callee26, this, [[5, 10]]);
       }));
       function replaceOrdersSnapshotInSQLite(_x19, _x20) {
         return _replaceOrdersSnapshotInSQLite.apply(this, arguments);
@@ -3521,38 +3611,38 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "clear",
     value: (function () {
-      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29() {
-        var _this23 = this;
-        return _regeneratorRuntime().wrap(function _callee29$(_context29) {
-          while (1) switch (_context29.prev = _context29.next) {
+      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28() {
+        var _this24 = this;
+        return _regeneratorRuntime().wrap(function _callee28$(_context28) {
+          while (1) switch (_context28.prev = _context28.next) {
             case 0:
               this.store.list = [];
               this.store.map = new Map();
               if (!this.dbManager) {
-                _context29.next = 5;
+                _context28.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) {
+              _context28.next = 5;
+              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27() {
+                return _regeneratorRuntime().wrap(function _callee27$(_context27) {
+                  while (1) switch (_context27.prev = _context27.next) {
                     case 0:
-                      _context28.next = 2;
-                      return _this23.dbManager.clear(INDEXDB_STORE_NAME);
+                      _context27.next = 2;
+                      return _this24.dbManager.clear(INDEXDB_STORE_NAME);
                     case 2:
                     case "end":
-                      return _context28.stop();
+                      return _context27.stop();
                   }
-                }, _callee28);
+                }, _callee27);
               })));
             case 5:
               this.setStorageItem(ORDER_LAST_FULL_FETCH_AT_STORAGE_KEY, '');
               this.emitOrdersChanged([], 'clear');
             case 7:
             case "end":
-              return _context29.stop();
+              return _context28.stop();
           }
-        }, _callee29, this);
+        }, _callee28, this);
       }));
       function clear() {
         return _clear.apply(this, arguments);