@pisell/pisellos 2.3.62 → 2.3.64

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

@@ -41,8 +41,8 @@ import { getOrderPaymentIdentityKeys, isIdentifiedPendingOrderPayment, isPending
  * SQLite 存储名称
  */
 var INDEXDB_STORE_NAME = 'orders';
+var ORDER_STORAGE_KEY_FIELD = '__order_storage_key';
 var ORDER_LAST_FULL_FETCH_AT_STORAGE_KEY = 'server_order_last_full_fetch_at';
-var ORDER_LAST_FULL_FETCH_SHOP_ID_STORAGE_KEY = 'server_order_last_full_fetch_shop_id';
 var ORDER_SYNC_THROTTLE_MS_STORAGE_KEY = 'order_sync_throttle_ms';
 var DEFAULT_ORDER_SYNC_THROTTLE_MS = 2000;
 /** pubsub 回声写入去重窗口：业务 API 刚写入后，跳过同单 SQLite patch */
@@ -65,7 +65,6 @@ var ORDER_COLLECTION_KIND_BY_FIELD = {
   bookings: 'booking',
   payments: 'payment'
 };
-
 /**
  * Order 模块 - 基础框架
  */
@@ -701,78 +700,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "preload",
     value: function () {
       var _preload = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-        var preloadStartedAt, cachedOrders, memoryOrders, orders;
+        var orders;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              preloadStartedAt = Date.now();
-              cachedOrders = null;
-              if (!this.dbManager) {
-                _context4.next = 12;
-                break;
-              }
-              _context4.prev = 3;
-              _context4.next = 6;
-              return this.loadOrdersFromSQLite({
-                throwOnError: true
-              });
-            case 6:
-              cachedOrders = _context4.sent;
-              _context4.next = 12;
-              break;
-            case 9:
-              _context4.prev = 9;
-              _context4.t0 = _context4["catch"](3);
-              this.logWarning('preload-SQLite读取失败，回退远端全量拉取', {
-                error: _context4.t0 instanceof Error ? _context4.t0.message : String(_context4.t0)
-              });
-            case 12:
-              if (!(cachedOrders !== null && this.hasPulledOrdersToday())) {
-                _context4.next = 22;
-                break;
-              }
-              memoryOrders = this.normalizeOrdersForMemoryList(cachedOrders, 'preload.sqliteMemory');
-              this.store.list = cloneDeep(memoryOrders);
-              this.syncOrdersMap();
-              _context4.next = 18;
-              return this.core.effects.emit(OrderHooks.onOrdersLoaded, this.store.list);
-            case 18:
-              _context4.next = 20;
-              return this.emitOrdersChanged([], 'preload.sqlite');
-            case 20:
-              this.logInfo('预加载完成', {
-                trigger: 'preload',
-                source: 'SQLite',
-                orderCount: this.store.list.length,
-                duration: "".concat(Date.now() - preloadStartedAt, "ms")
-              });
-              return _context4.abrupt("return");
-            case 22:
-              _context4.next = 24;
-              return this.loadOrdersByServer({
-                trigger: 'preload'
-              });
-            case 24:
+              _context4.next = 2;
+              return this.loadOrdersByServer();
+            case 2:
               orders = _context4.sent;
               this.store.list = cloneDeep(orders);
               this.syncOrdersMap();
-              _context4.next = 29;
+              _context4.next = 7;
               return this.emitOrdersChanged([], 'preload');
-            case 29:
-              _context4.next = 31;
+            case 7:
+              _context4.next = 9;
               return this.core.effects.emit(OrderHooks.onOrdersSyncCompleted, null);
-            case 31:
-              this.logInfo('预加载完成', {
-                trigger: 'preload',
-                source: 'Server',
-                orderCount: this.store.list.length,
-                duration: "".concat(Date.now() - preloadStartedAt, "ms")
-              });
-            case 32:
+            case 9:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[3, 9]]);
+        }, _callee4, this);
       }));
       function preload() {
         return _preload.apply(this, arguments);
@@ -1105,32 +1052,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var _loadOrdersByServer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
         var _this5 = this,
           _this$store;
-        var options,
-          orderList,
-          hasFetchedRemoteSnapshot,
-          trigger,
-          protectedOrdersBeforeRemoteFetch,
-          data,
-          _yield$this$replaceOr,
-          mergedOrders,
-          isRemoteSnapshotPersisted,
-          memoryOrders,
-          _args8 = arguments;
+        var orderList, protectedOrdersBeforeRemoteFetch, data, mergedOrders, memoryOrders;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              options = _args8.length > 0 && _args8[0] !== undefined ? _args8[0] : {};
               orderList = [];
-              hasFetchedRemoteSnapshot = false;
-              trigger = options.trigger || 'unknown';
-              _context8.next = 6;
+              _context8.next = 3;
               return this.loadOrdersFromSQLite();
-            case 6:
+            case 3:
               protectedOrdersBeforeRemoteFetch = _context8.sent.filter(function (order) {
                 return _this5.shouldProtectLocalOrderFromRemoteSnapshot(order);
               });
               this.logInfo('loadOrdersByServer-开始', {
-                trigger: trigger,
                 hasOrderDataSource: !!this.orderDataSource,
                 query: ((_this$store = this.store) === null || _this$store === void 0 ? void 0 : _this$store.createdAtQuery) || null,
                 protectedLocalOrderCount: protectedOrdersBeforeRemoteFetch.length,
@@ -1139,61 +1072,51 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }, 0)
               });
               if (!this.orderDataSource) {
-                _context8.next = 23;
+                _context8.next = 20;
                 break;
               }
-              _context8.prev = 9;
-              _context8.next = 12;
+              _context8.prev = 6;
+              _context8.next = 9;
               return this.orderDataSource.run({
                 sse: {
                   query: this.store.createdAtQuery
                 }
               });
-            case 12:
+            case 9:
               data = _context8.sent;
               orderList = data || [];
               this.logInfo('loadOrdersByServer-SSE拉取成功', {
-                trigger: trigger,
                 count: orderList.length
               });
-              hasFetchedRemoteSnapshot = true;
+              this.markOrderPulledAtNow();
               this.lastServerFullFetchAtMs = Date.now();
-              _context8.next = 23;
+              _context8.next = 20;
               break;
-            case 19:
-              _context8.prev = 19;
-              _context8.t0 = _context8["catch"](9);
+            case 16:
+              _context8.prev = 16;
+              _context8.t0 = _context8["catch"](6);
               this.logInfo('loadOrdersByServer-SSE拉取失败，保持当前内存订单');
               return _context8.abrupt("return", this.store.list);
