@pisell/pisellos 2.2.197 → 2.2.199

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

@@ -1,6 +1,10 @@
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -43,7 +47,7 @@ var ORDER_SQLITE_DEDUPE_MS = 15000;
 /** silentRefresh 最小间隔，避免 preload 后立即全量重拉 */
 var ORDER_SILENT_REFRESH_MIN_INTERVAL_MS = 30000;
 /** 视为「业务侧刚写入」的来源，pubsub 回声可跳过 SQLite */
-var ORDER_BUSINESS_WRITE_SOURCES = new Set(['upsertOrdersFromRemote', 'overwriteExistingOrder']);
+var ORDER_BUSINESS_WRITE_SOURCES = new Set(['upsertOrdersFromRemote', 'upsertPendingSyncOrders', 'overwriteExistingOrder']);
 
 /**
  * Order 模块 - 基础框架
@@ -795,6 +799,115 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       return upsertOrdersFromRemote;
     }()
+    /**
+     * 将本地待同步订单按 SQLite storage key 合并进 store 并落库。
+     * checkout 离线兜底可能没有 order_id，但通常会有 external_sale_number。
+     */
+    )
+  }, {
+    key: "upsertPendingSyncOrders",
+    value: (function () {
+      var _upsertPendingSyncOrders = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(pendingOrders) {
+        var _this6 = this;
+        var pendingMap, _iterator4, _step4, order, storageKey, patchedOrders, mergeActions, updatedList, _iterator5, _step5, _step5$value, _storageKey, _order;
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
+            case 0:
+              if (pendingOrders !== null && pendingOrders !== void 0 && pendingOrders.length) {
+                _context9.next = 3;
+                break;
+              }
+              this.logInfo('upsertPendingSyncOrders-订单列表为空', {});
+              return _context9.abrupt("return");
+            case 3:
+              pendingMap = new Map();
+              _iterator4 = _createForOfIteratorHelper(pendingOrders);
+              _context9.prev = 5;
+              _iterator4.s();
+            case 7:
+              if ((_step4 = _iterator4.n()).done) {
+                _context9.next = 15;
+                break;
+              }
+              order = _step4.value;
+              storageKey = this.getOrderStorageKey(order);
+              if (storageKey) {
+                _context9.next = 12;
+                break;
+              }
+              return _context9.abrupt("continue", 13);
+            case 12:
+              pendingMap.set(storageKey, order);
+            case 13:
+              _context9.next = 7;
+              break;
+            case 15:
+              _context9.next = 20;
+              break;
+            case 17:
+              _context9.prev = 17;
+              _context9.t0 = _context9["catch"](5);
+              _iterator4.e(_context9.t0);
+            case 20:
+              _context9.prev = 20;
+              _iterator4.f();
+              return _context9.finish(20);
+            case 23:
+              if (!(pendingMap.size === 0)) {
+                _context9.next = 26;
+                break;
+              }
+              this.logError('upsertPendingSyncOrders-订单缺少可落库标识', {
+                count: pendingOrders.length
+              });
+              return _context9.abrupt("return");
+            case 26:
+              this.logInfo('upsertPendingSyncOrders-开始', {
+                count: pendingMap.size
+              });
+              patchedOrders = _toConsumableArray(pendingMap.values());
+              mergeActions = {};
+              updatedList = this.store.list.map(function (order) {
+                var storageKey = _this6.getOrderStorageKey(order);
+                if (!storageKey || !pendingMap.has(storageKey)) return order;
+                var pendingOrder = pendingMap.get(storageKey);
+                pendingMap.delete(storageKey);
+                mergeActions[storageKey] = 'update';
+                return pendingOrder;
+              });
+              _iterator5 = _createForOfIteratorHelper(pendingMap.entries());
+              try {
+                for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+                  _step5$value = _slicedToArray(_step5.value, 2), _storageKey = _step5$value[0], _order = _step5$value[1];
+                  mergeActions[_storageKey] = 'insert';
+                  updatedList.push(_order);
+                }
+              } catch (err) {
+                _iterator5.e(err);
+              } finally {
+                _iterator5.f();
+              }
+              this.store.list = updatedList;
+              this.syncOrdersMap();
+              _context9.next = 36;
+              return this.patchOrdersInSQLite(patchedOrders, 'upsertPendingSyncOrders', mergeActions);
+            case 36:
+              this.logInfo('upsertPendingSyncOrders-结束', {
+                count: patchedOrders.length,
+                storeOrderCountAfter: this.store.list.length
+              });
+              this.core.effects.emit(OrderHooks.onOrdersChanged, this.store.list);
+            case 38:
+            case "end":
+              return _context9.stop();
+          }
+        }, _callee9, this, [[5, 17, 20, 23]]);
+      }));
+      function upsertPendingSyncOrders(_x6) {
+        return _upsertPendingSyncOrders.apply(this, arguments);
+      }
+      return upsertPendingSyncOrders;
+    }()
     /**
      * 通过 SSE 按自定义 query 拉取订单（支持 select/with 精简字段）
      */
