@pisell/pisellos 2.3.29 → 2.3.30

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

@@ -37,6 +37,7 @@ var import_dayjs = __toESM(require("dayjs"));
 var import_BaseModule = require("../../../modules/BaseModule");
 var import_orderCollectionIdentity = require("../../../modules/Order/utils/orderCollectionIdentity");
 var import_types = require("./types");
+var import_payment_utils = require("../../../modules/Order/payment-utils");
 var INDEXDB_STORE_NAME = "orders";
 var ORDER_LAST_FULL_FETCH_AT_STORAGE_KEY = "server_order_last_full_fetch_at";
 var ORDER_SYNC_THROTTLE_MS_STORAGE_KEY = "order_sync_throttle_ms";
@@ -46,8 +47,10 @@ var ORDER_SILENT_REFRESH_MIN_INTERVAL_MS = 3e4;
 var ORDER_BUSINESS_WRITE_SOURCES = /* @__PURE__ */ new Set([
   "upsertOrdersFromRemote",
   "upsertPendingSyncOrders",
+  "upsertLocalDraftOrders",
   "overwriteExistingOrder",
-  "markOrderSyncedByExternalSaleNumber"
+  "markOrderSyncedByExternalSaleNumber",
+  "updateLocalPayment"
 ]);
 var ORDER_MERGE_SELF_CHECK = false;
 var ORDER_AUTHORITATIVE_COLLECTION_FIELDS = ["products", "bookings", "payments"];
@@ -482,6 +485,27 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   getOrderByOrderId(orderId) {
     return this.store.map.get(this.getIdKey(orderId));
   }
+  buildLocalPaymentOrderLogContext(order) {
+    if (!order)
+      return {};
+    return {
+      order_id: order.order_id ?? null,
+      external_sale_number: order.external_sale_number ?? null,
+      order_number: order.order_number ?? null,
+      shop_order_number: order.shop_order_number ?? null,
+      shop_full_order_number: order.shop_full_order_number ?? null,
+      order_status: order.status ?? null,
+      payment_status: order.payment_status ?? null,
+      is_draft_order: Number(order.is_draft_order || 0),
+      need_sync: Number(order.need_sync || 0),
+      platform: order.platform ?? null,
+      business_code: order.business_code ?? null,
+      order_sales_channel: order.order_sales_channel ?? null,
+      sales_channel: order.sales_channel ?? null,
+      order_type: order.type ?? null,
+      payments_count: Array.isArray(order.payments) ? order.payments.length : 0
+    };
+  }
   getLocalOrderFromMemoryByLookup(lookup) {
     const key = this.getIdKey(lookup);
     const memoryOrderById = this.store.map.get(key);
@@ -490,21 +514,176 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const memoryOrder = this.store.list.find((order) => this.isOrderLookupMatch(order, key));
     return memoryOrder || null;
   }