-            case 23:
-              if (hasFetchedRemoteSnapshot) {
-                this.clearOrderSnapshotMarker();
-              }
-              _context8.next = 26;
+            case 20:
+              _context8.next = 22;
               return this.replaceOrdersSnapshotInSQLite(orderList, 'loadOrdersByServer', protectedOrdersBeforeRemoteFetch);
-            case 26:
-              _yield$this$replaceOr = _context8.sent;
-              mergedOrders = _yield$this$replaceOr.orders;
-              isRemoteSnapshotPersisted = _yield$this$replaceOr.persisted;
-              if (hasFetchedRemoteSnapshot && isRemoteSnapshotPersisted) {
-                this.markOrderPulledAtNow();
-              }
+            case 22:
+              mergedOrders = _context8.sent;
               memoryOrders = this.normalizeOrdersForMemoryList(mergedOrders, 'loadOrdersByServer.memory');
               this.logInfo('loadOrdersByServer-结束', {
-                trigger: trigger,
                 count: memoryOrders.length,
                 persistedCount: mergedOrders.length,
                 sqliteOnlyDraftCount: mergedOrders.length - memoryOrders.length
               });
-              _context8.next = 34;
+              _context8.next = 27;
               return this.core.effects.emit(OrderHooks.onOrdersLoaded, memoryOrders);
-            case 34:
+            case 27:
               return _context8.abrupt("return", memoryOrders);
-            case 35:
+            case 28:
             case "end":
               return _context8.stop();
           }
