@pisell/pisellos 2.3.28 → 2.3.30

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

@@ -33,7 +33,9 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { cloneDeep } from 'lodash-es';
 import dayjs from 'dayjs';
 import { BaseModule } from "../../../modules/BaseModule";
+import { applyOrderCollectionUidRemaps, getOrderCollectionPersistentId, getOrderCollectionReferenceUid, getOrderCollectionUid, isSameOrderCollectionItem, mergeOrderCollectionItems, normalizeOrderCollections } from "../../../modules/Order/utils/orderCollectionIdentity";
 import { OrderHooks } from "./types";
+import { mergeOrderPaymentListsByIdentity, mergeOrderPaymentRecord, resolveOrderPaymentIdentity } from "../../../modules/Order/payment-utils";
 
 /**
  * SQLite 存储名称
@@ -47,7 +49,7 @@ var ORDER_SQLITE_DEDUPE_MS = 15000;
 /** silentRefresh 最小间隔，避免 preload 后立即全量重拉 */
 var ORDER_SILENT_REFRESH_MIN_INTERVAL_MS = 30000;
 /** 视为「业务侧刚写入」的来源，pubsub 回声可跳过 SQLite */
-var ORDER_BUSINESS_WRITE_SOURCES = new Set(['upsertOrdersFromRemote', 'upsertPendingSyncOrders', 'overwriteExistingOrder', 'markOrderSyncedByExternalSaleNumber']);
+var ORDER_BUSINESS_WRITE_SOURCES = new Set(['upsertOrdersFromRemote', 'upsertPendingSyncOrders', 'upsertLocalDraftOrders', 'overwriteExistingOrder', 'markOrderSyncedByExternalSaleNumber', 'updateLocalPayment']);
 
 /**
  * 合并热路径全表去重自检开关：默认关闭。
@@ -55,6 +57,12 @@ var ORDER_BUSINESS_WRITE_SOURCES = new Set(['upsertOrdersFromRemote', 'upsertPen
  * 仅用于排查增量身份索引是否遗漏了重复订单，不应在生产常开。
  */
 var ORDER_MERGE_SELF_CHECK = false;