@@ -802,42 +915,42 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "fetchOrdersBySSE",
     value: (function () {
-      var _fetchOrdersBySSE = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+      var _fetchOrdersBySSE = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
         var query,
           data,
-          _args9 = arguments;
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+          _args10 = arguments;
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
-              query = _args9.length > 0 && _args9[0] !== undefined ? _args9[0] : {};
+              query = _args10.length > 0 && _args10[0] !== undefined ? _args10[0] : {};
               if (this.orderDataSource) {
-                _context9.next = 3;
+                _context10.next = 3;
                 break;
               }
-              return _context9.abrupt("return", []);
+              return _context10.abrupt("return", []);
             case 3:
-              _context9.prev = 3;
-              _context9.next = 6;
+              _context10.prev = 3;
+              _context10.next = 6;
               return this.orderDataSource.run({
                 sse: {
                   query: query
                 }
               });
             case 6:
-              data = _context9.sent;
-              return _context9.abrupt("return", data || []);
+              data = _context10.sent;
+              return _context10.abrupt("return", data || []);
             case 10:
-              _context9.prev = 10;
-              _context9.t0 = _context9["catch"](3);
+              _context10.prev = 10;
+              _context10.t0 = _context10["catch"](3);
               this.logError('fetchOrdersBySSE-失败', {
-                error: _context9.t0 instanceof Error ? _context9.t0.message : String(_context9.t0)
+                error: _context10.t0 instanceof Error ? _context10.t0.message : String(_context10.t0)
               });
-              return _context9.abrupt("return", []);
+              return _context10.abrupt("return", []);
             case 14:
             case "end":
-              return _context9.stop();
+              return _context10.stop();
           }
-        }, _callee9, this, [[3, 10]]);
+        }, _callee10, this, [[3, 10]]);
       }));
       function fetchOrdersBySSE() {
         return _fetchOrdersBySSE.apply(this, arguments);
@@ -865,44 +978,44 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncOrdersMap",
     value: function syncOrdersMap() {
-      var _this6 = this;
+      var _this7 = this;
       this.store.map.clear();
       this.resourceIdIndex.clear();
-      var _iterator4 = _createForOfIteratorHelper(this.store.list),
-        _step4;
+      var _iterator6 = _createForOfIteratorHelper(this.store.list),
+        _step6;
       try {
         var _loop = function _loop() {
-          var order = _step4.value;
+          var order = _step6.value;
           var id = order.order_id;
           if (id === undefined || id === null) return 1; // continue
-          _this6.store.map.set(_this6.getIdKey(id), order);
-          var resourceIds = _this6.extractResourceIds(order);
-          var _iterator5 = _createForOfIteratorHelper(resourceIds),
-            _step5;
+          _this7.store.map.set(_this7.getIdKey(id), order);
+          var resourceIds = _this7.extractResourceIds(order);
+          var _iterator7 = _createForOfIteratorHelper(resourceIds),
+            _step7;
           try {
-            for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-              var resourceId = _step5.value;
+            for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+              var resourceId = _step7.value;
               var key = String(resourceId);
-              var existing = _this6.resourceIdIndex.get(key) || [];
+              var existing = _this7.resourceIdIndex.get(key) || [];
               if (existing.some(function (eid) {
-                return _this6.getIdKey(eid) === _this6.getIdKey(id);
+                return _this7.getIdKey(eid) === _this7.getIdKey(id);
               })) continue;
               existing.push(id);
-              _this6.resourceIdIndex.set(key, existing);
+              _this7.resourceIdIndex.set(key, existing);
             }
           } catch (err) {
-            _iterator5.e(err);
+            _iterator7.e(err);
           } finally {
-            _iterator5.f();
+            _iterator7.f();
           }
         };
-        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
           if (_loop()) continue;
         }
       } catch (err) {
-        _iterator4.e(err);
+        _iterator6.e(err);
       } finally {
-        _iterator4.f();
+        _iterator6.f();
       }
     }
   }, {
@@ -957,7 +1070,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setupOrderSync",
     value: function setupOrderSync() {
-      var _this7 = this;
+      var _this8 = this;
       if (!this.orderDataSource) return;
       this.orderDataSource.run({
         pubsub: {
@@ -965,21 +1078,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             var _message$id, _message$order_id, _message$type;
             console.log('orderDataSource', res);
             var pubsubReceivedAt = Date.now();
-            var message = _this7.normalizeOrderSyncMessage(res);
+            var message = _this8.normalizeOrderSyncMessage(res);
             if (!message) return;
             message._pubsubReceivedAt = pubsubReceivedAt;
-            _this7.pendingSyncMessages.push(message);
-            var throttleMs = _this7.getOrderSyncThrottleMs();
-            var routeInfo = _this7.resolveSyncMessageRoute(message);
-            _this7.logInfo('orderSync-收到消息并入队', {
+            _this8.pendingSyncMessages.push(message);
+            var throttleMs = _this8.getOrderSyncThrottleMs();
+            var routeInfo = _this8.resolveSyncMessageRoute(message);
+            _this8.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: _this7.pendingSyncMessages.length,
+              pendingCount: _this8.pendingSyncMessages.length,
               throttleMs: throttleMs,
               pubsubReceivedAt: new Date(pubsubReceivedAt).toISOString()
             });
-            _this7.scheduleOrderSyncThrottle();
+            _this8.scheduleOrderSyncThrottle();
           }
         }
       }).catch(function () {
@@ -996,7 +1109,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "scheduleOrderSyncThrottle",
     value: function scheduleOrderSyncThrottle() {
-      var _this8 = this;
+      var _this9 = this;
       if (this.isProcessingSyncBatch) return;
       if (this.isIdlePhase) {
         this.isIdlePhase = false;
@@ -1007,8 +1120,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (this.syncTimer) return;
       var throttleMs = this.getOrderSyncThrottleMs();
       this.syncTimer = setTimeout(function () {
-        _this8.syncTimer = undefined;
-        void _this8.flushOrderSyncMessagesByThrottle();
+        _this9.syncTimer = undefined;
+        void _this9.flushOrderSyncMessagesByThrottle();
       }, throttleMs);
     }
 
@@ -1019,41 +1132,41 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "flushOrderSyncMessagesByThrottle",
     value: (function () {
-      var _flushOrderSyncMessagesByThrottle = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+      var _flushOrderSyncMessagesByThrottle = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
+        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
               if (!this.isProcessingSyncBatch) {
-                _context10.next = 2;
+                _context11.next = 2;
                 break;
               }
-              return _context10.abrupt("return");
+              return _context11.abrupt("return");
             case 2:
               if (!(this.pendingSyncMessages.length === 0)) {
-                _context10.next = 5;
+                _context11.next = 5;
                 break;
               }
               this.isIdlePhase = true;
-              return _context10.abrupt("return");
+              return _context11.abrupt("return");
             case 5:
               this.isProcessingSyncBatch = true;
-              _context10.prev = 6;
-              _context10.next = 9;
+              _context11.prev = 6;
+              _context11.next = 9;
               return this.processOrderSyncMessages();
             case 9:
-              _context10.prev = 9;
+              _context11.prev = 9;
               this.isProcessingSyncBatch = false;
               if (this.pendingSyncMessages.length > 0) {
                 this.scheduleOrderSyncThrottle();
               } else {
                 this.isIdlePhase = true;
               }
-              return _context10.finish(9);
+              return _context11.finish(9);
             case 13:
             case "end":
-              return _context10.stop();
+              return _context11.stop();
           }
-        }, _callee10, this, [[6,, 9, 13]]);
+        }, _callee11, this, [[6,, 9, 13]]);
       }));
       function flushOrderSyncMessagesByThrottle() {
         return _flushOrderSyncMessagesByThrottle.apply(this, arguments);
@@ -1075,19 +1188,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "processOrderSyncMessages",
     value: (function () {
-      var _processOrderSyncMessages = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
-        var _this9 = this;
+      var _processOrderSyncMessages = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
+        var _this10 = this;
         var messages, batchProcessStartAt, earliestReceivedAt, upsertOrders, refreshIds, uniqueRefreshIds, upsertList, _this$filterRedundant, toFetch, skipped, freshOrders, batchProcessEndAt;
-        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
               messages = _toConsumableArray(this.pendingSyncMessages);
               this.pendingSyncMessages = [];
               if (!(messages.length === 0)) {
-                _context11.next = 4;
+                _context12.next = 4;
                 break;
               }
-              return _context11.abrupt("return");
+              return _context12.abrupt("return");
             case 4:
               batchProcessStartAt = Date.now();
               earliestReceivedAt = Math.min.apply(Math, _toConsumableArray(messages.map(function (m) {
@@ -1103,13 +1216,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               upsertOrders = new Map();
               refreshIds = [];
               messages.forEach(function (msg, msgIndex) {
-                var routeInfo = _this9.resolveSyncMessageRoute(msg);
+                var routeInfo = _this10.resolveSyncMessageRoute(msg);
                 var hasBatchIds = routeInfo.hasBatchIds;
                 var singleId = routeInfo.singleId;
                 var hasSingleId = routeInfo.hasSingleId;
-                var normalizedBody = _this9.normalizeOrderSyncPayload(msg.body || msg.data);
+                var normalizedBody = _this10.normalizeOrderSyncPayload(msg.body || msg.data);
                 if (routeInfo.route === 'bodyUpsert' && normalizedBody) {
-                  upsertOrders.set(_this9.getIdKey(normalizedBody.order_id), normalizedBody);
+                  upsertOrders.set(_this10.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));
@@ -1121,41 +1234,41 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 refreshIdCount: uniqueRefreshIds.length
               });
               if (!(upsertList.length > 0)) {
-                _context11.next = 16;
+                _context12.next = 16;
                 break;
               }
-              _context11.next = 16;
+              _context12.next = 16;
               return this.mergeOrdersToStore(upsertList, 'pubsub.bodyUpsert');
             case 16:
               if (!(uniqueRefreshIds.length > 0)) {
-                _context11.next = 28;
+                _context12.next = 28;
                 break;
               }
               _this$filterRedundant = this.filterRedundantHttpRefreshIds(uniqueRefreshIds), toFetch = _this$filterRedundant.toFetch, skipped = _this$filterRedundant.skipped;
               if (skipped.length > 0) {}
               if (!(toFetch.length > 0)) {
-                _context11.next = 28;
+                _context12.next = 28;
                 break;
               }
-              _context11.next = 22;
+              _context12.next = 22;
               return this.fetchOrdersByHttp(toFetch);
             case 22:
-              freshOrders = _context11.sent;
+              freshOrders = _context12.sent;
               if (!(freshOrders.length > 0)) {
-                _context11.next = 28;
+                _context12.next = 28;
                 break;
               }
-              _context11.next = 26;
+              _context12.next = 26;
               return this.mergeOrdersToStore(freshOrders, 'pubsub.httpRefresh');
             case 26:
-              _context11.next = 28;
+              _context12.next = 28;
               break;
             case 28:
               if (!(upsertList.length === 0 && uniqueRefreshIds.length === 0)) {
-                _context11.next = 30;
+                _context12.next = 30;
                 break;
               }
-              return _context11.abrupt("return");
+              return _context12.abrupt("return");
             case 30:
               batchProcessEndAt = Date.now();
               this.logInfo('processOrderSyncMessages-结束', {
@@ -1164,13 +1277,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 batchProcessDurationMs: batchProcessEndAt - batchProcessStartAt,
                 totalFromPubsubToProcessedMs: batchProcessEndAt - earliestReceivedAt
               });
-              _context11.next = 34;
+              _context12.next = 34;
               return this.core.effects.emit(OrderHooks.onOrdersSyncCompleted, null);
             case 34:
             case "end":
-              return _context11.stop();
+              return _context12.stop();
           }
-        }, _callee11, this);
+        }, _callee12, this);
       }));
       function processOrderSyncMessages() {
         return _processOrderSyncMessages.apply(this, arguments);
@@ -1191,29 +1304,29 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "fetchOrdersByHttp",
     value: (function () {
-      var _fetchOrdersByHttp = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(ids) {
+      var _fetchOrdersByHttp = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(ids) {
         var _orderList, orderList;
-        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
               if (!(!this.orderDataSource || ids.length === 0)) {
-                _context12.next = 2;
+                _context13.next = 2;
                 break;
               }
-              return _context12.abrupt("return", []);
+              return _context13.abrupt("return", []);
             case 2:
-              _context12.prev = 2;
+              _context13.prev = 2;
               if (!(typeof this.orderDataSource.fetchOrdersByIds === 'function')) {
-                _context12.next = 8;
+                _context13.next = 8;
                 break;
               }
-              _context12.next = 6;
+              _context13.next = 6;
               return this.orderDataSource.fetchOrdersByIds(ids);
             case 6:
-              _orderList = _context12.sent;
-              return _context12.abrupt("return", _orderList || []);
+              _orderList = _context13.sent;
+              return _context13.abrupt("return", _orderList || []);
             case 8:
-              _context12.next = 10;
+              _context13.next = 10;
               return this.orderDataSource.run({
                 http: {
                   query: {
@@ -1222,19 +1335,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               });
             case 10:
-              orderList = _context12.sent;
-              return _context12.abrupt("return", orderList || []);
+              orderList = _context13.sent;
+              return _context13.abrupt("return", orderList || []);
             case 14:
-              _context12.prev = 14;
-              _context12.t0 = _context12["catch"](2);
-              return _context12.abrupt("return", []);
+              _context13.prev = 14;
+              _context13.t0 = _context13["catch"](2);
+              return _context13.abrupt("return", []);
             case 17:
             case "end":
-              return _context12.stop();
+              return _context13.stop();
           }
-        }, _callee12, this, [[2, 14]]);
+        }, _callee13, this, [[2, 14]]);
       }));
