@pisell/pisellos 2.3.66 → 2.3.68

package/lib/modules/Order/index.js

@@ -66,8 +66,7 @@ function isSameDiscountList(left, right) {
   );
 }
 function isManualProductDiscountProduct(product) {
-  var _a, _b;
-  return ((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.is_manual_discount) === true || ((_b = product == null ? void 0 : product.metadata) == null ? void 0 : _b.is_manual_discount) === 1 || ((product == null ? void 0 : product.discount_list) || []).some((item) => (item == null ? void 0 : item.type) === "product");
+  return (0, import_manualProductDiscount.hasManualProductDiscountFlag)(product == null ? void 0 : product.metadata) || ((product == null ? void 0 : product.discount_list) || []).some((item) => (item == null ? void 0 : item.type) === "product");
 }
 var ORDER_PAYMENT_STATUS_PAID = "paid";
 var ORDER_PAYMENT_STATUS_PENDING = "payment_pending";
@@ -114,6 +113,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     super(name || "order", version);
     this.defaultName = "order";
     this.defaultVersion = "1.0.0";
+    this.openCache = false;
+    this.sessionStoragePersistEnabled = false;
+    this.sessionStorageRestoreRecord = null;
     // ─── 促销/赠品 ────────────────────────────────────
     /** 评估器引用；由 SalesSdkProvider 注入，未注入时 applyPromotion 静默跳过 */
     this.promotionEvaluator = null;
@@ -330,11 +332,32 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return product;
     });
   }