+var ORDER_AUTHORITATIVE_COLLECTION_FIELDS = ['products', 'bookings', 'payments'];
+var ORDER_COLLECTION_KIND_BY_FIELD = {
+  products: 'product',
+  bookings: 'booking',
+  payments: 'payment'
+};
 
 /**
  * Order 模块 - 基础框架
@@ -233,6 +241,104 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
     }
 
+    /**
+     * 在订单进入内存或 SQLite 前统一压缩子项强身份重复并补齐协议 UID。
+     * 仅记录计数与订单标识，不输出商品、预约、支付或客户明细。
+     */
+  }, {
+    key: "normalizeOrderCollectionsForIngress",
+    value: function normalizeOrderCollectionsForIngress(order, source) {
+      var result = normalizeOrderCollections(order);
+      var kinds = ['product', 'booking', 'payment'];
+      var hasChanges = kinds.some(function (kind) {
+        var stats = result.stats[kind];
+        return stats.backfilledUidCount > 0 || stats.collapsedDuplicateCount > 0 || stats.uidConflictCount > 0 || stats.anonymousRowCount > 0;
+      });
+      if (hasChanges) {
+        var _order$order_id, _external_sale_number;
+        var summarize = function summarize(stats) {
+          return {
+            backfilled_uid_count: stats.backfilledUidCount,
+            collapsed_duplicate_count: stats.collapsedDuplicateCount,
+            uid_conflict_count: stats.uidConflictCount,
+            anonymous_row_count: stats.anonymousRowCount
+          };
+        };
+        var context = {
+          source: source,
+          order_id: (_order$order_id = order === null || order === void 0 ? void 0 : order.order_id) !== null && _order$order_id !== void 0 ? _order$order_id : null,
+          external_sale_number: (_external_sale_number = order === null || order === void 0 ? void 0 : order.external_sale_number) !== null && _external_sale_number !== void 0 ? _external_sale_number : null,
+          products: summarize(result.stats.product),
+          bookings: summarize(result.stats.booking),
+          payments: summarize(result.stats.payment)
+        };
+        var hasUnsafeIdentity = kinds.some(function (kind) {
+          var stats = result.stats[kind];
+          return stats.uidConflictCount > 0 || stats.anonymousRowCount > 0;
+        });
+        if (hasUnsafeIdentity) {
+          this.logWarning('订单子项身份存在冲突或匿名行', context);
+        } else {
+          this.logInfo('订单子项身份已规范化', context);
+        }
+      }
+      return result.order;
+    }
+
+    /**
+     * incoming 决定权威成员集合；同一持久化行仍从 existing 补齐 incoming 省略的本地展示字段。
+     */
+  }, {
+    key: "mergeAuthoritativeOrderCollection",
+    value: function mergeAuthoritativeOrderCollection(field, existing, incoming) {
+      var uidRemaps = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
+      var kind = ORDER_COLLECTION_KIND_BY_FIELD[field];
+      var existingItems = Array.isArray(existing) ? existing : [];
+      return incoming.map(function (incomingItem) {
+        var existingItem = existingItems.find(function (item) {
+          return isSameOrderCollectionItem(kind, item, incomingItem);
+        });
+        if (!existingItem) return cloneDeep(incomingItem);
+        var mergedItem = mergeOrderCollectionItems(kind, existingItem, incomingItem);
+        var mergedUid = getOrderCollectionUid(kind, mergedItem);
+        if (mergedUid) {
+          var _iterator = _createForOfIteratorHelper(new Set([getOrderCollectionReferenceUid(kind, existingItem), getOrderCollectionReferenceUid(kind, incomingItem)])),
+            _step;
+          try {
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              var from = _step.value;
+              if (!from || from === mergedUid) continue;
+              uidRemaps.push({
+                kind: kind,
+                from: from,
+                to: mergedUid,
+                persistentId: getOrderCollectionPersistentId(kind, incomingItem) || getOrderCollectionPersistentId(kind, existingItem)
+              });
+            }
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
+          }
+        }
+        return mergedItem;
+      });
+    }
+  }, {
+    key: "reconcileOverwriteOrderCollections",
+    value: function reconcileOverwriteOrderCollections(existing, incoming) {
+      var reconciled = cloneDeep(incoming);
+      var existingRecord = existing;
+      var incomingRecord = incoming;
+      var uidRemaps = [];
+      for (var _i = 0, _ORDER_AUTHORITATIVE_ = ORDER_AUTHORITATIVE_COLLECTION_FIELDS; _i < _ORDER_AUTHORITATIVE_.length; _i++) {
+        var field = _ORDER_AUTHORITATIVE_[_i];
+        if (!Array.isArray(incomingRecord[field])) continue;
+        reconciled[field] = this.mergeAuthoritativeOrderCollection(field, existingRecord[field], incomingRecord[field], uidRemaps);
+      }
+      return this.normalizeOrderCollectionsForIngress(applyOrderCollectionUidRemaps(reconciled, uidRemaps), 'overwriteExistingOrder.reconciled');
+    }
+
     /**
      * 记录订单最近一次 SQLite 写入，供 pubsub 回声去重使用。
      *
@@ -243,11 +349,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "recordRecentSqliteWrite",
     value: function recordRecentSqliteWrite(source, orders) {
       var now = Date.now();
-      var _iterator = _createForOfIteratorHelper(orders),
-        _step;
+      var _iterator2 = _createForOfIteratorHelper(orders),
+        _step2;
       try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var order = _step.value;
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var order = _step2.value;
           var storageKey = this.getOrderStorageKey(order);
           if (!storageKey) continue;
           this.recentSqliteWriteByStorageKey.set(storageKey, {
@@ -256,9 +362,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           });
         }
       } catch (err) {
-        _iterator.e(err);
+        _iterator2.e(err);
       } finally {
-        _iterator.f();
+        _iterator2.f();
       }
     }
 
@@ -281,11 +387,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var now = Date.now();
       var toWrite = [];
       var skipped = [];
-      var _iterator2 = _createForOfIteratorHelper(orders),
-        _step2;
+      var _iterator3 = _createForOfIteratorHelper(orders),
+        _step3;
       try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var order = _step2.value;
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var order = _step3.value;
           var storageKey = this.getOrderStorageKey(order);
           if (!storageKey) {
             toWrite.push(order);
@@ -301,9 +407,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
           var recent = this.recentSqliteWriteByStorageKey.get(storageKey);
           if (recent && ORDER_BUSINESS_WRITE_SOURCES.has(recent.source) && now - recent.ts < ORDER_SQLITE_DEDUPE_MS) {
-            var _order$order_id;
+            var _order$order_id2;
             skipped.push({
-              orderId: (_order$order_id = order.order_id) !== null && _order$order_id !== void 0 ? _order$order_id : null,
+              orderId: (_order$order_id2 = order.order_id) !== null && _order$order_id2 !== void 0 ? _order$order_id2 : null,
               storageKey: storageKey,
               reason: 'skip_pubsub_echo_after_business_write',
               lastSource: recent.source,
@@ -314,9 +420,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           toWrite.push(order);
         }
       } catch (err) {
-        _iterator2.e(err);
+        _iterator3.e(err);
       } finally {
-        _iterator2.f();
+        _iterator3.f();
       }
       return {
         toWrite: toWrite,
@@ -336,11 +442,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var now = Date.now();
       var toFetch = [];
       var skipped = [];
-      var _iterator3 = _createForOfIteratorHelper(ids),
-        _step3;
+      var _iterator4 = _createForOfIteratorHelper(ids),
+        _step4;
       try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          var id = _step3.value;
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var id = _step4.value;
           var existing = this.getOrderByOrderId(id);
           if (!existing) {
             toFetch.push(id);
@@ -359,9 +465,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           toFetch.push(id);
         }
       } catch (err) {
-        _iterator3.e(err);
+        _iterator4.e(err);
       } finally {
-        _iterator3.f();
+        _iterator4.f();
       }
       return {
         toFetch: toFetch,
@@ -575,6 +681,29 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function getOrderByOrderId(orderId) {
       return this.store.map.get(this.getIdKey(orderId));
     }
+  }, {
+    key: "buildLocalPaymentOrderLogContext",
+    value: function buildLocalPaymentOrderLogContext(order) {
+      var _order$order_id3, _order$external_sale_, _order$order_number, _order$shop_order_num, _order$shop_full_orde, _order$status, _order$payment_status, _order$platform, _order$business_code, _order$order_sales_ch, _order$sales_channel, _order$type;
+      if (!order) return {};
+      return {
+        order_id: (_order$order_id3 = order.order_id) !== null && _order$order_id3 !== void 0 ? _order$order_id3 : null,
+        external_sale_number: (_order$external_sale_ = order.external_sale_number) !== null && _order$external_sale_ !== void 0 ? _order$external_sale_ : null,
+        order_number: (_order$order_number = order.order_number) !== null && _order$order_number !== void 0 ? _order$order_number : null,
+        shop_order_number: (_order$shop_order_num = order.shop_order_number) !== null && _order$shop_order_num !== void 0 ? _order$shop_order_num : null,
+        shop_full_order_number: (_order$shop_full_orde = order.shop_full_order_number) !== null && _order$shop_full_orde !== void 0 ? _order$shop_full_orde : null,
+        order_status: (_order$status = order.status) !== null && _order$status !== void 0 ? _order$status : null,
+        payment_status: (_order$payment_status = order.payment_status) !== null && _order$payment_status !== void 0 ? _order$payment_status : null,
+        is_draft_order: Number(order.is_draft_order || 0),
+        need_sync: Number(order.need_sync || 0),
+        platform: (_order$platform = order.platform) !== null && _order$platform !== void 0 ? _order$platform : null,
+        business_code: (_order$business_code = order.business_code) !== null && _order$business_code !== void 0 ? _order$business_code : null,
+        order_sales_channel: (_order$order_sales_ch = order.order_sales_channel) !== null && _order$order_sales_ch !== void 0 ? _order$order_sales_ch : null,
+        sales_channel: (_order$sales_channel = order.sales_channel) !== null && _order$sales_channel !== void 0 ? _order$sales_channel : null,
+        order_type: (_order$type = order.type) !== null && _order$type !== void 0 ? _order$type : null,
+        payments_count: Array.isArray(order.payments) ? order.payments.length : 0
+      };
+    }
   }, {
     key: "getLocalOrderFromMemoryByLookup",
     value: function getLocalOrderFromMemoryByLookup(lookup) {
@@ -592,46 +721,83 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _getLocalOrderByLookup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(lookup) {
         var _this6 = this;
-        var key, memoryOrderById, memoryOrder, orders, localOrder;
+        var options,
+          key,
+          logContext,
+          memoryOrderById,
+          memoryOrder,
+          orders,
+          localOrder,
+          normalizedOrder,
+          _args5 = arguments;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
+              options = _args5.length > 1 && _args5[1] !== undefined ? _args5[1] : {};
               key = this.getIdKey(lookup);
+              logContext = {
+                operation_id: options.operationId,
+                lookup: key,
+                memory_order_count: this.store.list.length
+              };
+              if (options.operationId) {
+                this.logInfo('getLocalOrderByLookup-localPayment-开始', logContext);
+              }
               memoryOrderById = this.store.map.get(key);
               if (!memoryOrderById) {
-                _context5.next = 4;
+                _context5.next = 8;
                 break;
               }
+              if (options.operationId) {
+                this.logInfo('getLocalOrderByLookup-localPayment-命中内存映射', _objectSpread(_objectSpread({}, logContext), this.buildLocalPaymentOrderLogContext(memoryOrderById)));
+              }
               return _context5.abrupt("return", memoryOrderById);
-            case 4:
+            case 8:
               memoryOrder = this.store.list.find(function (order) {
                 return _this6.isOrderLookupMatch(order, key);
               });
               if (!memoryOrder) {
-                _context5.next = 7;
+                _context5.next = 12;
                 break;
               }
+              if (options.operationId) {
+                this.logInfo('getLocalOrderByLookup-localPayment-命中内存列表', _objectSpread(_objectSpread({}, logContext), this.buildLocalPaymentOrderLogContext(memoryOrder)));
+              }
               return _context5.abrupt("return", memoryOrder);
-            case 7:
-              _context5.next = 9;
+            case 12:
+              if (options.operationId) {
+                this.logInfo('getLocalOrderByLookup-localPayment-开始读取SQLite', logContext);
+              }
+              _context5.next = 15;
               return this.loadOrdersFromSQLite();
-            case 9:
+            case 15:
               orders = _context5.sent;
               localOrder = orders.find(function (order) {
                 return _this6.isOrderLookupMatch(order, key);
               });
               if (localOrder) {
-                _context5.next = 13;
+                _context5.next = 20;
                 break;
               }
+              if (options.operationId) {
+                this.logWarning('getLocalOrderByLookup-localPayment-SQLite未命中', _objectSpread(_objectSpread({}, logContext), {}, {
+                  sqlite_order_count: orders.length
+                }));
+              }
               return _context5.abrupt("return", null);
-            case 13:
+            case 20:
               this.store.list = orders.map(function (order) {
                 return _this6.normalizeOrderForMemoryList(order);
               });
               this.syncOrdersMap();
-              return _context5.abrupt("return", this.normalizeOrderForMemoryList(localOrder));
-            case 16:
+              normalizedOrder = this.normalizeOrderForMemoryList(localOrder);
+              if (options.operationId) {
+                this.logInfo('getLocalOrderByLookup-localPayment-SQLite命中', _objectSpread(_objectSpread({}, logContext), {}, {
+                  sqlite_order_count: orders.length
+                }, this.buildLocalPaymentOrderLogContext(normalizedOrder)));
+              }
+              return _context5.abrupt("return", normalizedOrder);
+            case 25:
             case "end":
               return _context5.stop();
           }
@@ -642,15 +808,186 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       return getLocalOrderByLookup;
     }()
+  }, {
+    key: "getLocalPayment",
+    value: function () {
+      var _getLocalPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(params) {
+        var logContext, order, payments, match;
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
+            case 0:
+              logContext = {
+                operation_id: params.operationId,
+                sale_id: params.saleId,
+                payment_number: params.paymentNumber
+              };
+              this.logInfo('getLocalPayment-开始', logContext);
+              _context6.prev = 2;
+              _context6.next = 5;
+              return this.getLocalOrderByLookup(params.saleId, {
+                operationId: params.operationId
+              });
+            case 5:
+              order = _context6.sent;
+              if (order) {
+                _context6.next = 9;
+                break;
+              }
+              this.logWarning('getLocalPayment-订单未命中', logContext);
+              return _context6.abrupt("return", null);
+            case 9:
+              payments = order.payments || [];
+              match = resolveOrderPaymentIdentity(payments, params.paymentNumber, 'compat');
+              if (match) {
+                _context6.next = 14;
+                break;
+              }
+              this.logWarning('getLocalPayment-支付项未命中', _objectSpread(_objectSpread(_objectSpread({}, logContext), this.buildLocalPaymentOrderLogContext(order)), {}, {
+                payments: payments
+              }));
+              return _context6.abrupt("return", null);
+            case 14:
+              this.logInfo('getLocalPayment-支付项命中', _objectSpread(_objectSpread(_objectSpread({}, logContext), this.buildLocalPaymentOrderLogContext(order)), {}, {
+                matched_by: match.matchedBy,
+                payment_index: match.index,
+                payment: match.payment
+              }));
+              return _context6.abrupt("return", {
+                order: order,
+                payment: match.payment,
+                paymentIndex: match.index,
+                matchedBy: match.matchedBy
+              });
+            case 18:
+              _context6.prev = 18;
+              _context6.t0 = _context6["catch"](2);
+              this.logError('getLocalPayment-查询失败', _objectSpread(_objectSpread({}, logContext), {}, {
+                error: _context6.t0 instanceof Error ? _context6.t0.message : String(_context6.t0)
+              }));
+              throw _context6.t0;
+            case 22:
+            case "end":
+              return _context6.stop();
+          }
+        }, _callee6, this, [[2, 18]]);
+      }));
+      function getLocalPayment(_x4) {
+        return _getLocalPayment.apply(this, arguments);
+      }
+      return getLocalPayment;
+    }()
+  }, {
+    key: "updateLocalPayment",
+    value: function () {
+      var _updateLocalPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(params) {
+        var logContext, found, previousPayment, nextPayment, nextOrder, paymentContext, targetIndex, previousList, storageOrder, _storageOrder$order_i, _storageOrder$order_i2, _storageOrder$order_i3;
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
+            case 0:
+              logContext = {
+                operation_id: params.operationId,
+                sale_id: params.saleId,
+                payment_number: params.paymentNumber,
+                incoming_payment_update: params.updates
+              };
+              this.logInfo('updateLocalPayment-开始', logContext);
+              _context7.next = 4;
+              return this.getLocalPayment(params);
+            case 4:
+              found = _context7.sent;
+              if (found) {
+                _context7.next = 8;
+                break;
+              }
+              this.logWarning('updateLocalPayment-支付项未命中', logContext);
+              return _context7.abrupt("return", null);
+            case 8:
+              previousPayment = cloneDeep(found.payment);
+              nextPayment = mergeOrderPaymentRecord(found.payment, _objectSpread(_objectSpread({}, params.updates), {}, {
+                updated_at: params.updates.updated_at || dayjs().format('YYYY-MM-DD HH:mm:ss')
+              }));
+              nextOrder = _objectSpread(_objectSpread({}, found.order), {}, {
+                payments: (found.order.payments || []).map(function (payment, index) {
+                  return index === found.paymentIndex ? nextPayment : payment;
+                }),
+                updated_at: dayjs().format('YYYY-MM-DD HH:mm:ss')
+              });
+              paymentContext = _objectSpread(_objectSpread(_objectSpread({}, logContext), {}, {
+                matched_by: found.matchedBy,
+                payment_index: found.paymentIndex
+              }, this.buildLocalPaymentOrderLogContext(nextOrder)), {}, {
+                previous_payment: previousPayment,
+                payment: nextPayment
+              });
+              this.logInfo('updateLocalPayment-支付项合并完成', paymentContext);
+              targetIndex = this.findOrderIndexByIdentity(this.store.list, found.order);
+              if (!(targetIndex < 0)) {
+                _context7.next = 17;
+                break;
+              }
+              this.logError('updateLocalPayment-订单Store索引未命中', paymentContext);
+              return _context7.abrupt("return", null);
+            case 17:
+              previousList = this.store.list;
+              this.store.list = this.store.list.map(function (order, index) {
+                return index === targetIndex ? nextOrder : order;
+              });
+              this.syncOrdersMap();
+              storageOrder = this.withoutSyntheticDraftOrderId(nextOrder);
+              _context7.prev = 21;
+              this.logInfo('updateLocalPayment-SQLite写入开始', _objectSpread(_objectSpread({}, paymentContext), {}, {
+                storage_order_id: (_storageOrder$order_i = storageOrder.order_id) !== null && _storageOrder$order_i !== void 0 ? _storageOrder$order_i : null
+              }));
+              _context7.next = 25;
+              return this.updateOrderInSQLite(storageOrder, 'updateLocalPayment', {
+                throwOnError: true
+              });
+            case 25:
+              this.logInfo('updateLocalPayment-SQLite写入完成', _objectSpread(_objectSpread({}, paymentContext), {}, {
+                storage_order_id: (_storageOrder$order_i2 = storageOrder.order_id) !== null && _storageOrder$order_i2 !== void 0 ? _storageOrder$order_i2 : null
+              }));
+              _context7.next = 34;
+              break;
+            case 28:
+              _context7.prev = 28;
+              _context7.t0 = _context7["catch"](21);
+              this.store.list = previousList;
+              this.syncOrdersMap();
+              this.logError('updateLocalPayment-SQLite写入失败并回滚内存', _objectSpread(_objectSpread({}, paymentContext), {}, {
+                storage_order_id: (_storageOrder$order_i3 = storageOrder.order_id) !== null && _storageOrder$order_i3 !== void 0 ? _storageOrder$order_i3 : null,
+                error: _context7.t0 instanceof Error ? _context7.t0.message : String(_context7.t0)
+              }));
+              throw _context7.t0;
+            case 34:
+              _context7.next = 36;
+              return this.emitOrdersChanged([nextOrder], 'updateLocalPayment');
+            case 36:
+              this.logInfo('updateLocalPayment-变更事件完成', paymentContext);
+              return _context7.abrupt("return", {
+                order: nextOrder,
+                payment: nextPayment,
+                previousPayment: previousPayment
+              });
+            case 38:
+            case "end":
+              return _context7.stop();
+          }
+        }, _callee7, this, [[21, 28]]);
+      }));
+      function updateLocalPayment(_x5) {
+        return _updateLocalPayment.apply(this, arguments);
+      }
+      return updateLocalPayment;
+    }()
   }, {
     key: "loadOrdersByServer",
     value: function () {
-      var _loadOrdersByServer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+      var _loadOrdersByServer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
         var _this$store,
           _this7 = this;
         var orderList, data, mergedOrders, memoryOrders;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
               orderList = [];
               this.logInfo('loadOrdersByServer-开始', {
@@ -658,51 +995,51 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 query: ((_this$store = this.store) === null || _this$store === void 0 ? void 0 : _this$store.createdAtQuery) || null
               });
               if (!this.orderDataSource) {
-                _context6.next = 17;
+                _context8.next = 17;
                 break;
               }
-              _context6.prev = 3;
-              _context6.next = 6;
+              _context8.prev = 3;
+              _context8.next = 6;
               return this.orderDataSource.run({
                 sse: {
                   query: this.store.createdAtQuery
                 }
               });
             case 6:
-              data = _context6.sent;
+              data = _context8.sent;
               orderList = data || [];
               this.logInfo('loadOrdersByServer-SSE拉取成功', {
                 count: orderList.length
               });
               this.markOrderPulledAtNow();
               this.lastServerFullFetchAtMs = Date.now();
-              _context6.next = 17;
+              _context8.next = 17;
               break;
             case 13:
-              _context6.prev = 13;
-              _context6.t0 = _context6["catch"](3);
+              _context8.prev = 13;
+              _context8.t0 = _context8["catch"](3);
               this.logInfo('loadOrdersByServer-SSE拉取失败，保持当前内存订单');
-              return _context6.abrupt("return", this.store.list);
+              return _context8.abrupt("return", this.store.list);
             case 17:
-              _context6.next = 19;
+              _context8.next = 19;
               return this.replaceOrdersSnapshotInSQLite(orderList, 'loadOrdersByServer');
             case 19:
-              mergedOrders = _context6.sent;
+              mergedOrders = _context8.sent;
               memoryOrders = mergedOrders.map(function (order) {
                 return _this7.normalizeOrderForMemoryList(order);
               });
               this.logInfo('loadOrdersByServer-结束', {
                 count: memoryOrders.length
               });
-              _context6.next = 24;
+              _context8.next = 24;
               return this.core.effects.emit(OrderHooks.onOrdersLoaded, memoryOrders);
             case 24:
-              return _context6.abrupt("return", memoryOrders);
+              return _context8.abrupt("return", memoryOrders);
             case 25:
             case "end":
-              return _context6.stop();
+              return _context8.stop();
           }
-        }, _callee6, this, [[3, 13]]);
+        }, _callee8, this, [[3, 13]]);
       }));
       function loadOrdersByServer() {
         return _loadOrdersByServer.apply(this, arguments);
@@ -717,61 +1054,61 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "silentRefresh",
     value: (function () {
-      var _silentRefresh = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+      var _silentRefresh = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
         var startTime, elapsedSinceFullFetch, orders, errorMessage;
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
               startTime = Date.now();
               elapsedSinceFullFetch = Date.now() - this.lastServerFullFetchAtMs;
               if (!(this.lastServerFullFetchAtMs > 0 && elapsedSinceFullFetch < ORDER_SILENT_REFRESH_MIN_INTERVAL_MS)) {
-                _context7.next = 4;
+                _context9.next = 4;
                 break;
               }
-              return _context7.abrupt("return", this.store.list);
+              return _context9.abrupt("return", this.store.list);
             case 4:
               this.logInfo('silentRefresh 开始');
-              _context7.prev = 5;
+              _context9.prev = 5;
               // 刷新前，需要更新当前营业日边界（store.createdAtQuery）
               this.updateCreateStore();
-              _context7.next = 9;
+              _context9.next = 9;
               return this.loadOrdersByServer();
             case 9:
-              orders = _context7.sent;
+              orders = _context9.sent;
               if (!(orders.length > 0)) {
-                _context7.next = 19;
+                _context9.next = 19;
                 break;
               }
               this.store.list = cloneDeep(orders);
               this.syncOrdersMap();
               this.emitOrdersChanged([], 'silentRefresh');
-              _context7.next = 16;
+              _context9.next = 16;
               return this.core.effects.emit(OrderHooks.onOrdersSyncCompleted, null);
             case 16:
               this.logInfo('silentRefresh 完成', {
                 orderCount: orders.length,
                 duration: "".concat(Date.now() - startTime, "ms")
               });
-              _context7.next = 20;
+              _context9.next = 20;
               break;
             case 19:
               this.logInfo('silentRefresh: 服务器未返回数据');
             case 20:
-              return _context7.abrupt("return", this.store.list);
+              return _context9.abrupt("return", this.store.list);
             case 23:
-              _context7.prev = 23;
-              _context7.t0 = _context7["catch"](5);
-              errorMessage = _context7.t0 instanceof Error ? _context7.t0.message : String(_context7.t0);
+              _context9.prev = 23;
+              _context9.t0 = _context9["catch"](5);
+              errorMessage = _context9.t0 instanceof Error ? _context9.t0.message : String(_context9.t0);
               this.logError('silentRefresh 失败', {
                 duration: "".concat(Date.now() - startTime, "ms"),
                 error: errorMessage
               });
-              return _context7.abrupt("return", this.store.list);
+              return _context9.abrupt("return", this.store.list);
             case 28:
             case "end":
-              return _context7.stop();
+              return _context9.stop();
           }
-        }, _callee7, this, [[5, 23]]);
+        }, _callee9, this, [[5, 23]]);
       }));
       function silentRefresh() {
         return _silentRefresh.apply(this, arguments);
@@ -781,17 +1118,30 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeOrderForMemoryList",
     value: function normalizeOrderForMemoryList(order) {
-      var externalSaleNumber = order === null || order === void 0 ? void 0 : order.external_sale_number;
-      if ((order === null || order === void 0 ? void 0 : order.order_id) !== undefined && (order === null || order === void 0 ? void 0 : order.order_id) !== null && (order === null || order === void 0 ? void 0 : order.order_id) !== '') {
-        return order;
+      var source = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'normalizeOrderForMemoryList';
+      var normalizedOrder = this.normalizeOrderCollectionsForIngress(order, source);
+      var externalSaleNumber = normalizedOrder === null || normalizedOrder === void 0 ? void 0 : normalizedOrder.external_sale_number;
+      if ((normalizedOrder === null || normalizedOrder === void 0 ? void 0 : normalizedOrder.order_id) !== undefined && (normalizedOrder === null || normalizedOrder === void 0 ? void 0 : normalizedOrder.order_id) !== null && (normalizedOrder === null || normalizedOrder === void 0 ? void 0 : normalizedOrder.order_id) !== '') {
+        return normalizedOrder;
       }
       if (externalSaleNumber === undefined || externalSaleNumber === null || externalSaleNumber === '') {
-        return order;
+        return normalizedOrder;
       }
-      return _objectSpread(_objectSpread({}, order), {}, {
+      return _objectSpread(_objectSpread({}, normalizedOrder), {}, {
         order_id: externalSaleNumber
       });
     }
+  }, {
+    key: "withoutSyntheticDraftOrderId",
+    value: function withoutSyntheticDraftOrderId(order) {
+      var externalSaleNumber = order.external_sale_number;
+      if (Number(order.is_draft_order || 0) !== 1 || order.order_id === undefined || externalSaleNumber === undefined || String(order.order_id) !== String(externalSaleNumber)) {
+        return order;
+      }
+      var next = _objectSpread({}, order);
+      delete next.order_id;
+      return next;
+    }
 
     /**
      * 仅覆盖本地已存在的订单；不存在则直接跳过，不落库、不 emit。
@@ -800,31 +1150,31 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "overwriteExistingOrder",
     value: (function () {
-      var _overwriteExistingOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(fresh) {
+      var _overwriteExistingOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(fresh) {
         var _this8 = this;
-        var orderId, key;
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+        var orderId, key, normalizedFresh, existingOrder, reconciledFresh;
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
               orderId = fresh === null || fresh === void 0 ? void 0 : fresh.order_id;
               if (!(orderId === undefined || orderId === null)) {
-                _context8.next = 4;
+                _context10.next = 4;
                 break;
               }
               this.logError('overwriteExistingOrder-入参缺少 order_id');
-              return _context8.abrupt("return", {
+              return _context10.abrupt("return", {
                 overwritten: false
               });
             case 4:
               key = this.getIdKey(orderId);
               if (this.store.map.has(key)) {
-                _context8.next = 8;
+                _context10.next = 8;
                 break;
               }
               this.logInfo('overwriteExistingOrder-本地不存在该订单，跳过', {
                 orderId: orderId
               });
-              return _context8.abrupt("return", {
+              return _context10.abrupt("return", {
                 overwritten: false
               });
             case 8:
@@ -832,32 +1182,37 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 orderId: orderId,
                 storeOrderCountBefore: this.store.list.length
               });
+              normalizedFresh = this.normalizeOrderForMemoryList(fresh, 'overwriteExistingOrder.incoming');
+              existingOrder = this.store.map.get(key);
+              reconciledFresh = this.reconcileOverwriteOrderCollections(existingOrder, normalizedFresh);
               this.store.list = this.store.list.map(function (order) {
                 var id = order === null || order === void 0 ? void 0 : order.order_id;
-                if (id === undefined || id === null) return order;
-                return _this8.getIdKey(id) === key ? fresh : order;
+                if (id === undefined || id === null) {
+                  return _this8.normalizeOrderForMemoryList(order, 'overwriteExistingOrder.existingMemory');
+                }
+                return _this8.getIdKey(id) === key ? reconciledFresh : _this8.normalizeOrderForMemoryList(order, 'overwriteExistingOrder.existingMemory');
               });
               this.syncOrdersMap();
-              _context8.next = 13;
-              return this.updateOrderInSQLite(fresh, 'overwriteExistingOrder');
-            case 13:
+              _context10.next = 16;
+              return this.updateOrderInSQLite(reconciledFresh, 'overwriteExistingOrder');
+            case 16:
               this.logInfo('overwriteExistingOrder-结束', {
                 orderId: orderId,
                 storeOrderCountAfter: this.store.list.length
               });
-              _context8.next = 16;
-              return this.emitOrdersChanged([fresh], 'overwriteExistingOrder');
-            case 16:
-              return _context8.abrupt("return", {
+              _context10.next = 19;
+              return this.emitOrdersChanged([reconciledFresh], 'overwriteExistingOrder');
+            case 19:
+              return _context10.abrupt("return", {
                 overwritten: true
               });
-            case 17:
+            case 20:
             case "end":
-              return _context8.stop();
+              return _context10.stop();
           }
-        }, _callee8, this);
+        }, _callee10, this);
       }));
-      function overwriteExistingOrder(_x4) {
+      function overwriteExistingOrder(_x6) {
         return _overwriteExistingOrder.apply(this, arguments);
       }
       return overwriteExistingOrder;
@@ -870,29 +1225,33 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "upsertOrdersFromRemote",
     value: (function () {
-      var _upsertOrdersFromRemote = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(freshOrders) {
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+      var _upsertOrdersFromRemote = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(freshOrders) {
+        var source,
+          _args11 = arguments;
+        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
+              source = _args11.length > 1 && _args11[1] !== undefined ? _args11[1] : 'upsertOrdersFromRemote';
               if (freshOrders !== null && freshOrders !== void 0 && freshOrders.length) {
-                _context9.next = 3;
+                _context11.next = 4;
                 break;
               }
               this.logInfo('upsertOrdersFromRemote-订单列表为空', {});
-              return _context9.abrupt("return");
-            case 3:
+              return _context11.abrupt("return");
+            case 4:
               this.logInfo('upsertOrdersFromRemote-开始', {
-                count: freshOrders.length
+                count: freshOrders.length,
+                source: source
               });
-              _context9.next = 6;
-              return this.mergeOrdersToStore(freshOrders, 'upsertOrdersFromRemote');
-            case 6:
+              _context11.next = 7;
+              return this.mergeOrdersToStore(freshOrders, source);
+            case 7:
             case "end":
-              return _context9.stop();
+              return _context11.stop();
           }
-        }, _callee9, this);
+        }, _callee11, this);
       }));
-      function upsertOrdersFromRemote(_x5) {
+      function upsertOrdersFromRemote(_x7) {
         return _upsertOrdersFromRemote.apply(this, arguments);
       }
       return upsertOrdersFromRemote;
@@ -900,21 +1259,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "markOrderSyncedByExternalSaleNumber",
     value: function () {
-      var _markOrderSyncedByExternalSaleNumber = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(params) {
+      var _markOrderSyncedByExternalSaleNumber = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(params) {
         var _this9 = this,
           _existing$external_sa,
           _nextOrder$order_id;
         var externalSaleNumber, key, targetIndex, existing, nextOrder, storageKey;
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
               externalSaleNumber = params.externalSaleNumber;
               if (!(externalSaleNumber === undefined || externalSaleNumber === null || externalSaleNumber === '')) {
-                _context10.next = 4;
+                _context12.next = 4;
                 break;
               }
               this.logError('markOrderSyncedByExternalSaleNumber-缺少 external_sale_number');
-              return _context10.abrupt("return", {
+              return _context12.abrupt("return", {
                 updated: false
               });
             case 4:
@@ -925,20 +1284,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 return _this9.getIdKey(value) === key;
               });
               if (!(targetIndex < 0)) {
-                _context10.next = 9;
+                _context12.next = 9;
                 break;
               }
               this.logInfo('markOrderSyncedByExternalSaleNumber-本地订单不存在，跳过', {
                 external_sale_number: externalSaleNumber
               });
-              return _context10.abrupt("return", {
+              return _context12.abrupt("return", {
                 updated: false
               });
             case 9:
               existing = this.store.list[targetIndex];
               nextOrder = this.normalizeRemoteSyncedOrder(_objectSpread(_objectSpread(_objectSpread({}, existing), params.patch || {}), {}, {
                 external_sale_number: (_existing$external_sa = existing.external_sale_number) !== null && _existing$external_sa !== void 0 ? _existing$external_sa : externalSaleNumber,
-                need_sync: 0
+                need_sync: 0,
+                is_draft_order: 0
               }));
               storageKey = this.getOrderStorageKey(nextOrder) || key;
               this.store.list = this.store.list.map(function (order, index) {
@@ -946,27 +1306,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 return nextOrder;
               });
               this.syncOrdersMap();
-              _context10.next = 16;
+              _context12.next = 16;
               return this.patchOrdersInSQLite([nextOrder], 'markOrderSyncedByExternalSaleNumber', _defineProperty({}, storageKey, 'update'));
             case 16:
               this.logInfo('markOrderSyncedByExternalSaleNumber-完成', {
                 external_sale_number: externalSaleNumber,
                 order_id: (_nextOrder$order_id = nextOrder.order_id) !== null && _nextOrder$order_id !== void 0 ? _nextOrder$order_id : null
               });
-              _context10.next = 19;
+              _context12.next = 19;
               return this.emitOrdersChanged([nextOrder], 'markOrderSyncedByExternalSaleNumber');
             case 19:
-              return _context10.abrupt("return", {
+              return _context12.abrupt("return", {
                 updated: true,
                 order: nextOrder
               });
             case 20:
             case "end":
-              return _context10.stop();
+              return _context12.stop();
           }
-        }, _callee10, this);
+        }, _callee12, this);
       }));
-      function markOrderSyncedByExternalSaleNumber(_x6) {
+      function markOrderSyncedByExternalSaleNumber(_x8) {
         return _markOrderSyncedByExternalSaleNumber.apply(this, arguments);
       }
       return markOrderSyncedByExternalSaleNumber;
@@ -978,149 +1338,357 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "upsertPendingSyncOrders",
     value: (function () {
-      var _upsertPendingSyncOrders = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(pendingOrders) {
-        var pendingMap, memoryPendingMap, _iterator4, _step4, order, storageKey, patchedOrders, mergeActions, updatedList, identityKeyToIndex, index, _iterator5, _step5, key, _iterator6, _step6, _step6$value, _storageKey, pendingOrder, matchIndex, mergedOrder, insertIndex;
-        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+      var _upsertPendingSyncOrders = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(pendingOrders) {
+        var _this10 = this;
+        var options,
+          pendingMap,
+          memoryPendingMap,
+          _iterator5,
+          _step5,
+          order,
+          normalizedOrder,
+          pendingOrder,
+          storageKey,
+          mergeActions,
+          updatedList,
+          identityKeyToIndex,
+          index,
+          _iterator6,
+          _step6,
+          key,
+          _iterator7,
+          _step7,
+          _step7$value,
+          _storageKey,
+          _pendingOrder,
+          matchIndex,
+          existingOrder,
+          mergedOrder,
+          nextOrder,
+          pendingSnapshot,
+          insertIndex,
+          patchedOrders,
+          previousList,
+          _args13 = arguments;
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
+              options = _args13.length > 1 && _args13[1] !== undefined ? _args13[1] : {};
               if (pendingOrders !== null && pendingOrders !== void 0 && pendingOrders.length) {
-                _context11.next = 3;
+                _context13.next = 4;
                 break;
               }
               this.logInfo('upsertPendingSyncOrders-订单列表为空', {});
-              return _context11.abrupt("return");
-            case 3:
+              return _context13.abrupt("return");
+            case 4:
               pendingMap = new Map();
               memoryPendingMap = new Map();
-              _iterator4 = _createForOfIteratorHelper(pendingOrders);
-              _context11.prev = 6;
-              _iterator4.s();
-            case 8:
-              if ((_step4 = _iterator4.n()).done) {
-                _context11.next = 17;
+              _iterator5 = _createForOfIteratorHelper(pendingOrders);
+              _context13.prev = 7;
+              _iterator5.s();
+            case 9:
+              if ((_step5 = _iterator5.n()).done) {
+                _context13.next = 20;
                 break;
               }
-              order = _step4.value;
-              storageKey = this.getOrderStorageKey(order);
+              order = _step5.value;
+              normalizedOrder = this.normalizeOrderCollectionsForIngress(order, 'upsertPendingSyncOrders.incoming');
+              pendingOrder = _objectSpread(_objectSpread({}, normalizedOrder), {}, {
+                need_sync: 1,
+                is_draft_order: 0
+              });
+              storageKey = this.getOrderStorageKey(pendingOrder);
               if (storageKey) {
-                _context11.next = 13;
+                _context13.next = 16;
                 break;
               }
-              return _context11.abrupt("continue", 15);
-            case 13:
-              pendingMap.set(storageKey, order);
-              memoryPendingMap.set(storageKey, this.normalizeOrderForMemoryList(order));
-            case 15:
-              _context11.next = 8;
+              return _context13.abrupt("continue", 18);
+            case 16:
+              pendingMap.set(storageKey, pendingOrder);
+              memoryPendingMap.set(storageKey, this.normalizeOrderForMemoryList(pendingOrder, 'upsertPendingSyncOrders.memory'));
+            case 18:
+              _context13.next = 9;
               break;
-            case 17:
-              _context11.next = 22;
+            case 20:
+              _context13.next = 25;
               break;
-            case 19:
-              _context11.prev = 19;
-              _context11.t0 = _context11["catch"](6);
-              _iterator4.e(_context11.t0);
             case 22:
-              _context11.prev = 22;
-              _iterator4.f();
-              return _context11.finish(22);
+              _context13.prev = 22;
+              _context13.t0 = _context13["catch"](7);
+              _iterator5.e(_context13.t0);
             case 25:
+              _context13.prev = 25;
+              _iterator5.f();
+              return _context13.finish(25);
+            case 28:
               if (!(pendingMap.size === 0)) {
-                _context11.next = 28;
+                _context13.next = 31;
                 break;
               }
               this.logError('upsertPendingSyncOrders-订单缺少可落库标识', {
                 count: pendingOrders.length
               });
-              return _context11.abrupt("return");
-            case 28:
+              return _context13.abrupt("return");
+            case 31:
               this.logInfo('upsertPendingSyncOrders-开始', {
                 count: pendingMap.size
               });
-              patchedOrders = _toConsumableArray(pendingMap.values());
               mergeActions = {};
-              updatedList = _toConsumableArray(this.store.list); // 与 mergeOrdersToStore 一致：基于身份键（field:value）建立索引，把「查找已存在订单」
+              updatedList = this.store.list.map(function (order) {
+                return _this10.normalizeOrderForMemoryList(order, 'upsertPendingSyncOrders.existingMemory');
+              }); // 与 mergeOrdersToStore 一致：基于身份键（field:value）建立索引，把「查找已存在订单」
               // 从 O(n) 线性扫描降为 O(1)，整体复杂度由 O(n^2) 降为 O(n + m)。
               identityKeyToIndex = new Map();
               for (index = 0; index < updatedList.length; index += 1) {
-                _iterator5 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(updatedList[index]));
+                _iterator6 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(updatedList[index]));
                 try {
-                  for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-                    key = _step5.value;
+                  for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+                    key = _step6.value;
                     // 同一 key 命中多张时保留最靠前的下标，与原 findIndex「取首个匹配」一致
                     if (!identityKeyToIndex.has(key)) identityKeyToIndex.set(key, index);
                   }
                 } catch (err) {
-                  _iterator5.e(err);
+                  _iterator6.e(err);
                 } finally {
-                  _iterator5.f();
+                  _iterator6.f();
                 }
               }
-              _iterator6 = _createForOfIteratorHelper(memoryPendingMap.entries());
-              _context11.prev = 35;
-              _iterator6.s();
-            case 37:
-              if ((_step6 = _iterator6.n()).done) {
-                _context11.next = 52;
+              _iterator7 = _createForOfIteratorHelper(memoryPendingMap.entries());
+              _context13.prev = 37;
+              _iterator7.s();
+            case 39:
+              if ((_step7 = _iterator7.n()).done) {
+                _context13.next = 58;
                 break;
               }
-              _step6$value = _slicedToArray(_step6.value, 2), _storageKey = _step6$value[0], pendingOrder = _step6$value[1];
-              matchIndex = this.lookupOrderIndexByIdentityKeys(identityKeyToIndex, this.getOrderIdentityMatchKeys(pendingOrder));
+              _step7$value = _slicedToArray(_step7.value, 2), _storageKey = _step7$value[0], _pendingOrder = _step7$value[1];
+              matchIndex = this.lookupOrderIndexByIdentityKeys(identityKeyToIndex, this.getOrderIdentityMatchKeys(_pendingOrder));
               if (!(matchIndex >= 0)) {
-                _context11.next = 46;
+                _context13.next = 52;
                 break;
               }
-              mergedOrder = this.mergeOrderRecords(updatedList[matchIndex], pendingOrder, {
-                preferIncomingProducts: true
+              existingOrder = updatedList[matchIndex];
+              mergedOrder = this.mergeOrderRecords(existingOrder, _pendingOrder);
+              nextOrder = _objectSpread(_objectSpread({}, mergedOrder), {}, {
+                need_sync: 1,
+                is_draft_order: 0
               });
-              updatedList[matchIndex] = mergedOrder;
+              updatedList[matchIndex] = nextOrder;
+              pendingSnapshot = pendingMap.get(_storageKey);
+              if (pendingSnapshot) {
+                pendingMap.set(_storageKey, this.reconcileOverwriteOrderCollections(existingOrder, pendingSnapshot));
+              }
               // 合并后身份字段可能新增（如挂单拿到 order_id），同步登记，供同批后续 pending 命中同一槽位
-              this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, matchIndex);
+              this.registerOrderIdentityKeys(identityKeyToIndex, nextOrder, matchIndex);
               mergeActions[_storageKey] = 'update';
-              return _context11.abrupt("continue", 50);
-            case 46:
+              return _context13.abrupt("continue", 56);
+            case 52:
               insertIndex = updatedList.length;
-              updatedList.push(pendingOrder);
-              this.registerOrderIdentityKeys(identityKeyToIndex, pendingOrder, insertIndex);
+              updatedList.push(_pendingOrder);
+              this.registerOrderIdentityKeys(identityKeyToIndex, _pendingOrder, insertIndex);
               mergeActions[_storageKey] = 'insert';
-            case 50:
-              _context11.next = 37;
+            case 56:
+              _context13.next = 39;
               break;
-            case 52:
-              _context11.next = 57;
+            case 58:
+              _context13.next = 63;
               break;
-            case 54:
-              _context11.prev = 54;
-              _context11.t1 = _context11["catch"](35);
-              _iterator6.e(_context11.t1);
-            case 57:
-              _context11.prev = 57;
-              _iterator6.f();
-              return _context11.finish(57);
             case 60:
-              // 增量索引已保证 store 去重不变量，无需再对全表做 O(n^2) 压缩；仅自检开关开启时兜底。
+              _context13.prev = 60;
+              _context13.t1 = _context13["catch"](37);
+              _iterator7.e(_context13.t1);
+            case 63:
+              _context13.prev = 63;
+              _iterator7.f();
+              return _context13.finish(63);
+            case 66:
+              patchedOrders = _toConsumableArray(pendingMap.values()); // 增量索引已保证 store 去重不变量，无需再对全表做 O(n^2) 压缩；仅自检开关开启时兜底。
+              previousList = this.store.list;
               this.store.list = this.runOrderStoreSelfCheck(updatedList, 'upsertPendingSyncOrders.store');
               this.syncOrdersMap();
-              _context11.next = 64;
-              return this.patchOrdersInSQLite(patchedOrders, 'upsertPendingSyncOrders', mergeActions);
-            case 64:
+              _context13.prev = 70;
+              _context13.next = 73;
+              return this.patchOrdersInSQLite(patchedOrders, 'upsertPendingSyncOrders', mergeActions, options);
+            case 73:
+              _context13.next = 80;
+              break;
+            case 75:
+              _context13.prev = 75;
+              _context13.t2 = _context13["catch"](70);
+              this.store.list = previousList;
+              this.syncOrdersMap();
+              throw _context13.t2;
+            case 80:
               this.logInfo('upsertPendingSyncOrders-结束', {
                 count: patchedOrders.length,
                 storeOrderCountAfter: this.store.list.length
               });
-              _context11.next = 67;
+              _context13.next = 83;
               return this.emitOrdersChanged(patchedOrders, 'upsertPendingSyncOrders');
-            case 67:
+            case 83:
             case "end":
-              return _context11.stop();
+              return _context13.stop();
           }
-        }, _callee11, this, [[6, 19, 22, 25], [35, 54, 57, 60]]);
+        }, _callee13, this, [[7, 22, 25, 28], [37, 60, 63, 66], [70, 75]]);
       }));
-      function upsertPendingSyncOrders(_x7) {
+      function upsertPendingSyncOrders(_x9) {
         return _upsertPendingSyncOrders.apply(this, arguments);
       }
       return upsertPendingSyncOrders;
     }()
+    /**
+     * 将 POS 草稿订单按 SQLite storage key 合并进 store 并落库。
+     * 草稿只表示本地可恢复快照，不进入同步队列。
+     */
+    )
+  }, {
+    key: "upsertLocalDraftOrders",
+    value: (function () {
+      var _upsertLocalDraftOrders = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(draftOrders) {
+        var draftMap, memoryDraftMap, _iterator8, _step8, order, draftOrder, storageKey, patchedOrders, mergeActions, updatedList, identityKeyToIndex, index, _iterator9, _step9, key, _iterator10, _step10, _step10$value, _storageKey2, _draftOrder, matchIndex, mergedOrder, nextOrder, insertIndex;
+        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
+            case 0:
+              if (draftOrders !== null && draftOrders !== void 0 && draftOrders.length) {
+                _context14.next = 3;
+                break;
+              }
+              this.logInfo('upsertLocalDraftOrders-订单列表为空', {});
+              return _context14.abrupt("return");
+            case 3:
+              draftMap = new Map();
+              memoryDraftMap = new Map();
+              _iterator8 = _createForOfIteratorHelper(draftOrders);
+              _context14.prev = 6;
+              _iterator8.s();
+            case 8:
+              if ((_step8 = _iterator8.n()).done) {
+                _context14.next = 18;
+                break;
+              }
+              order = _step8.value;
+              draftOrder = _objectSpread(_objectSpread({}, order), {}, {
+                need_sync: 0,
+                is_draft_order: 1
+              });
+              storageKey = this.getOrderStorageKey(draftOrder);
+              if (storageKey) {
+                _context14.next = 14;
+                break;
+              }
+              return _context14.abrupt("continue", 16);
+            case 14:
+              draftMap.set(storageKey, draftOrder);
+              memoryDraftMap.set(storageKey, this.normalizeOrderForMemoryList(draftOrder));
+            case 16:
+              _context14.next = 8;
+              break;
+            case 18:
+              _context14.next = 23;
+              break;
+            case 20:
+              _context14.prev = 20;
+              _context14.t0 = _context14["catch"](6);
+              _iterator8.e(_context14.t0);
+            case 23:
+              _context14.prev = 23;
+              _iterator8.f();
+              return _context14.finish(23);
+            case 26:
+              if (!(draftMap.size === 0)) {
+                _context14.next = 29;
+                break;
+              }
+              this.logError('upsertLocalDraftOrders-订单缺少可落库标识', {
+                count: draftOrders.length
+              });
+              return _context14.abrupt("return");
+            case 29:
+              this.logInfo('upsertLocalDraftOrders-开始', {
+                count: draftMap.size
+              });
+              patchedOrders = _toConsumableArray(draftMap.values());
+              mergeActions = {};
+              updatedList = _toConsumableArray(this.store.list);
+              identityKeyToIndex = new Map();
+              for (index = 0; index < updatedList.length; index += 1) {
+                _iterator9 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(updatedList[index]));
+                try {
+                  for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+                    key = _step9.value;
+                    if (!identityKeyToIndex.has(key)) identityKeyToIndex.set(key, index);
+                  }
+                } catch (err) {
+                  _iterator9.e(err);
+                } finally {
+                  _iterator9.f();
+                }
+              }
+              _iterator10 = _createForOfIteratorHelper(memoryDraftMap.entries());
+              _context14.prev = 36;
+              _iterator10.s();
+            case 38:
+              if ((_step10 = _iterator10.n()).done) {
+                _context14.next = 54;
+                break;
+              }
+              _step10$value = _slicedToArray(_step10.value, 2), _storageKey2 = _step10$value[0], _draftOrder = _step10$value[1];
+              matchIndex = this.lookupOrderIndexByIdentityKeys(identityKeyToIndex, this.getOrderIdentityMatchKeys(_draftOrder));
+              if (!(matchIndex >= 0)) {
+                _context14.next = 48;
+                break;
+              }
+              mergedOrder = this.mergeOrderRecords(updatedList[matchIndex], _draftOrder);
+              nextOrder = _objectSpread(_objectSpread({}, mergedOrder), {}, {
+                need_sync: 0,
+                is_draft_order: 1
+              });
+              updatedList[matchIndex] = nextOrder;
+              this.registerOrderIdentityKeys(identityKeyToIndex, nextOrder, matchIndex);
+              mergeActions[_storageKey2] = 'update';
+              return _context14.abrupt("continue", 52);
+            case 48:
+              insertIndex = updatedList.length;
+              updatedList.push(_draftOrder);
+              this.registerOrderIdentityKeys(identityKeyToIndex, _draftOrder, insertIndex);
+              mergeActions[_storageKey2] = 'insert';
+            case 52:
+              _context14.next = 38;
+              break;
+            case 54:
+              _context14.next = 59;
+              break;
+            case 56:
+              _context14.prev = 56;
+              _context14.t1 = _context14["catch"](36);
+              _iterator10.e(_context14.t1);
+            case 59:
+              _context14.prev = 59;
+              _iterator10.f();
+              return _context14.finish(59);
+            case 62:
+              this.store.list = this.runOrderStoreSelfCheck(updatedList, 'upsertLocalDraftOrders.store');
+              this.syncOrdersMap();
+              _context14.next = 66;
+              return this.patchOrdersInSQLite(patchedOrders, 'upsertLocalDraftOrders', mergeActions);
+            case 66:
+              this.logInfo('upsertLocalDraftOrders-结束', {
+                count: patchedOrders.length,
+                storeOrderCountAfter: this.store.list.length
+              });
+              _context14.next = 69;
+              return this.emitOrdersChanged(patchedOrders, 'upsertLocalDraftOrders');
+            case 69:
+            case "end":
+              return _context14.stop();
+          }
+        }, _callee14, this, [[6, 20, 23, 26], [36, 56, 59, 62]]);
+      }));
+      function upsertLocalDraftOrders(_x10) {
+        return _upsertLocalDraftOrders.apply(this, arguments);
+      }
+      return upsertLocalDraftOrders;
+    }()
     /**
      * 通过 SSE 按自定义 query 拉取订单（支持 select/with 精简字段）
      */