-  async getLocalOrderByLookup(lookup) {
+  async getLocalOrderByLookup(lookup, options = {}) {
     const key = this.getIdKey(lookup);
+    const logContext = {
+      operation_id: options.operationId,
+      lookup: key,
+      memory_order_count: this.store.list.length
+    };
+    if (options.operationId) {
+      this.logInfo("getLocalOrderByLookup-localPayment-开始", logContext);
+    }
     const memoryOrderById = this.store.map.get(key);
-    if (memoryOrderById)
+    if (memoryOrderById) {
+      if (options.operationId) {
+        this.logInfo("getLocalOrderByLookup-localPayment-命中内存映射", {
+          ...logContext,
+          ...this.buildLocalPaymentOrderLogContext(memoryOrderById)
+        });
+      }
       return memoryOrderById;
+    }
     const memoryOrder = this.store.list.find((order) => this.isOrderLookupMatch(order, key));
-    if (memoryOrder)
+    if (memoryOrder) {
+      if (options.operationId) {
+        this.logInfo("getLocalOrderByLookup-localPayment-命中内存列表", {
+          ...logContext,
+          ...this.buildLocalPaymentOrderLogContext(memoryOrder)
+        });
+      }
       return memoryOrder;
+    }
+    if (options.operationId) {
+      this.logInfo("getLocalOrderByLookup-localPayment-开始读取SQLite", logContext);
+    }
     const orders = await this.loadOrdersFromSQLite();
     const localOrder = orders.find((order) => this.isOrderLookupMatch(order, key));
-    if (!localOrder)
+    if (!localOrder) {
+      if (options.operationId) {
+        this.logWarning("getLocalOrderByLookup-localPayment-SQLite未命中", {
+          ...logContext,
+          sqlite_order_count: orders.length
+        });
+      }
       return null;
+    }
     this.store.list = orders.map((order) => this.normalizeOrderForMemoryList(order));
     this.syncOrdersMap();
-    return this.normalizeOrderForMemoryList(localOrder);
+    const normalizedOrder = this.normalizeOrderForMemoryList(localOrder);
+    if (options.operationId) {
+      this.logInfo("getLocalOrderByLookup-localPayment-SQLite命中", {
+        ...logContext,
+        sqlite_order_count: orders.length,
+        ...this.buildLocalPaymentOrderLogContext(normalizedOrder)
+      });
+    }
+    return normalizedOrder;
+  }
+  async getLocalPayment(params) {
+    const logContext = {
+      operation_id: params.operationId,
+      sale_id: params.saleId,
+      payment_number: params.paymentNumber
+    };
+    this.logInfo("getLocalPayment-开始", logContext);
+    try {
+      const order = await this.getLocalOrderByLookup(params.saleId, {
+        operationId: params.operationId
+      });
+      if (!order) {
+        this.logWarning("getLocalPayment-订单未命中", logContext);
+        return null;
+      }
+      const payments = order.payments || [];
+      const match = (0, import_payment_utils.resolveOrderPaymentIdentity)(
+        payments,
+        params.paymentNumber,
+        "compat"
+      );
+      if (!match) {
+        this.logWarning("getLocalPayment-支付项未命中", {
+          ...logContext,
+          ...this.buildLocalPaymentOrderLogContext(order),
+          payments
+        });
+        return null;
+      }
+      this.logInfo("getLocalPayment-支付项命中", {
+        ...logContext,
+        ...this.buildLocalPaymentOrderLogContext(order),
+        matched_by: match.matchedBy,
+        payment_index: match.index,
+        payment: match.payment
+      });
+      return {
+        order,
+        payment: match.payment,
+        paymentIndex: match.index,
+        matchedBy: match.matchedBy
+      };
+    } catch (error) {
+      this.logError("getLocalPayment-查询失败", {
+        ...logContext,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
+  }
+  async updateLocalPayment(params) {
+    const logContext = {
+      operation_id: params.operationId,
+      sale_id: params.saleId,
+      payment_number: params.paymentNumber,
+      incoming_payment_update: params.updates
+    };
+    this.logInfo("updateLocalPayment-开始", logContext);
+    const found = await this.getLocalPayment(params);
+    if (!found) {
+      this.logWarning("updateLocalPayment-支付项未命中", logContext);
+      return null;
+    }
+    const previousPayment = (0, import_lodash_es.cloneDeep)(found.payment);
+    const nextPayment = (0, import_payment_utils.mergeOrderPaymentRecord)(found.payment, {
+      ...params.updates,
+      updated_at: params.updates.updated_at || (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss")
+    });
+    const nextOrder = {
+      ...found.order,
+      payments: (found.order.payments || []).map((payment, index) => index === found.paymentIndex ? nextPayment : payment),
+      updated_at: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss")
+    };
+    const paymentContext = {
+      ...logContext,
+      matched_by: found.matchedBy,
+      payment_index: found.paymentIndex,
+      ...this.buildLocalPaymentOrderLogContext(nextOrder),
+      previous_payment: previousPayment,
+      payment: nextPayment
+    };
+    this.logInfo("updateLocalPayment-支付项合并完成", paymentContext);
+    const targetIndex = this.findOrderIndexByIdentity(this.store.list, found.order);
+    if (targetIndex < 0) {
+      this.logError("updateLocalPayment-订单Store索引未命中", paymentContext);
+      return null;
+    }
+    const previousList = this.store.list;
+    this.store.list = this.store.list.map((order, index) => index === targetIndex ? nextOrder : order);
+    this.syncOrdersMap();
+    const storageOrder = this.withoutSyntheticDraftOrderId(nextOrder);
+    try {
+      this.logInfo("updateLocalPayment-SQLite写入开始", {
+        ...paymentContext,
+        storage_order_id: storageOrder.order_id ?? null
+      });
+      await this.updateOrderInSQLite(storageOrder, "updateLocalPayment", { throwOnError: true });
+      this.logInfo("updateLocalPayment-SQLite写入完成", {
+        ...paymentContext,
+        storage_order_id: storageOrder.order_id ?? null
+      });
+    } catch (error) {
+      this.store.list = previousList;
+      this.syncOrdersMap();
+      this.logError("updateLocalPayment-SQLite写入失败并回滚内存", {
+        ...paymentContext,
+        storage_order_id: storageOrder.order_id ?? null,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
+    await this.emitOrdersChanged([nextOrder], "updateLocalPayment");
+    this.logInfo("updateLocalPayment-变更事件完成", paymentContext);
+    return { order: nextOrder, payment: nextPayment, previousPayment };
   }
   async loadOrdersByServer() {
     var _a;
@@ -590,6 +769,15 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       order_id: externalSaleNumber
     };
   }
+  withoutSyntheticDraftOrderId(order) {
+    const externalSaleNumber = order.external_sale_number;
+    if (Number(order.is_draft_order || 0) !== 1 || order.order_id === void 0 || externalSaleNumber === void 0 || String(order.order_id) !== String(externalSaleNumber)) {
+      return order;
+    }
+    const next = { ...order };
+    delete next.order_id;
+    return next;
+  }
   /**
    * 仅覆盖本地已存在的订单；不存在则直接跳过，不落库、不 emit。
    * 适用于"按 order_id 主动刷新本地订单详情"的代理场景。
@@ -638,13 +826,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * 将远端拉取的订单合并进本地 store（已存在则更新，不存在则追加），落库并 emit onOrdersChanged。
    * 供 /update/localOrder 等在「本地尚无该单」时写入新建单。
    */
-  async upsertOrdersFromRemote(freshOrders) {
+  async upsertOrdersFromRemote(freshOrders, source = "upsertOrdersFromRemote") {
     if (!(freshOrders == null ? void 0 : freshOrders.length)) {
       this.logInfo("upsertOrdersFromRemote-订单列表为空", {});
       return;
     }
-    this.logInfo("upsertOrdersFromRemote-开始", { count: freshOrders.length });
-    await this.mergeOrdersToStore(freshOrders, "upsertOrdersFromRemote");
+    this.logInfo("upsertOrdersFromRemote-开始", { count: freshOrders.length, source });
+    await this.mergeOrdersToStore(freshOrders, source);
   }
   async markOrderSyncedByExternalSaleNumber(params) {
     const externalSaleNumber = params.externalSaleNumber;
@@ -670,7 +858,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       ...existing,
       ...params.patch || {},
       external_sale_number: existing.external_sale_number ?? externalSaleNumber,
-      need_sync: 0
+      need_sync: 0,
+      is_draft_order: 0
     });
     const storageKey = this.getOrderStorageKey(nextOrder) || key;
     this.store.list = this.store.list.map((order, index) => {
@@ -695,7 +884,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * 将本地待同步订单按 SQLite storage key 合并进 store 并落库。
    * checkout 离线兜底可能没有 order_id，但通常会有 external_sale_number。
    */
-  async upsertPendingSyncOrders(pendingOrders) {
+  async upsertPendingSyncOrders(pendingOrders, options = {}) {
     if (!(pendingOrders == null ? void 0 : pendingOrders.length)) {
       this.logInfo("upsertPendingSyncOrders-订单列表为空", {});
       return;
@@ -707,14 +896,19 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         order,
         "upsertPendingSyncOrders.incoming"
       );
-      const storageKey = this.getOrderStorageKey(normalizedOrder);
+      const pendingOrder = {
+        ...normalizedOrder,
+        need_sync: 1,
+        is_draft_order: 0
+      };
+      const storageKey = this.getOrderStorageKey(pendingOrder);
       if (!storageKey)
         continue;
-      pendingMap.set(storageKey, normalizedOrder);
+      pendingMap.set(storageKey, pendingOrder);
       memoryPendingMap.set(
         storageKey,
         this.normalizeOrderForMemoryList(
-          normalizedOrder,
+          pendingOrder,
           "upsertPendingSyncOrders.memory"
         )
       );
@@ -745,7 +939,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       if (matchIndex >= 0) {
         const existingOrder = updatedList[matchIndex];
         const mergedOrder = this.mergeOrderRecords(existingOrder, pendingOrder);
-        updatedList[matchIndex] = mergedOrder;
+        const nextOrder = {
+          ...mergedOrder,
+          need_sync: 1,
+          is_draft_order: 0
+        };
+        updatedList[matchIndex] = nextOrder;
         const pendingSnapshot = pendingMap.get(storageKey);
         if (pendingSnapshot) {
           pendingMap.set(
@@ -753,7 +952,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
             this.reconcileOverwriteOrderCollections(existingOrder, pendingSnapshot)
           );
         }
-        this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, matchIndex);
+        this.registerOrderIdentityKeys(identityKeyToIndex, nextOrder, matchIndex);
         mergeActions[storageKey] = "update";
         continue;
       }
@@ -763,15 +962,98 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       mergeActions[storageKey] = "insert";
     }
     const patchedOrders = [...pendingMap.values()];
+    const previousList = this.store.list;
     this.store.list = this.runOrderStoreSelfCheck(updatedList, "upsertPendingSyncOrders.store");
     this.syncOrdersMap();
-    await this.patchOrdersInSQLite(patchedOrders, "upsertPendingSyncOrders", mergeActions);
+    try {
+      await this.patchOrdersInSQLite(
+        patchedOrders,
+        "upsertPendingSyncOrders",
+        mergeActions,
+        options
+      );
+    } catch (error) {
+      this.store.list = previousList;
+      this.syncOrdersMap();
+      throw error;
+    }
     this.logInfo("upsertPendingSyncOrders-结束", {
       count: patchedOrders.length,
       storeOrderCountAfter: this.store.list.length
     });
     await this.emitOrdersChanged(patchedOrders, "upsertPendingSyncOrders");
   }
+  /**
+   * 将 POS 草稿订单按 SQLite storage key 合并进 store 并落库。
+   * 草稿只表示本地可恢复快照，不进入同步队列。
+   */
+  async upsertLocalDraftOrders(draftOrders) {
+    if (!(draftOrders == null ? void 0 : draftOrders.length)) {
+      this.logInfo("upsertLocalDraftOrders-订单列表为空", {});
+      return;
+    }
+    const draftMap = /* @__PURE__ */ new Map();
+    const memoryDraftMap = /* @__PURE__ */ new Map();
+    for (const order of draftOrders) {
+      const draftOrder = {
+        ...order,
+        need_sync: 0,
+        is_draft_order: 1
+      };
+      const storageKey = this.getOrderStorageKey(draftOrder);
+      if (!storageKey)
+        continue;
+      draftMap.set(storageKey, draftOrder);
+      memoryDraftMap.set(storageKey, this.normalizeOrderForMemoryList(draftOrder));
+    }
+    if (draftMap.size === 0) {
+      this.logError("upsertLocalDraftOrders-订单缺少可落库标识", {
+        count: draftOrders.length
+      });
+      return;
+    }
+    this.logInfo("upsertLocalDraftOrders-开始", { count: draftMap.size });
+    const patchedOrders = [...draftMap.values()];
+    const mergeActions = {};
+    const updatedList = [...this.store.list];
+    const identityKeyToIndex = /* @__PURE__ */ new Map();
+    for (let index = 0; index < updatedList.length; index += 1) {
+      for (const key of this.getOrderIdentityMatchKeys(updatedList[index])) {
+        if (!identityKeyToIndex.has(key))
+          identityKeyToIndex.set(key, index);
+      }
+    }
+    for (const [storageKey, draftOrder] of memoryDraftMap.entries()) {
+      const matchIndex = this.lookupOrderIndexByIdentityKeys(
+        identityKeyToIndex,
+        this.getOrderIdentityMatchKeys(draftOrder)
+      );
+      if (matchIndex >= 0) {
+        const mergedOrder = this.mergeOrderRecords(updatedList[matchIndex], draftOrder);
+        const nextOrder = {
+          ...mergedOrder,
+          need_sync: 0,
+          is_draft_order: 1
+        };
+        updatedList[matchIndex] = nextOrder;
+        this.registerOrderIdentityKeys(identityKeyToIndex, nextOrder, matchIndex);
+        mergeActions[storageKey] = "update";
+        continue;
+      }
+      const insertIndex = updatedList.length;
+      updatedList.push(draftOrder);
+      this.registerOrderIdentityKeys(identityKeyToIndex, draftOrder, insertIndex);
+      mergeActions[storageKey] = "insert";
+    }
+    this.store.list = this.runOrderStoreSelfCheck(updatedList, "upsertLocalDraftOrders.store");
+    this.syncOrdersMap();
+    await this.patchOrdersInSQLite(patchedOrders, "upsertLocalDraftOrders", mergeActions);
+    this.logInfo("upsertLocalDraftOrders-结束", {
+      count: patchedOrders.length,
+      storeOrderCountAfter: this.store.list.length
+    });
+    await this.emitOrdersChanged(patchedOrders, "upsertLocalDraftOrders");
+  }
   /**
    * 通过 SSE 按自定义 query 拉取订单（支持 select/with 精简字段）
    */
@@ -1126,9 +1408,43 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           });
           continue;
         }
-        const mergedOrder = this.mergeOrderRecords(existingOrder, fresh);
-        updatedList[matchIndex] = mergedOrder;
-        this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, matchIndex);
+        if (this.isDraftOrder(existingOrder) && this.shouldProtectDraftOrderFromIncoming(source)) {
+          this.logInfo("mergeOrdersToStore-跳过 draft 订单远端覆盖", {
+            source,
+            order_id: existingOrder.order_id ?? fresh.order_id ?? null,
+            external_sale_number: existingOrder.external_sale_number ?? fresh.external_sale_number ?? null,
+            local_is_draft_order: existingOrder.is_draft_order ?? null,
+            remote_is_draft_order: fresh.is_draft_order ?? null,
+            reason: "protect_draft_order_from_remote_echo"
+          });
+          continue;
+        }
+        let mergedOrder = this.mergeOrderRecords(existingOrder, fresh);
+        let adjustedMatchIndex = matchIndex;
+        const duplicateIndexes = /* @__PURE__ */ new Set();
+        for (const key of freshIdentityKeys) {
+          const duplicateIndex = identityKeyToIndex.get(key);
+          if (duplicateIndex === void 0 || duplicateIndex === matchIndex)
+            continue;
+          duplicateIndexes.add(duplicateIndex);
+        }
+        if (duplicateIndexes.size > 0) {
+          for (const duplicateIndex of [...duplicateIndexes].sort((left, right) => right - left)) {
+            mergedOrder = this.mergeOrderRecords(mergedOrder, updatedList[duplicateIndex]);
+            updatedList.splice(duplicateIndex, 1);
+            if (duplicateIndex < adjustedMatchIndex)
+              adjustedMatchIndex -= 1;
+          }
+          identityKeyToIndex.clear();
+          for (let index = 0; index < updatedList.length; index += 1) {
+            for (const key of this.getOrderIdentityMatchKeys(updatedList[index])) {
+              if (!identityKeyToIndex.has(key))
+                identityKeyToIndex.set(key, index);
+            }
+          }
+        }
+        updatedList[adjustedMatchIndex] = mergedOrder;
+        this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, adjustedMatchIndex);
         patchedOrders.push(mergedOrder);
         if (mergeKey)
           mergeActions[mergeKey] = "update";
@@ -1320,6 +1636,57 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return right;
     return left;
   }
+  getProductIdentityKeys(product) {
+    var _a;
+    const record = product;
+    if (!record)
+      return [];
+    const keys = [];
+    const metadataUid = (_a = record.metadata) == null ? void 0 : _a.unique_identification_number;
+    if (!this.isBlankIdentityValue(metadataUid))
+      keys.push(`uid:${String(metadataUid)}`);
+    const topLevelUid = record.unique_identification_number;
+    if (!this.isBlankIdentityValue(topLevelUid))
+      keys.push(`uid:${String(topLevelUid)}`);
+    const orderDetailId = record.order_detail_id;
+    if (!this.isBlankIdentityValue(orderDetailId))
+      keys.push(`detail:${String(orderDetailId)}`);
+    const bookingUid = record.booking_uid;
+    if (!this.isBlankIdentityValue(bookingUid))
+      keys.push(`booking:${String(bookingUid)}`);
+    return keys;
+  }
+  mergeOrderProductLists(preferred, secondary) {
+    const preferredList = Array.isArray(preferred) ? preferred : [];
+    const secondaryList = Array.isArray(secondary) ? secondary : [];
+    if (secondaryList.length === 0)
+      return preferredList;
+    if (preferredList.length === 0)
+      return secondaryList;
+    const seenKeys = /* @__PURE__ */ new Set();
+    for (const item of preferredList) {
+      const keys = this.getProductIdentityKeys(item);
+      for (const key of keys)
+        seenKeys.add(key);
+    }
+    const result = [...preferredList];
+    for (const item of secondaryList) {
+      const keys = this.getProductIdentityKeys(item);
+      if (keys.length === 0 || keys.some((key) => seenKeys.has(key)))
+        continue;
+      for (const key of keys)
+        seenKeys.add(key);
+      result.push((0, import_lodash_es.cloneDeep)(item));
+    }
+    return result;
+  }
+  mergeOrderPaymentLists(existing, incoming) {
+    const existingList = Array.isArray(existing) ? existing : [];
+    const incomingList = Array.isArray(incoming) ? incoming : [];
+    if (incomingList.length === 0)
+      return (0, import_lodash_es.cloneDeep)(existingList);
+    return (0, import_payment_utils.mergeOrderPaymentListsByIdentity)(existingList, incomingList);
+  }
   mergeOrderRecords(existing, incoming) {
     const preferred = this.pickPreferredOrder(existing, incoming);
     const secondary = preferred === existing ? incoming : existing;
@@ -1349,7 +1716,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       "contacts_info",
       "phone",
       "email",
-      "relation_forms"
+      "relation_forms",
+      "is_draft_order"
     ];
     const mergedRecord = merged;
     const preferredRecord = preferred;
@@ -1416,7 +1784,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         external_sale_number: order.external_sale_number ?? null,
         shop_order_number: order.shop_order_number ?? null,
         shop_full_order_number: order.shop_full_order_number ?? null,
-        need_sync: order.need_sync ?? null
+        need_sync: order.need_sync ?? null,
+        is_draft_order: order.is_draft_order ?? null
       }))
     }));
   }