-      function fetchOrdersByHttp(_x6) {
+      function fetchOrdersByHttp(_x7) {
         return _fetchOrdersByHttp.apply(this, arguments);
       }
       return fetchOrdersByHttp;
@@ -1246,76 +1359,122 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "mergeOrdersToStore",
     value: (function () {
-      var _mergeOrdersToStore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(freshOrders, source) {
-        var _this10 = this;
-        var freshMap, _iterator6, _step6, order, id, uniqueFreshCount, patchedOrders, mergeActions, updatedList, _iterator7, _step7, _order, _id, insertCount, updateCount;
-        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+      var _mergeOrdersToStore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(freshOrders, source) {
+        var _this11 = this;
+        var freshMap, _iterator8, _step8, order, id, freshStorageKeyMap, _iterator9, _step9, _order2, storageKey, uniqueFreshCount, patchedOrders, mergeActions, updatedList, _iterator10, _step10, _order3, _id, insertCount, updateCount;
+        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
               this.logInfo('mergeOrdersToStore-开始', {
                 freshOrderCount: freshOrders.length,
                 storeOrderCountBefore: this.store.list.length
               });
               freshMap = new Map();
-              _iterator6 = _createForOfIteratorHelper(freshOrders);
-              _context13.prev = 3;
-              _iterator6.s();
+              _iterator8 = _createForOfIteratorHelper(freshOrders);
+              _context14.prev = 3;
+              _iterator8.s();
             case 5:
-              if ((_step6 = _iterator6.n()).done) {
-                _context13.next = 13;
+              if ((_step8 = _iterator8.n()).done) {
+                _context14.next = 13;
                 break;
               }
-              order = _step6.value;
+              order = _step8.value;
               id = order === null || order === void 0 ? void 0 : order.order_id;
               if (!(id === undefined || id === null)) {
-                _context13.next = 10;
+                _context14.next = 10;
                 break;
               }
-              return _context13.abrupt("continue", 11);
+              return _context14.abrupt("continue", 11);
             case 10:
-              freshMap.set(this.getIdKey(id), order);
+              freshMap.set(this.getIdKey(id), this.normalizeRemoteSyncedOrder(order));
             case 11:
-              _context13.next = 5;
+              _context14.next = 5;
               break;
             case 13:
-              _context13.next = 18;
+              _context14.next = 18;
               break;
             case 15:
-              _context13.prev = 15;
-              _context13.t0 = _context13["catch"](3);
-              _iterator6.e(_context13.t0);
+              _context14.prev = 15;
+              _context14.t0 = _context14["catch"](3);
+              _iterator8.e(_context14.t0);
             case 18:
-              _context13.prev = 18;
-              _iterator6.f();
-              return _context13.finish(18);
+              _context14.prev = 18;
+              _iterator8.f();
+              return _context14.finish(18);
             case 21:
+              freshStorageKeyMap = new Map();
+              _iterator9 = _createForOfIteratorHelper(freshMap.values());
+              _context14.prev = 23;
+              _iterator9.s();
+            case 25:
+              if ((_step9 = _iterator9.n()).done) {
+                _context14.next = 33;
+                break;
+              }
+              _order2 = _step9.value;
+              storageKey = this.getOrderStorageKey(_order2);
+              if (storageKey) {
+                _context14.next = 30;
+                break;
+              }
+              return _context14.abrupt("continue", 31);
+            case 30:
+              freshStorageKeyMap.set(storageKey, _order2);
+            case 31:
+              _context14.next = 25;
+              break;
+            case 33:
+              _context14.next = 38;
+              break;
+            case 35:
+              _context14.prev = 35;
+              _context14.t1 = _context14["catch"](23);
+              _iterator9.e(_context14.t1);
+            case 38:
+              _context14.prev = 38;
+              _iterator9.f();
+              return _context14.finish(38);
+            case 41:
               uniqueFreshCount = freshMap.size;
               patchedOrders = _toConsumableArray(freshMap.values());
               mergeActions = {};
               updatedList = this.store.list.map(function (order) {
+                var storageKey = _this11.getOrderStorageKey(order);
+                if (storageKey && freshStorageKeyMap.has(storageKey)) {
+                  var _fresh = freshStorageKeyMap.get(storageKey);
+                  freshStorageKeyMap.delete(storageKey);
+                  var freshId = _fresh.order_id;
+                  if (freshId !== undefined && freshId !== null) {
+                    freshMap.delete(_this11.getIdKey(freshId));
+                    mergeActions[_this11.getIdKey(freshId)] = 'update';
+                  } else {
+                    mergeActions[storageKey] = 'update';
+                  }
+                  return _fresh;
+                }
                 var id = order.order_id;
                 if (id === undefined || id === null) return order;
-                var key = _this10.getIdKey(id);
+                var key = _this11.getIdKey(id);
                 if (!freshMap.has(key)) return order;
                 var fresh = freshMap.get(key);
                 freshMap.delete(key);
                 mergeActions[key] = 'update';
                 return fresh;
               });
-              _iterator7 = _createForOfIteratorHelper(freshMap.values());
+              _iterator10 = _createForOfIteratorHelper(freshMap.values());
               try {
-                for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-                  _order = _step7.value;
-                  _id = _order.order_id;
+                for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+                  _order3 = _step10.value;
+                  _id = _order3.order_id;
                   if (_id !== undefined && _id !== null) {
                     mergeActions[this.getIdKey(_id)] = 'insert';
                   }
-                  updatedList.push(_order);
+                  updatedList.push(_order3);
                 }
               } catch (err) {
-                _iterator7.e(err);
+                _iterator10.e(err);
               } finally {
-                _iterator7.f();
+                _iterator10.f();
               }
               insertCount = Object.values(mergeActions).filter(function (v) {
                 return v === 'insert';
@@ -1325,21 +1484,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }).length;
               this.store.list = updatedList;
               this.syncOrdersMap();
-              _context13.next = 33;
+              _context14.next = 53;
               return this.patchOrdersInSQLite(patchedOrders, source, mergeActions);
-            case 33:
+            case 53:
               this.logInfo('mergeOrdersToStore-结束', {
                 uniqueFreshCount: uniqueFreshCount,
                 storeOrderCountAfter: this.store.list.length
               });
               this.core.effects.emit(OrderHooks.onOrdersChanged, this.store.list);
-            case 35:
+            case 55:
             case "end":
-              return _context13.stop();
+              return _context14.stop();
           }
-        }, _callee13, this, [[3, 15, 18, 21]]);
+        }, _callee14, this, [[3, 15, 18, 21], [23, 35, 38, 41]]);
       }));