@@ -1128,42 +1696,42 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "fetchOrdersBySSE",
     value: (function () {
-      var _fetchOrdersBySSE = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
+      var _fetchOrdersBySSE = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
         var query,
           data,
-          _args12 = arguments;
-        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+          _args15 = arguments;
+        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
-              query = _args12.length > 0 && _args12[0] !== undefined ? _args12[0] : {};
+              query = _args15.length > 0 && _args15[0] !== undefined ? _args15[0] : {};
               if (this.orderDataSource) {
-                _context12.next = 3;
+                _context15.next = 3;
                 break;
               }
-              return _context12.abrupt("return", []);
+              return _context15.abrupt("return", []);
             case 3:
-              _context12.prev = 3;
-              _context12.next = 6;
+              _context15.prev = 3;
+              _context15.next = 6;
               return this.orderDataSource.run({
                 sse: {
                   query: query
                 }
               });
             case 6:
-              data = _context12.sent;
-              return _context12.abrupt("return", data || []);
+              data = _context15.sent;
+              return _context15.abrupt("return", data || []);
             case 10:
-              _context12.prev = 10;
-              _context12.t0 = _context12["catch"](3);
+              _context15.prev = 10;
+              _context15.t0 = _context15["catch"](3);
               this.logError('fetchOrdersBySSE-失败', {
-                error: _context12.t0 instanceof Error ? _context12.t0.message : String(_context12.t0)
+                error: _context15.t0 instanceof Error ? _context15.t0.message : String(_context15.t0)
               });
-              return _context12.abrupt("return", []);
+              return _context15.abrupt("return", []);
             case 14:
             case "end":
-              return _context12.stop();
+              return _context15.stop();
           }
-        }, _callee12, this, [[3, 10]]);
+        }, _callee15, this, [[3, 10]]);
       }));
       function fetchOrdersBySSE() {
         return _fetchOrdersBySSE.apply(this, arguments);
@@ -1192,19 +1760,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "syncOrdersMap",
     value: function syncOrdersMap() {
       this.store.map.clear();
-      var _iterator7 = _createForOfIteratorHelper(this.store.list),
-        _step7;
+      var _iterator11 = _createForOfIteratorHelper(this.store.list),
+        _step11;
       try {
-        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-          var order = _step7.value;
+        for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+          var order = _step11.value;
           var primaryIdentity = this.getOrderMapKey(order);
           if (!primaryIdentity) continue;
           this.store.map.set(primaryIdentity, order);
         }
       } catch (err) {
-        _iterator7.e(err);
+        _iterator11.e(err);
       } finally {
-        _iterator7.f();
+        _iterator11.f();
       }
     }
   }, {
@@ -1228,7 +1796,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderIdentityEntries",
     value: function getOrderIdentityEntries(order) {
-      var _this10 = this;
+      var _this11 = this;
       if (!order) return [];
       var record = order;
       var candidates = [{
@@ -1246,9 +1814,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }];
       var entries = [];
       var _loop = function _loop() {
-          var candidate = _candidates[_i];
-          if (_this10.isBlankIdentityValue(candidate.value)) return 0; // continue
-          var key = _this10.getIdKey(candidate.value);
+          var candidate = _candidates[_i2];
+          if (_this11.isBlankIdentityValue(candidate.value)) return 0; // continue
+          var key = _this11.getIdKey(candidate.value);
           if (entries.some(function (entry) {
             return entry.field === candidate.field && entry.key === key;
           })) return 0; // continue
@@ -1258,7 +1826,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           });
         },
         _ret;