@@ -1533,16 +1902,26 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   isPendingSyncOrder(order) {
     return Number(order == null ? void 0 : order.need_sync) === 1;
   }
+  isDraftOrder(order) {
+    return Number(order == null ? void 0 : order.is_draft_order) === 1;
+  }
+  shouldProtectDraftOrderFromIncoming(source) {
+    return source !== "checkoutSync";
+  }
   normalizeRemoteSyncedOrder(order) {
     const normalizedOrder = this.normalizeOrderCollectionsForIngress(
       order,
       "normalizeRemoteSyncedOrder"
     );
     if (this.isPendingSyncOrder(normalizedOrder))
-      return normalizedOrder;
+      return {
+        ...normalizedOrder,
+        is_draft_order: 0
+      };
     return {
       ...normalizedOrder,
-      need_sync: 0
+      need_sync: 0,
+      is_draft_order: 0
     };
   }
   mergeRemoteSnapshotWithPendingOrders(remoteOrders, existingOrders) {
@@ -1552,11 +1931,15 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         rawOrder,
         "mergeRemoteSnapshotWithPendingOrders.existingSQLite"
       );
-      if (!this.isPendingSyncOrder(order))
+      if (!this.isPendingSyncOrder(order) && !this.isDraftOrder(order))
         continue;
       const 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))
