@pisell/pisellos 2.2.278 → 2.2.280

package/lib/modules/Order/index.js

@@ -44,6 +44,7 @@ var import_utils3 = require("../../solution/ScanOrder/utils");
 var import_manualProductDiscount = require("./utils/manualProductDiscount");
 var import_bundleDiscountHydration = require("./utils/bundleDiscountHydration");
 var import_orderCollectionIdentity = require("./utils/orderCollectionIdentity");
+var import_discountProductLineIdentity = require("./utils/discountProductLineIdentity");
 var import_Discount = require("../Discount");
 var import_Rules = require("../Rules");
 var import_types2 = require("../Rules/types");
@@ -65,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";
@@ -113,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;
@@ -329,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;
+    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) {
@@ -343,25 +367,24 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       this.store.availableWalletIds = [];
     }
     this.request = this.core.getPlugin("request");
-    this.appPlugin = this.core.getPlugin("app");
-    if (!this.appPlugin) {
-      throw new Error("Order 模块需要 app 插件支持");
+    const appPlugin = this.core.getPlugin("app");
+    if (!appPlugin) {
+      console.error("Order 模块需要 app 插件支持");
     }
-    const app = this.appPlugin.getApp();
-    this.logger = app.logger;
+    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 = (_a = otherParams.rules) == null ? void 0 : _a.hooks;
+    this.rulesHooksOverride = (_b = otherParams.rules) == null ? void 0 : _b.hooks;
     this.moduleHooksOverride = options.hooks;
-    this.orderHooks = this.moduleHooksOverride || ((_b = otherParams.order) == null ? void 0 : _b.hooks) || ((_c = otherParams.hooks) == null ? void 0 : _c.order);
+    this.orderHooks = this.moduleHooksOverride || ((_c = otherParams.order) == null ? void 0 : _c.hooks) || ((_d = otherParams.hooks) == null ? void 0 : _d.order);
     this.otherParams = otherParams;
     this.registerDiscountModules(options);
     this.logInfo("OrderModule initialized successfully");
   }
   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")