-      for (var _i = 0, _candidates = candidates; _i < _candidates.length; _i++) {
+      for (var _i2 = 0, _candidates = candidates; _i2 < _candidates.length; _i2++) {
         _ret = _loop();
         if (_ret === 0) continue;
       }
@@ -1268,17 +1836,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "getOrderIdentityKeys",
     value: function getOrderIdentityKeys(order) {
       var keys = [];
-      var _iterator8 = _createForOfIteratorHelper(this.getOrderIdentityEntries(order)),
-        _step8;
+      var _iterator12 = _createForOfIteratorHelper(this.getOrderIdentityEntries(order)),
+        _step12;
       try {
-        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-          var entry = _step8.value;
+        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+          var entry = _step12.value;
           if (!keys.includes(entry.key)) keys.push(entry.key);
         }
       } catch (err) {
-        _iterator8.e(err);
+        _iterator12.e(err);
       } finally {
-        _iterator8.f();
+        _iterator12.f();
       }
       return keys;
     }
@@ -1287,8 +1855,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function getOrderDateKey(order) {
       var _order$bookings, _order$bookings2;
       var candidates = [order === null || order === void 0 ? void 0 : order.schedule_date, order === null || order === void 0 ? void 0 : order.create_date, order === null || order === void 0 ? void 0 : order.created_at, order === null || order === void 0 || (_order$bookings = order.bookings) === null || _order$bookings === void 0 || (_order$bookings = _order$bookings[0]) === null || _order$bookings === void 0 ? void 0 : _order$bookings.start_date, order === null || order === void 0 || (_order$bookings2 = order.bookings) === null || _order$bookings2 === void 0 || (_order$bookings2 = _order$bookings2[0]) === null || _order$bookings2 === void 0 ? void 0 : _order$bookings2.select_date];
-      for (var _i2 = 0, _candidates2 = candidates; _i2 < _candidates2.length; _i2++) {
-        var v = _candidates2[_i2];
+      for (var _i3 = 0, _candidates2 = candidates; _i3 < _candidates2.length; _i3++) {
+        var v = _candidates2[_i3];
         if (!v) continue;
         var text = String(v);
         if (!text) continue;
@@ -1315,7 +1883,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setupOrderSync",
     value: function setupOrderSync() {
-      var _this11 = this;
+      var _this12 = this;
       if (!this.orderDataSource) return;
       this.orderDataSource.run({
         pubsub: {
@@ -1323,22 +1891,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             var _message$id, _message$order_id, _message$type;
             console.log('orderDataSource', res);
             var pubsubReceivedAt = Date.now();
-            var message = _this11.normalizeOrderSyncMessage(res);
+            var message = _this12.normalizeOrderSyncMessage(res);
             if (!message) return;
             message._pubsubReceivedAt = pubsubReceivedAt;
-            _this11.pendingSyncMessages.push(message);
-            var throttleMs = _this11.getOrderSyncThrottleMs();
-            var routeInfo = _this11.resolveSyncMessageRoute(message);
-            _this11.logInfo('orderSync-收到消息并入队', {
+            _this12.pendingSyncMessages.push(message);
+            var throttleMs = _this12.getOrderSyncThrottleMs();
+            var routeInfo = _this12.resolveSyncMessageRoute(message);
+            _this12.logInfo('orderSync-收到消息并入队', {
               id: (_message$id = message.id) !== null && _message$id !== void 0 ? _message$id : null,
               order_id: (_message$order_id = message.order_id) !== null && _message$order_id !== void 0 ? _message$order_id : null,
               type: (_message$type = message.type) !== null && _message$type !== void 0 ? _message$type : null,
-              pendingCount: _this11.pendingSyncMessages.length,
+              pendingCount: _this12.pendingSyncMessages.length,
               throttleMs: throttleMs,
               pubsubReceivedAt: new Date(pubsubReceivedAt).toISOString(),
               fullMessage: JSON.stringify(message)
             });
-            _this11.scheduleOrderSyncThrottle();
+            _this12.scheduleOrderSyncThrottle();
           }
         }
       }).catch(function () {
@@ -1355,7 +1923,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "scheduleOrderSyncThrottle",
     value: function scheduleOrderSyncThrottle() {
-      var _this12 = this;
+      var _this13 = this;
       if (this.isProcessingSyncBatch) return;
       if (this.isIdlePhase) {
         this.isIdlePhase = false;
@@ -1366,8 +1934,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (this.syncTimer) return;
       var throttleMs = this.getOrderSyncThrottleMs();
       this.syncTimer = setTimeout(function () {
-        _this12.syncTimer = undefined;
-        void _this12.flushOrderSyncMessagesByThrottle();
+        _this13.syncTimer = undefined;
+        void _this13.flushOrderSyncMessagesByThrottle();
       }, throttleMs);
     }
 
@@ -1378,41 +1946,41 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "flushOrderSyncMessagesByThrottle",
     value: (function () {
-      var _flushOrderSyncMessagesByThrottle = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
-        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+      var _flushOrderSyncMessagesByThrottle = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
+        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
               if (!this.isProcessingSyncBatch) {
-                _context13.next = 2;
+                _context16.next = 2;
                 break;
               }
-              return _context13.abrupt("return");
+              return _context16.abrupt("return");
             case 2:
               if (!(this.pendingSyncMessages.length === 0)) {
-                _context13.next = 5;
+                _context16.next = 5;
                 break;
               }
               this.isIdlePhase = true;
-              return _context13.abrupt("return");
+              return _context16.abrupt("return");
             case 5:
               this.isProcessingSyncBatch = true;
-              _context13.prev = 6;
-              _context13.next = 9;
+              _context16.prev = 6;
+              _context16.next = 9;
               return this.processOrderSyncMessages();
             case 9:
-              _context13.prev = 9;
+              _context16.prev = 9;
               this.isProcessingSyncBatch = false;
               if (this.pendingSyncMessages.length > 0) {
                 this.scheduleOrderSyncThrottle();
               } else {
                 this.isIdlePhase = true;
               }
-              return _context13.finish(9);
+              return _context16.finish(9);
             case 13:
             case "end":
-              return _context13.stop();
+              return _context16.stop();
           }
-        }, _callee13, this, [[6,, 9, 13]]);
+        }, _callee16, this, [[6,, 9, 13]]);
       }));
       function flushOrderSyncMessagesByThrottle() {
         return _flushOrderSyncMessagesByThrottle.apply(this, arguments);
@@ -1434,19 +2002,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "processOrderSyncMessages",
     value: (function () {
-      var _processOrderSyncMessages = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
-        var _this13 = this;
+      var _processOrderSyncMessages = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
+        var _this14 = this;
         var messages, batchProcessStartAt, earliestReceivedAt, upsertOrders, refreshIds, uniqueRefreshIds, upsertList, _this$filterRedundant, toFetch, skipped, freshOrders, batchProcessEndAt;
-        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
               messages = _toConsumableArray(this.pendingSyncMessages);
               this.pendingSyncMessages = [];
               if (!(messages.length === 0)) {
-                _context14.next = 4;
+                _context17.next = 4;
                 break;
               }
-              return _context14.abrupt("return");
+              return _context17.abrupt("return");
             case 4:
               batchProcessStartAt = Date.now();
               earliestReceivedAt = Math.min.apply(Math, _toConsumableArray(messages.map(function (m) {
@@ -1462,13 +2030,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               upsertOrders = new Map();
               refreshIds = [];
               messages.forEach(function (msg, msgIndex) {
-                var routeInfo = _this13.resolveSyncMessageRoute(msg);
+                var routeInfo = _this14.resolveSyncMessageRoute(msg);
                 var hasBatchIds = routeInfo.hasBatchIds;
                 var singleId = routeInfo.singleId;
                 var hasSingleId = routeInfo.hasSingleId;
-                var normalizedBody = _this13.normalizeOrderSyncPayload(msg.body || msg.data);
+                var normalizedBody = _this14.normalizeOrderSyncPayload(msg.body || msg.data);
                 if (routeInfo.route === 'bodyUpsert' && normalizedBody) {
-                  upsertOrders.set(_this13.getIdKey(normalizedBody.order_id), normalizedBody);
+                  upsertOrders.set(_this14.getIdKey(normalizedBody.order_id), normalizedBody);
                   return;
                 }
                 if (hasBatchIds) refreshIds.push.apply(refreshIds, _toConsumableArray(routeInfo.batchIds));else if (routeInfo.route === 'httpRefresh.singleId' && singleId !== null) refreshIds.push(singleId);else if (routeInfo.route === 'httpRefresh.relationIds') refreshIds.push.apply(refreshIds, _toConsumableArray(routeInfo.batchIds));
@@ -1480,41 +2048,41 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 refreshIdCount: uniqueRefreshIds.length
               });
               if (!(upsertList.length > 0)) {
-                _context14.next = 16;
+                _context17.next = 16;
                 break;
               }
-              _context14.next = 16;
+              _context17.next = 16;
               return this.mergeOrdersToStore(upsertList, 'pubsub.bodyUpsert');
             case 16:
               if (!(uniqueRefreshIds.length > 0)) {
-                _context14.next = 28;
+                _context17.next = 28;
                 break;
               }
               _this$filterRedundant = this.filterRedundantHttpRefreshIds(uniqueRefreshIds), toFetch = _this$filterRedundant.toFetch, skipped = _this$filterRedundant.skipped;
               if (skipped.length > 0) {}
               if (!(toFetch.length > 0)) {
-                _context14.next = 28;
+                _context17.next = 28;
                 break;
               }
-              _context14.next = 22;
+              _context17.next = 22;
               return this.fetchOrdersByHttp(toFetch);
             case 22:
-              freshOrders = _context14.sent;
+              freshOrders = _context17.sent;
               if (!(freshOrders.length > 0)) {
-                _context14.next = 28;
+                _context17.next = 28;
                 break;
               }
-              _context14.next = 26;
+              _context17.next = 26;
               return this.mergeOrdersToStore(freshOrders, 'pubsub.httpRefresh');
             case 26:
-              _context14.next = 28;
+              _context17.next = 28;
               break;
             case 28:
               if (!(upsertList.length === 0 && uniqueRefreshIds.length === 0)) {
-                _context14.next = 30;
+                _context17.next = 30;
                 break;
               }
-              return _context14.abrupt("return");
+              return _context17.abrupt("return");
             case 30:
               batchProcessEndAt = Date.now();
               this.logInfo('processOrderSyncMessages-结束', {
@@ -1523,13 +2091,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 batchProcessDurationMs: batchProcessEndAt - batchProcessStartAt,
                 totalFromPubsubToProcessedMs: batchProcessEndAt - earliestReceivedAt
               });
-              _context14.next = 34;
+              _context17.next = 34;
               return this.core.effects.emit(OrderHooks.onOrdersSyncCompleted, null);
             case 34:
             case "end":
-              return _context14.stop();
+              return _context17.stop();
           }
-        }, _callee14, this);
+        }, _callee17, this);
       }));
       function processOrderSyncMessages() {
         return _processOrderSyncMessages.apply(this, arguments);
@@ -1550,29 +2118,29 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "fetchOrdersByHttp",
     value: (function () {
-      var _fetchOrdersByHttp = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(ids) {
+      var _fetchOrdersByHttp = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(ids) {
         var _orderList, orderList;
-        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
               if (!(!this.orderDataSource || ids.length === 0)) {
-                _context15.next = 2;
+                _context18.next = 2;
                 break;
               }
-              return _context15.abrupt("return", []);
+              return _context18.abrupt("return", []);
             case 2:
-              _context15.prev = 2;
+              _context18.prev = 2;
               if (!(typeof this.orderDataSource.fetchOrdersByIds === 'function')) {
-                _context15.next = 8;
+                _context18.next = 8;
                 break;
               }
-              _context15.next = 6;
+              _context18.next = 6;
               return this.orderDataSource.fetchOrdersByIds(ids);
             case 6:
-              _orderList = _context15.sent;
-              return _context15.abrupt("return", _orderList || []);
+              _orderList = _context18.sent;
+              return _context18.abrupt("return", _orderList || []);
             case 8:
-              _context15.next = 10;
+              _context18.next = 10;
               return this.orderDataSource.run({
                 http: {
                   query: {
@@ -1581,19 +2149,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               });
             case 10:
-              orderList = _context15.sent;
-              return _context15.abrupt("return", orderList || []);
+              orderList = _context18.sent;
+              return _context18.abrupt("return", orderList || []);
             case 14:
-              _context15.prev = 14;
-              _context15.t0 = _context15["catch"](2);
-              return _context15.abrupt("return", []);
+              _context18.prev = 14;
+              _context18.t0 = _context18["catch"](2);
+              return _context18.abrupt("return", []);
             case 17:
             case "end":
-              return _context15.stop();
+              return _context18.stop();
           }
-        }, _callee15, this, [[2, 14]]);
+        }, _callee18, this, [[2, 14]]);
       }));