+  syncSessionStorageOptions(otherParams) {
+    this.cacheId = otherParams.cacheId;
+    this.fatherModule = otherParams.fatherModule;
+    this.openCache = Boolean(
+      this.cacheId && otherParams.openCache !== false
+    );
+    this.sessionStoragePersistEnabled = Boolean(
+      this.openCache && otherParams.enableSessionStoragePersist === true
+    );
+  }
   async initialize(core, options) {
     var _a, _b, _c, _d;
     this.core = core;
     this.store = options.store;
-    if (!this.store.tempOrder) {
+    const otherParams = options.otherParams || {};
+    this.syncSessionStorageOptions(otherParams);
+    if (this.sessionStoragePersistEnabled) {
+      const cachedTempOrder = this.store.tempOrder;
+      this.sessionStorageRestoreRecord = (0, import_utils.isTempOrder)(cachedTempOrder) ? (0, import_lodash_es.cloneDeep)(cachedTempOrder) : null;
+      this.store.tempOrder = null;
+      this.store.summary = (0, import_utils.createEmptySummary)();
+      this.store.availableWalletIds = [];
+      this.store.lastOrderInfo = void 0;
+      this.store.syncState = void 0;
+      this.store.discountList = [];
+    } else if (!this.store.tempOrder) {
       this.store.tempOrder = null;
     }
     if (!this.store.summary) {
@@ -351,8 +374,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const app = (_a = appPlugin == null ? void 0 : appPlugin.getApp) == null ? void 0 : _a.call(appPlugin);
     this.logger = app == null ? void 0 : app.logger;
     this.window = this.core.getPlugin("window");
-    const otherParams = options.otherParams || {};
-    this.cacheId = otherParams.cacheId;
     this.salesSummaryModuleName = otherParams.salesSummaryModuleName;
     this.rulesHooksOverride = (_b = otherParams.rules) == null ? void 0 : _b.hooks;
     this.moduleHooksOverride = options.hooks;
@@ -363,6 +384,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   async destroy() {
     var _a, _b;
+    this.sessionStorageRestoreRecord = null;
     const childModules = [(_a = this.store) == null ? void 0 : _a.discount, (_b = this.store) == null ? void 0 : _b.rules];
     for (const childModule of childModules) {
       if (!childModule || typeof childModule.destroy !== "function")
@@ -392,7 +414,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   updateOtherParams(params) {
     var _a, _b, _c;
     const otherParams = params || {};
-    this.cacheId = otherParams.cacheId;
+    this.syncSessionStorageOptions(otherParams);
     this.salesSummaryModuleName = otherParams.salesSummaryModuleName;
     this.rulesHooksOverride = (_a = otherParams.rules) == null ? void 0 : _a.hooks;
     this.orderHooks = this.moduleHooksOverride || ((_b = otherParams.order) == null ? void 0 : _b.hooks) || ((_c = otherParams.hooks) == null ? void 0 : _c.order);
@@ -437,14 +459,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   // ─── Discount: 子模块注册 ───
   registerDiscountModules(options) {
     let targetCacheData = {};
-    if (this.cacheId && this.window) {
-      const sessionData = this.window.sessionStorage.getItem(this.name);
-      if (sessionData) {
-        try {
+    if (!this.sessionStoragePersistEnabled && this.openCache && this.cacheId && this.window) {
+      try {
+        const sessionData = this.window.sessionStorage.getItem(this.name);
+        if (sessionData) {
           const data = JSON.parse(sessionData);
           targetCacheData = (data == null ? void 0 : data[this.cacheId]) || {};
-        } catch {
         }
+      } catch {
       }
     }
     const discount = new import_Discount.DiscountModule(`${this.name}_discount`);
@@ -452,7 +474,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       initialState: targetCacheData == null ? void 0 : targetCacheData[discount.name],
       otherParams: {
         fatherModule: this.name,
-        openCache: !!this.cacheId,
+        // Unified 的单快照由 Order 管理；其他 Solution 保持原有 Discount 缓存语义。
+        openCache: this.openCache && !this.sessionStoragePersistEnabled,
         cacheId: this.cacheId
       }
     });
@@ -870,7 +893,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   /**
    * 控制 IndexedDB 草稿（saveDraft）是否写入。
-   * localStorage 版 tempOrder 持久化已废弃，此方法仅影响 saveDraft。
+   * 此开关仅影响 saveDraft；可选 sessionStorage 会话恢复由
+   * enableSessionStoragePersist 独立控制。
    *
    * @example
    * order.setEnableTempOrderPersist(false); // BigSale 弹窗：跳过 ~1s 的 dbUpdate
@@ -882,8 +906,70 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   isTempOrderPersistEnabled() {
     return this.draftPersistEnabled;
   }
-  /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化；草稿保存请使用 IndexedDB saveDraft。 */
+  /**
+   * 在 UnifiedBookingSales 显式开启会话恢复时，将完整 tempOrder 写入
+   * sessionStorage 的 cacheId 分桶。写入失败由 BaseModule 静默降级。
+   */
   persistTempOrder() {
+    if (!this.sessionStoragePersistEnabled || !this.store.tempOrder)
+      return;
+    this.checkSaveCache({
+      cacheId: this.cacheId,
+      fatherModule: this.fatherModule,
+      store: { tempOrder: this.store.tempOrder },
+      cacheKey: ["tempOrder"]
+    });
+  }
+  /**
+   * 终止当前模块实例的 sessionStorage 订单恢复会话。
+   *
+   * 支付跳转等终态场景需要同时删除当前 cacheId 的 tempOrder 快照，并关闭
+   * 本实例后续异步任务的再次写入；新模块实例初始化时会按 otherParams 重新启用。
+   */
+  clearSessionStoragePersistedTempOrder() {
+    var _a;
+    this.sessionStorageRestoreRecord = null;
+    if (!this.sessionStoragePersistEnabled)
+      return;
+    this.sessionStoragePersistEnabled = false;
+    if (!this.cacheId || !this.fatherModule || !((_a = this.window) == null ? void 0 : _a.sessionStorage)) {
+      return;
+    }
+    const sessionStorage = this.window.sessionStorage;
+    const rawCacheData = sessionStorage.getItem(this.fatherModule);
+    if (!rawCacheData)
+      return;
+    let parsedCacheData;
+    try {
+      parsedCacheData = JSON.parse(rawCacheData);
+    } catch {
+      return;
+    }
+    if (!parsedCacheData || typeof parsedCacheData !== "object" || Array.isArray(parsedCacheData)) {
+      return;
+    }
+    const cacheRoot = parsedCacheData;
+    const cacheBucket = cacheRoot[this.cacheId];
+    if (!cacheBucket || typeof cacheBucket !== "object" || Array.isArray(cacheBucket)) {
+      return;
+    }
+    const moduleBucket = cacheBucket[this.name];
+    if (!moduleBucket || typeof moduleBucket !== "object" || Array.isArray(moduleBucket)) {
+      return;
+    }
+    delete moduleBucket.tempOrder;
+    if (Object.keys(moduleBucket).length === 0) {
+      delete cacheBucket[this.name];
+    }
+    if (Object.keys(cacheBucket).length === 0) {
+      delete cacheRoot[this.cacheId];
+    }
+    sessionStorage.setItem(this.fatherModule, JSON.stringify(cacheRoot));
+  }
+  consumeSessionStorageRestore() {
+    const record = this.sessionStorageRestoreRecord;
+    this.sessionStorageRestoreRecord = null;
+    return record ? (0, import_lodash_es.cloneDeep)(record) : null;
   }
   notifyTempOrderChanged() {
     if (!this.store.tempOrder)
@@ -1084,7 +1170,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       paidAmount: netPaidAmount
     });
     const isOrderFullyPaid = orderExpectedAmount.lte(0) ? true : netPaidAmount.gte(orderExpectedAmount);
-    const paymentStage = this.isDepositOrder(tempOrder, depositAmount) && !isDepositFullyPaid ? "deposit" : "normal";
+    const paymentStage = this.isDepositOrder(tempOrder, depositAmount) && !isDepositFullyPaid && !this.hasPaidNormalPayment(paymentList) ? "deposit" : "normal";
     return {
       isFullyPaid: isOrderFullyPaid,
       isOrderFullyPaid,
@@ -1105,12 +1191,22 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return sum.plus(this.calculatePaymentGapAmount(paymentRecord));
     }, new import_decimal.default(0));
   }
+  hasPaidNormalPayment(payments) {
+    return (payments || []).some((payment) => {
+      const paymentRecord = payment;
+      if (!isPaidPaymentRecord(paymentRecord))
+        return false;
+      return paymentRecord.order_payment_type !== "deposit" && paymentRecord.type !== "deposit";
+    });
+  }
   resolveNextOrderPaymentType(tempOrder) {
     const depositAmount = new import_decimal.default(tempOrder.deposit_amount || "0.00");
     if (!this.isDepositOrder(tempOrder, depositAmount))
       return "normal";
     if (depositAmount.lte(0))
       return "normal";
+    if (this.hasPaidNormalPayment(tempOrder.payments || []))
+      return "normal";
     const depositPaidAmount = this.calculateDepositPaidAmount(tempOrder.payments || []);
     return depositPaidAmount.lt(depositAmount) ? "deposit" : "normal";
   }
@@ -1408,24 +1504,28 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
   }
   calculateSummaryAmountGap(params) {
-    const { tempOrder, summary, orderPaidAmount } = params;
+    const { tempOrder, summary, orderPaidAmount, payments } = params;
     const refundAmount = this.getSummaryRefundAmount(summary);
     const netOrderPaidAmount = import_decimal.default.max(orderPaidAmount.minus(refundAmount), 0);
     const targetAmount = this.calculatePaymentTargetAmount(
       tempOrder,
       summary,
-      netOrderPaidAmount
+      netOrderPaidAmount,
+      payments
     );
     return targetAmount.minus(netOrderPaidAmount).toFixed(2);
   }
   getSummaryRefundAmount(summary) {
     return import_decimal.default.max(new import_decimal.default((summary == null ? void 0 : summary.total_refund_amount) || 0), 0);
   }
-  calculatePaymentTargetAmount(tempOrder, summary, paidAmount = new import_decimal.default(0)) {
+  calculatePaymentTargetAmount(tempOrder, summary, paidAmount = new import_decimal.default(0), payments = tempOrder.payments || []) {
     const depositAmount = this.getDepositAmount(tempOrder, summary);
     if (!this.isDepositOrder(tempOrder, depositAmount)) {
       return this.getOrderExpectedAmount(summary);
     }
+    if (this.hasPaidNormalPayment(payments)) {
+      return this.getOrderExpectedAmount(summary);
+    }
     if (this.isDepositCovered({ tempOrder, summary, paidAmount })) {
       return this.getOrderExpectedAmount(summary);
     }
@@ -1605,19 +1705,21 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     return snapshot;
   }
   isSnapshotPayableAmountUnchanged(tempOrder, snapshot, snapshotSummary) {
-    const currentPaidPaymentSummary = this.calculatePaidPaymentSummary(tempOrder.payments || []);
+    const currentPayments = tempOrder.payments || [];
+    const currentPaidPaymentSummary = this.calculatePaidPaymentSummary(currentPayments);
     const currentAmountGap = this.calculateSummaryAmountGap({
       tempOrder,
       summary: snapshotSummary,
-      orderPaidAmount: currentPaidPaymentSummary.gapPaidAmount
+      orderPaidAmount: currentPaidPaymentSummary.gapPaidAmount,
+      payments: currentPayments
     });
-    const snapshotPaidPaymentSummary = this.calculatePaidPaymentSummary(
-      Array.isArray(snapshot.payments) ? snapshot.payments : []
-    );
+    const snapshotPayments = Array.isArray(snapshot.payments) ? snapshot.payments : [];
+    const snapshotPaidPaymentSummary = this.calculatePaidPaymentSummary(snapshotPayments);
     const snapshotAmountGap = this.calculateSummaryAmountGap({
       tempOrder,
       summary: snapshotSummary,
-      orderPaidAmount: snapshotPaidPaymentSummary.gapPaidAmount
+      orderPaidAmount: snapshotPaidPaymentSummary.gapPaidAmount,
+      payments: snapshotPayments
     });
     return currentAmountGap === snapshotAmountGap;
   }
@@ -1659,6 +1761,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const isPayableAmountUnchanged = this.isSnapshotPayableAmountUnchanged(tempOrder, snapshot, summary);
     if (!isPayableAmountUnchanged)
       return null;
+    const currentPaidPaymentSummary = this.calculatePaidPaymentSummary(tempOrder.payments || []);
+    summary.amount_gap = this.calculateSummaryAmountGap({
+      tempOrder,
+      summary,
+      orderPaidAmount: currentPaidPaymentSummary.gapPaidAmount
+    });
     if (Array.isArray(snapshot.products)) {
       tempOrder.products = (0, import_lodash_es.cloneDeep)(snapshot.products);
     }
@@ -1738,6 +1846,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   restoreOrder() {
     var _a, _b;
     this.logInfo("restoreOrder start", {});
+    this.sessionStorageRestoreRecord = null;
     const freshTempOrder = this.createDefaultTempOrderInstance();
     this.ensureExternalSaleNumber(freshTempOrder);
     this.store.tempOrder = freshTempOrder;
@@ -1756,6 +1865,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (!(0, import_utils.isTempOrder)(tempOrder)) {
       throw new Error("无效的 tempOrder 数据");
     }
+    this.sessionStorageRestoreRecord = null;
     const nextTempOrder = this.normalizeTempOrderForRuntime(
       (0, import_lodash_es.cloneDeep)(tempOrder),
       { ensureIdentity: false }
@@ -1894,6 +2004,23 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     return tempOrder._extend;
   }
+  repairDuplicateProductLineIdentities(tempOrder) {
+    var _a;
+    const result = (0, import_orderCollectionIdentity.repairDuplicateProductLineIdentities)(
+      tempOrder.products,
+      (_a = tempOrder._extend) == null ? void 0 : _a.productsByUid
+    );
+    if (!result.repairs.length)
+      return;
+    tempOrder.products = result.products;
+    if (result.productsByUid) {
+      this.ensureExtend(tempOrder).productsByUid = result.productsByUid;
+    }
+    this.logWarning("Repaired duplicate product line identities", {
+      repairCount: result.repairs.length,
+      repairs: result.repairs
+    });
+  }
   captureProductRuntime(tempOrder, rawProduct, normalizedProduct, existedUid) {
     var _a;
     const uid = existedUid || this.getProductUid(normalizedProduct);
@@ -2949,15 +3076,18 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       normalizedIncoming
     );
     const hasIncomingProductNote = this.hasOrderProductLineNote(normalizedIncoming);
+    const hasIncomingManualProductDiscount = isManualProductDiscountProduct(normalizedIncoming);
     const hasIncomingBookingUid = this.hasLinkedBookingUid(productToAdd) || this.hasLinkedBookingUid(normalizedIncoming);
     const isIncomingCustomItem = ((_e = (_d = productToAdd.metadata) == null ? void 0 : _d.origin) == null ? void 0 : _e.isCustomItem) === true || ((_f = productToAdd._origin) == null ? void 0 : _f.isCustomItem) === true;
-    const shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingBookingUid || isIncomingCustomItem || isWeighingProduct;
+    const shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingManualProductDiscount || hasIncomingBookingUid || isIncomingCustomItem || isWeighingProduct;
     const matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex((item) => {
       var _a2;
       if (this.hasGoodPassDiscount(item))
         return false;
       if (this.hasOrderProductLineNote(item))
         return false;
+      if (isManualProductDiscountProduct(item))
+        return false;
       if (item.order_detail_id !== void 0 && item.order_detail_id !== null)
         return false;
       if ((_a2 = item.metadata) == null ? void 0 : _a2.is_edit_for_runtime)
@@ -3019,17 +3149,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           normalizedProduct.discount_list
         );
         const nextNum = (0, import_utils3.getSafeProductNum)(targetProduct.num + normalizedProduct.num);
-        const targetIsManualProductDiscount = isManualProductDiscountProduct(targetProduct);
-        const nextDiscountList = targetIsManualProductDiscount ? (0, import_utils.normalizeOrderProductDiscountList)(
-          (0, import_manualProductDiscount.syncManualProductDiscountProductNum)(
-            targetProduct.discount_list,
-            nextNum
-          )
-        ) : normalizedProduct.discount_list;
         tempOrder.products[matchedIndex] = {
           ...targetProduct,
           ...normalizedProduct,
-          discount_list: nextDiscountList,
+          discount_list: normalizedProduct.discount_list,
           metadata: {
             ...targetProduct.metadata || {},
             ...normalizedProduct.metadata || {},
@@ -3040,16 +3163,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
             ...normalizedProduct.product_sku || { option: [] },
             option: (0, import_utils.getProductSkuOptions)(normalizedProduct)
           },
-          ...targetIsManualProductDiscount ? {
-            selling_price: targetProduct.selling_price,
-            original_price: targetProduct.original_price,
-            payment_price: targetProduct.payment_price,
-            metadata: {
-              ...normalizedProduct.metadata || {},
-              ...targetProduct.metadata || {},
-              unique_identification_number: targetUid
-            }
-          } : {},
           note: targetProduct.note,
           order_detail_id: targetProduct.order_detail_id,
           num: nextNum
@@ -3522,6 +3635,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       product_bundle
     } = params;
     const tempOrder = this.ensureTempOrder();
+    this.repairDuplicateProductLineIdentities(tempOrder);
     const identityLookup = {
       product_id,
       product_variant_id
@@ -3632,6 +3746,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   async removeProductsFromOrder(identities, options) {
     var _a, _b, _c, _d;
     const tempOrder = this.ensureTempOrder();
+    this.repairDuplicateProductLineIdentities(tempOrder);
     if (!identities.length) {
       return tempOrder.products;
     }
@@ -4368,24 +4483,39 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * 例如数组字段、商品行唯一值、价格 metadata、summary 派生状态和 _extend。
    */
   async hydrateTempOrderFromRecord(record, options) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f;
     const sourceRaw = record && typeof record === "object" && record.data && record.order_id == null ? record.data : record || {};
+    const duplicateProductIdentityRepair = (0, import_orderCollectionIdentity.repairDuplicateProductLineIdentities)(
+      Array.isArray(sourceRaw.products) ? sourceRaw.products : [],
+      (_a = sourceRaw._extend) == null ? void 0 : _a.productsByUid
+    );
+    const duplicateIdentityReadySource = duplicateProductIdentityRepair.repairs.length ? {
+      ...sourceRaw,
+      products: duplicateProductIdentityRepair.products,
+      ...duplicateProductIdentityRepair.productsByUid ? {
+        _extend: {
+          ...sourceRaw._extend || {},
+          productsByUid: duplicateProductIdentityRepair.productsByUid
+        }
+      } : {}
+    } : sourceRaw;
     const identityReadySource = this.seedAnonymousBookingUidsFromProducts(
-      sourceRaw
+      duplicateIdentityReadySource
     );
     const normalizedCollections = (0, import_orderCollectionIdentity.normalizeOrderCollections)(identityReadySource);
     const raw = normalizedCollections.order;
-    const hasIdentityChanges = Object.values(normalizedCollections.stats).some(
+    const hasIdentityChanges = duplicateProductIdentityRepair.repairs.length > 0 || Object.values(normalizedCollections.stats).some(
       (stats) => stats.backfilledUidCount > 0 || stats.collapsedDuplicateCount > 0 || stats.uidConflictCount > 0 || stats.anonymousRowCount > 0
     );
     if (hasIdentityChanges) {
       const identityLogMetadata = {
         collections: normalizedCollections.stats,
-        uidRemapCount: normalizedCollections.uidRemaps.length
+        uidRemapCount: normalizedCollections.uidRemaps.length,
+        duplicateProductUidRepairCount: duplicateProductIdentityRepair.repairs.length
       };
       const hasIdentityWarnings = Object.values(normalizedCollections.stats).some(
         (stats) => stats.uidConflictCount > 0 || stats.anonymousRowCount > 0
-      );
+      ) || duplicateProductIdentityRepair.repairs.length > 0;
       if (hasIdentityWarnings) {
         this.logWarning(
           "Normalized hydrated order collection identities",
@@ -4398,8 +4528,37 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         );
       }
     }
-    const nextTempOrder = this.normalizeTempOrderForRuntime(raw, { makeEditMark: true });
-    const sourceLastOrderInfo = raw.lastOrderInfo || raw;
+    const isSessionStorageHydrate = (options == null ? void 0 : options.source) === "sessionStorage";
+    const nextTempOrder = this.normalizeTempOrderForRuntime(raw, {
+      makeEditMark: !isSessionStorageHydrate
+    });
+    this.store.tempOrder = nextTempOrder;
+    if (isSessionStorageHydrate) {
+      const restoredSessionDiscounts = Array.isArray(raw.discount_list) ? (0, import_lodash_es.cloneDeep)(raw.discount_list) : [];
+      const nextExtend = { ...nextTempOrder._extend || {} };
+      delete nextExtend.originalSalesSnapshot;
+      nextTempOrder._extend = nextExtend;
+      nextTempOrder.products.forEach((product) => {
+        if (product.metadata) {
+          delete product.metadata.is_edit_for_runtime;
+        }
+      });
+      nextTempOrder.discount_list = restoredSessionDiscounts;
+      this.store.summary = (0, import_utils.createEmptySummary)();
+      this.store.lastOrderInfo = void 0;
+      await ((_b = this.store.discount) == null ? void 0 : _b.setOriginalDiscountList(
+        (0, import_lodash_es.cloneDeep)(restoredSessionDiscounts)
+      ));
+      await ((_c = this.store.discount) == null ? void 0 : _c.setDiscountList(
+        (0, import_lodash_es.cloneDeep)(restoredSessionDiscounts)
+      ));
+      if (options == null ? void 0 : options.recalcOnHydrate) {
+        await this.recalculateSummary({ createIfMissing: false });
+      }
+      this.persistTempOrder();
+      return nextTempOrder;
+    }
+    const sourceLastOrderInfo = sourceRaw.lastOrderInfo || sourceRaw;
     const isDraftOrder = Number(nextTempOrder.is_draft_order || 0) === 1;
     const syntheticIdentityOptions = {
       isDraftOrder,
@@ -4407,7 +4566,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     };
     const rawSummary = raw.summary && typeof raw.summary === "object" ? raw.summary : {};
     const summarySurcharges = Array.isArray(rawSummary.surcharges) ? rawSummary.surcharges.map((s) => ({ ...s || {} })) : (0, import_lodash_es.cloneDeep)(nextTempOrder.surcharges || []);
-    this.store.tempOrder = nextTempOrder;
     this.store.summary = {
       ...(0, import_utils.createEmptySummary)(),
       ...rawSummary,
@@ -4434,7 +4592,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       this.store.syncState = "local";
     }
     const hydratedEditDiscounts = this.collectHydratedEditDiscounts(nextTempOrder.products);
-    const currentDiscounts = typeof ((_a = this.store.discount) == null ? void 0 : _a.getDiscountList) === "function" ? this.store.discount.getDiscountList() || [] : [];
+    const currentDiscounts = typeof ((_d = this.store.discount) == null ? void 0 : _d.getDiscountList) === "function" ? this.store.discount.getDiscountList() || [] : [];
     const currentScanDiscounts = currentDiscounts.filter((discount) => discount == null ? void 0 : discount.isScan);
     const hydratedDiscountIds = new Set(
       hydratedEditDiscounts.map((discount) => discount == null ? void 0 : discount.id)
@@ -4452,8 +4610,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         nextTempOrder.products,
         nextDiscounts
       );
-      await ((_b = this.store.discount) == null ? void 0 : _b.setOriginalDiscountList(nextDiscounts));
-      await ((_c = this.store.discount) == null ? void 0 : _c.setDiscountList(nextDiscounts));
+      await ((_e = this.store.discount) == null ? void 0 : _e.setOriginalDiscountList(nextDiscounts));
+      await ((_f = this.store.discount) == null ? void 0 : _f.setDiscountList(nextDiscounts));
     }
     if (options == null ? void 0 : options.recalcOnHydrate) {
       await this.recalculateSummary({ createIfMissing: false });

package/lib/modules/Order/types.d.ts

@@ -579,6 +579,10 @@ export interface LoadSalesDetailParams {
      * 存在时 loadSalesDetail 会跳过远端 lookup，直接复用 hydrate 后半段逻辑。
      */
     preloadedSalesDetail?: Record<string, any>;
+    /**
+     * sessionStorage 快照复用详情 hydrate 时使用；不带该值时保持既有编辑订单语义。
+     */
+    hydrateSource?: 'sessionStorage';
     forceRemote?: boolean;
     merge?: boolean;
 }
@@ -749,8 +753,15 @@ export interface OrderModuleAPI {
     removeProductFromOrder: (identity: OrderProductIdentity, options?: RemoveProductsFromOrderOptions) => Promise<OrderProduct[]>;
     /** 批量删除购物车行，末尾仅触发一次促销重算与 summary 刷新 */
     removeProductsFromOrder: (identities: OrderProductIdentity[], options?: RemoveProductsFromOrderOptions) => Promise<OrderProduct[]>;
-    /** @deprecated no-op；OrderModule 不再负责 tempOrder localStorage 持久化。 */
+    /** 在显式开启时保存当前 tempOrder 的 sessionStorage 会话快照。 */
     persistTempOrder: () => void;
+    /**
+     * 删除当前 cacheId 的 tempOrder 会话快照，并阻止当前模块实例再次写入。
+     * 新模块实例初始化时会按 otherParams 重新启用持久化。
+     */
+    clearSessionStoragePersistedTempOrder: () => void;
+    /** 取出一次待恢复的 sessionStorage tempOrder 快照。 */
+    consumeSessionStorageRestore: () => Record<string, any> | null;
     /**
      * 控制 IndexedDB 草稿（saveDraft）开关；localStorage tempOrder 持久化已废弃。
      * BigSale 弹窗等场景传 false 可跳过 saveDraft。
@@ -808,6 +819,7 @@ export interface OrderModuleAPI {
     saveDraft: () => Promise<void>;
     hydrateTempOrderFromRecord: (record: Record<string, any>, options?: {
         recalcOnHydrate?: boolean;
+        source?: 'salesDetail' | 'sessionStorage';
     }) => Promise<OrderTempOrder>;
     syncPaymentsToOrder: <T = any>(params: SyncPaymentsToOrderParams) => Promise<SyncPaymentsToOrderResult<T>>;
     getSalesOrderByLookup: (params: SalesOrderLookupParams) => Promise<any>;

package/lib/modules/Order/utils/orderCollectionIdentity.d.ts

@@ -24,6 +24,16 @@ export interface NormalizeOrderCollectionsResult<T> {
     stats: Record<OrderCollectionKind, OrderCollectionIdentityStats>;
     uidRemaps: OrderCollectionUidRemap[];
 }
+export interface ProductLineIdentityRepair {
+    index: number;
+    from: string;
+    to: string;
+}
+export interface RepairDuplicateProductLineIdentitiesResult<T> {
+    products: T[];
+    productsByUid?: Record<string, Record<string, any>>;
+    repairs: ProductLineIdentityRepair[];
+}
 export declare function createUuidV4(): string;
 export declare function isBlankOrderCollectionIdentity(value: unknown): boolean;
 export declare function getOrderCollectionPersistentId(kind: OrderCollectionKind, item: unknown): string | null;
@@ -31,6 +41,11 @@ export declare function getOrderCollectionUid(kind: OrderCollectionKind, item: u
 export declare function buildOrderCollectionFallbackUid(kind: OrderCollectionKind, persistentId: string | number): string;
 export declare function getOrderCollectionReferenceUid(kind: OrderCollectionKind, item: unknown): string | null;
 export declare function setOrderCollectionUid<T>(kind: OrderCollectionKind, item: T, uid: string): T;
+/**
+ * Rules 会把同一商品按商品券拆成多条真实订单行。拆行结果会继承原商品 UID，
+ * 因此必须在通用 collection normalization 之前为后续行派生稳定身份，避免被折叠。
+ */
+export declare function repairDuplicateProductLineIdentities<T extends Record<string, any>>(products: T[] | null | undefined, productsByUid?: Record<string, Record<string, any>> | null): RepairDuplicateProductLineIdentitiesResult<T>;
 /**
  * 持久化行 ID 是服务端事实主键；只有至少一侧尚未持久化时，才允许用 runtime UID 对齐。
  */

package/lib/modules/Order/utils/orderCollectionIdentity.js

@@ -30,6 +30,7 @@ __export(orderCollectionIdentity_exports, {
   mergeOrderCollectionItems: () => mergeOrderCollectionItems,
   normalizeOrderCollection: () => normalizeOrderCollection,
   normalizeOrderCollections: () => normalizeOrderCollections,
+  repairDuplicateProductLineIdentities: () => repairDuplicateProductLineIdentities,
   setOrderCollectionUid: () => setOrderCollectionUid
 });
 module.exports = __toCommonJS(orderCollectionIdentity_exports);
@@ -105,6 +106,74 @@ function setOrderCollectionUid(kind, item, uid) {
   delete record[uidField];
   return record;
 }
+function getGoodPassResourceId(product) {
+  var _a;
+  const goodPass = (product.discount_list || []).find((item) => {
+    var _a2, _b;
+    const type = (item == null ? void 0 : item.type) || (item == null ? void 0 : item.tag) || ((_a2 = item == null ? void 0 : item.discount) == null ? void 0 : _a2.type) || ((_b = item == null ? void 0 : item.discount) == null ? void 0 : _b.tag);
+    return type === "good_pass";
+  });
+  if (!goodPass)
+    return null;
+  const resourceId = ((_a = goodPass.discount) == null ? void 0 : _a.resource_id) ?? goodPass.resource_id ?? goodPass.discount_id ?? goodPass.id;
+  return isBlankOrderCollectionIdentity(resourceId) ? null : String(resourceId);
+}
+function buildSplitProductUid(originalUid, product, duplicateOrdinal) {
+  const encodedOriginalUid = encodeURIComponent(originalUid);
+  const resourceId = getGoodPassResourceId(product);
+  if (resourceId) {
+    return `os-split:product:${encodedOriginalUid}:good-pass:${encodeURIComponent(resourceId)}:${duplicateOrdinal}`;
+  }
+  return `os-split:product:${encodedOriginalUid}:duplicate:${duplicateOrdinal}`;
+}
+function repairDuplicateProductLineIdentities(products, productsByUid) {
+  const repairedProducts = (0, import_lodash_es.cloneDeep)(products || []);
+  const repairedProductsByUid = productsByUid ? (0, import_lodash_es.cloneDeep)(productsByUid) : void 0;
+  const occupiedUids = new Set(
+    repairedProducts.map((product) => getOrderCollectionUid("product", product)).filter((uid) => Boolean(uid))
+  );
+  Object.keys(repairedProductsByUid || {}).forEach((uid) => occupiedUids.add(uid));
+  const occurrences = /* @__PURE__ */ new Map();
+  const repairs = [];
+  repairedProducts.forEach((product, index) => {
+    const originalUid = getOrderCollectionUid("product", product);
+    if (!originalUid)
+      return;
+    const occurrence = (occurrences.get(originalUid) || 0) + 1;
+    occurrences.set(originalUid, occurrence);
+    if (occurrence === 1)
+      return;
+    const duplicateOrdinal = occurrence - 1;
+    const baseCandidate = buildSplitProductUid(
+      originalUid,
+      product,
+      duplicateOrdinal
+    );
+    let nextUid = baseCandidate;
+    let conflictOrdinal = 1;
+    while (occupiedUids.has(nextUid)) {
+      nextUid = `${baseCandidate}:conflict:${conflictOrdinal}`;
+      conflictOrdinal += 1;
+    }
+    const repairedProduct = setOrderCollectionUid("product", product, nextUid);
+    repairedProduct.identity_key = nextUid;
+    repairedProducts[index] = repairedProduct;
+    occupiedUids.add(nextUid);
+    repairs.push({ index, from: originalUid, to: nextUid });
+    const runtimeSource = repairedProductsByUid == null ? void 0 : repairedProductsByUid[originalUid];
+    if (runtimeSource && repairedProductsByUid) {
+      repairedProductsByUid[nextUid] = {
+        ...(0, import_lodash_es.cloneDeep)(runtimeSource),
+        ...runtimeSource.rowKey !== void 0 ? { rowKey: nextUid } : {}
+      };
+    }
+  });
+  return {
+    products: repairedProducts,
+    ...repairedProductsByUid ? { productsByUid: repairedProductsByUid } : {},
+    repairs
+  };
+}
 function isSameOrderCollectionItem(kind, left, right) {
   const leftPersistentId = getOrderCollectionPersistentId(kind, left);
   const rightPersistentId = getOrderCollectionPersistentId(kind, right);
@@ -414,5 +483,6 @@ function normalizeOrderCollections(sourceOrder, options) {
   mergeOrderCollectionItems,
   normalizeOrderCollection,
   normalizeOrderCollections,
+  repairDuplicateProductLineIdentities,
   setOrderCollectionUid
 });