@@ -391,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);
@@ -436,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`);
@@ -451,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
       }
     });
@@ -672,6 +696,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           };
         })
       );
+      (0, import_discountProductLineIdentity.ensureUniqueProductLineUids)(tempOrder);
+      (0, import_discountProductLineIdentity.consolidateDiscountFreeProductLines)(tempOrder);
     }
     if (result == null ? void 0 : result.discountList) {
       OrderModule.populateSavedAmounts(
@@ -867,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
@@ -879,8 +906,80 @@ 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)
+      return;
+    this.store.tempOrder = {
+      ...this.store.tempOrder,
+      products: [...this.store.tempOrder.products],
+      bookings: this.store.tempOrder.bookings ? [...this.store.tempOrder.bookings] : []
+    };
+    this.persistTempOrder();
   }
   // ─── TempOrder: 创建 & 获取 ───
   createDefaultTempOrderInstance() {
@@ -1071,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,
@@ -1092,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";
   }
@@ -1395,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);
     }
@@ -1592,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;
   }
@@ -1646,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);
     }
@@ -1725,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;
@@ -1743,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 }
@@ -1870,6 +1993,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     tempOrder.products = (tempOrder.products || []).map(
       (product) => this.sanitizeOrderProductForTempOrder(product)
     );
+    (0, import_discountProductLineIdentity.ensureUniqueProductLineUids)(tempOrder);
   }
   ensureExtend(tempOrder) {
     if (!tempOrder._extend || typeof tempOrder._extend !== "object") {
@@ -1880,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);
@@ -2525,6 +2666,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       delete tempOrder._extend.customerSnapshot;
     this.store.availableWalletIds = [];
     this.clearCustomerBoundDiscounts(tempOrder);
+    this.applyDiscount();
     this.persistTempOrder();
     this.saveDraftInBackground();
     this.core.effects.emit(import_types.OrderHooks.OnOrderCustomerChange, null);
@@ -2830,21 +2972,29 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       devicePrefix
     });
   }
-  async shouldMergeProductToOrder(params) {
+  normalizeShouldMergeProductResult(result) {
+    if (typeof result === "boolean")
+      return result;
+    if (result && typeof result === "object" && typeof result.shouldMerge === "boolean") {
+      return result.shouldMerge;
+    }
+    return true;
+  }
+  shouldMergeProductToOrder(params) {
     var _a;
     const onBeforeMergeProductToOrder = (_a = this.orderHooks) == null ? void 0 : _a.onBeforeMergeProductToOrder;
     if (!onBeforeMergeProductToOrder)
       return true;
-    const result = await onBeforeMergeProductToOrder({
+    const result = onBeforeMergeProductToOrder({
       ...params,
       defaultShouldMerge: true
     });
-    if (typeof result === "boolean")
-      return result;
-    if (result && typeof result === "object" && typeof result.shouldMerge === "boolean") {
-      return result.shouldMerge;
+    if (result && typeof result === "object" && typeof result.then === "function") {
+      return Promise.resolve(result).then(
+        (resolved) => this.normalizeShouldMergeProductResult(resolved)
+      );
     }
-    return true;
+    return this.normalizeShouldMergeProductResult(result);
   }
   hasOrderProductLineNote(product) {
     return typeof (product == null ? void 0 : product.note) === "string" && product.note.trim().length > 0;
@@ -2887,10 +3037,15 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * 带 booking 且 num>1 时由 `addProductToOrder` 拆成多次本方法调用（每次 num=1）。
    *
    * @example
-   * await this.appendProductLineToTempOrder(tempOrder, { product_id: 1, num: 1 }, booking);
+   * const pending = this.appendProductLineToTempOrder(
+   *   tempOrder,
+   *   { product_id: 1, num: 1 },
+   *   booking,
+   * );
+   * if (pending) await pending;
    */
-  async appendProductLineToTempOrder(tempOrder, product, booking, options) {
-    var _a, _b, _c, _d, _e, _f, _g;
+  appendProductLineToTempOrder(tempOrder, product, booking, options) {
+    var _a, _b, _c, _d, _e, _f;
     const linked = booking ? this.createLinkedProductAndBooking({ product, booking }) : null;
     const productToAdd = (linked == null ? void 0 : linked.product) || product;
     const incomingFingerprint = (0, import_utils3.buildProductLineFingerprint)(
@@ -2921,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)
@@ -2949,7 +3107,90 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       (0, import_utils.getProductSkuOptions)(matchedProduct),
       matchedProduct.product_bundle
     ) : "";
-    const shouldMerge = matchedProduct ? await this.shouldMergeProductToOrder({
+    const commitProductLine = (shouldMerge2) => {
+      var _a2;
+      if (matchedIndex === -1 || !matchedProduct || !shouldMerge2) {
+        this.captureProductRuntime(
+          tempOrder,
+          productToAdd,
+          normalizedIncoming
+        );
+        if (linked) {
+          normalizedIncoming.booking_uid = linked.bookingUid;
+          normalizedIncoming.metadata = {
+            ...normalizedIncoming.metadata || {},
+            booking_uid: linked.bookingUid
+          };
+        }
+        const insertAtIndex = options == null ? void 0 : options.insertAtIndex;
+        if (Number.isInteger(insertAtIndex) && Number(insertAtIndex) >= 0 && Number(insertAtIndex) < tempOrder.products.length) {
+          tempOrder.products = [
+            ...tempOrder.products.slice(0, insertAtIndex),
+            normalizedIncoming,
+            ...tempOrder.products.slice(insertAtIndex)
+          ];
+        } else {
+          tempOrder.products = [...tempOrder.products, normalizedIncoming];
+        }
+      } else {
+        const targetProduct = matchedProduct;
+        const targetUid = (_a2 = targetProduct.metadata) == null ? void 0 : _a2.unique_identification_number;
+        const normalizedProduct = (0, import_utils.mergeOrderProductDisplayFields)(
+          targetProduct,
+          (0, import_utils3.normalizeOrderProduct)({
+            ...productToAdd,
+            metadata: {
+              ...productToAdd.metadata || {},
+              unique_identification_number: targetUid
+            }
+          })
+        );
+        normalizedProduct.discount_list = (0, import_utils.normalizeOrderProductDiscountList)(
+          normalizedProduct.discount_list
+        );
+        const nextNum = (0, import_utils3.getSafeProductNum)(targetProduct.num + normalizedProduct.num);
+        tempOrder.products[matchedIndex] = {
+          ...targetProduct,
+          ...normalizedProduct,
+          discount_list: normalizedProduct.discount_list,
+          metadata: {
+            ...targetProduct.metadata || {},
+            ...normalizedProduct.metadata || {},
+            unique_identification_number: targetUid
+          },
+          product_sku: {
+            ...targetProduct.product_sku || { option: [] },
+            ...normalizedProduct.product_sku || { option: [] },
+            option: (0, import_utils.getProductSkuOptions)(normalizedProduct)
+          },
+          note: targetProduct.note,
+          order_detail_id: targetProduct.order_detail_id,
+          num: nextNum
+        };
+        this.captureProductRuntime(
+          tempOrder,
+          productToAdd,
+          tempOrder.products[matchedIndex],
+          targetUid
+        );
+        if (matchedIndex !== tempOrder.products.length - 1) {
+          const mergedProduct = tempOrder.products[matchedIndex];
+          tempOrder.products = [
+            ...tempOrder.products.slice(0, matchedIndex),
+            ...tempOrder.products.slice(matchedIndex + 1),
+            mergedProduct
+          ];
+        }
+      }
+      if (linked) {
+        tempOrder.bookings = [...tempOrder.bookings || [], linked.booking];
+      }
+    };
+    if (!matchedProduct) {
+      commitProductLine(false);
+      return;
+    }
+    const shouldMerge = this.shouldMergeProductToOrder({
       incomingProduct: productToAdd,
       normalizedIncoming,
       matchedProduct,
@@ -2958,100 +3199,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       existedFingerprint,
       tempOrder,
       booking
-    }) : false;
-    if (matchedIndex === -1 || !matchedProduct || !shouldMerge) {
-      this.captureProductRuntime(
-        tempOrder,
-        productToAdd,
-        normalizedIncoming
-      );
-      if (linked) {
-        normalizedIncoming.booking_uid = linked.bookingUid;
-        normalizedIncoming.metadata = {
-          ...normalizedIncoming.metadata || {},
-          booking_uid: linked.bookingUid
-        };
-      }
-      const insertAtIndex = options == null ? void 0 : options.insertAtIndex;
-      if (Number.isInteger(insertAtIndex) && Number(insertAtIndex) >= 0 && Number(insertAtIndex) < tempOrder.products.length) {
-        tempOrder.products = [
-          ...tempOrder.products.slice(0, insertAtIndex),
-          normalizedIncoming,
-          ...tempOrder.products.slice(insertAtIndex)
-        ];
-      } else {
-        tempOrder.products = [...tempOrder.products, normalizedIncoming];
-      }
-    } else {
-      const targetProduct = matchedProduct;
-      const targetUid = (_g = targetProduct.metadata) == null ? void 0 : _g.unique_identification_number;
-      const normalizedProduct = (0, import_utils.mergeOrderProductDisplayFields)(
-        targetProduct,
-        (0, import_utils3.normalizeOrderProduct)({
-          ...productToAdd,
-          metadata: {
-            ...productToAdd.metadata || {},
-            unique_identification_number: targetUid
-          }
-        })
-      );
-      normalizedProduct.discount_list = (0, import_utils.normalizeOrderProductDiscountList)(
-        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,
-        metadata: {
-          ...targetProduct.metadata || {},
-          ...normalizedProduct.metadata || {},
-          unique_identification_number: targetUid
-        },
-        product_sku: {
-          ...targetProduct.product_sku || { option: [] },
-          ...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
-      };
-      this.captureProductRuntime(
-        tempOrder,
-        productToAdd,
-        tempOrder.products[matchedIndex],
-        targetUid
-      );
-      if (matchedIndex !== tempOrder.products.length - 1) {
-        const mergedProduct = tempOrder.products[matchedIndex];
-        tempOrder.products = [
-          ...tempOrder.products.slice(0, matchedIndex),
-          ...tempOrder.products.slice(matchedIndex + 1),
-          mergedProduct
-        ];
-      }
-    }
-    if (linked) {
-      tempOrder.bookings = [...tempOrder.bookings || [], linked.booking];
+    });
+    if (shouldMerge && typeof shouldMerge === "object" && typeof shouldMerge.then === "function") {
+      return Promise.resolve(shouldMerge).then(commitProductLine);
     }
+    commitProductLine(shouldMerge);
   }
   /**
    * 添加商品行。带 booking 时强制独立行；num>1 时拆成多条 num=1 的 product+booking（对齐 BookingByStep / ticketBooking addService）。
@@ -3079,12 +3231,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           const singleLine = (0, import_lodash_es.cloneDeep)(productRecord);
           singleLine.num = 1;
           delete singleLine.product_quantity;
-          await this.appendProductLineToTempOrder(
+          const appendResult2 = this.appendProductLineToTempOrder(
             tempOrder,
             singleLine,
             (0, import_lodash_es.cloneDeep)(booking),
             { insertAtIndex }
           );
+          if (appendResult2)
+            await appendResult2;
           if (insertAtIndex !== void 0)
             insertAtIndex += 1;
         }
@@ -3092,12 +3246,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         return tempOrder.products;
       }
     }
-    await this.appendProductLineToTempOrder(
+    const appendResult = this.appendProductLineToTempOrder(
       tempOrder,
       product,
       booking,
       { insertAtIndex }
     );
+    if (appendResult)
+      await appendResult;
     await this.finalizeProductOrderMutation(tempOrder);
     this.logInfo("addProductToOrder success", {
       product_id: product.product_id,
@@ -3132,16 +3288,24 @@ var OrderModule = class extends import_BaseModule.BaseModule {
             const singleLine = (0, import_lodash_es.cloneDeep)(productRecord);
             singleLine.num = 1;
             delete singleLine.product_quantity;
-            await this.appendProductLineToTempOrder(
+            const appendResult2 = this.appendProductLineToTempOrder(
               tempOrder,
               singleLine,
               (0, import_lodash_es.cloneDeep)(booking)
             );
+            if (appendResult2)
+              await appendResult2;
           }
           continue;
         }
       }
-      await this.appendProductLineToTempOrder(tempOrder, product, booking);
+      const appendResult = this.appendProductLineToTempOrder(
+        tempOrder,
+        product,
+        booking
+      );
+      if (appendResult)
+        await appendResult;
     }
     await this.finalizeProductOrderMutation(tempOrder, options);
     this.logInfo("addProductsToOrder success", {
@@ -3471,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
@@ -3581,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;
     }
@@ -3988,7 +4154,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       tempOrder,
       effectivePayments
     );
-    const submitResult = await this.submitTempOrder({
+    const submitParams = {
       payments: effectivePayments,
       paymentStatus,
       smallTicketDataFlag: params.smallTicketDataFlag,
@@ -4002,7 +4168,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         };
         return nextPayload;
       }
-    });
+    };
+    const submitResult = params.checkoutSyncTaskEnabled === false ? await this.submitTempOrderAsync(submitParams) : await this.submitTempOrder(submitParams);
     return { ...completion, submitResult };
   }
   createOrder(params) {
@@ -4019,11 +4186,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       is_deposit: 0,
       relation_products: [],
       relation_forms: [],
+      business_code: params == null ? void 0 : params.business_code,
       ...(params == null ? void 0 : params.extraData) || {}
     };
     let is_deposit = 0;
     if (params.cartItems.length > 0) {
       params.cartItems.forEach((item) => {
+        var _a2;
         if (!item._origin.duration) {
           const { duration, durationType } = (0, import_utils.generateDuration)(item);
           item._origin.duration = duration;
@@ -4032,6 +4201,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         item._origin.sub_type = (0, import_utils.normalizeBookingSubType)(item._origin);
         const discountList = (0, import_utils.getAllDiscountList)(item);
         item._origin.product.discount_list = discountList;
+        if ((_a2 = params == null ? void 0 : params.extraData) == null ? void 0 : _a2.is_add_holder_info) {
+          (0, import_utils.ensureCartItemOriginHolder)(item, this.window);
+        }
         if ((0, import_utils2.isNormalProduct)(item._origin)) {
           order.relation_products.push(item._origin.product);
           const relationForms = item._origin.relation_forms || [];
@@ -4311,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",
@@ -4341,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,
@@ -4350,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,
@@ -4377,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)
@@ -4395,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 });
@@ -4689,8 +4904,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     delete row[`product_${"option"}_item`];
     if (!Array.isArray(row.product_bundle))
       row.product_bundle = [];
-    if (!row.metadata || typeof row.metadata !== "object")
-      row.metadata = {};
+    row.metadata = row.metadata && typeof row.metadata === "object" ? { ...row.metadata } : {};
+    delete row.bundle_edit;
+    delete row.metadata.bundle_edit;
     if (row.booking_uid && !row.metadata.booking_uid) {
       row.metadata.booking_uid = row.booking_uid;
     }