-      function fetchOrdersByHttp(_x8) {
+      function fetchOrdersByHttp(_x11) {
         return _fetchOrdersByHttp.apply(this, arguments);
       }
       return fetchOrdersByHttp;
@@ -1605,10 +2173,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "mergeOrdersToStore",
     value: (function () {
-      var _mergeOrdersToStore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(freshOrders, source) {
-        var storeOrderCountBefore, normalizedFreshOrders, _iterator9, _step9, order, id, uniqueFreshOrders, uniqueFreshCount, patchedOrders, mergeActions, updatedList, identityKeyToIndex, index, identityKeys, _iterator10, _step10, key, _iterator11, _step11, fresh, freshIdentityKeys, matchIndex, storageKey, mergeKey, existingOrder, _ref2, _existingOrder$order_, _ref3, _external_sale_number, _existingOrder$paymen, _fresh$payment_status, _existingOrder$need_s, _fresh$need_sync, mergedOrder, insertIndex, insertCount, updateCount;
-        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+      var _mergeOrdersToStore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(freshOrders, source) {
+        var _this15 = this;
+        var storeOrderCountBefore, normalizedFreshOrders, _iterator13, _step13, order, id, uniqueFreshOrders, uniqueFreshCount, patchedOrders, mergeActions, updatedList, identityKeyToIndex, index, identityKeys, _iterator14, _step14, key, _iterator15, _step15, fresh, freshIdentityKeys, matchIndex, storageKey, mergeKey, existingOrder, _ref2, _existingOrder$order_, _ref3, _external_sale_number2, _existingOrder$paymen, _fresh$payment_status, _existingOrder$need_s, _fresh$need_sync, _ref4, _existingOrder$order_2, _ref5, _external_sale_number3, _existingOrder$is_dra, _fresh$is_draft_order, mergedOrder, adjustedMatchIndex, duplicateIndexes, _iterator16, _step16, _key2, _duplicateIndex, _iterator17, _step17, duplicateIndex, _index, _iterator18, _step18, _key, insertIndex, insertCount, updateCount;
+        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
               storeOrderCountBefore = this.store.list.length;
               this.logInfo('mergeOrdersToStore-开始', {
@@ -1618,125 +2187,206 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
               this.logDuplicateOrders("".concat(source, ".beforeMerge"), this.store.list);
               normalizedFreshOrders = [];
-              _iterator9 = _createForOfIteratorHelper(freshOrders);
-              _context16.prev = 5;
-              _iterator9.s();
+              _iterator13 = _createForOfIteratorHelper(freshOrders);
+              _context19.prev = 5;
+              _iterator13.s();
             case 7:
-              if ((_step9 = _iterator9.n()).done) {
-                _context16.next = 15;
+              if ((_step13 = _iterator13.n()).done) {
+                _context19.next = 15;
                 break;
               }
-              order = _step9.value;
+              order = _step13.value;
               id = order === null || order === void 0 ? void 0 : order.order_id;
               if (!(id === undefined || id === null)) {
-                _context16.next = 12;
+                _context19.next = 12;
                 break;
               }
-              return _context16.abrupt("continue", 13);
+              return _context19.abrupt("continue", 13);
             case 12:
               normalizedFreshOrders.push(this.normalizeRemoteSyncedOrder(order));
             case 13:
-              _context16.next = 7;
+              _context19.next = 7;
               break;
             case 15:
-              _context16.next = 20;
+              _context19.next = 20;
               break;
             case 17:
-              _context16.prev = 17;
-              _context16.t0 = _context16["catch"](5);
-              _iterator9.e(_context16.t0);
+              _context19.prev = 17;
+              _context19.t0 = _context19["catch"](5);
+              _iterator13.e(_context19.t0);
             case 20:
-              _context16.prev = 20;
-              _iterator9.f();
-              return _context16.finish(20);
+              _context19.prev = 20;
+              _iterator13.f();
+              return _context19.finish(20);
             case 23:
               // 先对本批新单做去重（批内规模 m 很小），保证每条 fresh 身份唯一
               uniqueFreshOrders = this.compactOrderListByIdentity(normalizedFreshOrders, "".concat(source, ".incoming")).list;
               uniqueFreshCount = uniqueFreshOrders.length;
               patchedOrders = [];
               mergeActions = {};
-              updatedList = _toConsumableArray(this.store.list); // 基于身份键（field:value）建立索引，把「查找已存在订单」从 O(n) 线性扫描降为 O(1)，
+              updatedList = this.store.list.map(function (order) {
+                return _this15.normalizeOrderForMemoryList(order, "".concat(source, ".existingMemory"));
+              }); // 基于身份键（field:value）建立索引，把「查找已存在订单」从 O(n) 线性扫描降为 O(1)，
               // 整体合并复杂度由 O(n^2) 降为 O(n + m)。索引语义与 doOrdersShareIdentity 完全一致：
               // 任一身份字段（order_id/external_sale_number/order_number/shop_order_number）同值即同一单。
               identityKeyToIndex = new Map();
               for (index = 0; index < updatedList.length; index += 1) {
                 identityKeys = this.getOrderIdentityMatchKeys(updatedList[index]);
-                _iterator10 = _createForOfIteratorHelper(identityKeys);
+                _iterator14 = _createForOfIteratorHelper(identityKeys);
                 try {
-                  for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-                    key = _step10.value;
+                  for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+                    key = _step14.value;
                     // 同一 key 命中多张时保留最靠前的下标，与原 findIndex「取首个匹配」一致
                     if (!identityKeyToIndex.has(key)) identityKeyToIndex.set(key, index);
                   }
                 } catch (err) {
-                  _iterator10.e(err);
+                  _iterator14.e(err);
                 } finally {
-                  _iterator10.f();
+                  _iterator14.f();
                 }
               }
-              _iterator11 = _createForOfIteratorHelper(uniqueFreshOrders);
-              _context16.prev = 31;
-              _iterator11.s();
+              _iterator15 = _createForOfIteratorHelper(uniqueFreshOrders);
+              _context19.prev = 31;
+              _iterator15.s();
             case 33:
-              if ((_step11 = _iterator11.n()).done) {
-                _context16.next = 57;
+              if ((_step15 = _iterator15.n()).done) {
+                _context19.next = 82;
                 break;
               }
-              fresh = _step11.value;
+              fresh = _step15.value;
               freshIdentityKeys = this.getOrderIdentityMatchKeys(fresh);
               matchIndex = this.lookupOrderIndexByIdentityKeys(identityKeyToIndex, freshIdentityKeys);
               storageKey = this.getOrderStorageKey(fresh);
               mergeKey = storageKey || (fresh.order_id !== undefined && fresh.order_id !== null ? this.getIdKey(fresh.order_id) : '');
               if (!(matchIndex >= 0)) {
-                _context16.next = 50;
+                _context19.next = 75;
                 break;
               }
               existingOrder = updatedList[matchIndex];
               if (!(this.isPendingSyncOrder(existingOrder) && this.isRemoteEchoMergeSource(source))) {
-                _context16.next = 44;
+                _context19.next = 44;
                 break;
               }
               this.logInfo('mergeOrdersToStore-跳过 pending 订单远端覆盖', {
                 source: source,
                 order_id: (_ref2 = (_existingOrder$order_ = existingOrder.order_id) !== null && _existingOrder$order_ !== void 0 ? _existingOrder$order_ : fresh.order_id) !== null && _ref2 !== void 0 ? _ref2 : null,
-                external_sale_number: (_ref3 = (_external_sale_number = existingOrder.external_sale_number) !== null && _external_sale_number !== void 0 ? _external_sale_number : fresh.external_sale_number) !== null && _ref3 !== void 0 ? _ref3 : null,
+                external_sale_number: (_ref3 = (_external_sale_number2 = existingOrder.external_sale_number) !== null && _external_sale_number2 !== void 0 ? _external_sale_number2 : fresh.external_sale_number) !== null && _ref3 !== void 0 ? _ref3 : null,
                 local_payment_status: (_existingOrder$paymen = existingOrder.payment_status) !== null && _existingOrder$paymen !== void 0 ? _existingOrder$paymen : null,
                 remote_payment_status: (_fresh$payment_status = fresh.payment_status) !== null && _fresh$payment_status !== void 0 ? _fresh$payment_status : null,
                 local_need_sync: (_existingOrder$need_s = existingOrder.need_sync) !== null && _existingOrder$need_s !== void 0 ? _existingOrder$need_s : null,
                 remote_need_sync: (_fresh$need_sync = fresh.need_sync) !== null && _fresh$need_sync !== void 0 ? _fresh$need_sync : null,
                 reason: 'protect_pending_sync_order_from_remote_echo'
               });
-              return _context16.abrupt("continue", 55);
+              return _context19.abrupt("continue", 80);
             case 44:
+              if (!(this.isDraftOrder(existingOrder) && this.shouldProtectDraftOrderFromIncoming(source))) {
+                _context19.next = 47;
+                break;
+              }
+              this.logInfo('mergeOrdersToStore-跳过 draft 订单远端覆盖', {
+                source: source,
+                order_id: (_ref4 = (_existingOrder$order_2 = existingOrder.order_id) !== null && _existingOrder$order_2 !== void 0 ? _existingOrder$order_2 : fresh.order_id) !== null && _ref4 !== void 0 ? _ref4 : null,
+                external_sale_number: (_ref5 = (_external_sale_number3 = existingOrder.external_sale_number) !== null && _external_sale_number3 !== void 0 ? _external_sale_number3 : fresh.external_sale_number) !== null && _ref5 !== void 0 ? _ref5 : null,
+                local_is_draft_order: (_existingOrder$is_dra = existingOrder.is_draft_order) !== null && _existingOrder$is_dra !== void 0 ? _existingOrder$is_dra : null,
+                remote_is_draft_order: (_fresh$is_draft_order = fresh.is_draft_order) !== null && _fresh$is_draft_order !== void 0 ? _fresh$is_draft_order : null,
+                reason: 'protect_draft_order_from_remote_echo'
+              });
+              return _context19.abrupt("continue", 80);
+            case 47:
               mergedOrder = this.mergeOrderRecords(existingOrder, fresh);
-              updatedList[matchIndex] = mergedOrder;
+              adjustedMatchIndex = matchIndex;
+              duplicateIndexes = new Set();
+              _iterator16 = _createForOfIteratorHelper(freshIdentityKeys);
+              _context19.prev = 51;
+              _iterator16.s();
+            case 53:
+              if ((_step16 = _iterator16.n()).done) {
+                _context19.next = 61;
+                break;
+              }
+              _key2 = _step16.value;
+              _duplicateIndex = identityKeyToIndex.get(_key2);
+              if (!(_duplicateIndex === undefined || _duplicateIndex === matchIndex)) {
+                _context19.next = 58;
+                break;
+              }
+              return _context19.abrupt("continue", 59);
+            case 58:
+              duplicateIndexes.add(_duplicateIndex);
+            case 59:
+              _context19.next = 53;
+              break;
+            case 61:
+              _context19.next = 66;
+              break;
+            case 63:
+              _context19.prev = 63;
+              _context19.t1 = _context19["catch"](51);
+              _iterator16.e(_context19.t1);
+            case 66:
+              _context19.prev = 66;
+              _iterator16.f();
+              return _context19.finish(66);
+            case 69:
+              if (duplicateIndexes.size > 0) {
+                _iterator17 = _createForOfIteratorHelper(_toConsumableArray(duplicateIndexes).sort(function (left, right) {
+                  return right - left;
+                }));
+                try {
+                  for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
+                    duplicateIndex = _step17.value;
+                    mergedOrder = this.mergeOrderRecords(mergedOrder, updatedList[duplicateIndex]);
+                    updatedList.splice(duplicateIndex, 1);
+                    if (duplicateIndex < adjustedMatchIndex) adjustedMatchIndex -= 1;
+                  }
+                } catch (err) {
+                  _iterator17.e(err);
+                } finally {
+                  _iterator17.f();
+                }
+                identityKeyToIndex.clear();
+                for (_index = 0; _index < updatedList.length; _index += 1) {
+                  _iterator18 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(updatedList[_index]));
+                  try {
+                    for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
+                      _key = _step18.value;
+                      if (!identityKeyToIndex.has(_key)) identityKeyToIndex.set(_key, _index);
+                    }
+                  } catch (err) {
+                    _iterator18.e(err);
+                  } finally {
+                    _iterator18.f();
+                  }
+                }
+              }
+              updatedList[adjustedMatchIndex] = mergedOrder;
               // 合并后身份字段可能新增（如挂单拿到 order_id），同步登记到索引，
               // 供同批后续 fresh 命中同一槽位，避免重复插入
-              this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, matchIndex);
+              this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, adjustedMatchIndex);
               patchedOrders.push(mergedOrder);
               if (mergeKey) mergeActions[mergeKey] = 'update';
-              return _context16.abrupt("continue", 55);
-            case 50:
+              return _context19.abrupt("continue", 80);
+            case 75:
               insertIndex = updatedList.length;
               updatedList.push(fresh);
               this.registerOrderIdentityKeys(identityKeyToIndex, fresh, insertIndex);
               patchedOrders.push(fresh);
               if (mergeKey) mergeActions[mergeKey] = 'insert';
-            case 55:
-              _context16.next = 33;
+            case 80:
+              _context19.next = 33;
               break;
-            case 57:
-              _context16.next = 62;
+            case 82:
+              _context19.next = 87;
               break;
-            case 59:
-              _context16.prev = 59;
-              _context16.t1 = _context16["catch"](31);
-              _iterator11.e(_context16.t1);
-            case 62:
-              _context16.prev = 62;
-              _iterator11.f();
-              return _context16.finish(62);
-            case 65:
+            case 84:
+              _context19.prev = 84;
+              _context19.t2 = _context19["catch"](31);
+              _iterator15.e(_context19.t2);
+            case 87:
+              _context19.prev = 87;
+              _iterator15.f();
+              return _context19.finish(87);
+            case 90:
               insertCount = Object.values(mergeActions).filter(function (v) {
                 return v === 'insert';
               }).length;
@@ -1752,24 +2402,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               // 仅在自检开关开启时做一次兜底校验。
               this.store.list = this.runOrderStoreSelfCheck(updatedList, "".concat(source, ".store"));
               this.syncOrdersMap();
-              _context16.next = 72;
+              _context19.next = 97;
               return this.patchOrdersInSQLite(patchedOrders, source, mergeActions);
-            case 72:
+            case 97:
               this.logInfo('mergeOrdersToStore-结束', {
                 uniqueFreshCount: uniqueFreshCount,
                 storeOrderCountAfter: this.store.list.length,
                 insertCount: insertCount,
                 updateCount: updateCount
               });
-              _context16.next = 75;
+              _context19.next = 100;
               return this.emitOrdersChanged(patchedOrders, source);
-            case 75:
+            case 100:
             case "end":
-              return _context16.stop();
+              return _context19.stop();
           }
-        }, _callee16, this, [[5, 17, 20, 23], [31, 59, 62, 65]]);
+        }, _callee19, this, [[5, 17, 20, 23], [31, 84, 87, 90], [51, 63, 66, 69]]);
       }));