-      function mergeOrdersToStore(_x7, _x8) {
+      function mergeOrdersToStore(_x8, _x9) {
         return _mergeOrdersToStore.apply(this, arguments);
       }
       return mergeOrdersToStore;
@@ -1376,17 +1535,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "uniqueOrderIds",
     value: function uniqueOrderIds(ids) {
       var idMap = new Map();
-      var _iterator8 = _createForOfIteratorHelper(ids),
-        _step8;
+      var _iterator11 = _createForOfIteratorHelper(ids),
+        _step11;
       try {
-        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-          var id = _step8.value;
+        for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+          var id = _step11.value;
           idMap.set(this.getIdKey(id), id);
         }
       } catch (err) {
-        _iterator8.e(err);
+        _iterator11.e(err);
       } finally {
-        _iterator8.f();
+        _iterator11.f();
       }
       return _toConsumableArray(idMap.values());
     }
@@ -1398,12 +1557,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "isOrderLookupMatch",
     value: function isOrderLookupMatch(order, lookupKey) {
-      var _this11 = this;
+      var _this12 = 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 _this11.getIdKey(value) === lookupKey;
+        return _this12.getIdKey(value) === lookupKey;
       });
     }
 
@@ -1508,38 +1667,80 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadOrdersFromSQLite",
     value: function () {
-      var _loadOrdersFromSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
+      var _loadOrdersFromSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
         var orders;
-        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
               if (this.dbManager) {
-                _context14.next = 2;
+                _context15.next = 2;
                 break;
               }
-              return _context14.abrupt("return", []);
+              return _context15.abrupt("return", []);
             case 2:
-              _context14.prev = 2;
-              _context14.next = 5;
+              _context15.prev = 2;
+              _context15.next = 5;
               return this.dbManager.getAll(INDEXDB_STORE_NAME);
             case 5:
-              orders = _context14.sent;
-              return _context14.abrupt("return", orders || []);
+              orders = _context15.sent;
+              return _context15.abrupt("return", orders || []);
             case 9:
-              _context14.prev = 9;
-              _context14.t0 = _context14["catch"](2);
-              return _context14.abrupt("return", []);
+              _context15.prev = 9;
+              _context15.t0 = _context15["catch"](2);
+              return _context15.abrupt("return", []);
             case 12:
             case "end":
-              return _context14.stop();
+              return _context15.stop();
           }