@@ -1584,8 +1967,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * @example
    * await this.patchOrdersInSQLite(freshOrders)
    */
-  async patchOrdersInSQLite(orders, source, mergeActions = {}) {
-    if (!this.dbManager || orders.length === 0) {
+  async patchOrdersInSQLite(orders, source, mergeActions = {}, options = {}) {
+    if (orders.length === 0) {
+      return;
+    }
+    if (!this.dbManager) {
+      if (options.throwOnError)
+        throw new Error("订单 SQLite 数据库未初始化");
       return;
     }
     const ordersSnapshot = (0, import_lodash_es.cloneDeep)(orders).map((order) => this.normalizeOrderCollectionsForIngress(order, `${source}.sqliteIngress`)).filter((order) => this.getOrderStorageKey(order));
@@ -1623,6 +2011,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           for (const order of compactedToWrite) {
             await this.dbManager.update(INDEXDB_STORE_NAME, order);
           }
+        } else if (options.throwOnError) {
+          throw new Error("订单 SQLite 数据库不支持写入");
         }
         this.recordRecentSqliteWrite(source, compactedToWrite);
         this.logInfo("patchOrdersInSQLite-完成", {
@@ -1637,6 +2027,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         error: error instanceof Error ? error.message : String(error),
         orderCount: ordersSnapshot.length
       });
+      if (options.throwOnError)
+        throw error;
     }
   }
   /**
@@ -1645,8 +2037,15 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * @example
    * await this.updateOrderInSQLite(freshOrder)
    */