-      function mergeOrdersToStore(_x9, _x10) {
+      function mergeOrdersToStore(_x12, _x13) {
         return _mergeOrdersToStore.apply(this, arguments);
       }
       return mergeOrdersToStore;
@@ -1786,19 +2436,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "lookupOrderIndexByIdentityKeys",
     value: function lookupOrderIndexByIdentityKeys(identityKeyToIndex, identityKeys) {
       var matchIndex = -1;
-      var _iterator12 = _createForOfIteratorHelper(identityKeys),
-        _step12;
+      var _iterator19 = _createForOfIteratorHelper(identityKeys),
+        _step19;
       try {
-        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
-          var key = _step12.value;
+        for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
+          var key = _step19.value;
           var index = identityKeyToIndex.get(key);
           if (index === undefined) continue;
           if (matchIndex < 0 || index < matchIndex) matchIndex = index;
         }
       } catch (err) {
-        _iterator12.e(err);
+        _iterator19.e(err);
       } finally {
-        _iterator12.f();
+        _iterator19.f();
       }
       return matchIndex;
     }
@@ -1819,17 +2469,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "registerOrderIdentityKeys",
     value: function registerOrderIdentityKeys(identityKeyToIndex, order, index) {
       var identityKeys = this.getOrderIdentityMatchKeys(order);
-      var _iterator13 = _createForOfIteratorHelper(identityKeys),
-        _step13;
+      var _iterator20 = _createForOfIteratorHelper(identityKeys),
+        _step20;
       try {
-        for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
-          var key = _step13.value;
+        for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
+          var key = _step20.value;
           identityKeyToIndex.set(key, index);
         }
       } catch (err) {
-        _iterator13.e(err);
+        _iterator20.e(err);
       } finally {
-        _iterator13.f();
+        _iterator20.f();
       }
     }
 
@@ -1884,17 +2534,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "uniqueOrderIds",
     value: function uniqueOrderIds(ids) {
       var idMap = new Map();
-      var _iterator14 = _createForOfIteratorHelper(ids),
-        _step14;
+      var _iterator21 = _createForOfIteratorHelper(ids),
+        _step21;
       try {
-        for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
-          var id = _step14.value;
+        for (_iterator21.s(); !(_step21 = _iterator21.n()).done;) {
+          var id = _step21.value;
           idMap.set(this.getIdKey(id), id);
         }
       } catch (err) {
-        _iterator14.e(err);
+        _iterator21.e(err);
       } finally {
-        _iterator14.f();
+        _iterator21.f();
       }
       return _toConsumableArray(idMap.values());
     }
@@ -1906,12 +2556,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "isOrderLookupMatch",
     value: function isOrderLookupMatch(order, lookupKey) {
-      var _this14 = this;
+      var _this16 = this;
       if (!order || !lookupKey) return false;
       var candidates = [order.order_id, order.external_sale_number, order.order_number, order.shop_order_number, order.shop_full_order_number];
       return candidates.some(function (value) {
         if (value === undefined || value === null || value === '') return false;
-        return _this14.getIdKey(value) === lookupKey;
+        return _this16.getIdKey(value) === lookupKey;
       });
     }
 
@@ -1954,10 +2604,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "findOrderIndexByIdentity",
     value: function findOrderIndexByIdentity(orders, target) {
-      var _this15 = this;
+      var _this17 = this;
       if (this.getOrderIdentityMatchKeys(target).length === 0) return -1;
       return orders.findIndex(function (order) {
-        return _this15.doOrdersShareIdentity(order, target);
+        return _this17.doOrdersShareIdentity(order, target);
       });
     }
   }, {
@@ -2006,128 +2656,85 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (secondaryList.length === 0) return preferredList;
       if (preferredList.length === 0) return secondaryList;
       var seenKeys = new Set();
-      var _iterator15 = _createForOfIteratorHelper(preferredList),
-        _step15;
+      var _iterator22 = _createForOfIteratorHelper(preferredList),
+        _step22;
       try {
-        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
-          var item = _step15.value;
+        for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
+          var item = _step22.value;
           var keys = this.getProductIdentityKeys(item);
-          var _iterator17 = _createForOfIteratorHelper(keys),
-            _step17;
+          var _iterator24 = _createForOfIteratorHelper(keys),
+            _step24;
           try {
-            for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
-              var key = _step17.value;
+            for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
+              var key = _step24.value;
               seenKeys.add(key);
             }
           } catch (err) {
-            _iterator17.e(err);
+            _iterator24.e(err);
           } finally {
-            _iterator17.f();
+            _iterator24.f();
           }
         }
       } catch (err) {
-        _iterator15.e(err);
+        _iterator22.e(err);
       } finally {
-        _iterator15.f();
+        _iterator22.f();
       }
       var result = _toConsumableArray(preferredList);
-      var _iterator16 = _createForOfIteratorHelper(secondaryList),
-        _step16;
+      var _iterator23 = _createForOfIteratorHelper(secondaryList),
+        _step23;
       try {
-        for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
-          var _item = _step16.value;
+        for (_iterator23.s(); !(_step23 = _iterator23.n()).done;) {
+          var _item = _step23.value;
           var _keys = this.getProductIdentityKeys(_item);
           if (_keys.length === 0 || _keys.some(function (key) {
             return seenKeys.has(key);
           })) continue;
-          var _iterator18 = _createForOfIteratorHelper(_keys),
-            _step18;
+          var _iterator25 = _createForOfIteratorHelper(_keys),
+            _step25;
           try {
-            for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
-              var _key = _step18.value;
-              seenKeys.add(_key);
+            for (_iterator25.s(); !(_step25 = _iterator25.n()).done;) {
+              var _key3 = _step25.value;
+              seenKeys.add(_key3);
             }
           } catch (err) {
-            _iterator18.e(err);
+            _iterator25.e(err);
           } finally {
-            _iterator18.f();
+            _iterator25.f();
           }
           result.push(cloneDeep(_item));
         }
       } catch (err) {
-        _iterator16.e(err);
+        _iterator23.e(err);
       } finally {
-        _iterator16.f();
+        _iterator23.f();
       }
       return result;
     }