-        }, _callee14, this, [[2, 9]]);
+        }, _callee15, this, [[2, 9]]);
       }));
       function loadOrdersFromSQLite() {
         return _loadOrdersFromSQLite.apply(this, arguments);
       }
       return loadOrdersFromSQLite;
     }()
+  }, {
+    key: "isPendingSyncOrder",
+    value: function isPendingSyncOrder(order) {
+      return Number(order === null || order === void 0 ? void 0 : order.need_sync) === 1;
+    }
+  }, {
+    key: "normalizeRemoteSyncedOrder",
+    value: function normalizeRemoteSyncedOrder(order) {
+      if (this.isPendingSyncOrder(order)) return order;
+      return _objectSpread(_objectSpread({}, order), {}, {
+        need_sync: 0
+      });
+    }
+  }, {
+    key: "mergeRemoteSnapshotWithPendingOrders",
+    value: function mergeRemoteSnapshotWithPendingOrders(remoteOrders, existingOrders) {
+      var _this13 = this;
+      var merged = remoteOrders.map(function (order) {
+        return _this13.normalizeRemoteSyncedOrder(order);
+      });
+      var remoteStorageKeys = new Set(merged.map(function (order) {
+        return _this13.getOrderStorageKey(order);
+      }).filter(Boolean));
+      var _iterator12 = _createForOfIteratorHelper(existingOrders),
+        _step12;
+      try {
+        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+          var order = _step12.value;
+          if (!this.isPendingSyncOrder(order)) continue;
+          var storageKey = this.getOrderStorageKey(order);
+          if (!storageKey || remoteStorageKeys.has(storageKey)) continue;
+          merged.push(order);
+          remoteStorageKeys.add(storageKey);
+        }
+      } catch (err) {
+        _iterator12.e(err);
+      } finally {
+        _iterator12.f();
+      }
+      return merged;
+    }
+
     /**
      * 串行执行订单 SQLite 写入任务，避免快照替换与增量 upsert 并发交错。
      *
@@ -1551,10 +1752,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "runInOrderSQLiteSaveQueue",
     value: (function () {
-      var _runInOrderSQLiteSaveQueue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(task) {
+      var _runInOrderSQLiteSaveQueue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(task) {
         var queuedTask;
-        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
               queuedTask = this.orderSQLiteSaveQueue.then(task, task);
               this.orderSQLiteSaveQueue = queuedTask.then(function () {
@@ -1562,14 +1763,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }, function () {
                 return undefined;
               });
-              return _context15.abrupt("return", queuedTask);
+              return _context16.abrupt("return", queuedTask);
             case 3:
             case "end":
-              return _context15.stop();
+              return _context16.stop();
           }
-        }, _callee15, this);
+        }, _callee16, this);
       }));
-      function runInOrderSQLiteSaveQueue(_x9) {
+      function runInOrderSQLiteSaveQueue(_x10) {
         return _runInOrderSQLiteSaveQueue.apply(this, arguments);
       }
       return runInOrderSQLiteSaveQueue;
@@ -1584,108 +1785,108 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "patchOrdersInSQLite",
     value: (function () {
-      var _patchOrdersInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(orders, source) {
-        var _this12 = this;
+      var _patchOrdersInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(orders, source) {
+        var _this14 = this;
         var mergeActions,
           ordersSnapshot,
           _this$filterRedundant2,
           toWrite,
           skipped,
-          _args17 = arguments;
-        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+          _args18 = arguments;
+        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
-              mergeActions = _args17.length > 2 && _args17[2] !== undefined ? _args17[2] : {};
+              mergeActions = _args18.length > 2 && _args18[2] !== undefined ? _args18[2] : {};
               if (!(!this.dbManager || orders.length === 0)) {
-                _context17.next = 3;
+                _context18.next = 3;
                 break;
               }
-              return _context17.abrupt("return");
+              return _context18.abrupt("return");
             case 3:
               ordersSnapshot = cloneDeep(orders).filter(function (order) {
-                return _this12.getOrderStorageKey(order);
+                return _this14.getOrderStorageKey(order);
               });
               if (!(ordersSnapshot.length === 0)) {
-                _context17.next = 6;
+                _context18.next = 6;
                 break;
               }
-              return _context17.abrupt("return");
+              return _context18.abrupt("return");
             case 6:
               _this$filterRedundant2 = this.filterRedundantPatchOrders(source, ordersSnapshot, mergeActions), toWrite = _this$filterRedundant2.toWrite, skipped = _this$filterRedundant2.skipped;
               if (!(toWrite.length === 0)) {
-                _context17.next = 9;
+                _context18.next = 9;
                 break;
               }
-              return _context17.abrupt("return");
+              return _context18.abrupt("return");
             case 9:
-              _context17.prev = 9;
-              _context17.next = 12;
-              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
-                var writeMethod, _iterator9, _step9, order;
-                return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-                  while (1) switch (_context16.prev = _context16.next) {
+              _context18.prev = 9;
+              _context18.next = 12;
+              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
+                var writeMethod, _iterator13, _step13, order;
+                return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+                  while (1) switch (_context17.prev = _context17.next) {
                     case 0:
                       writeMethod = 'none';
-                      _this12.logInfo('patchOrdersInSQLite-开始', {
+                      _this14.logInfo('patchOrdersInSQLite-开始', {
                         source: source,
                         count: toWrite.length,
                         dedupedCount: skipped.length
                       });
-                      if (!(typeof _this12.dbManager.bulkUpdate === 'function')) {
-                        _context16.next = 8;
+                      if (!(typeof _this14.dbManager.bulkUpdate === 'function')) {
+                        _context17.next = 8;
                         break;
                       }
                       writeMethod = 'bulkUpdate';
-                      _context16.next = 6;
-                      return _this12.dbManager.bulkUpdate(INDEXDB_STORE_NAME, toWrite);
+                      _context17.next = 6;
+                      return _this14.dbManager.bulkUpdate(INDEXDB_STORE_NAME, toWrite);
                     case 6:
-                      _context16.next = 33;
+                      _context17.next = 33;
                       break;
                     case 8:
-                      if (!(typeof _this12.dbManager.bulkAdd === 'function')) {
-                        _context16.next = 14;
+                      if (!(typeof _this14.dbManager.bulkAdd === 'function')) {
+                        _context17.next = 14;
                         break;
                       }
                       writeMethod = 'bulkAdd';
-                      _context16.next = 12;
-                      return _this12.dbManager.bulkAdd(INDEXDB_STORE_NAME, toWrite);
+                      _context17.next = 12;
+                      return _this14.dbManager.bulkAdd(INDEXDB_STORE_NAME, toWrite);
                     case 12:
-                      _context16.next = 33;
+                      _context17.next = 33;
                       break;
                     case 14:
-                      if (!(typeof _this12.dbManager.update === 'function')) {
-                        _context16.next = 33;
+                      if (!(typeof _this14.dbManager.update === 'function')) {
+                        _context17.next = 33;
                         break;
                       }
                       writeMethod = 'update';
-                      _iterator9 = _createForOfIteratorHelper(toWrite);
-                      _context16.prev = 17;
-                      _iterator9.s();
+                      _iterator13 = _createForOfIteratorHelper(toWrite);
+                      _context17.prev = 17;
+                      _iterator13.s();
                     case 19:
-                      if ((_step9 = _iterator9.n()).done) {
-                        _context16.next = 25;
+                      if ((_step13 = _iterator13.n()).done) {
+                        _context17.next = 25;
                         break;
                       }
-                      order = _step9.value;
-                      _context16.next = 23;
-                      return _this12.dbManager.update(INDEXDB_STORE_NAME, order);
+                      order = _step13.value;
+                      _context17.next = 23;
+                      return _this14.dbManager.update(INDEXDB_STORE_NAME, order);
                     case 23:
-                      _context16.next = 19;
+                      _context17.next = 19;
                       break;
                     case 25:
-                      _context16.next = 30;
+                      _context17.next = 30;
                       break;
                     case 27:
-                      _context16.prev = 27;
-                      _context16.t0 = _context16["catch"](17);
-                      _iterator9.e(_context16.t0);
+                      _context17.prev = 27;
+                      _context17.t0 = _context17["catch"](17);
+                      _iterator13.e(_context17.t0);
                     case 30:
-                      _context16.prev = 30;
-                      _iterator9.f();
-                      return _context16.finish(30);
+                      _context17.prev = 30;
+                      _iterator13.f();
+                      return _context17.finish(30);
                     case 33:
-                      _this12.recordRecentSqliteWrite(source, toWrite);
-                      _this12.logInfo('patchOrdersInSQLite-完成', {
+                      _this14.recordRecentSqliteWrite(source, toWrite);
+                      _this14.logInfo('patchOrdersInSQLite-完成', {
                         source: source,
                         count: toWrite.length,
                         writeMethod: writeMethod,
@@ -1693,27 +1894,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       });
                     case 35:
                     case "end":
-                      return _context16.stop();
+                      return _context17.stop();
                   }
-                }, _callee16, null, [[17, 27, 30, 33]]);
+                }, _callee17, null, [[17, 27, 30, 33]]);
               })));
             case 12:
-              _context17.next = 17;
+              _context18.next = 17;
               break;
             case 14:
-              _context17.prev = 14;
-              _context17.t0 = _context17["catch"](9);
+              _context18.prev = 14;
+              _context18.t0 = _context18["catch"](9);
               this.logError('增量保存订单到 SQLite 失败', {
-                error: _context17.t0 instanceof Error ? _context17.t0.message : String(_context17.t0),
+                error: _context18.t0 instanceof Error ? _context18.t0.message : String(_context18.t0),
                 orderCount: ordersSnapshot.length
               });
             case 17:
             case "end":
-              return _context17.stop();
+              return _context18.stop();
           }
-        }, _callee17, this, [[9, 14]]);
+        }, _callee18, this, [[9, 14]]);
       }));
-      function patchOrdersInSQLite(_x10, _x11) {
+      function patchOrdersInSQLite(_x11, _x12) {
         return _patchOrdersInSQLite.apply(this, arguments);
       }
       return patchOrdersInSQLite;
@@ -1728,92 +1929,92 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderInSQLite",
     value: (function () {
-      var _updateOrderInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(order, source) {
-        var _this13 = this;
+      var _updateOrderInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(order, source) {
+        var _this15 = this;
         var orderSnapshot, _orderSnapshot$order_3;
-        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
               if (!(!this.dbManager || !this.getOrderStorageKey(order))) {
-                _context19.next = 2;
+                _context20.next = 2;
                 break;
               }
-              return _context19.abrupt("return");
+              return _context20.abrupt("return");
             case 2:
               orderSnapshot = cloneDeep(order);
-              _context19.prev = 3;
-              _context19.next = 6;
-              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
+              _context20.prev = 3;
+              _context20.next = 6;
+              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
                 var _orderSnapshot$order_, _orderSnapshot$order_2;
                 var writeMethod;
-                return _regeneratorRuntime().wrap(function _callee18$(_context18) {
-                  while (1) switch (_context18.prev = _context18.next) {
+                return _regeneratorRuntime().wrap(function _callee19$(_context19) {
+                  while (1) switch (_context19.prev = _context19.next) {
                     case 0:
                       writeMethod = 'none';
-                      _this13.logInfo('updateOrderInSQLite-开始', {
+                      _this15.logInfo('updateOrderInSQLite-开始', {
                         source: source,
                         orderId: (_orderSnapshot$order_ = orderSnapshot.order_id) !== null && _orderSnapshot$order_ !== void 0 ? _orderSnapshot$order_ : null,
-                        storageKey: _this13.getOrderStorageKey(orderSnapshot)
+                        storageKey: _this15.getOrderStorageKey(orderSnapshot)
                       });
-                      if (!(typeof _this13.dbManager.update === 'function')) {
-                        _context18.next = 8;
+                      if (!(typeof _this15.dbManager.update === 'function')) {
+                        _context19.next = 8;
                         break;
                       }
                       writeMethod = 'update';
-                      _context18.next = 6;
-                      return _this13.dbManager.update(INDEXDB_STORE_NAME, orderSnapshot);
+                      _context19.next = 6;
+                      return _this15.dbManager.update(INDEXDB_STORE_NAME, orderSnapshot);
                     case 6:
-                      _context18.next = 18;
+                      _context19.next = 18;
                       break;
                     case 8:
-                      if (!(typeof _this13.dbManager.bulkUpdate === 'function')) {
-                        _context18.next = 14;
+                      if (!(typeof _this15.dbManager.bulkUpdate === 'function')) {
+                        _context19.next = 14;
                         break;
                       }
                       writeMethod = 'bulkUpdate';
-                      _context18.next = 12;
-                      return _this13.dbManager.bulkUpdate(INDEXDB_STORE_NAME, [orderSnapshot]);
+                      _context19.next = 12;
+                      return _this15.dbManager.bulkUpdate(INDEXDB_STORE_NAME, [orderSnapshot]);
                     case 12:
-                      _context18.next = 18;
+                      _context19.next = 18;
                       break;
                     case 14:
-                      if (!(typeof _this13.dbManager.bulkAdd === 'function')) {
-                        _context18.next = 18;
+                      if (!(typeof _this15.dbManager.bulkAdd === 'function')) {
+                        _context19.next = 18;
                         break;
                       }
                       writeMethod = 'bulkAdd';
-                      _context18.next = 18;
-                      return _this13.dbManager.bulkAdd(INDEXDB_STORE_NAME, [orderSnapshot]);
+                      _context19.next = 18;
+                      return _this15.dbManager.bulkAdd(INDEXDB_STORE_NAME, [orderSnapshot]);
                     case 18:
-                      _this13.recordRecentSqliteWrite(source, [orderSnapshot]);
-                      _this13.logInfo('updateOrderInSQLite-完成', {
+                      _this15.recordRecentSqliteWrite(source, [orderSnapshot]);
+                      _this15.logInfo('updateOrderInSQLite-完成', {
                         source: source,
                         orderId: (_orderSnapshot$order_2 = orderSnapshot.order_id) !== null && _orderSnapshot$order_2 !== void 0 ? _orderSnapshot$order_2 : null,
                         writeMethod: writeMethod
                       });
                     case 20:
                     case "end":
-                      return _context18.stop();
+                      return _context19.stop();
                   }
-                }, _callee18);
+                }, _callee19);
               })));
             case 6:
-              _context19.next = 11;
+              _context20.next = 11;
               break;
             case 8:
-              _context19.prev = 8;
-              _context19.t0 = _context19["catch"](3);
+              _context20.prev = 8;
+              _context20.t0 = _context20["catch"](3);
               this.logError('单条保存订单到 SQLite 失败', {
-                error: _context19.t0 instanceof Error ? _context19.t0.message : String(_context19.t0),
+                error: _context20.t0 instanceof Error ? _context20.t0.message : String(_context20.t0),
                 orderId: (_orderSnapshot$order_3 = orderSnapshot.order_id) !== null && _orderSnapshot$order_3 !== void 0 ? _orderSnapshot$order_3 : null
               });
             case 11:
             case "end":
-              return _context19.stop();
+              return _context20.stop();
           }
-        }, _callee19, this, [[3, 8]]);
+        }, _callee20, this, [[3, 8]]);
       }));
-      function updateOrderInSQLite(_x12, _x13) {
+      function updateOrderInSQLite(_x13, _x14) {
         return _updateOrderInSQLite.apply(this, arguments);
       }
       return updateOrderInSQLite;
@@ -1828,72 +2029,90 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "replaceOrdersSnapshotInSQLite",
     value: (function () {
-      var _replaceOrdersSnapshotInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(orderList, source) {
-        var _this14 = this;
-        var orderListSnapshot;
-        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+      var _replaceOrdersSnapshotInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(orderList, source) {
+        var _this16 = this;
+        var remoteSnapshot;
+        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
               if (this.dbManager) {
-                _context21.next = 2;
+                _context22.next = 2;
                 break;
               }
-              return _context21.abrupt("return");
+              return _context22.abrupt("return");
             case 2:
-              orderListSnapshot = cloneDeep(orderList);
-              _context21.prev = 3;
-              _context21.next = 6;
-              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20() {
-                return _regeneratorRuntime().wrap(function _callee20$(_context20) {
-                  while (1) switch (_context20.prev = _context20.next) {
+              remoteSnapshot = cloneDeep(orderList);
+              _context22.prev = 3;
+              _context22.next = 6;
+              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
+                var existingOrders, orderListSnapshot;
+                return _regeneratorRuntime().wrap(function _callee21$(_context21) {
+                  while (1) switch (_context21.prev = _context21.next) {
                     case 0:
-                      _this14.logInfo('replaceOrdersSnapshotInSQLite-开始', {
+                      if (!(typeof _this16.dbManager.getAll === 'function')) {
+                        _context21.next = 6;
+                        break;
+                      }
+                      _context21.next = 3;
+                      return _this16.dbManager.getAll(INDEXDB_STORE_NAME);
+                    case 3:
+                      _context21.t0 = _context21.sent;
+                      _context21.next = 7;
+                      break;
+                    case 6:
+                      _context21.t0 = [];
+                    case 7:
+                      existingOrders = _context21.t0;
+                      orderListSnapshot = _this16.mergeRemoteSnapshotWithPendingOrders(remoteSnapshot, existingOrders || []);
+                      _this16.logInfo('replaceOrdersSnapshotInSQLite-开始', {
                         source: source,
-                        count: orderListSnapshot.length
+                        count: orderListSnapshot.length,
+                        remoteCount: remoteSnapshot.length,
+                        preservedPendingCount: orderListSnapshot.length - remoteSnapshot.length
                       });
-                      _context20.next = 3;
-                      return _this14.dbManager.clear(INDEXDB_STORE_NAME);
-                    case 3:
-                      _this14.logInfo('replaceOrdersSnapshotInSQLite-clear完成', {
+                      _context21.next = 12;
+                      return _this16.dbManager.clear(INDEXDB_STORE_NAME);
+                    case 12:
+                      _this16.logInfo('replaceOrdersSnapshotInSQLite-clear完成', {
                         count: orderListSnapshot.length
                       });
                       if (!(orderListSnapshot.length === 0)) {
-                        _context20.next = 6;
+                        _context21.next = 15;
                         break;
                       }
-                      return _context20.abrupt("return");
-                    case 6:
-                      _context20.next = 8;
-                      return _this14.dbManager.bulkAdd(INDEXDB_STORE_NAME, orderListSnapshot);
-                    case 8:
-                      _this14.recordRecentSqliteWrite(source, orderListSnapshot);
-                      _this14.logInfo('replaceOrdersSnapshotInSQLite-bulkAdd完成', {
+                      return _context21.abrupt("return");
+                    case 15:
+                      _context21.next = 17;
+                      return _this16.dbManager.bulkAdd(INDEXDB_STORE_NAME, orderListSnapshot);
+                    case 17:
+                      _this16.recordRecentSqliteWrite(source, orderListSnapshot);
+                      _this16.logInfo('replaceOrdersSnapshotInSQLite-bulkAdd完成', {
                         source: source,
                         count: orderListSnapshot.length
                       });
-                    case 10:
+                    case 19:
                     case "end":
-                      return _context20.stop();
+                      return _context21.stop();
                   }
-                }, _callee20);
+                }, _callee21);
               })));
             case 6:
-              _context21.next = 11;
+              _context22.next = 11;
               break;
             case 8:
-              _context21.prev = 8;
-              _context21.t0 = _context21["catch"](3);
+              _context22.prev = 8;
+              _context22.t0 = _context22["catch"](3);
               this.logError('全量保存订单到 SQLite 失败', {
-                error: _context21.t0 instanceof Error ? _context21.t0.message : String(_context21.t0),
-                orderList: orderListSnapshot.length
+                error: _context22.t0 instanceof Error ? _context22.t0.message : String(_context22.t0),
+                orderList: remoteSnapshot.length
               });
             case 11:
             case "end":
-              return _context21.stop();
+              return _context22.stop();
           }
-        }, _callee21, this, [[3, 8]]);
+        }, _callee22, this, [[3, 8]]);
       }));
-      function replaceOrdersSnapshotInSQLite(_x14, _x15) {
+      function replaceOrdersSnapshotInSQLite(_x15, _x16) {
         return _replaceOrdersSnapshotInSQLite.apply(this, arguments);
       }
       return replaceOrdersSnapshotInSQLite;
@@ -1908,39 +2127,39 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "clear",
     value: (function () {
-      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
-        var _this15 = this;
-        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24() {
+        var _this17 = this;
+        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
             case 0:
               this.store.list = [];
               this.store.map = new Map();
               this.resourceIdIndex.clear();
               if (!this.dbManager) {
-                _context23.next = 6;
+                _context24.next = 6;
                 break;
               }
-              _context23.next = 6;
-              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22() {
-                return _regeneratorRuntime().wrap(function _callee22$(_context22) {
-                  while (1) switch (_context22.prev = _context22.next) {
+              _context24.next = 6;
+              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
+                return _regeneratorRuntime().wrap(function _callee23$(_context23) {
+                  while (1) switch (_context23.prev = _context23.next) {
                     case 0:
-                      _context22.next = 2;
-                      return _this15.dbManager.clear(INDEXDB_STORE_NAME);
+                      _context23.next = 2;
+                      return _this17.dbManager.clear(INDEXDB_STORE_NAME);
                     case 2:
                     case "end":
-                      return _context22.stop();
+                      return _context23.stop();
                   }
-                }, _callee22);
+                }, _callee23);
               })));
             case 6:
               this.setStorageItem(ORDER_LAST_FULL_FETCH_AT_STORAGE_KEY, '');
               this.core.effects.emit(OrderHooks.onOrdersChanged, this.store.list);
             case 8:
             case "end":
-              return _context23.stop();
+              return _context24.stop();
           }
-        }, _callee23, this);
+        }, _callee24, this);
       }));
       function clear() {
         return _clear.apply(this, arguments);