-  async updateOrderInSQLite(order, source) {
-    if (!this.dbManager || !this.getOrderStorageKey(order)) {
+  async updateOrderInSQLite(order, source, options = {}) {
+    if (!this.getOrderStorageKey(order)) {
+      if (options.throwOnError)
+        throw new Error("订单缺少可用的 SQLite 存储主键");
+      return;
+    }
+    if (!this.dbManager) {
+      if (options.throwOnError)
+        throw new Error("订单 SQLite 数据库未初始化");
       return;
     }
     const orderSnapshot = this.normalizeOrderCollectionsForIngress(
@@ -1670,6 +2069,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         } else if (typeof this.dbManager.bulkAdd === "function") {
           writeMethod = "bulkAdd";
           await this.dbManager.bulkAdd(INDEXDB_STORE_NAME, [orderSnapshot]);
+        } else if (options.throwOnError) {
+          throw new Error("订单 SQLite 数据库不支持写入");
         }
         this.recordRecentSqliteWrite(source, [orderSnapshot]);
         this.logInfo("updateOrderInSQLite-完成", {
@@ -1683,6 +2084,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         error: error instanceof Error ? error.message : String(error),
         orderId: orderSnapshot.order_id ?? null
       });
+      if (options.throwOnError)
+        throw error;
     }
   }
   /**
@@ -1717,7 +2120,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           source,
           count: mergedSnapshot.length,
           remoteCount: remoteSnapshot.length,
-          preservedPendingCount: mergedSnapshot.length - remoteSnapshot.length
+          preservedLocalUnsyncedCount: mergedSnapshot.length - remoteSnapshot.length
         });
         await this.dbManager.clear(INDEXDB_STORE_NAME);
         this.logInfo("replaceOrdersSnapshotInSQLite-clear完成", {