-  }, {
-    key: "getPaymentMergeKey",
-    value: function getPaymentMergeKey(payment) {
-      var _record$metadata2;
-      var record = payment;
-      if (!record) return '';
-      var uniquePaymentNumber = (_record$metadata2 = record.metadata) === null || _record$metadata2 === void 0 ? void 0 : _record$metadata2.unique_payment_number;
-      if (!this.isBlankIdentityValue(uniquePaymentNumber)) {
-        return "unique:".concat(String(uniquePaymentNumber));
-      }
-      var orderPaymentId = record.order_payment_id;
-      if (!this.isBlankIdentityValue(orderPaymentId)) return "order_payment:".concat(String(orderPaymentId));
-      var code = record.code;
-      var customPaymentId = record.custom_payment_id;
-      if (!this.isBlankIdentityValue(code) && !this.isBlankIdentityValue(customPaymentId)) {
-        return "custom:".concat(String(code), "#").concat(String(customPaymentId));
-      }
-      return '';
-    }
   }, {
     key: "mergeOrderPaymentLists",
     value: function mergeOrderPaymentLists(existing, incoming) {
-      var _this16 = this;
       var existingList = Array.isArray(existing) ? existing : [];
       var incomingList = Array.isArray(incoming) ? incoming : [];
       if (incomingList.length === 0) return cloneDeep(existingList);
-      if (existingList.length === 0) return cloneDeep(incomingList);
-      var existingByKey = new Map();
-      var _iterator19 = _createForOfIteratorHelper(existingList),
-        _step19;
-      try {
-        for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
-          var payment = _step19.value;
-          var key = this.getPaymentMergeKey(payment);
-          if (!key) continue;
-          existingByKey.set(key, payment);
-        }
-      } catch (err) {
-        _iterator19.e(err);
-      } finally {
-        _iterator19.f();
-      }
-      return incomingList.map(function (payment) {
-        var incomingPayment = payment;
-        var key = _this16.getPaymentMergeKey(incomingPayment);
-        var existingPayment = key ? existingByKey.get(key) : undefined;
-        if (!existingPayment) return cloneDeep(incomingPayment);
-        return _objectSpread(_objectSpread(_objectSpread({}, cloneDeep(existingPayment)), cloneDeep(incomingPayment)), {}, {
-          metadata: _objectSpread(_objectSpread({}, cloneDeep(existingPayment.metadata || {})), cloneDeep(incomingPayment.metadata || {}))
-        });
-      });
+      return mergeOrderPaymentListsByIdentity(existingList, incomingList);
     }
   }, {
     key: "mergeOrderRecords",
-    value: function mergeOrderRecords(existing, incoming, options) {
+    value: function mergeOrderRecords(existing, incoming) {
       var preferred = this.pickPreferredOrder(existing, incoming);
       var secondary = preferred === existing ? incoming : existing;
       var merged = _objectSpread(_objectSpread({}, secondary), preferred);
       var fieldsToPreserve = ['order_id', 'external_sale_number', 'order_number', 'shop_order_number', 'shop_full_order_number'];
-      var incomingPatchFields = ['payment_status', 'status', 'shipping_status', 'updated_at', 'shop_discount', 'summary', 'products', 'bookings', 'note', 'customer_id', 'customer_name', 'customer', 'holder', 'contacts_info', 'phone', 'email', 'relation_forms'];
+      var incomingPatchFields = ['payment_status', 'status', 'shipping_status', 'updated_at', 'shop_discount', 'summary', 'note', 'customer_id', 'customer_name', 'customer', 'holder', 'contacts_info', 'phone', 'email', 'relation_forms', 'is_draft_order'];
       var mergedRecord = merged;
       var preferredRecord = preferred;
       var secondaryRecord = secondary;
+      var existingRecord = existing;
       var incomingRecord = incoming;
-      var previousRecord = preferred === incoming ? secondaryRecord : preferredRecord;
-      for (var _i3 = 0, _fieldsToPreserve = fieldsToPreserve; _i3 < _fieldsToPreserve.length; _i3++) {
-        var field = _fieldsToPreserve[_i3];
+      var childUidRemaps = [];
+      for (var _i4 = 0, _fieldsToPreserve = fieldsToPreserve; _i4 < _fieldsToPreserve.length; _i4++) {
+        var field = _fieldsToPreserve[_i4];
         if (!this.isBlankIdentityValue(preferredRecord[field])) {
           mergedRecord[field] = preferredRecord[field];
           continue;
@@ -2136,76 +2743,82 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           mergedRecord[field] = secondaryRecord[field];
         }
       }
-      var hasIncomingProducts = Object.prototype.hasOwnProperty.call(incomingRecord, 'products');
-      var shouldUseIncomingProductsSnapshot = (options === null || options === void 0 ? void 0 : options.preferIncomingProducts) === true && hasIncomingProducts && incomingRecord.products !== undefined && incomingRecord.products !== null;
-      for (var _i4 = 0, _incomingPatchFields = incomingPatchFields; _i4 < _incomingPatchFields.length; _i4++) {
-        var _field = _incomingPatchFields[_i4];
+      for (var _i5 = 0, _incomingPatchFields = incomingPatchFields; _i5 < _incomingPatchFields.length; _i5++) {
+        var _field = _incomingPatchFields[_i5];
         if (!Object.prototype.hasOwnProperty.call(incomingRecord, _field)) continue;
         if (incomingRecord[_field] === undefined || incomingRecord[_field] === null) continue;
         if (typeof incomingRecord[_field] === 'string' && incomingRecord[_field] === '') continue;
         mergedRecord[_field] = cloneDeep(incomingRecord[_field]);
       }
-      mergedRecord.products = shouldUseIncomingProductsSnapshot ? cloneDeep(incomingRecord.products) : this.mergeOrderProductLists(preferredRecord.products, secondaryRecord.products);
-      if (Object.prototype.hasOwnProperty.call(incomingRecord, 'payments')) {
-        if (Array.isArray(incomingRecord.payments)) {
-          mergedRecord.payments = this.mergeOrderPaymentLists(previousRecord.payments, incomingRecord.payments);
-        } else if (incomingRecord.payments !== undefined && incomingRecord.payments !== null) {
-          mergedRecord.payments = cloneDeep(incomingRecord.payments);
+
+      // 子项数组遵循完整快照语义：incoming 自有且为数组（包括 []）时权威替换；
+      // 字段缺席或不是数组时视为稀疏 patch，继续保留 existing。
+      for (var _i6 = 0, _ORDER_AUTHORITATIVE_2 = ORDER_AUTHORITATIVE_COLLECTION_FIELDS; _i6 < _ORDER_AUTHORITATIVE_2.length; _i6++) {
+        var _field2 = _ORDER_AUTHORITATIVE_2[_i6];
+        if (Array.isArray(incomingRecord[_field2])) {
+          mergedRecord[_field2] = this.mergeAuthoritativeOrderCollection(_field2, existingRecord[_field2], incomingRecord[_field2], childUidRemaps);
+          continue;
+        }
+        if (Object.prototype.hasOwnProperty.call(existingRecord, _field2)) {
+          mergedRecord[_field2] = cloneDeep(existingRecord[_field2]);
+        } else {
+          delete mergedRecord[_field2];
         }
       }
       if (!this.isPendingSyncOrder(preferred) || !this.isPendingSyncOrder(secondary)) {
         merged.need_sync = 0;
       }
-      return merged;
+      return this.normalizeOrderCollectionsForIngress(applyOrderCollectionUidRemaps(merged, childUidRemaps), 'mergeOrderRecords');
     }
   }, {
     key: "summarizeDuplicateOrders",
     value: function summarizeDuplicateOrders(orders) {
       var groups = new Map();
-      var _iterator20 = _createForOfIteratorHelper(orders),
-        _step20;
+      var _iterator26 = _createForOfIteratorHelper(orders),
+        _step26;
       try {
-        for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
-          var order = _step20.value;
-          var _iterator21 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(order)),
-            _step21;
+        for (_iterator26.s(); !(_step26 = _iterator26.n()).done;) {
+          var order = _step26.value;
+          var _iterator27 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(order)),
+            _step27;
           try {
-            for (_iterator21.s(); !(_step21 = _iterator21.n()).done;) {
-              var key = _step21.value;
+            for (_iterator27.s(); !(_step27 = _iterator27.n()).done;) {
+              var key = _step27.value;
               var group = groups.get(key) || [];
               group.push(order);
               groups.set(key, group);
             }
           } catch (err) {
-            _iterator21.e(err);
+            _iterator27.e(err);
           } finally {
-            _iterator21.f();
+            _iterator27.f();
           }
         }
       } catch (err) {
-        _iterator20.e(err);
+        _iterator26.e(err);
       } finally {
-        _iterator20.f();
+        _iterator26.f();
       }
-      return _toConsumableArray(groups.entries()).filter(function (_ref4) {
-        var _ref5 = _slicedToArray(_ref4, 2),
-          group = _ref5[1];
-        return group.length > 1;
-      }).slice(0, 20).map(function (_ref6) {
+      return _toConsumableArray(groups.entries()).filter(function (_ref6) {
         var _ref7 = _slicedToArray(_ref6, 2),
-          key = _ref7[0],
           group = _ref7[1];
+        return group.length > 1;
+      }).slice(0, 20).map(function (_ref8) {
+        var _ref9 = _slicedToArray(_ref8, 2),
+          key = _ref9[0],
+          group = _ref9[1];
         return {
           key: key,
           count: group.length,
           orders: group.map(function (order) {
-            var _order$order_id2, _external_sale_number2, _shop_order_number, _shop_full_order_numb, _order$need_sync;
+            var _order$order_id4, _external_sale_number4, _shop_order_number, _shop_full_order_numb, _order$need_sync, _order$is_draft_order;
             return {
-              order_id: (_order$order_id2 = order.order_id) !== null && _order$order_id2 !== void 0 ? _order$order_id2 : null,
-              external_sale_number: (_external_sale_number2 = order.external_sale_number) !== null && _external_sale_number2 !== void 0 ? _external_sale_number2 : null,
+              order_id: (_order$order_id4 = order.order_id) !== null && _order$order_id4 !== void 0 ? _order$order_id4 : null,
+              external_sale_number: (_external_sale_number4 = order.external_sale_number) !== null && _external_sale_number4 !== void 0 ? _external_sale_number4 : null,
               shop_order_number: (_shop_order_number = order.shop_order_number) !== null && _shop_order_number !== void 0 ? _shop_order_number : null,
               shop_full_order_number: (_shop_full_order_numb = order.shop_full_order_number) !== null && _shop_full_order_numb !== void 0 ? _shop_full_order_numb : null,
-              need_sync: (_order$need_sync = order.need_sync) !== null && _order$need_sync !== void 0 ? _order$need_sync : null
+              need_sync: (_order$need_sync = order.need_sync) !== null && _order$need_sync !== void 0 ? _order$need_sync : null,
+              is_draft_order: (_order$is_draft_order = order.is_draft_order) !== null && _order$is_draft_order !== void 0 ? _order$is_draft_order : null
             };
           })
         };
@@ -2227,23 +2840,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function compactOrderListByIdentity(orders, source) {
       var list = [];
       var removedCount = 0;
-      var _iterator22 = _createForOfIteratorHelper(orders),
-        _step22;
+      var _iterator28 = _createForOfIteratorHelper(orders),
+        _step28;
       try {
-        for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
-          var order = _step22.value;
-          var matchIndex = this.findOrderIndexByIdentity(list, order);
+        for (_iterator28.s(); !(_step28 = _iterator28.n()).done;) {
+          var order = _step28.value;
+          var normalizedOrder = this.normalizeOrderCollectionsForIngress(order, "".concat(source, ".order"));
+          var matchIndex = this.findOrderIndexByIdentity(list, normalizedOrder);
           if (matchIndex < 0) {
-            list.push(order);
+            list.push(normalizedOrder);
             continue;
           }
-          list[matchIndex] = this.mergeOrderRecords(list[matchIndex], order);
+          list[matchIndex] = this.mergeOrderRecords(list[matchIndex], normalizedOrder);
           removedCount += 1;
         }
       } catch (err) {
-        _iterator22.e(err);
+        _iterator28.e(err);
       } finally {
-        _iterator22.f();
+        _iterator28.f();
       }
       if (removedCount > 0) {
         this.logWarning('订单列表重复项已压缩', {
@@ -2341,32 +2955,35 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadOrdersFromSQLite",
     value: function () {
-      var _loadOrdersFromSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
+      var _loadOrdersFromSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20() {
+        var _this18 = this;
         var orders;
-        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
               if (this.dbManager) {
-                _context17.next = 2;
+                _context20.next = 2;
                 break;
               }
-              return _context17.abrupt("return", []);
+              return _context20.abrupt("return", []);
             case 2:
-              _context17.prev = 2;
-              _context17.next = 5;
+              _context20.prev = 2;
+              _context20.next = 5;
               return this.dbManager.getAll(INDEXDB_STORE_NAME);
             case 5:
-              orders = _context17.sent;
-              return _context17.abrupt("return", orders || []);
+              orders = _context20.sent;
+              return _context20.abrupt("return", (orders || []).map(function (order) {
+                return _this18.normalizeOrderCollectionsForIngress(order, 'loadOrdersFromSQLite');
+              }));
             case 9:
-              _context17.prev = 9;
-              _context17.t0 = _context17["catch"](2);
-              return _context17.abrupt("return", []);
+              _context20.prev = 9;
+              _context20.t0 = _context20["catch"](2);
+              return _context20.abrupt("return", []);
             case 12:
             case "end":
-              return _context17.stop();
+              return _context20.stop();
           }
-        }, _callee17, this, [[2, 9]]);
+        }, _callee20, this, [[2, 9]]);
       }));
       function loadOrdersFromSQLite() {
         return _loadOrdersFromSQLite.apply(this, arguments);
@@ -2378,39 +2995,58 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function isPendingSyncOrder(order) {
       return Number(order === null || order === void 0 ? void 0 : order.need_sync) === 1;
     }
+  }, {
+    key: "isDraftOrder",
+    value: function isDraftOrder(order) {
+      return Number(order === null || order === void 0 ? void 0 : order.is_draft_order) === 1;
+    }
+  }, {
+    key: "shouldProtectDraftOrderFromIncoming",
+    value: function shouldProtectDraftOrderFromIncoming(source) {
+      return source !== 'checkoutSync';
+    }
   }, {
     key: "normalizeRemoteSyncedOrder",
     value: function normalizeRemoteSyncedOrder(order) {
-      if (this.isPendingSyncOrder(order)) return order;
-      return _objectSpread(_objectSpread({}, order), {}, {
-        need_sync: 0
+      var normalizedOrder = this.normalizeOrderCollectionsForIngress(order, 'normalizeRemoteSyncedOrder');
+      if (this.isPendingSyncOrder(normalizedOrder)) return _objectSpread(_objectSpread({}, normalizedOrder), {}, {
+        is_draft_order: 0
+      });
+      return _objectSpread(_objectSpread({}, normalizedOrder), {}, {
+        need_sync: 0,
+        is_draft_order: 0
       });
     }
   }, {
     key: "mergeRemoteSnapshotWithPendingOrders",
     value: function mergeRemoteSnapshotWithPendingOrders(remoteOrders, existingOrders) {
-      var _this17 = this;
+      var _this19 = this;
       var merged = remoteOrders.map(function (order) {
-        return _this17.normalizeRemoteSyncedOrder(order);
+        return _this19.normalizeRemoteSyncedOrder(order);
       });
-      var _iterator23 = _createForOfIteratorHelper(existingOrders),
-        _step23;
+      var _iterator29 = _createForOfIteratorHelper(existingOrders),
+        _step29;
       try {
-        for (_iterator23.s(); !(_step23 = _iterator23.n()).done;) {
-          var order = _step23.value;
-          if (!this.isPendingSyncOrder(order)) continue;
+        for (_iterator29.s(); !(_step29 = _iterator29.n()).done;) {
+          var rawOrder = _step29.value;
+          var order = this.normalizeOrderCollectionsForIngress(rawOrder, 'mergeRemoteSnapshotWithPendingOrders.existingSQLite');
+          if (!this.isPendingSyncOrder(order) && !this.isDraftOrder(order)) continue;
           var matchIndex = this.findOrderIndexByIdentity(merged, order);
           if (matchIndex >= 0) {
-            merged[matchIndex] = this.mergeOrderRecords(order, merged[matchIndex]);
+            if (this.isDraftOrder(order)) {
+              merged[matchIndex] = order;
+            } else {
+              merged[matchIndex] = this.mergeOrderRecords(order, merged[matchIndex]);
+            }
             continue;
           }
           if (!this.getOrderStorageKey(order)) continue;
           merged.push(order);
         }
       } catch (err) {
-        _iterator23.e(err);
+        _iterator29.e(err);
       } finally {
-        _iterator23.f();
+        _iterator29.f();
       }
       return this.compactOrderListByIdentity(merged, 'mergeRemoteSnapshotWithPendingOrders').list;
     }
@@ -2426,10 +3062,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "runInOrderSQLiteSaveQueue",
     value: (function () {
-      var _runInOrderSQLiteSaveQueue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(task) {
+      var _runInOrderSQLiteSaveQueue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(task) {
         var queuedTask;
-        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
             case 0:
               queuedTask = this.orderSQLiteSaveQueue.then(task, task);
               this.orderSQLiteSaveQueue = queuedTask.then(function () {
@@ -2437,14 +3073,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }, function () {
                 return undefined;
               });
-              return _context18.abrupt("return", queuedTask);
+              return _context21.abrupt("return", queuedTask);
             case 3:
             case "end":
-              return _context18.stop();
+              return _context21.stop();
           }
-        }, _callee18, this);
+        }, _callee21, this);
       }));
-      function runInOrderSQLiteSaveQueue(_x11) {
+      function runInOrderSQLiteSaveQueue(_x14) {
         return _runInOrderSQLiteSaveQueue.apply(this, arguments);
       }
       return runInOrderSQLiteSaveQueue;
@@ -2459,144 +3095,174 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "patchOrdersInSQLite",
     value: (function () {
-      var _patchOrdersInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(orders, source) {
-        var _this18 = this;
+      var _patchOrdersInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(orders, source) {
+        var _this20 = this;
         var mergeActions,
+          options,
           ordersSnapshot,
           _this$filterRedundant2,
           toWrite,
           skipped,
           compactedToWrite,
-          _args20 = arguments;
-        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+          _args23 = arguments;
+        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
+          while (1) switch (_context23.prev = _context23.next) {
             case 0:
-              mergeActions = _args20.length > 2 && _args20[2] !== undefined ? _args20[2] : {};
-              if (!(!this.dbManager || orders.length === 0)) {
-                _context20.next = 3;
+              mergeActions = _args23.length > 2 && _args23[2] !== undefined ? _args23[2] : {};
+              options = _args23.length > 3 && _args23[3] !== undefined ? _args23[3] : {};
+              if (!(orders.length === 0)) {
+                _context23.next = 4;
                 break;
               }
-              return _context20.abrupt("return");
-            case 3:
-              ordersSnapshot = cloneDeep(orders).filter(function (order) {
-                return _this18.getOrderStorageKey(order);
+              return _context23.abrupt("return");
+            case 4:
+              if (this.dbManager) {
+                _context23.next = 8;
+                break;
+              }
+              if (!options.throwOnError) {
+                _context23.next = 7;
+                break;
+              }
+              throw new Error('订单 SQLite 数据库未初始化');
+            case 7:
+              return _context23.abrupt("return");
+            case 8:
+              ordersSnapshot = cloneDeep(orders).map(function (order) {
+                return _this20.normalizeOrderCollectionsForIngress(order, "".concat(source, ".sqliteIngress"));
+              }).filter(function (order) {
+                return _this20.getOrderStorageKey(order);
               });
               if (!(ordersSnapshot.length === 0)) {
-                _context20.next = 6;
+                _context23.next = 11;
                 break;
               }
-              return _context20.abrupt("return");
-            case 6:
+              return _context23.abrupt("return");
+            case 11:
               _this$filterRedundant2 = this.filterRedundantPatchOrders(source, ordersSnapshot, mergeActions), toWrite = _this$filterRedundant2.toWrite, skipped = _this$filterRedundant2.skipped;
               if (!(toWrite.length === 0)) {
-                _context20.next = 9;
+                _context23.next = 14;
                 break;
               }
-              return _context20.abrupt("return");
-            case 9:
+              return _context23.abrupt("return");
+            case 14:
               compactedToWrite = this.compactOrderListByIdentity(toWrite, "".concat(source, ".sqlitePatch")).list;
               if (!(compactedToWrite.length === 0)) {
-                _context20.next = 12;
+                _context23.next = 17;
                 break;
               }
-              return _context20.abrupt("return");
-            case 12:
-              _context20.prev = 12;
-              _context20.next = 15;
-              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
-                var writeMethod, _iterator24, _step24, order;
-                return _regeneratorRuntime().wrap(function _callee19$(_context19) {
-                  while (1) switch (_context19.prev = _context19.next) {
+              return _context23.abrupt("return");
+            case 17:
+              _context23.prev = 17;
+              _context23.next = 20;
+              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22() {
+                var writeMethod, _iterator30, _step30, order;
+                return _regeneratorRuntime().wrap(function _callee22$(_context22) {
+                  while (1) switch (_context22.prev = _context22.next) {
                     case 0:
                       writeMethod = 'none';
-                      _this18.logInfo('patchOrdersInSQLite-开始', {
+                      _this20.logInfo('patchOrdersInSQLite-开始', {
                         source: source,
                         count: compactedToWrite.length,
                         dedupedCount: skipped.length
                       });
-                      if (!(typeof _this18.dbManager.bulkUpdate === 'function')) {
-                        _context19.next = 8;
+                      if (!(typeof _this20.dbManager.bulkUpdate === 'function')) {
+                        _context22.next = 8;
                         break;
                       }
                       writeMethod = 'bulkUpdate';
-                      _context19.next = 6;
-                      return _this18.dbManager.bulkUpdate(INDEXDB_STORE_NAME, compactedToWrite);
+                      _context22.next = 6;
+                      return _this20.dbManager.bulkUpdate(INDEXDB_STORE_NAME, compactedToWrite);
                     case 6:
-                      _context19.next = 33;
+                      _context22.next = 37;
                       break;
                     case 8:
-                      if (!(typeof _this18.dbManager.bulkAdd === 'function')) {
-                        _context19.next = 14;
+                      if (!(typeof _this20.dbManager.bulkAdd === 'function')) {
+                        _context22.next = 14;
                         break;
                       }
                       writeMethod = 'bulkAdd';
-                      _context19.next = 12;
-                      return _this18.dbManager.bulkAdd(INDEXDB_STORE_NAME, compactedToWrite);
+                      _context22.next = 12;
+                      return _this20.dbManager.bulkAdd(INDEXDB_STORE_NAME, compactedToWrite);
                     case 12:
-                      _context19.next = 33;
+                      _context22.next = 37;
                       break;
                     case 14:
-                      if (!(typeof _this18.dbManager.update === 'function')) {
-                        _context19.next = 33;
+                      if (!(typeof _this20.dbManager.update === 'function')) {
+                        _context22.next = 35;
                         break;
                       }
                       writeMethod = 'update';
-                      _iterator24 = _createForOfIteratorHelper(compactedToWrite);
-                      _context19.prev = 17;
-                      _iterator24.s();
+                      _iterator30 = _createForOfIteratorHelper(compactedToWrite);
+                      _context22.prev = 17;
+                      _iterator30.s();
                     case 19:
-                      if ((_step24 = _iterator24.n()).done) {
-                        _context19.next = 25;
+                      if ((_step30 = _iterator30.n()).done) {
+                        _context22.next = 25;
                         break;
                       }
-                      order = _step24.value;
-                      _context19.next = 23;
-                      return _this18.dbManager.update(INDEXDB_STORE_NAME, order);
+                      order = _step30.value;
+                      _context22.next = 23;
+                      return _this20.dbManager.update(INDEXDB_STORE_NAME, order);
                     case 23:
-                      _context19.next = 19;
+                      _context22.next = 19;
                       break;
                     case 25:
-                      _context19.next = 30;
+                      _context22.next = 30;
                       break;
                     case 27:
-                      _context19.prev = 27;
-                      _context19.t0 = _context19["catch"](17);
-                      _iterator24.e(_context19.t0);
+                      _context22.prev = 27;
+                      _context22.t0 = _context22["catch"](17);
+                      _iterator30.e(_context22.t0);
                     case 30:
-                      _context19.prev = 30;
-                      _iterator24.f();
-                      return _context19.finish(30);
+                      _context22.prev = 30;
+                      _iterator30.f();
+                      return _context22.finish(30);
                     case 33:
-                      _this18.recordRecentSqliteWrite(source, compactedToWrite);
-                      _this18.logInfo('patchOrdersInSQLite-完成', {
+                      _context22.next = 37;
+                      break;
+                    case 35:
+                      if (!options.throwOnError) {
+                        _context22.next = 37;
+                        break;
+                      }
+                      throw new Error('订单 SQLite 数据库不支持写入');
+                    case 37:
+                      _this20.recordRecentSqliteWrite(source, compactedToWrite);
+                      _this20.logInfo('patchOrdersInSQLite-完成', {
                         source: source,
                         count: compactedToWrite.length,
                         writeMethod: writeMethod,
                         dedupedCount: skipped.length
                       });
-                    case 35:
+                    case 39:
                     case "end":
-                      return _context19.stop();
+                      return _context22.stop();
                   }
-                }, _callee19, null, [[17, 27, 30, 33]]);
+                }, _callee22, null, [[17, 27, 30, 33]]);
               })));
-            case 15:
-              _context20.next = 20;
+            case 20:
+              _context23.next = 27;
               break;
-            case 17:
-              _context20.prev = 17;
-              _context20.t0 = _context20["catch"](12);
+            case 22:
+              _context23.prev = 22;
+              _context23.t0 = _context23["catch"](17);
               this.logError('增量保存订单到 SQLite 失败', {
-                error: _context20.t0 instanceof Error ? _context20.t0.message : String(_context20.t0),
+                error: _context23.t0 instanceof Error ? _context23.t0.message : String(_context23.t0),
                 orderCount: ordersSnapshot.length
               });
-            case 20:
+              if (!options.throwOnError) {
+                _context23.next = 27;
+                break;
+              }
+              throw _context23.t0;
+            case 27:
             case "end":
-              return _context20.stop();
+              return _context23.stop();
           }
-        }, _callee20, this, [[12, 17]]);
+        }, _callee23, this, [[17, 22]]);
       }));
-      function patchOrdersInSQLite(_x12, _x13) {
+      function patchOrdersInSQLite(_x15, _x16) {
         return _patchOrdersInSQLite.apply(this, arguments);
       }
       return patchOrdersInSQLite;
@@ -2611,92 +3277,128 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderInSQLite",
     value: (function () {
-      var _updateOrderInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(order, source) {
-        var _this19 = this;
-        var orderSnapshot, _orderSnapshot$order_3;
-        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
+      var _updateOrderInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(order, source) {
+        var _this21 = this;
+        var options,
+          orderSnapshot,
+          _orderSnapshot$order_3,
+          _args25 = arguments;
+        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
             case 0:
-              if (!(!this.dbManager || !this.getOrderStorageKey(order))) {
-                _context22.next = 2;
+              options = _args25.length > 2 && _args25[2] !== undefined ? _args25[2] : {};
+              if (this.getOrderStorageKey(order)) {
+                _context25.next = 5;
                 break;
               }
-              return _context22.abrupt("return");
-            case 2:
-              orderSnapshot = cloneDeep(order);
-              _context22.prev = 3;
-              _context22.next = 6;
-              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
+              if (!options.throwOnError) {
+                _context25.next = 4;
+                break;
+              }
+              throw new Error('订单缺少可用的 SQLite 存储主键');
+            case 4:
+              return _context25.abrupt("return");
+            case 5:
+              if (this.dbManager) {
+                _context25.next = 9;
+                break;
+              }
+              if (!options.throwOnError) {
+                _context25.next = 8;
+                break;
+              }
+              throw new Error('订单 SQLite 数据库未初始化');
+            case 8:
+              return _context25.abrupt("return");
+            case 9:
+              orderSnapshot = this.normalizeOrderCollectionsForIngress(cloneDeep(order), "".concat(source, ".sqliteIngress"));
+              _context25.prev = 10;
+              _context25.next = 13;
+              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24() {
                 var _orderSnapshot$order_, _orderSnapshot$order_2;
                 var writeMethod;
-                return _regeneratorRuntime().wrap(function _callee21$(_context21) {
-                  while (1) switch (_context21.prev = _context21.next) {
+                return _regeneratorRuntime().wrap(function _callee24$(_context24) {
+                  while (1) switch (_context24.prev = _context24.next) {
                     case 0:
                       writeMethod = 'none';
-                      _this19.logInfo('updateOrderInSQLite-开始', {
+                      _this21.logInfo('updateOrderInSQLite-开始', {
                         source: source,
                         orderId: (_orderSnapshot$order_ = orderSnapshot.order_id) !== null && _orderSnapshot$order_ !== void 0 ? _orderSnapshot$order_ : null,
-                        storageKey: _this19.getOrderStorageKey(orderSnapshot)
+                        storageKey: _this21.getOrderStorageKey(orderSnapshot)
                       });
-                      if (!(typeof _this19.dbManager.update === 'function')) {
-                        _context21.next = 8;
+                      if (!(typeof _this21.dbManager.update === 'function')) {
+                        _context24.next = 8;
                         break;
                       }
                       writeMethod = 'update';
-                      _context21.next = 6;
-                      return _this19.dbManager.update(INDEXDB_STORE_NAME, orderSnapshot);
+                      _context24.next = 6;
+                      return _this21.dbManager.update(INDEXDB_STORE_NAME, orderSnapshot);
                     case 6:
-                      _context21.next = 18;
+                      _context24.next = 22;
                       break;
                     case 8:
-                      if (!(typeof _this19.dbManager.bulkUpdate === 'function')) {
-                        _context21.next = 14;
+                      if (!(typeof _this21.dbManager.bulkUpdate === 'function')) {
+                        _context24.next = 14;
                         break;
                       }
                       writeMethod = 'bulkUpdate';
-                      _context21.next = 12;
-                      return _this19.dbManager.bulkUpdate(INDEXDB_STORE_NAME, [orderSnapshot]);
+                      _context24.next = 12;
+                      return _this21.dbManager.bulkUpdate(INDEXDB_STORE_NAME, [orderSnapshot]);
                     case 12:
-                      _context21.next = 18;
+                      _context24.next = 22;
                       break;
                     case 14:
-                      if (!(typeof _this19.dbManager.bulkAdd === 'function')) {
-                        _context21.next = 18;
+                      if (!(typeof _this21.dbManager.bulkAdd === 'function')) {
+                        _context24.next = 20;
                         break;
                       }
                       writeMethod = 'bulkAdd';
-                      _context21.next = 18;
-                      return _this19.dbManager.bulkAdd(INDEXDB_STORE_NAME, [orderSnapshot]);
+                      _context24.next = 18;
+                      return _this21.dbManager.bulkAdd(INDEXDB_STORE_NAME, [orderSnapshot]);
                     case 18:
-                      _this19.recordRecentSqliteWrite(source, [orderSnapshot]);
-                      _this19.logInfo('updateOrderInSQLite-完成', {
+                      _context24.next = 22;
+                      break;
+                    case 20:
+                      if (!options.throwOnError) {
+                        _context24.next = 22;
+                        break;
+                      }
+                      throw new Error('订单 SQLite 数据库不支持写入');
+                    case 22:
+                      _this21.recordRecentSqliteWrite(source, [orderSnapshot]);
+                      _this21.logInfo('updateOrderInSQLite-完成', {
                         source: source,
                         orderId: (_orderSnapshot$order_2 = orderSnapshot.order_id) !== null && _orderSnapshot$order_2 !== void 0 ? _orderSnapshot$order_2 : null,
                         writeMethod: writeMethod
                       });
-                    case 20:
+                    case 24:
                     case "end":
-                      return _context21.stop();
+                      return _context24.stop();
                   }
-                }, _callee21);
+                }, _callee24);
               })));
-            case 6:
-              _context22.next = 11;
+            case 13:
+              _context25.next = 20;
               break;
-            case 8:
-              _context22.prev = 8;
-              _context22.t0 = _context22["catch"](3);
+            case 15:
+              _context25.prev = 15;
+              _context25.t0 = _context25["catch"](10);
               this.logError('单条保存订单到 SQLite 失败', {
-                error: _context22.t0 instanceof Error ? _context22.t0.message : String(_context22.t0),
+                error: _context25.t0 instanceof Error ? _context25.t0.message : String(_context25.t0),
                 orderId: (_orderSnapshot$order_3 = orderSnapshot.order_id) !== null && _orderSnapshot$order_3 !== void 0 ? _orderSnapshot$order_3 : null
               });
-            case 11:
+              if (!options.throwOnError) {
+                _context25.next = 20;
+                break;
+              }
+              throw _context25.t0;
+            case 20:
             case "end":
-              return _context22.stop();
+              return _context25.stop();
           }
-        }, _callee22, this, [[3, 8]]);
+        }, _callee25, this, [[10, 15]]);
       }));
-      function updateOrderInSQLite(_x14, _x15) {
+      function updateOrderInSQLite(_x17, _x18) {
         return _updateOrderInSQLite.apply(this, arguments);
       }
       return updateOrderInSQLite;
@@ -2711,98 +3413,100 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "replaceOrdersSnapshotInSQLite",
     value: (function () {
-      var _replaceOrdersSnapshotInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(orderList, source) {
-        var _this20 = this;
+      var _replaceOrdersSnapshotInSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(orderList, source) {
+        var _this22 = this;
         var remoteSnapshot, mergedSnapshot;
-        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
+        return _regeneratorRuntime().wrap(function _callee27$(_context27) {
+          while (1) switch (_context27.prev = _context27.next) {
             case 0:
               if (this.dbManager) {
-                _context24.next = 2;
+                _context27.next = 2;
                 break;
               }
-              return _context24.abrupt("return", this.compactOrderListByIdentity(orderList.map(function (order) {
-                return _this20.normalizeRemoteSyncedOrder(order);
+              return _context27.abrupt("return", this.compactOrderListByIdentity(orderList.map(function (order) {
+                return _this22.normalizeRemoteSyncedOrder(order);
               }), "".concat(source, ".snapshotNoDb")).list);
             case 2:
-              remoteSnapshot = cloneDeep(orderList);
+              remoteSnapshot = cloneDeep(orderList).map(function (order) {
+                return _this22.normalizeOrderCollectionsForIngress(order, "".concat(source, ".remoteIngress"));
+              });
               mergedSnapshot = this.compactOrderListByIdentity(remoteSnapshot.map(function (order) {
-                return _this20.normalizeRemoteSyncedOrder(order);
+                return _this22.normalizeRemoteSyncedOrder(order);
               }), "".concat(source, ".remoteSnapshot")).list;
-              _context24.prev = 4;
-              _context24.next = 7;
-              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
+              _context27.prev = 4;
+              _context27.next = 7;
+              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26() {
                 var existingOrders, orderListSnapshot;
-                return _regeneratorRuntime().wrap(function _callee23$(_context23) {
-                  while (1) switch (_context23.prev = _context23.next) {
+                return _regeneratorRuntime().wrap(function _callee26$(_context26) {
+                  while (1) switch (_context26.prev = _context26.next) {
                     case 0:
-                      if (!(typeof _this20.dbManager.getAll === 'function')) {
-                        _context23.next = 6;
+                      if (!(typeof _this22.dbManager.getAll === 'function')) {
+                        _context26.next = 6;
                         break;
                       }
-                      _context23.next = 3;
-                      return _this20.dbManager.getAll(INDEXDB_STORE_NAME);
+                      _context26.next = 3;
+                      return _this22.dbManager.getAll(INDEXDB_STORE_NAME);
                     case 3:
-                      _context23.t0 = _context23.sent;
-                      _context23.next = 7;
+                      _context26.t0 = _context26.sent;
+                      _context26.next = 7;
                       break;
                     case 6:
-                      _context23.t0 = [];
+                      _context26.t0 = [];
                     case 7:
-                      existingOrders = _context23.t0;
-                      orderListSnapshot = _this20.mergeRemoteSnapshotWithPendingOrders(remoteSnapshot, existingOrders || []);
-                      mergedSnapshot = _this20.compactOrderListByIdentity(orderListSnapshot, "".concat(source, ".sqliteSnapshot")).list;
-                      _this20.logInfo('replaceOrdersSnapshotInSQLite-开始', {
+                      existingOrders = _context26.t0;
+                      orderListSnapshot = _this22.mergeRemoteSnapshotWithPendingOrders(remoteSnapshot, existingOrders || []);
+                      mergedSnapshot = _this22.compactOrderListByIdentity(orderListSnapshot, "".concat(source, ".sqliteSnapshot")).list;
+                      _this22.logInfo('replaceOrdersSnapshotInSQLite-开始', {
                         source: source,
                         count: mergedSnapshot.length,
                         remoteCount: remoteSnapshot.length,
-                        preservedPendingCount: mergedSnapshot.length - remoteSnapshot.length
+                        preservedLocalUnsyncedCount: mergedSnapshot.length - remoteSnapshot.length
                       });
-                      _context23.next = 13;
-                      return _this20.dbManager.clear(INDEXDB_STORE_NAME);
+                      _context26.next = 13;
+                      return _this22.dbManager.clear(INDEXDB_STORE_NAME);
                     case 13:
-                      _this20.logInfo('replaceOrdersSnapshotInSQLite-clear完成', {
+                      _this22.logInfo('replaceOrdersSnapshotInSQLite-clear完成', {
                         count: mergedSnapshot.length
                       });
                       if (!(mergedSnapshot.length === 0)) {
-                        _context23.next = 16;
+                        _context26.next = 16;
                         break;
                       }
-                      return _context23.abrupt("return");
+                      return _context26.abrupt("return");
                     case 16:
-                      _context23.next = 18;
-                      return _this20.dbManager.bulkAdd(INDEXDB_STORE_NAME, mergedSnapshot);
+                      _context26.next = 18;
+                      return _this22.dbManager.bulkAdd(INDEXDB_STORE_NAME, mergedSnapshot);
                     case 18:
-                      _this20.recordRecentSqliteWrite(source, mergedSnapshot);
-                      _this20.logInfo('replaceOrdersSnapshotInSQLite-bulkAdd完成', {
+                      _this22.recordRecentSqliteWrite(source, mergedSnapshot);
+                      _this22.logInfo('replaceOrdersSnapshotInSQLite-bulkAdd完成', {
                         source: source,
                         count: mergedSnapshot.length
                       });
                     case 20:
                     case "end":
-                      return _context23.stop();
+                      return _context26.stop();
                   }
-                }, _callee23);
+                }, _callee26);
               })));
             case 7:
-              _context24.next = 12;
+              _context27.next = 12;
               break;
             case 9:
-              _context24.prev = 9;
-              _context24.t0 = _context24["catch"](4);
+              _context27.prev = 9;
+              _context27.t0 = _context27["catch"](4);
               this.logError('全量保存订单到 SQLite 失败', {
-                error: _context24.t0 instanceof Error ? _context24.t0.message : String(_context24.t0),
+                error: _context27.t0 instanceof Error ? _context27.t0.message : String(_context27.t0),
                 orderList: remoteSnapshot.length
               });
             case 12:
-              return _context24.abrupt("return", mergedSnapshot);
+              return _context27.abrupt("return", mergedSnapshot);
             case 13:
             case "end":
-              return _context24.stop();
+              return _context27.stop();
           }
-        }, _callee24, this, [[4, 9]]);
+        }, _callee27, this, [[4, 9]]);
       }));
-      function replaceOrdersSnapshotInSQLite(_x16, _x17) {
+      function replaceOrdersSnapshotInSQLite(_x19, _x20) {
         return _replaceOrdersSnapshotInSQLite.apply(this, arguments);
       }
       return replaceOrdersSnapshotInSQLite;
@@ -2817,38 +3521,38 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "clear",
     value: (function () {
-      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26() {
-        var _this21 = this;
-        return _regeneratorRuntime().wrap(function _callee26$(_context26) {
-          while (1) switch (_context26.prev = _context26.next) {
+      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29() {
+        var _this23 = this;
+        return _regeneratorRuntime().wrap(function _callee29$(_context29) {
+          while (1) switch (_context29.prev = _context29.next) {
             case 0:
               this.store.list = [];
               this.store.map = new Map();
               if (!this.dbManager) {
-                _context26.next = 5;
+                _context29.next = 5;
                 break;
               }
-              _context26.next = 5;
-              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25() {
-                return _regeneratorRuntime().wrap(function _callee25$(_context25) {
-                  while (1) switch (_context25.prev = _context25.next) {
+              _context29.next = 5;
+              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28() {
+                return _regeneratorRuntime().wrap(function _callee28$(_context28) {
+                  while (1) switch (_context28.prev = _context28.next) {
                     case 0:
-                      _context25.next = 2;
-                      return _this21.dbManager.clear(INDEXDB_STORE_NAME);
+                      _context28.next = 2;
+                      return _this23.dbManager.clear(INDEXDB_STORE_NAME);
                     case 2:
                     case "end":
-                      return _context25.stop();
+                      return _context28.stop();
                   }
-                }, _callee25);
+                }, _callee28);
               })));
             case 5:
               this.setStorageItem(ORDER_LAST_FULL_FETCH_AT_STORAGE_KEY, '');
               this.emitOrdersChanged([], 'clear');
             case 7:
             case "end":
-              return _context26.stop();
+              return _context29.stop();
           }
-        }, _callee26, this);
+        }, _callee29, this);
       }));
       function clear() {
         return _clear.apply(this, arguments);