-        }, _callee8, this, [[9, 19]]);
+        }, _callee8, this, [[6, 16]]);
       }));
       function loadOrdersByServer() {
         return _loadOrdersByServer.apply(this, arguments);
@@ -1209,76 +1132,53 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "silentRefresh",
     value: (function () {
       var _silentRefresh = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
-        var options,
-          startTime,
-          trigger,
-          elapsedSinceFullFetch,
-          orders,
-          errorMessage,
-          _args9 = arguments;
+        var startTime, elapsedSinceFullFetch, orders, errorMessage;
         return _regeneratorRuntime().wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              options = _args9.length > 0 && _args9[0] !== undefined ? _args9[0] : {};
               startTime = Date.now();
-              trigger = options.trigger || 'background';
               elapsedSinceFullFetch = Date.now() - this.lastServerFullFetchAtMs;
               if (!(this.lastServerFullFetchAtMs > 0 && elapsedSinceFullFetch < ORDER_SILENT_REFRESH_MIN_INTERVAL_MS)) {
-                _context9.next = 7;
+                _context9.next = 4;
                 break;
               }
-              this.logInfo('silentRefresh 跳过全量 SSE', {
-                trigger: trigger,
-                reason: 'within_min_interval',
-                minIntervalMs: ORDER_SILENT_REFRESH_MIN_INTERVAL_MS,
-                elapsedSinceFullFetchMs: elapsedSinceFullFetch,
-                orderCount: this.store.list.length
-              });
               return _context9.abrupt("return", this.store.list);
-            case 7:
-              this.logInfo('silentRefresh 开始', {
-                trigger: trigger,
-                elapsedSinceFullFetchMs: elapsedSinceFullFetch,
-                orderCount: this.store.list.length
-              });
-              _context9.prev = 8;
+            case 4:
+              this.logInfo('silentRefresh 开始');
+              _context9.prev = 5;
               // 刷新前，需要更新当前营业日边界（store.createdAtQuery）
               this.updateCreateStore();
-              _context9.next = 12;
-              return this.loadOrdersByServer({
-                trigger: trigger
-              });
-            case 12:
+              _context9.next = 9;
+              return this.loadOrdersByServer();
+            case 9:
               orders = _context9.sent;
               this.store.list = cloneDeep(orders);
               this.syncOrdersMap();
-              _context9.next = 17;
+              _context9.next = 14;
               return this.emitOrdersChanged([], 'silentRefresh');
-            case 17:
-              _context9.next = 19;
+            case 14:
+              _context9.next = 16;
               return this.core.effects.emit(OrderHooks.onOrdersSyncCompleted, null);
-            case 19:
+            case 16:
               this.logInfo('silentRefresh 完成', {
-                trigger: trigger,
                 orderCount: orders.length,
                 duration: "".concat(Date.now() - startTime, "ms")
               });
               return _context9.abrupt("return", this.store.list);
-            case 23:
-              _context9.prev = 23;
-              _context9.t0 = _context9["catch"](8);
+            case 20:
+              _context9.prev = 20;
+              _context9.t0 = _context9["catch"](5);
               errorMessage = _context9.t0 instanceof Error ? _context9.t0.message : String(_context9.t0);
               this.logError('silentRefresh 失败', {
-                trigger: trigger,
                 duration: "".concat(Date.now() - startTime, "ms"),
                 error: errorMessage
               });
               return _context9.abrupt("return", this.store.list);
-            case 28:
+            case 25:
             case "end":
               return _context9.stop();
           }
-        }, _callee9, this, [[8, 23]]);
+        }, _callee9, this, [[5, 20]]);
       }));
       function silentRefresh() {
         return _silentRefresh.apply(this, arguments);
@@ -2427,7 +2327,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _mergeOrdersToStore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(freshOrders, source) {
         var _this16 = this;
-        var storeOrderCountBefore, normalizedFreshOrders, incomingProductsHaveStableIdentity, _iterator14, _step14, order, id, rawProducts, _incomingProductsHave, allProductsHaveStableIdentity, orderIdKey, uniqueFreshOrders, uniqueFreshCount, patchedOrders, remoteProductMembershipChanges, forceWriteStorageKeys, mergeActions, existingProductsHaveStableIdentity, updatedList, identityKeyToIndex, index, identityKeys, _iterator15, _step15, key, _iterator16, _step16, fresh, freshIdentityKeys, matchIndex, storageKey, mergeKey, existingOrder, _ref, _existingOrder$order_, _ref2, _external_sale_number2, _existingOrder$paymen, _fresh$payment_status, _existingOrder$need_s, _fresh$need_sync, _ref3, _existingOrder$order_2, _ref4, _external_sale_number3, _existingOrder$is_dra, _fresh$is_draft_order, mergedOrder, freshOrderId, incomingProductsAreStable, membershipChange, mergedProductsHaveStableIdentity, adjustedMatchIndex, duplicateIndexes, _iterator17, _step17, _key2, _duplicateIndex, _iterator18, _step18, duplicateIndex, _index, _iterator19, _step19, _key, mergedStorageKey, insertIndex, insertCount, updateCount;
+        var storeOrderCountBefore, normalizedFreshOrders, incomingProductsHaveStableIdentity, _iterator14, _step14, order, id, rawProducts, _incomingProductsHave, allProductsHaveStableIdentity, orderIdKey, uniqueFreshOrders, uniqueFreshCount, patchedOrders, remoteProductMembershipChanges, forceWriteStorageKeys, storageKeyMigrations, mergeActions, existingProductsHaveStableIdentity, updatedList, identityKeyToIndex, index, identityKeys, _iterator15, _step15, key, _iterator16, _step16, fresh, freshIdentityKeys, matchIndex, storageKey, mergeKey, existingOrder, previousStorageKey, _ref, _existingOrder$order_, _ref2, _external_sale_number2, _existingOrder$paymen, _fresh$payment_status, _existingOrder$need_s, _fresh$need_sync, _ref3, _existingOrder$order_2, _ref4, _external_sale_number3, _existingOrder$is_dra, _fresh$is_draft_order, mergedOrder, freshOrderId, incomingProductsAreStable, membershipChange, mergedProductsHaveStableIdentity, adjustedMatchIndex, duplicateIndexes, _iterator17, _step17, _key2, _duplicateIndex, _iterator18, _step18, duplicateIndex, _index, _iterator19, _step19, _key, nextStorageKey, _ref5, _ref6, _mergedOrder$order_id, mergedStorageKey, insertIndex, insertCount, updateCount;
         return _regeneratorRuntime().wrap(function _callee19$(_context19) {
           while (1) switch (_context19.prev = _context19.next) {
             case 0:
@@ -2484,6 +2384,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               patchedOrders = [];
               remoteProductMembershipChanges = [];
               forceWriteStorageKeys = new Set();
+              storageKeyMigrations = [];
               mergeActions = {};
               existingProductsHaveStableIdentity = this.store.list.map(function (order) {
                 return _this16.doProductsHaveStableMembershipIdentity(order.products);
@@ -2510,11 +2411,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               }
               _iterator16 = _createForOfIteratorHelper(uniqueFreshOrders);
-              _context19.prev = 37;
+              _context19.prev = 38;
               _iterator16.s();
-            case 39:
+            case 40:
               if ((_step16 = _iterator16.n()).done) {
-                _context19.next = 96;
+                _context19.next = 100;
                 break;
               }
               fresh = _step16.value;
@@ -2523,12 +2424,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               storageKey = this.getOrderStorageKey(fresh);
               mergeKey = storageKey || (fresh.order_id !== undefined && fresh.order_id !== null ? this.getIdKey(fresh.order_id) : '');
               if (!(matchIndex >= 0)) {
-                _context19.next = 88;
+                _context19.next = 92;
                 break;
               }
               existingOrder = updatedList[matchIndex];
+              previousStorageKey = this.getPersistedOrderStorageKey(existingOrder);
               if (!(this.isPendingSyncOrder(existingOrder) && this.isRemoteEchoMergeSource(source))) {
-                _context19.next = 50;
+                _context19.next = 52;
                 break;
               }
               this.logInfo('mergeOrdersToStore-跳过 pending 订单远端覆盖', {
@@ -2541,10 +2443,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 remote_need_sync: (_fresh$need_sync = fresh.need_sync) !== null && _fresh$need_sync !== void 0 ? _fresh$need_sync : null,
                 reason: 'protect_pending_sync_order_from_remote_echo'
               });
-              return _context19.abrupt("continue", 94);
-            case 50:
+              return _context19.abrupt("continue", 98);
+            case 52:
               if (!(this.isDraftOrder(existingOrder) && this.shouldProtectDraftOrderFromIncoming(source))) {
-                _context19.next = 53;
+                _context19.next = 55;
                 break;
               }
               this.logInfo('mergeOrdersToStore-跳过 draft 订单远端覆盖', {
@@ -2555,8 +2457,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 remote_is_draft_order: (_fresh$is_draft_order = fresh.is_draft_order) !== null && _fresh$is_draft_order !== void 0 ? _fresh$is_draft_order : null,
                 reason: 'protect_draft_order_from_remote_echo'
               });
-              return _context19.abrupt("continue", 94);
-            case 53:
+              return _context19.abrupt("continue", 98);
+            case 55:
               mergedOrder = this.mergeOrderRecords(existingOrder, fresh);
               freshOrderId = fresh.order_id;
               incomingProductsAreStable = freshOrderId !== undefined && freshOrderId !== null && incomingProductsHaveStableIdentity.get(this.getIdKey(freshOrderId)) !== false;
@@ -2568,37 +2470,37 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               adjustedMatchIndex = matchIndex;
               duplicateIndexes = new Set();
               _iterator17 = _createForOfIteratorHelper(freshIdentityKeys);
-              _context19.prev = 62;
+              _context19.prev = 64;
               _iterator17.s();
-            case 64:
+            case 66:
               if ((_step17 = _iterator17.n()).done) {
-                _context19.next = 72;
+                _context19.next = 74;
                 break;
               }
               _key2 = _step17.value;
               _duplicateIndex = identityKeyToIndex.get(_key2);
               if (!(_duplicateIndex === undefined || _duplicateIndex === matchIndex)) {
-                _context19.next = 69;
+                _context19.next = 71;
                 break;
               }
-              return _context19.abrupt("continue", 70);
-            case 69:
+              return _context19.abrupt("continue", 72);
+            case 71:
               duplicateIndexes.add(_duplicateIndex);
-            case 70:
-              _context19.next = 64;
-              break;
             case 72:
-              _context19.next = 77;
+              _context19.next = 66;
               break;
             case 74:
-              _context19.prev = 74;
-              _context19.t1 = _context19["catch"](62);
+              _context19.next = 79;
+              break;
+            case 76:
+              _context19.prev = 76;
+              _context19.t1 = _context19["catch"](64);
               _iterator17.e(_context19.t1);
-            case 77:
-              _context19.prev = 77;
+            case 79:
+              _context19.prev = 79;
               _iterator17.f();
-              return _context19.finish(77);
-            case 80:
+              return _context19.finish(79);
+            case 82:
               if (duplicateIndexes.size > 0) {
                 _iterator18 = _createForOfIteratorHelper(_toConsumableArray(duplicateIndexes).sort(function (left, right) {
                   return right - left;
@@ -2632,6 +2534,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   }
                 }
               }
+              nextStorageKey = this.getOrderStorageKey(mergedOrder);
+              if (previousStorageKey && nextStorageKey && previousStorageKey !== nextStorageKey) {
+                storageKeyMigrations.push({
+                  orderId: (_ref5 = (_ref6 = (_mergedOrder$order_id = mergedOrder.order_id) !== null && _mergedOrder$order_id !== void 0 ? _mergedOrder$order_id : existingOrder.order_id) !== null && _ref6 !== void 0 ? _ref6 : fresh.order_id) !== null && _ref5 !== void 0 ? _ref5 : null,
+                  from: previousStorageKey,
+                  to: nextStorageKey
+                });
+              }
               updatedList[adjustedMatchIndex] = mergedOrder;
               existingProductsHaveStableIdentity[adjustedMatchIndex] = mergedProductsHaveStableIdentity;
               if (membershipChange) {
@@ -2644,29 +2554,29 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, adjustedMatchIndex);
               patchedOrders.push(mergedOrder);
               if (mergeKey) mergeActions[mergeKey] = 'update';
-              return _context19.abrupt("continue", 94);
-            case 88:
+              return _context19.abrupt("continue", 98);
+            case 92:
               insertIndex = updatedList.length;
               updatedList.push(fresh);
               existingProductsHaveStableIdentity.push(fresh.order_id !== undefined && fresh.order_id !== null && incomingProductsHaveStableIdentity.get(this.getIdKey(fresh.order_id)) !== false);
               this.registerOrderIdentityKeys(identityKeyToIndex, fresh, insertIndex);
               patchedOrders.push(fresh);
               if (mergeKey) mergeActions[mergeKey] = 'insert';
-            case 94:
-              _context19.next = 39;
+            case 98:
+              _context19.next = 40;
               break;
-            case 96:
-              _context19.next = 101;
+            case 100:
+              _context19.next = 105;
               break;
-            case 98:
-              _context19.prev = 98;
-              _context19.t2 = _context19["catch"](37);
+            case 102:
+              _context19.prev = 102;
+              _context19.t2 = _context19["catch"](38);
               _iterator16.e(_context19.t2);
-            case 101:
-              _context19.prev = 101;
+            case 105:
+              _context19.prev = 105;
               _iterator16.f();
-              return _context19.finish(101);
-            case 104:
+              return _context19.finish(105);
+            case 108:
               insertCount = Object.values(mergeActions).filter(function (v) {
                 return v === 'insert';
               }).length;
@@ -2682,25 +2592,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               // 仅在自检开关开启时做一次兜底校验。
               this.store.list = this.runOrderStoreSelfCheck(updatedList, "".concat(source, ".store"));
               this.syncOrdersMap();
-              _context19.next = 111;
-              return this.patchOrdersInSQLite(patchedOrders, source, mergeActions, {}, forceWriteStorageKeys);
-            case 111:
+              _context19.next = 115;
+              return this.patchOrdersInSQLite(patchedOrders, source, mergeActions, {
+                storageKeyMigrations: storageKeyMigrations
+              }, forceWriteStorageKeys);
+            case 115:
               this.logInfo('mergeOrdersToStore-结束', {
                 uniqueFreshCount: uniqueFreshCount,
                 storeOrderCountAfter: this.store.list.length,
                 insertCount: insertCount,
                 updateCount: updateCount
               });
-              _context19.next = 114;
+              _context19.next = 118;
               return this.emitRemoteProductMembershipChanges(remoteProductMembershipChanges);
-            case 114:
-              _context19.next = 116;
+            case 118:
+              _context19.next = 120;
               return this.emitOrdersChanged(patchedOrders, source);
-            case 116:
+            case 120:
             case "end":
               return _context19.stop();
           }
-        }, _callee19, this, [[6, 20, 23, 26], [37, 98, 101, 104], [62, 74, 77, 80]]);
+        }, _callee19, this, [[6, 20, 23, 26], [38, 102, 105, 108], [64, 76, 79, 82]]);
       }));
       function mergeOrdersToStore(_x13, _x14) {
         return _mergeOrdersToStore.apply(this, arguments);
@@ -2783,7 +2695,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "getRemoteProductMembershipChange",
     value: function getRemoteProductMembershipChange(existingOrder, mergedOrder, source) {
       var _this17 = this,
-        _mergedOrder$order_id;
+        _mergedOrder$order_id2;
       if (!this.isRemoteProductMembershipChangeSource(source)) return null;
       var previousProducts = Array.isArray(existingOrder.products) ? existingOrder.products : [];
       var currentProducts = Array.isArray(mergedOrder.products) ? mergedOrder.products : [];
@@ -2820,7 +2732,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (addedProductKeys.length === 0 && removedProductKeys.length === 0) {
         return null;
       }
-      var orderId = (_mergedOrder$order_id = mergedOrder.order_id) !== null && _mergedOrder$order_id !== void 0 ? _mergedOrder$order_id : existingOrder.order_id;
+      var orderId = (_mergedOrder$order_id2 = mergedOrder.order_id) !== null && _mergedOrder$order_id2 !== void 0 ? _mergedOrder$order_id2 : existingOrder.order_id;
       if (orderId === undefined || orderId === null) return null;
       return {
         order_id: orderId,
@@ -2959,6 +2871,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       return '';
     }
+  }, {
+    key: "getPersistedOrderStorageKey",
+    value: function getPersistedOrderStorageKey(order) {
+      var persistedStorageKey = order === null || order === void 0 ? void 0 : order[ORDER_STORAGE_KEY_FIELD];
+      if (persistedStorageKey !== undefined && persistedStorageKey !== null && persistedStorageKey !== '') {
+        return String(persistedStorageKey);
+      }
+      return this.getOrderStorageKey(order);
+    }
   }, {
     key: "getOrderIdentityMatchKeys",
     value: function getOrderIdentityMatchKeys(order) {
@@ -3160,10 +3081,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           if (_field2 === 'payments') {
             var preservedPending = this.getUnmatchedIdentifiedPendingPayments(existingRecord[_field2], incomingRecord[_field2]);
             if (preservedPending.length > 0) {
-              var _ref5, _existing$order_id, _ref6, _existingRecord$exter;
+              var _ref7, _existing$order_id, _ref8, _existingRecord$exter;
               this.logInfo('mergeOrderRecords-保留本地 pending 支付项', {
-                order_id: (_ref5 = (_existing$order_id = existing.order_id) !== null && _existing$order_id !== void 0 ? _existing$order_id : incoming.order_id) !== null && _ref5 !== void 0 ? _ref5 : null,
-                external_sale_number: (_ref6 = (_existingRecord$exter = existingRecord.external_sale_number) !== null && _existingRecord$exter !== void 0 ? _existingRecord$exter : incomingRecord.external_sale_number) !== null && _ref6 !== void 0 ? _ref6 : null,
+                order_id: (_ref7 = (_existing$order_id = existing.order_id) !== null && _existing$order_id !== void 0 ? _existing$order_id : incoming.order_id) !== null && _ref7 !== void 0 ? _ref7 : null,
+                external_sale_number: (_ref8 = (_existingRecord$exter = existingRecord.external_sale_number) !== null && _existingRecord$exter !== void 0 ? _existingRecord$exter : incomingRecord.external_sale_number) !== null && _ref8 !== void 0 ? _ref8 : null,
                 preserved_pending_count: preservedPending.length,
                 preserved_payment_identities: preservedPending.map(function (payment) {
                   return getOrderPaymentIdentityKeys(payment);
@@ -3216,14 +3137,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       } finally {
         _iterator28.f();
       }
-      return _toConsumableArray(groups.entries()).filter(function (_ref7) {
-        var _ref8 = _slicedToArray(_ref7, 2),
-          group = _ref8[1];
-        return group.length > 1;
-      }).slice(0, 20).map(function (_ref9) {
+      return _toConsumableArray(groups.entries()).filter(function (_ref9) {
         var _ref10 = _slicedToArray(_ref9, 2),
-          key = _ref10[0],
           group = _ref10[1];
+        return group.length > 1;
+      }).slice(0, 20).map(function (_ref11) {
+        var _ref12 = _slicedToArray(_ref11, 2),
+          key = _ref12[0],
+          group = _ref12[1];
         return {
           key: key,
           count: group.length,
@@ -3293,32 +3214,25 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     }
 
     /**
-     * 当前订单缓存可复用窗口。
-     * start_time 模式使用精确的营业日起止时间；配置缺失或异常时退化为自然日。
+     * 当前订单拉取窗口：
+     * - 优先使用 createdAtQuery.sales_time_between（已按营业日边界初始化）
+     * - 无法解析时退化为自然日窗口
      */
   }, {
-    key: "getCurrentOrderCacheWindow",
-    value: function getCurrentOrderCacheWindow() {
+    key: "getCurrentPullWindow",
+    value: function getCurrentPullWindow() {
+      var _this$store2;
       var now = dayjs();
-      try {
-        var _coreData$core;
-        var appPlugin = this.core.getPlugin('app');
-        var app = appPlugin === null || appPlugin === void 0 ? void 0 : appPlugin.getApp();
-        var coreData = app === null || app === void 0 ? void 0 : app.data.store.getStore().getDataByModel('core');
-        var boundary = coreData === null || coreData === void 0 || (_coreData$core = coreData.core) === null || _coreData$core === void 0 ? void 0 : _coreData$core.operating_day_boundary;
-        if ((boundary === null || boundary === void 0 ? void 0 : boundary.type) === 'start_time') {
-          var boundaryTime = String(boundary.time || '').trim();
-          var todayBoundary = dayjs("".concat(now.format('YYYY-MM-DD'), " ").concat(boundaryTime));
-          if (todayBoundary.isValid()) {
-            var _startAt = now.isBefore(todayBoundary) ? todayBoundary.subtract(1, 'day') : todayBoundary;
-            return {
-              startAt: _startAt,
-              endExclusiveAt: _startAt.add(1, 'day')
-            };
-          }
+      var range = (_this$store2 = this.store) === null || _this$store2 === void 0 || (_this$store2 = _this$store2.createdAtQuery) === null || _this$store2 === void 0 ? void 0 : _this$store2.sales_time_between;
+      if (Array.isArray(range) && range.length >= 2) {
+        var _startAt = dayjs(range[0]);
+        var endExclusiveAt = dayjs(range[1]);
+        if (_startAt.isValid() && endExclusiveAt.isValid() && endExclusiveAt.isAfter(_startAt)) {
+          return {
+            startAt: _startAt,
+            endExclusiveAt: endExclusiveAt
+          };
         }
-      } catch (_unused6) {
-        // 读取营业日配置失败时按自然日兜底，不影响启动。
       }
       var startAt = now.startOf('day');
       return {
@@ -3331,47 +3245,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function hasPulledOrdersToday() {
       var lastFullFetchAt = this.getStorageItem(ORDER_LAST_FULL_FETCH_AT_STORAGE_KEY);
       if (!lastFullFetchAt) return false;
-      var currentShopId = this.getCurrentShopId();
-      var lastFullFetchShopId = this.getStorageItem(ORDER_LAST_FULL_FETCH_SHOP_ID_STORAGE_KEY);
-      if (!currentShopId || !lastFullFetchShopId || currentShopId !== lastFullFetchShopId) {
-        return false;
-      }
       var parsed = dayjs(lastFullFetchAt);
       if (!parsed.isValid()) return false;
-      var _this$getCurrentOrder = this.getCurrentOrderCacheWindow(),
-        startAt = _this$getCurrentOrder.startAt,
-        endExclusiveAt = _this$getCurrentOrder.endExclusiveAt;
+
+      // 按当前拉取窗口判断，而不是自然日判断。
+      // 这样在营业日跨日边界（start_time）场景下也能正确判定是否需要重新拉取。
+      var _this$getCurrentPullW = this.getCurrentPullWindow(),
+        startAt = _this$getCurrentPullW.startAt,
+        endExclusiveAt = _this$getCurrentPullW.endExclusiveAt;
       return (parsed.isAfter(startAt) || parsed.isSame(startAt)) && parsed.isBefore(endExclusiveAt);
     }
   }, {
     key: "markOrderPulledAtNow",
     value: function markOrderPulledAtNow() {
-      var currentShopId = this.getCurrentShopId();
-      if (!currentShopId) return;
       this.setStorageItem(ORDER_LAST_FULL_FETCH_AT_STORAGE_KEY, dayjs().format('YYYY-MM-DD HH:mm:ss'));
-      this.setStorageItem(ORDER_LAST_FULL_FETCH_SHOP_ID_STORAGE_KEY, currentShopId);
-    }
-  }, {
-    key: "clearOrderSnapshotMarker",
-    value: function clearOrderSnapshotMarker() {
-      this.setStorageItem(ORDER_LAST_FULL_FETCH_AT_STORAGE_KEY, '');
-      this.setStorageItem(ORDER_LAST_FULL_FETCH_SHOP_ID_STORAGE_KEY, '');
-    }
-  }, {
-    key: "getCurrentShopId",
-    value: function getCurrentShopId() {
-      try {
-        var _coreData$core2;
-        var appPlugin = this.core.getPlugin('app');
-        var app = appPlugin === null || appPlugin === void 0 ? void 0 : appPlugin.getApp();
-        if (!app) return null;
-        var coreData = app.data.store.getStore().getDataByModel('core');
-        var shopId = coreData === null || coreData === void 0 || (_coreData$core2 = coreData.core) === null || _coreData$core2 === void 0 ? void 0 : _coreData$core2.id;
-        if (shopId === undefined || shopId === null || shopId === '') return null;
-        return String(shopId);
-      } catch (_unused7) {
-        return null;
-      }
     }
   }, {
     key: "getStorageItem",
@@ -3382,7 +3269,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         if (typeof globalThis !== 'undefined' && globalThis !== null && globalThis !== void 0 && globalThis.localStorage) {
           return globalThis.localStorage.getItem(key);
         }
-      } catch (_unused8) {
+      } catch (_unused6) {
         // 忽略存储异常，避免影响主流程
       }
       return null;
@@ -3399,7 +3286,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         if (typeof globalThis !== 'undefined' && globalThis !== null && globalThis !== void 0 && globalThis.localStorage) {
           globalThis.localStorage.setItem(key, value);
         }
-      } catch (_unused9) {
+      } catch (_unused7) {
         // 忽略存储异常，避免影响主流程
       }
     }
@@ -3408,42 +3295,33 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _loadOrdersFromSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20() {
         var _this20 = this;
-        var options,
-          orders,
-          _args20 = arguments;
+        var orders;
         return _regeneratorRuntime().wrap(function _callee20$(_context20) {
           while (1) switch (_context20.prev = _context20.next) {
             case 0:
-              options = _args20.length > 0 && _args20[0] !== undefined ? _args20[0] : {};
               if (this.dbManager) {
-                _context20.next = 3;
+                _context20.next = 2;
                 break;
               }
               return _context20.abrupt("return", []);
-            case 3:
-              _context20.prev = 3;
-              _context20.next = 6;
+            case 2:
+              _context20.prev = 2;
+              _context20.next = 5;
               return this.dbManager.getAll(INDEXDB_STORE_NAME);
-            case 6:
+            case 5:
               orders = _context20.sent;
               return _context20.abrupt("return", (orders || []).map(function (order) {
                 return _this20.normalizeOrderCollectionsForIngress(order, 'loadOrdersFromSQLite');
               }));
-            case 10:
-              _context20.prev = 10;
-              _context20.t0 = _context20["catch"](3);
-              if (!options.throwOnError) {
-                _context20.next = 14;
-                break;
-              }
-              throw _context20.t0;
-            case 14:
+            case 9:
+              _context20.prev = 9;
+              _context20.t0 = _context20["catch"](2);
               return _context20.abrupt("return", []);
-            case 15:
+            case 12:
             case "end":
               return _context20.stop();
           }
-        }, _callee20, this, [[3, 10]]);
+        }, _callee20, this, [[2, 9]]);
       }));
       function loadOrdersFromSQLite() {
         return _loadOrdersFromSQLite.apply(this, arguments);
@@ -3573,11 +3451,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         var mergeActions,
           options,
           forceWriteStorageKeys,
+          migrationTargetStorageKeys,
           ordersSnapshot,
           _this$filterRedundant2,
           toWrite,
           skipped,
           compactedToWrite,
+          writtenStorageKeys,
+          storageKeyMigrations,
+          _iterator32,
+          _step32,
+          migration,
           _args23 = arguments;
         return _regeneratorRuntime().wrap(function _callee23$(_context23) {
           while (1) switch (_context23.prev = _context23.next) {
@@ -3603,35 +3487,83 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 8:
               return _context23.abrupt("return");
             case 9:
+              migrationTargetStorageKeys = new Set((options.storageKeyMigrations || []).map(function (migration) {
+                return migration.to;
+              }));
               ordersSnapshot = cloneDeep(orders).map(function (order) {
                 return _this22.normalizeOrderCollectionsForIngress(order, "".concat(source, ".sqliteIngress"));
+              }).map(function (order) {
+                var storageKey = _this22.getOrderStorageKey(order);
+                if (!storageKey || !migrationTargetStorageKeys.has(storageKey)) return order;
+                return _objectSpread(_objectSpread({}, order), {}, _defineProperty({}, ORDER_STORAGE_KEY_FIELD, storageKey));
               }).filter(function (order) {
                 return _this22.getOrderStorageKey(order);
               });
               if (!(ordersSnapshot.length === 0)) {
-                _context23.next = 12;
+                _context23.next = 13;
                 break;
               }
               return _context23.abrupt("return");
-            case 12:
+            case 13:
               _this$filterRedundant2 = this.filterRedundantPatchOrders(source, ordersSnapshot, mergeActions, forceWriteStorageKeys), toWrite = _this$filterRedundant2.toWrite, skipped = _this$filterRedundant2.skipped;
               if (!(toWrite.length === 0)) {
-                _context23.next = 15;
+                _context23.next = 16;
                 break;
               }
               return _context23.abrupt("return");
-            case 15:
+            case 16:
               compactedToWrite = this.compactOrderListByIdentity(toWrite, "".concat(source, ".sqlitePatch")).list;
               if (!(compactedToWrite.length === 0)) {
-                _context23.next = 18;
+                _context23.next = 19;
                 break;
               }
               return _context23.abrupt("return");
-            case 18:
-              _context23.prev = 18;
-              _context23.next = 21;
+            case 19:
+              writtenStorageKeys = new Set(compactedToWrite.map(function (order) {
+                return _this22.getOrderStorageKey(order);
+              }).filter(Boolean));
+              storageKeyMigrations = new Map();
+              _iterator32 = _createForOfIteratorHelper(options.storageKeyMigrations || []);
+              _context23.prev = 22;
+              _iterator32.s();
+            case 24:
+              if ((_step32 = _iterator32.n()).done) {
+                _context23.next = 33;
+                break;
+              }
+              migration = _step32.value;
+              if (writtenStorageKeys.has(migration.to)) {
+                _context23.next = 28;
+                break;
+              }
+              return _context23.abrupt("continue", 31);
+            case 28:
+              if (!writtenStorageKeys.has(migration.from)) {
+                _context23.next = 30;
+                break;
+              }
+              return _context23.abrupt("continue", 31);
+            case 30:
+              storageKeyMigrations.set(migration.from, migration);
+            case 31:
+              _context23.next = 24;
+              break;
+            case 33:
+              _context23.next = 38;
+              break;
+            case 35:
+              _context23.prev = 35;
+              _context23.t0 = _context23["catch"](22);
+              _iterator32.e(_context23.t0);
+            case 38:
+              _context23.prev = 38;
+              _iterator32.f();
+              return _context23.finish(38);
+            case 41:
+              _context23.prev = 41;
+              _context23.next = 44;
               return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22() {
-                var writeMethod, _iterator32, _step32, order;
+                var writeMethod, _iterator33, _step33, order, _iterator34, _step34, migration, _iterator35, _step35, _orderRecord$ORDER_ST, _order, orderRecord;
                 return _regeneratorRuntime().wrap(function _callee22$(_context22) {
                   while (1) switch (_context22.prev = _context22.next) {
                     case 0:
@@ -3668,15 +3600,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                         break;
                       }
                       writeMethod = 'update';
-                      _iterator32 = _createForOfIteratorHelper(compactedToWrite);
+                      _iterator33 = _createForOfIteratorHelper(compactedToWrite);
                       _context22.prev = 17;
-                      _iterator32.s();
+                      _iterator33.s();
                     case 19:
-                      if ((_step32 = _iterator32.n()).done) {
+                      if ((_step33 = _iterator33.n()).done) {
                         _context22.next = 25;
                         break;
                       }
-                      order = _step32.value;
+                      order = _step33.value;
                       _context22.next = 23;
                       return _this22.dbManager.update(INDEXDB_STORE_NAME, order);
                     case 23:
@@ -3688,10 +3620,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                     case 27:
                       _context22.prev = 27;
                       _context22.t0 = _context22["catch"](17);
-                      _iterator32.e(_context22.t0);
+                      _iterator33.e(_context22.t0);
                     case 30:
                       _context22.prev = 30;
-                      _iterator32.f();
+                      _iterator33.f();
                       return _context22.finish(30);
                     case 33:
                       _context22.next = 37;
@@ -3704,38 +3636,121 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       throw new Error('订单 SQLite 数据库不支持写入');
                     case 37:
                       _this22.recordRecentSqliteWrite(source, compactedToWrite);
+                      if (!(writeMethod !== 'none')) {
+                        _context22.next = 84;
+                        break;
+                      }
+                      _iterator34 = _createForOfIteratorHelper(storageKeyMigrations.values());
+                      _context22.prev = 40;
+                      _iterator34.s();
+                    case 42:
+                      if ((_step34 = _iterator34.n()).done) {
+                        _context22.next = 76;
+                        break;
+                      }
+                      migration = _step34.value;
+                      _context22.prev = 44;
+                      _context22.next = 47;
+                      return _this22.dbManager.delete(INDEXDB_STORE_NAME, migration.from);
+                    case 47:
+                      _this22.recentSqliteWriteByStorageKey.delete(migration.from);
+                      _iterator35 = _createForOfIteratorHelper(orders);
+                      _context22.prev = 49;
+                      _iterator35.s();
+                    case 51:
+                      if ((_step35 = _iterator35.n()).done) {
+                        _context22.next = 61;
+                        break;
+                      }
+                      _order = _step35.value;
+                      if (!(_this22.getOrderStorageKey(_order) !== migration.to)) {
+                        _context22.next = 55;
+                        break;
+                      }
+                      return _context22.abrupt("continue", 59);
+                    case 55:
+                      orderRecord = _order;
+                      if (!(String((_orderRecord$ORDER_ST = orderRecord[ORDER_STORAGE_KEY_FIELD]) !== null && _orderRecord$ORDER_ST !== void 0 ? _orderRecord$ORDER_ST : '') !== migration.from)) {
+                        _context22.next = 58;
+                        break;
+                      }
+                      return _context22.abrupt("continue", 59);
+                    case 58:
+                      orderRecord[ORDER_STORAGE_KEY_FIELD] = migration.to;
+                    case 59:
+                      _context22.next = 51;
+                      break;
+                    case 61:
+                      _context22.next = 66;
+                      break;
+                    case 63:
+                      _context22.prev = 63;
+                      _context22.t1 = _context22["catch"](49);
+                      _iterator35.e(_context22.t1);
+                    case 66:
+                      _context22.prev = 66;
+                      _iterator35.f();
+                      return _context22.finish(66);
+                    case 69:
+                      _context22.next = 74;
+                      break;
+                    case 71:
+                      _context22.prev = 71;
+                      _context22.t2 = _context22["catch"](44);
+                      _this22.logError('删除订单旧 SQLite storage key 失败', {
+                        source: source,
+                        order_id: migration.orderId,
+                        oldStorageKey: migration.from,
+                        newStorageKey: migration.to,
+                        error: _context22.t2 instanceof Error ? _context22.t2.message : String(_context22.t2)
+                      });
+                    case 74:
+                      _context22.next = 42;
+                      break;
+                    case 76:
+                      _context22.next = 81;
+                      break;
+                    case 78:
+                      _context22.prev = 78;
+                      _context22.t3 = _context22["catch"](40);
+                      _iterator34.e(_context22.t3);
+                    case 81:
+                      _context22.prev = 81;
+                      _iterator34.f();
+                      return _context22.finish(81);
+                    case 84:
                       _this22.logInfo('patchOrdersInSQLite-完成', {
                         source: source,
                         count: compactedToWrite.length,
                         writeMethod: writeMethod,
                         dedupedCount: skipped.length
                       });
-                    case 39:
+                    case 85:
                     case "end":
                       return _context22.stop();
                   }
-                }, _callee22, null, [[17, 27, 30, 33]]);
+                }, _callee22, null, [[17, 27, 30, 33], [40, 78, 81, 84], [44, 71], [49, 63, 66, 69]]);
               })));
-            case 21:
-              _context23.next = 28;
+            case 44:
+              _context23.next = 51;
               break;
-            case 23:
-              _context23.prev = 23;
-              _context23.t0 = _context23["catch"](18);
+            case 46:
+              _context23.prev = 46;
+              _context23.t1 = _context23["catch"](41);
               this.logError('增量保存订单到 SQLite 失败', {
-                error: _context23.t0 instanceof Error ? _context23.t0.message : String(_context23.t0),
+                error: _context23.t1 instanceof Error ? _context23.t1.message : String(_context23.t1),
                 orderCount: ordersSnapshot.length
               });
               if (!options.throwOnError) {
-                _context23.next = 28;
+                _context23.next = 51;
                 break;
               }
-              throw _context23.t0;
-            case 28:
+              throw _context23.t1;
+            case 51:
             case "end":
               return _context23.stop();
           }
-        }, _callee23, this, [[18, 23]]);
+        }, _callee23, this, [[22, 35, 38, 41], [41, 46]]);
       }));
       function patchOrdersInSQLite(_x16, _x17) {
         return _patchOrdersInSQLite.apply(this, arguments);
@@ -3883,7 +3898,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
      * 用于 SSE 全量拉取与营业日窗口裁剪。
      *
      * @example
-     * const { orders, persisted } = await this.replaceOrdersSnapshotInSQLite(orderList, 'refresh')
+     * await this.replaceOrdersSnapshotInSQLite(orderList)
      */
     )
   }, {
@@ -3894,7 +3909,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         var protectedOrdersBeforeRemoteFetch,
           remoteSnapshot,
           mergedSnapshot,
-          persisted,
           _args27 = arguments;
         return _regeneratorRuntime().wrap(function _callee27$(_context27) {
           while (1) switch (_context27.prev = _context27.next) {
@@ -3904,12 +3918,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 _context27.next = 3;
                 break;
               }
-              return _context27.abrupt("return", {
-                orders: this.compactOrderListByIdentity(orderList.map(function (order) {
-                  return _this24.normalizeRemoteSyncedOrder(order);
-                }), "".concat(source, ".snapshotNoDb")).list,
-                persisted: false
-              });
+              return _context27.abrupt("return", this.compactOrderListByIdentity(orderList.map(function (order) {
+                return _this24.normalizeRemoteSyncedOrder(order);
+              }), "".concat(source, ".snapshotNoDb")).list);
             case 3:
               remoteSnapshot = cloneDeep(orderList).map(function (order) {
                 return _this24.normalizeOrderCollectionsForIngress(order, "".concat(source, ".remoteIngress"));
@@ -3917,11 +3928,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               mergedSnapshot = this.compactOrderListByIdentity(remoteSnapshot.map(function (order) {
                 return _this24.normalizeRemoteSyncedOrder(order);
               }), "".concat(source, ".remoteSnapshot")).list;
-              persisted = false;
-              _context27.prev = 6;
-              _context27.next = 9;
+              _context27.prev = 5;
+              _context27.next = 8;
               return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26() {
-                var existingOrders, protectedLocalOrders, _iterator33, _step33, rawCurrentOrder, currentOrder, protectedIndex, currentNeedsProtection, orderListSnapshot;
+                var existingOrders, protectedLocalOrders, _iterator36, _step36, rawCurrentOrder, currentOrder, protectedIndex, currentNeedsProtection, orderListSnapshot;
                 return _regeneratorRuntime().wrap(function _callee26$(_context26) {
                   while (1) switch (_context26.prev = _context26.next) {
                     case 0:
@@ -3944,15 +3954,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       }).filter(function (order) {
                         return _this24.shouldProtectLocalOrderFromRemoteSnapshot(order);
                       });
-                      _iterator33 = _createForOfIteratorHelper(existingOrders || []);
+                      _iterator36 = _createForOfIteratorHelper(existingOrders || []);
                       _context26.prev = 10;
-                      _iterator33.s();
+                      _iterator36.s();
                     case 12:
-                      if ((_step33 = _iterator33.n()).done) {
+                      if ((_step36 = _iterator36.n()).done) {
                         _context26.next = 23;
                         break;
                       }
-                      rawCurrentOrder = _step33.value;
+                      rawCurrentOrder = _step36.value;
                       currentOrder = _this24.normalizeOrderCollectionsForIngress(rawCurrentOrder, "".concat(source, ".currentSQLite"));
                       protectedIndex = _this24.findOrderIndexByIdentity(protectedLocalOrders, currentOrder);
                       currentNeedsProtection = _this24.shouldProtectLocalOrderFromRemoteSnapshot(currentOrder);
@@ -3977,10 +3987,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                     case 25:
                       _context26.prev = 25;
                       _context26.t1 = _context26["catch"](10);
-                      _iterator33.e(_context26.t1);
+                      _iterator36.e(_context26.t1);
                     case 28:
                       _context26.prev = 28;
-                      _iterator33.f();
+                      _iterator36.f();
                       return _context26.finish(28);
                     case 31:
                       orderListSnapshot = _this24.mergeRemoteSnapshotWithPendingOrders(remoteSnapshot, protectedLocalOrders);
@@ -4032,27 +4042,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   }
                 }, _callee26, null, [[10, 25, 28, 31]]);
               })));
-            case 9:
-              persisted = true;
-              _context27.next = 15;
+            case 8:
+              _context27.next = 13;
               break;
-            case 12:
-              _context27.prev = 12;
-              _context27.t0 = _context27["catch"](6);
+            case 10:
+              _context27.prev = 10;
+              _context27.t0 = _context27["catch"](5);
               this.logError('全量保存订单到 SQLite 失败', {
                 error: _context27.t0 instanceof Error ? _context27.t0.message : String(_context27.t0),
                 orderList: remoteSnapshot.length
               });
-            case 15:
-              return _context27.abrupt("return", {
-                orders: mergedSnapshot,
-                persisted: persisted
-              });
-            case 16:
+            case 13:
+              return _context27.abrupt("return", mergedSnapshot);
+            case 14:
             case "end":
               return _context27.stop();
           }
-        }, _callee27, this, [[6, 12]]);
+        }, _callee27, this, [[5, 10]]);
       }));
       function replaceOrdersSnapshotInSQLite(_x20, _x21) {
         return _replaceOrdersSnapshotInSQLite.apply(this, arguments);
@@ -4094,7 +4100,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }, _callee28);
               })));
             case 5:
-              this.clearOrderSnapshotMarker();
+              this.setStorageItem(ORDER_LAST_FULL_FETCH_AT_STORAGE_KEY, '');
               this.emitOrdersChanged([], 'clear');
             case 7:
             case "end":