@pisell/pisellos 2.2.260 → 2.2.262

package/lib/modules/Order/index.js

@@ -40,6 +40,8 @@ var import_dayjs = __toESM(require("dayjs"));
 var import_cartPromotion = require("../../solution/BaseSales/utils/cartPromotion");
 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_Discount = require("../Discount");
 var import_Rules = require("../Rules");
 var import_types2 = require("../Rules/types");
@@ -64,6 +66,23 @@ 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");
 }
+var ORDER_PAYMENT_STATUS_PAID = "paid";
+var ORDER_PAYMENT_STATUS_PENDING = "payment_pending";
+function isVoucherPaymentRecord(payment) {
+  return (payment == null ? void 0 : payment.voucher_id) !== void 0 && Number(payment.voucher_id) !== 0;
+}
+function hasSyncedOrderPaymentRecord(payment) {
+  return (payment == null ? void 0 : payment.order_payment_id) !== void 0 && payment.order_payment_id !== null;
+}
+function isPendingVoucherPaymentRecord(payment) {
+  return isVoucherPaymentRecord(payment) && (payment == null ? void 0 : payment.status) === ORDER_PAYMENT_STATUS_PENDING;
+}
+function isPaidPaymentRecord(payment) {
+  return (payment == null ? void 0 : payment.status) === ORDER_PAYMENT_STATUS_PAID;
+}
+function isCommittedVoucherPaymentRecord(payment) {
+  return isVoucherPaymentRecord(payment) && (payment == null ? void 0 : payment.status) !== "voided" && (hasSyncedOrderPaymentRecord(payment) || isPaidPaymentRecord(payment));
+}
 var OrderModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name || "order", version);
@@ -89,9 +108,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.draftPersistEnabled = true;
   }
   collectHydratedEditDiscounts(products) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     const discountMap = /* @__PURE__ */ new Map();
-    for (const product of products || []) {
+    for (const product of (0, import_bundleDiscountHydration.expandHydratedProductsForDiscountCollection)(products)) {
       for (const item of (product == null ? void 0 : product.discount_list) || []) {
         const type = (item == null ? void 0 : item.type) ?? (item == null ? void 0 : item.tag);
         if (!type || type === "product")
@@ -114,15 +133,37 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           discount: item == null ? void 0 : item.discount,
           _num: Number(((_e = item == null ? void 0 : item.metadata) == null ? void 0 : _e.num) ?? (product == null ? void 0 : product.num) ?? (product == null ? void 0 : product.product_quantity) ?? 1) || 1
         };
+        const existed = discountMap.get(key);
+        if (existed) {
+          existed.amount = Number(existed.amount || 0) + amount;
+          existed.used_par_value = String(Number(existed.used_par_value || 0) + amount);
+          existed.balance = String(Number(existed.balance || 0) + amount);
+          const productIds = Array.isArray((_f = existed.limited_relation_product_data) == null ? void 0 : _f.product_ids) ? existed.limited_relation_product_data.product_ids : [];
+          if ((product == null ? void 0 : product.product_id) !== void 0 && (product == null ? void 0 : product.product_id) !== null && !productIds.includes(product.product_id)) {
+            existed.limited_relation_product_data = {
+              ...existed.limited_relation_product_data || {},
+              product_ids: [...productIds, product.product_id]
+            };
+          }
+          existed.applicableProductDetails = [
+            ...existed.applicableProductDetails || [],
+            detail
+          ];
+          existed.appliedProductDetails = [
+            ...existed.appliedProductDetails || [],
+            detail
+          ];
+          continue;
+        }
         discountMap.set(key, {
           id: key,
           product_name: "",
           encoded: "",
           code: "",
           tag: type,
-          product_id: ((_f = item == null ? void 0 : item.discount) == null ? void 0 : _f.discount_product_id) ?? (product == null ? void 0 : product.product_id) ?? 0,
+          product_id: ((_g = item == null ? void 0 : item.discount) == null ? void 0 : _g.discount_product_id) ?? (product == null ? void 0 : product.product_id) ?? 0,
           relation_type: "",
-          par_value: String(((_g = item == null ? void 0 : item.discount) == null ? void 0 : _g.original_amount) ?? (item == null ? void 0 : item.amount) ?? "0"),
+          par_value: String(((_h = item == null ? void 0 : item.discount) == null ? void 0 : _h.original_amount) ?? (item == null ? void 0 : item.amount) ?? "0"),
           used_par_value: String((item == null ? void 0 : item.amount) ?? "0"),
           limit_status: "enable",
           limited_relation_product_data: {
@@ -152,8 +193,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           discount: {
             ...(item == null ? void 0 : item.discount) || {},
             resource_id: key,
-            discount_product_id: ((_h = item == null ? void 0 : item.discount) == null ? void 0 : _h.discount_product_id) ?? (product == null ? void 0 : product.product_id) ?? 0,
-            discount_calculation_mode: ((_i = item == null ? void 0 : item.discount) == null ? void 0 : _i.discount_calculation_mode) ?? "item_level"
+            discount_product_id: ((_i = item == null ? void 0 : item.discount) == null ? void 0 : _i.discount_product_id) ?? (product == null ? void 0 : product.product_id) ?? 0,
+            discount_calculation_mode: ((_j = item == null ? void 0 : item.discount) == null ? void 0 : _j.discount_calculation_mode) ?? "item_level"
           },
           applicableProductDetails: [detail],
           appliedProductDetails: [detail]
@@ -236,6 +277,21 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         product.metadata.main_product_selling_price = newMainSellingPrice;
         product.metadata.price_schema_version = 2;
       }
+      if (Array.isArray(product.product_bundle)) {
+        product.product_bundle = product.product_bundle.map((bundle) => {
+          const hasBundleDiscount = Array.isArray(bundle == null ? void 0 : bundle.discount_list) && bundle.discount_list.length > 0;
+          if (hasBundleDiscount)
+            return bundle;
+          const restoredPrice = (bundle == null ? void 0 : bundle.original_price) ?? (bundle == null ? void 0 : bundle.product_price) ?? (bundle == null ? void 0 : bundle.price);
+          if (restoredPrice === void 0 || restoredPrice === null || restoredPrice === "")
+            return bundle;
+          return {
+            ...bundle,
+            price: restoredPrice,
+            bundle_selling_price: restoredPrice
+          };
+        });
+      }
       product.selling_price = (0, import_utils.composeLinePrice)({
         mainPrice: newMainSellingPrice,
         bundle: product.product_bundle
@@ -253,6 +309,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (!this.store.summary) {
       this.store.summary = (0, import_utils.createEmptySummary)();
     }
+    if (!Array.isArray(this.store.availableWalletIds)) {
+      this.store.availableWalletIds = [];
+    }
     this.request = this.core.getPlugin("request");
     const appPlugin = this.core.getPlugin("app");
     if (!appPlugin) {
@@ -380,19 +439,30 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   async loadDiscountConfig(params) {
     var _a, _b, _c, _d, _e, _f, _g;
     const orderId = params.orderId || ((_a = this.store.tempOrder) == null ? void 0 : _a.order_id) || void 0;
-    const discountList = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
+    const prepareConfigResult = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
       customer_id: params.customerId,
       action: params.action || (orderId ? "edit" : "create"),
       with_good_pass: 1,
       with_discount_card: 1,
       with_wallet_pass_holder: 1,
+      with_available_wallet_flag: 1,
+      with_available_wallet_pass_flag: 1,
       request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
       ...orderId ? { order_id: orderId } : {}
     }));
+    const discountList = prepareConfigResult == null ? void 0 : prepareConfigResult.discountList;
+    this.store.availableWalletIds = (prepareConfigResult == null ? void 0 : prepareConfigResult.availableWalletIds) || [];
     if (discountList) {
-      const currentEditDiscounts = (((_c = this.store.discount) == null ? void 0 : _c.getDiscountList()) || []).filter((discount) => discount == null ? void 0 : discount.isEditMode);
+      const currentDiscountList = ((_c = this.store.discount) == null ? void 0 : _c.getDiscountList()) || [];
+      const currentEditDiscounts = currentDiscountList.filter((discount) => discount == null ? void 0 : discount.isEditMode);
+      const currentScanDiscounts = currentDiscountList.filter((discount) => discount == null ? void 0 : discount.isScan);
+      const currentScanDiscountIds = new Set(
+        currentScanDiscounts.map((discount) => discount == null ? void 0 : discount.id)
+      );
       const runtimeDiscountIds = /* @__PURE__ */ new Set();
       const runtimeDiscounts = discountList.filter((discount) => {
+        if (currentScanDiscountIds.has(discount == null ? void 0 : discount.id))
+          return false;
         if (runtimeDiscountIds.has(discount == null ? void 0 : discount.id))
           return false;
         runtimeDiscountIds.add(discount == null ? void 0 : discount.id);
@@ -400,6 +470,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       });
       const mergedDiscountList = [
         ...currentEditDiscounts,
+        ...currentScanDiscounts,
         ...runtimeDiscounts
       ];
       await ((_d = this.store.discount) == null ? void 0 : _d.setOriginalDiscountList(mergedDiscountList));
@@ -414,6 +485,22 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     var _a;
     return ((_a = this.store.discount) == null ? void 0 : _a.getDiscountList()) || [];
   }
+  getAvailableWalletIds() {
+    return Array.isArray(this.store.availableWalletIds) ? [...this.store.availableWalletIds] : [];
+  }
+  async syncScannedDiscountsToOriginalDiscountList(discountList) {
+    var _a, _b, _c, _d;
+    const scanDiscounts = (discountList || []).filter((discount) => discount == null ? void 0 : discount.isScan);
+    if (!scanDiscounts.length)
+      return;
+    const scanDiscountIds = new Set(scanDiscounts.map((discount) => discount == null ? void 0 : discount.id));
+    const originalDiscounts = ((_b = (_a = this.store.discount) == null ? void 0 : _a.getOriginalDiscountList) == null ? void 0 : _b.call(_a)) || [];
+    const nextOriginalDiscounts = [
+      ...scanDiscounts,
+      ...originalDiscounts.filter((discount) => !scanDiscountIds.has(discount == null ? void 0 : discount.id))
+    ];
+    await ((_d = (_c = this.store.discount) == null ? void 0 : _c.setOriginalDiscountList) == null ? void 0 : _d.call(_c, nextOriginalDiscounts));
+  }
   async ensureEditDiscountConfigForProductChange(tempOrder) {
     var _a, _b, _c, _d, _e, _f;
     const orderId = tempOrder.order_id;
@@ -434,7 +521,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
   }
   async scanCode(code, customerId) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     const resultDiscountWithReason = await ((_a = this.store.discount) == null ? void 0 : _a.batchSearch(code, { customerId })) || { discountList: [], unavailableReasonKey: null };
     const { discountList: resultDiscountList, unavailableReasonKey } = resultDiscountWithReason;
     const rulesModule = this.store.rules;
@@ -462,6 +549,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }));
     const currentSelected = this.getDiscountList().filter((n) => n.isSelected);
     if (currentSelected.length && currentSelected.some((n) => withScanList.some((m) => m.id === n.id))) {
+      await this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
       return {
         type: "clientCalc",
         isAvailable: true,
@@ -470,18 +558,19 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       };
     }
     const tempOrder = this.store.tempOrder;
-    const holders = ((_b = tempOrder == null ? void 0 : tempOrder.holder) == null ? void 0 : _b.form_record_id) ? [{ form_record_id: tempOrder.holder.form_record_id }] : [];
+    const holders = ((_b = tempOrder == null ? void 0 : tempOrder.holder) == null ? void 0 : _b.form_record) || [];
     const { isAvailable, discountList: newDiscountList, unavailableReason } = rulesModule.isDiscountListAvailable({
       productList: (tempOrder == null ? void 0 : tempOrder.products) || [],
       oldDiscountList: this.getDiscountList(),
       newDiscountList: withScanList,
       orderTotalAmount: Number(((_c = this.store.summary) == null ? void 0 : _c.total_amount) || 0),
       holders,
-      isFormSubject: !!((_d = tempOrder == null ? void 0 : tempOrder.holder) == null ? void 0 : _d.type) && tempOrder.holder.type === "form"
+      isFormSubject: (product) => (0, import_utils.resolveIsFormSubject)(tempOrder, product)
     }) || { isAvailable: false, discountList: this.getDiscountList() };
     if (isAvailable && newDiscountList) {
-      (_e = this.store.discount) == null ? void 0 : _e.setDiscountList(newDiscountList);
+      (_d = this.store.discount) == null ? void 0 : _d.setDiscountList(newDiscountList);
       this.applyDiscount();
+      await this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
     }
     return {
       type: "clientCalc",
@@ -491,25 +580,28 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       unavailableReason
     };
   }
-  applyDiscount() {
-    var _a, _b, _c, _d, _e;
+  applyDiscount(options) {
+    var _a, _b, _c;
     const tempOrder = this.store.tempOrder;
     if (!tempOrder)
       return;
+    this.syncLinkedBookingHoldersToProducts(tempOrder);
     delete tempOrder.discount_list;
-    if (this.shouldSkipDiscountCalculation(tempOrder))
+    const discountList = ((_a = this.store.discount) == null ? void 0 : _a.getDiscountList()) || [];
+    const shouldSkipDiscountCalculation = this.shouldSkipDiscountCalculation(tempOrder);
+    if (shouldSkipDiscountCalculation)
       return;
     const rulesModule = this.store.rules;
     if (!rulesModule)
       return;
-    const discountList = ((_a = this.store.discount) == null ? void 0 : _a.getDiscountList()) || [];
-    const holders = ((_b = tempOrder.holder) == null ? void 0 : _b.form_record_id) ? [{ form_record_id: tempOrder.holder.form_record_id }] : [];
     const result = rulesModule.calcDiscount({
       productList: tempOrder.products,
       discountList,
-      holders,
-      isFormSubject: !!((_c = tempOrder.holder) == null ? void 0 : _c.type) && tempOrder.holder.type === "form",
-      orderTotalAmount: Number(((_d = this.store.summary) == null ? void 0 : _d.total_amount) || 0)
+      holders: [],
+      isFormSubject: (product) => (0, import_utils.resolveIsFormSubject)(tempOrder, product),
+      orderTotalAmount: Number(((_b = this.store.summary) == null ? void 0 : _b.total_amount) || 0)
+    }, {
+      reapplyBookingDiscountProductUids: options == null ? void 0 : options.reapplyBookingDiscountProductUids
     });
     if (result == null ? void 0 : result.productList) {
       const previousProductsByUid = (0, import_utils.indexOrderProductsByUid)(tempOrder.products);
@@ -538,7 +630,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         result.productList || tempOrder.products,
         result.discountList
       );
-      (_e = this.store.discount) == null ? void 0 : _e.setDiscountList(result.discountList);
+      (_c = this.store.discount) == null ? void 0 : _c.setDiscountList(result.discountList);
     }
     this.hasActiveCustomerBoundDiscount = (tempOrder.products || []).some(
       (product) => this.productHasCustomerBoundDiscount(product)
@@ -816,15 +908,53 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     return (0, import_utils.mapPaymentItemsToOrderPayments)(payments, {
       includeVoided: false
     }).reduce((sum, payment) => {
+      if (!isPaidPaymentRecord(payment))
+        return sum;
       return sum.plus(this.calculatePaymentEffectiveAmount(payment));
     }, new import_decimal.default(0));
   }
+  calculateOrderPaidPaymentTotal(payments) {
+    return (0, import_utils.mapPaymentItemsToOrderPayments)(payments, {
+      includeVoided: false
+    }).reduce((sum, payment) => {
+      if (!isPaidPaymentRecord(payment))
+        return sum;
+      return sum.plus(this.calculatePaymentGapAmount(payment));
+    }, new import_decimal.default(0));
+  }
   getDepositAmount(tempOrder, summary) {
     return new import_decimal.default(summary.deposit_amount || tempOrder.deposit_amount || "0.00");
   }
   normalizeDepositAmount(amount) {
     return import_decimal.default.max(new import_decimal.default(Number(amount) || 0), 0).toDecimalPlaces(2).toFixed(2);
   }
+  getLastOrderDepositSnapshot() {
+    var _a;
+    const lastOrderInfo = this.store.lastOrderInfo;
+    if (!lastOrderInfo || typeof lastOrderInfo !== "object")
+      return null;
+    const rawDepositAmount = lastOrderInfo.deposit_amount ?? ((_a = lastOrderInfo.summary) == null ? void 0 : _a.deposit_amount);
+    const depositAmount = this.normalizeDepositAmount(rawDepositAmount ?? 0);
+    const hasDepositAmount = new import_decimal.default(depositAmount).gt(0);
+    const isDeposit = Number(lastOrderInfo.is_deposit) === 1 || hasDepositAmount;
+    if (!isDeposit || !hasDepositAmount)
+      return null;
+    return {
+      isDeposit: 1,
+      depositAmount
+    };
+  }
+  getLastOrderSubmitSnapshot() {
+    const lastOrderInfo = this.store.lastOrderInfo;
+    if (!lastOrderInfo || typeof lastOrderInfo !== "object")
+      return {};
+    const businessCode = lastOrderInfo.business_code;
+    const type = lastOrderInfo.type;
+    return {
+      ...typeof businessCode === "string" && businessCode ? { businessCode } : {},
+      ...typeof type === "string" && type ? { type } : {}
+    };
+  }
   applyDepositAmountToSummary(tempOrder, summary, amount) {
     const depositAmount = this.normalizeDepositAmount(amount);
     const hasDepositAmount = new import_decimal.default(depositAmount).gt(0);
@@ -843,8 +973,27 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     tempOrder.is_deposit = hasDepositAmount ? 1 : 0;
     return nextSummary;
   }
+  applyLastOrderDepositSnapshot(tempOrder, summary) {
+    const snapshot = this.getLastOrderDepositSnapshot();
+    if (!snapshot)
+      return summary;
+    const existedDeposit = summary.deposit && typeof summary.deposit === "object" ? summary.deposit : void 0;
+    const nextSummary = {
+      ...summary,
+      deposit_amount: snapshot.depositAmount,
+      deposit: {
+        ...existedDeposit || {},
+        total: snapshot.depositAmount,
+        deposit_policy_ids: (existedDeposit == null ? void 0 : existedDeposit.deposit_policy_ids) || [],
+        hasDeposit: true
+      }
+    };
+    tempOrder.deposit_amount = snapshot.depositAmount;
+    tempOrder.is_deposit = tempOrder.is_deposit === 0 && new import_decimal.default(tempOrder.deposit_amount || 0).gt(0) ? 0 : snapshot.isDeposit;
+    return nextSummary;
+  }
   isDepositOrder(tempOrder, depositAmount) {
-    return tempOrder.is_deposit === 1 || depositAmount.gt(0);
+    return tempOrder.is_deposit === 1 && depositAmount.gt(0);
   }
   getOrderExpectedAmount(summary) {
     return new import_decimal.default(summary.expect_amount || summary.total_amount || 0);
@@ -857,19 +1006,42 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return false;
     return params.paidAmount.gte(depositAmount);
   }
+  getPaymentCompletion(payments) {
+    const tempOrder = this.ensureTempOrder();
+    const summary = this.store.summary || (0, import_utils.createEmptySummary)();
+    const paymentList = payments || tempOrder.payments || [];
+    const refundAmount = this.getSummaryRefundAmount(summary);
+    const netPaidAmount = import_decimal.default.max(
+      this.calculateOrderPaidPaymentTotal(paymentList).minus(refundAmount),
+      0
+    );
+    const depositAmount = this.getDepositAmount(tempOrder, summary);
+    const orderExpectedAmount = this.getOrderExpectedAmount(summary);
+    const isDepositFullyPaid = this.isDepositCovered({
+      tempOrder,
+      summary,
+      paidAmount: netPaidAmount
+    });
+    const isOrderFullyPaid = orderExpectedAmount.lte(0) ? true : netPaidAmount.gte(orderExpectedAmount);
+    const paymentStage = this.isDepositOrder(tempOrder, depositAmount) && !isDepositFullyPaid ? "deposit" : "normal";
+    return {
+      isFullyPaid: isOrderFullyPaid,
+      isOrderFullyPaid,
+      isDepositFullyPaid,
+      paymentStage,
+      depositAmount: depositAmount.toFixed(2),
+      orderExpectedAmount: orderExpectedAmount.toFixed(2)
+    };
+  }
   calculateDepositPaidAmount(payments) {
     return (payments || []).reduce((sum, payment) => {
       const paymentRecord = payment;
-      if ((paymentRecord == null ? void 0 : paymentRecord.status) !== "paid")
+      if (!isPaidPaymentRecord(paymentRecord))
         return sum;
       const isDepositPayment = paymentRecord.type === "deposit" || paymentRecord.order_payment_type === "deposit";
       if (!isDepositPayment)
         return sum;
-      if (paymentRecord.origin_amount !== void 0 && paymentRecord.origin_amount !== null && paymentRecord.origin_amount !== "") {
-        return sum.plus(this.calculatePaymentGapAmount(paymentRecord));
-      }
-      const rounding = new import_decimal.default(paymentRecord.rounding_amount || 0);
-      return sum.plus(new import_decimal.default(paymentRecord.amount || 0).minus(rounding));
+      return sum.plus(this.calculatePaymentGapAmount(paymentRecord));
     }, new import_decimal.default(0));
   }
   resolveNextOrderPaymentType(tempOrder) {
@@ -902,8 +1074,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   updateTempOrderPaymentStatus(tempOrder, options) {
     const summary = (options == null ? void 0 : options.summary) || this.store.summary || (0, import_utils.createEmptySummary)();
     const paymentTotal = this.calculatePaymentTotal(tempOrder.payments || []);
+    const orderPaymentTotal = this.calculateOrderPaidPaymentTotal(tempOrder.payments || []);
     const refundAmount = this.getSummaryRefundAmount(summary);
-    const netPaymentTotal = import_decimal.default.max(paymentTotal.minus(refundAmount), 0);
+    const netPaymentTotal = import_decimal.default.max(orderPaymentTotal.minus(refundAmount), 0);
     const targetAmount = this.calculatePaymentTargetAmount(
       tempOrder,
       summary,
@@ -972,7 +1145,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   capVoucherPaymentsByRemainingAmount(params) {
     const targetAmount = this.getPaymentTargetAmount();
-    const nonVoucherTotal = this.calculatePaymentTotal(params.nonVoucherPayments);
+    const nonVoucherTotal = this.calculateOrderPaidPaymentTotal(params.nonVoucherPayments);
     if (targetAmount.lte(0))
       return [];
     let remainingAmount = import_decimal.default.max(
@@ -1011,11 +1184,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     return (payments || []).reduce(
       (summary, payment) => {
         const paymentRecord = payment;
-        if ((paymentRecord == null ? void 0 : paymentRecord.status) !== "paid")
+        if (!isPaidPaymentRecord(paymentRecord))
           return summary;
         return {
           customerPaidAmount: summary.customerPaidAmount.plus(paymentRecord.amount || 0),
-          orderPaidAmount: summary.orderPaidAmount.plus(paymentRecord.origin_amount || 0),
+          orderPaidAmount: summary.orderPaidAmount.plus(this.calculatePaymentOrderAmount(paymentRecord)),
           gapPaidAmount: summary.gapPaidAmount.plus(this.calculatePaymentGapAmount(paymentRecord)),
           payServiceChargeAmount: summary.payServiceChargeAmount.plus(this.calculatePaymentServiceFee(paymentRecord)),
           roundingAmount: summary.roundingAmount.plus(this.calculatePaymentRoundingAmount(paymentRecord))
@@ -1040,11 +1213,30 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     return new import_decimal.default(payment.amount || 0).times(percentage).plus(fixedAmount);
   }
   calculatePaymentGapAmount(payment) {
-    if (payment.origin_amount === void 0 || payment.origin_amount === null || payment.origin_amount === "") {
-      return new import_decimal.default(0);
+    if (payment.origin_amount !== void 0 && payment.origin_amount !== null && payment.origin_amount !== "") {
+      const rounding2 = new import_decimal.default(payment.rounding_amount || 0);
+      return new import_decimal.default(payment.origin_amount || 0).minus(rounding2);
     }
     const rounding = new import_decimal.default(payment.rounding_amount || 0);
-    return new import_decimal.default(payment.origin_amount || 0).minus(rounding);
+    const amount = new import_decimal.default(payment.amount || 0);
+    const serviceFee = this.calculatePaymentServiceFee(payment);
+    if (serviceFee.lte(0))
+      return amount.minus(rounding);
+    if (!hasSyncedOrderPaymentRecord(payment))
+      return new import_decimal.default(0);
+    return import_decimal.default.max(amount.minus(serviceFee), 0).minus(rounding);
+  }
+  calculatePaymentOrderAmount(payment) {
+    if (payment.origin_amount !== void 0 && payment.origin_amount !== null && payment.origin_amount !== "") {
+      return new import_decimal.default(payment.origin_amount || 0);
+    }
+    const amount = new import_decimal.default(payment.amount || 0);
+    const serviceFee = this.calculatePaymentServiceFee(payment);
+    if (serviceFee.lte(0))
+      return amount;
+    if (!hasSyncedOrderPaymentRecord(payment))
+      return new import_decimal.default(0);
+    return import_decimal.default.max(amount.minus(serviceFee), 0);
   }
   calculatePaymentRoundingAmount(payment) {
     if (payment.rounding_amount === void 0 || payment.rounding_amount === null || payment.rounding_amount === "") {
@@ -1345,11 +1537,17 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
     return currentAmountGap === snapshotAmountGap;
   }
-  restoreOriginalSnapshotIfProductsUnchanged(tempOrder) {
-    const snapshot = this.getOriginalSalesSnapshot(tempOrder);
-    if (!snapshot)
-      return null;
+  hasShopDiscountChangedFromSnapshot(tempOrder, snapshot) {
+    const snapshotSummary = snapshot.summary && typeof snapshot.summary === "object" ? snapshot.summary : {};
+    const snapshotShopDiscount = snapshot.shop_discount ?? snapshotSummary.shop_discount;
+    if (snapshotShopDiscount === void 0 || snapshotShopDiscount === null || snapshotShopDiscount === "") {
+      return !new import_decimal.default(tempOrder.shop_discount || 0).equals(0);
+    }
+    return !new import_decimal.default(tempOrder.shop_discount || 0).equals(snapshotShopDiscount || 0);
+  }
+  restoreOriginalSnapshotIfProductsUnchanged(tempOrder, snapshot) {
     const currentFingerprint = this.buildOrderProductsFingerprint(tempOrder.products);
+    const manualDepositOverride = this.getManualDepositOverride(tempOrder);
     if (currentFingerprint !== snapshot.productFingerprint) {
       const currentStructuralFingerprint = this.buildOrderProductsStructuralFingerprint(tempOrder.products);
       const snapshotStructuralFingerprint = this.buildOrderProductsStructuralFingerprint(
@@ -1358,11 +1556,24 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       if (currentStructuralFingerprint !== snapshotStructuralFingerprint)
         return null;
     }
-    const summary = {
+    let summary = {
       ...(0, import_utils.createEmptySummary)(),
       ...(0, import_lodash_es.cloneDeep)(snapshot.summary || {})
     };
-    if (!this.isSnapshotPayableAmountUnchanged(tempOrder, snapshot, summary))
+    const shouldUseManualDepositOverride = Boolean(
+      manualDepositOverride && manualDepositOverride.productStructuralFingerprint === this.buildOrderProductsStructuralFingerprint(tempOrder.products)
+    );
+    if (shouldUseManualDepositOverride) {
+      summary = this.applyDepositAmountToSummary(
+        tempOrder,
+        summary,
+        manualDepositOverride.amount
+      );
+    } else if (manualDepositOverride) {
+      this.clearManualDepositOverride(tempOrder);
+    }
+    const isPayableAmountUnchanged = this.isSnapshotPayableAmountUnchanged(tempOrder, snapshot, summary);
+    if (!isPayableAmountUnchanged)
       return null;
     if (Array.isArray(snapshot.products)) {
       tempOrder.products = (0, import_lodash_es.cloneDeep)(snapshot.products);
@@ -1373,7 +1584,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     tempOrder.surcharge_fee = summary.surcharge_fee || tempOrder.surcharge_fee;
     tempOrder.deposit_amount = summary.deposit_amount || "0.00";
     tempOrder.is_deposit = summary.deposit_amount !== "0.00" ? 1 : 0;
+    const previousSummary = this.store.summary;
     this.store.summary = summary;
+    this.updateTempOrderPaymentStatus(tempOrder, {
+      previousSummary,
+      summary
+    });
     return summary;
   }
   clearPersistedAmountFieldsForFullRecalc(products) {
@@ -1437,6 +1653,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   restoreOrder() {
     var _a, _b;
+    this.logInfo("restoreOrder start", {});
     const freshTempOrder = this.createDefaultTempOrderInstance();
     this.ensureExternalSaleNumber(freshTempOrder);
     this.store.tempOrder = freshTempOrder;
@@ -1515,7 +1732,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       orderPaidAmount: paidPaymentSummary.gapPaidAmount
     });
     return {
-      isDeposit: tempOrder.is_deposit === 1 || depositAmount !== "0.00",
+      isDeposit: tempOrder.is_deposit === 1,
       depositAmount,
       expectAmount: summary.expect_amount || "0.00",
       totalAmount: summary.total_amount || "0.00",
@@ -1662,6 +1879,47 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const records = Array.isArray(source) ? source : [source];
     return records.filter((record) => record !== void 0 && record !== null && record !== "");
   }
+  setProductHolderFromBooking(product, booking) {
+    if (!product || !booking)
+      return;
+    const holderRecords = this.collectBookingHolderRecords(booking);
+    if (!product.metadata || typeof product.metadata !== "object") {
+      product.metadata = {};
+    }
+    product.metadata.holder_id = holderRecords.length > 0 ? holderRecords : null;
+  }
+  syncLinkedBookingHoldersToProducts(tempOrder) {
+    const bookings = tempOrder.bookings || [];
+    const products = tempOrder.products || [];
+    if (!bookings.length || !products.length)
+      return;
+    const bookingByProductUid = /* @__PURE__ */ new Map();
+    const bookingByBookingUid = /* @__PURE__ */ new Map();
+    bookings.forEach((booking) => {
+      var _a, _b;
+      if (!booking || typeof booking !== "object")
+        return;
+      const productUid = booking.product_uid || ((_a = booking.metadata) == null ? void 0 : _a.product_uid);
+      if (productUid !== void 0 && productUid !== null && String(productUid) !== "") {
+        bookingByProductUid.set(String(productUid), booking);
+      }
+      const bookingUid = ((_b = booking.metadata) == null ? void 0 : _b.unique_identification_number) || booking.booking_uid;
+      if (bookingUid !== void 0 && bookingUid !== null && String(bookingUid) !== "") {
+        bookingByBookingUid.set(String(bookingUid), booking);
+      }
+    });
+    products.forEach((product) => {
+      var _a, _b;
+      if (!product || typeof product !== "object")
+        return;
+      const productUid = ((_a = product.metadata) == null ? void 0 : _a.unique_identification_number) || product.unique_identification_number;
+      const bookingUid = product.booking_uid || ((_b = product.metadata) == null ? void 0 : _b.booking_uid);
+      const linkedBooking = (productUid !== void 0 && productUid !== null && String(productUid) !== "" ? bookingByProductUid.get(String(productUid)) : void 0) || (bookingUid !== void 0 && bookingUid !== null && String(bookingUid) !== "" ? bookingByBookingUid.get(String(bookingUid)) : void 0);
+      if (linkedBooking) {
+        this.setProductHolderFromBooking(product, linkedBooking);
+      }
+    });
+  }
   /**
    * 按 form_record 顺序读取 booking holder 的主字段名称。
    *
@@ -1741,6 +1999,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (nextHolder || hasHolderSource || bookings.length === 0) {
       tempOrder.holder = nextHolder;
     }
+    this.syncLinkedBookingHoldersToProducts(tempOrder);
   }
   getBookingUniqueIdentificationNumber(booking) {
     var _a;
@@ -1800,19 +2059,24 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         hasDeposit: true
       } : void 0
     };
+    const isExistingDepositDisabled = tempOrder.is_deposit === 0 && new import_decimal.default(tempOrder.deposit_amount || 0).gt(0);
     tempOrder.deposit_amount = depositAmount;
-    tempOrder.is_deposit = hasDepositAmount ? 1 : 0;
-    return nextSummary;
+    tempOrder.is_deposit = hasDepositAmount && !isExistingDepositDisabled ? 1 : 0;
+    return this.applyLastOrderDepositSnapshot(tempOrder, nextSummary);
   }
   async recalculateSummary(options) {
+    var _a;
     const tempOrder = (options == null ? void 0 : options.createIfMissing) ? this.ensureTempOrder() : this.store.tempOrder;
     if (!tempOrder)
       return null;
     this.sanitizeTempOrderProducts(tempOrder);
-    const snapshotSummary = this.restoreOriginalSnapshotIfProductsUnchanged(tempOrder);
+    const originalSnapshot = this.getOriginalSalesSnapshot(tempOrder);
+    const hasShopDiscountChanged = originalSnapshot ? this.hasShopDiscountChangedFromSnapshot(tempOrder, originalSnapshot) : false;
+    const shouldReuseOriginalSnapshot = originalSnapshot && !hasShopDiscountChanged;
+    const snapshotSummary = shouldReuseOriginalSnapshot ? this.restoreOriginalSnapshotIfProductsUnchanged(tempOrder, originalSnapshot) : null;
     if (snapshotSummary)
       return snapshotSummary;
-    const shouldFullRecalculateFromSnapshot = Boolean(this.getOriginalSalesSnapshot(tempOrder));
+    const shouldFullRecalculateFromSnapshot = Boolean(originalSnapshot);
     const summaryProducts = shouldFullRecalculateFromSnapshot ? (0, import_lodash_es.cloneDeep)(tempOrder.products || []) : tempOrder.products;
     if (shouldFullRecalculateFromSnapshot) {
       this.clearPersistedAmountFieldsForFullRecalc(summaryProducts || []);
@@ -1859,7 +2123,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const salesSummaryResult = await salesSummary.getSummary({
       products: summaryProducts,
       isPriceIncludeTax: tempOrder.is_price_include_tax,
-      shopDiscount: tempOrder.shop_discount
+      shopDiscount: tempOrder.shop_discount,
+      ...((_a = this.otherParams) == null ? void 0 : _a.channel) ? { channel: this.otherParams.channel } : {}
     });
     if (shouldFullRecalculateFromSnapshot) {
       tempOrder.products = summaryProducts;
@@ -2013,6 +2278,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const type = (discount == null ? void 0 : discount.type) ?? (discount == null ? void 0 : discount.tag);
     return type === "good_pass" || type === "discount_card" || type === "product_discount_card";
   }
+  shouldKeepCustomerBoundDiscountAfterCustomerChange(discount) {
+    return Boolean((discount == null ? void 0 : discount.isScan) || (discount == null ? void 0 : discount.isEditMode));
+  }
   productHasCustomerBoundDiscount(product) {
     if (((product == null ? void 0 : product.discount_list) || []).some((discount) => this.isCustomerBoundDiscount(discount))) {
       return true;
@@ -2068,12 +2336,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const currentDiscounts = ((_a = discountModule.getDiscountList) == null ? void 0 : _a.call(discountModule)) || [];
     const currentOriginalDiscounts = ((_b = discountModule.getOriginalDiscountList) == null ? void 0 : _b.call(discountModule)) || [];
     const nextDiscounts = currentDiscounts.filter((discount) => {
-      if (discount == null ? void 0 : discount.isEditMode)
+      if (this.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount))
         return true;
       return !this.isCustomerBoundDiscount(discount);
     });
     const nextOriginalDiscounts = currentOriginalDiscounts.filter((discount) => {
-      if (discount == null ? void 0 : discount.isEditMode)
+      if (this.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount))
         return true;
       return !this.isCustomerBoundDiscount(discount);
     });
@@ -2144,8 +2412,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     const nextCustomerId = tempOrder.customer_id ?? null;
     if (String(previousCustomerId ?? "") !== String(nextCustomerId ?? "")) {
+      this.store.availableWalletIds = [];
       (0, import_utils.clearTempOrderHolderAssignments)(tempOrder);
       this.clearCustomerBoundDiscounts(tempOrder);
+      this.applyDiscount();
     }
     this.persistTempOrder();
     this.saveDraftInBackground();
@@ -2182,6 +2452,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     tempOrder.customer = null;
     if (tempOrder._extend)
       delete tempOrder._extend.customerSnapshot;
+    this.store.availableWalletIds = [];
     this.clearCustomerBoundDiscounts(tempOrder);
     this.persistTempOrder();
     this.saveDraftInBackground();
@@ -2303,49 +2574,153 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.persistTempOrder();
     return tempOrder.payments;
   }
+  confirmPendingVoucherPaymentsInList(payments) {
+    return (payments || []).map((payment) => {
+      if (!isPendingVoucherPaymentRecord(payment))
+        return payment;
+      return {
+        ...payment,
+        status: ORDER_PAYMENT_STATUS_PAID
+      };
+    });
+  }
+  discardPendingVoucherPaymentsFromList(payments) {
+    return (payments || []).filter((payment) => !isPendingVoucherPaymentRecord(payment));
+  }
+  prepareVoucherPaymentsForSubmit(payments, confirmPendingVoucherPayments = true) {
+    const mappedPayments = (0, import_utils.mapPaymentItemsToOrderPayments)(payments || []);
+    return confirmPendingVoucherPayments ? this.confirmPendingVoucherPaymentsInList(mappedPayments) : this.discardPendingVoucherPaymentsFromList(mappedPayments);
+  }
+  applyPaymentLifecycleChange(tempOrder, options) {
+    this.updateTempOrderPaymentStatus(tempOrder);
+    if ((options == null ? void 0 : options.persist) !== false) {
+      this.persistTempOrder();
+    }
+    if ((options == null ? void 0 : options.recalculateSummary) === false)
+      return;
+    const logContext = (options == null ? void 0 : options.logContext) || "payment lifecycle change";
+    void this.recalculateSummary({ createIfMissing: true }).catch((error) => {
+      this.logError(`recalculate summary after ${logContext} failed`, {
+        error: error instanceof Error ? error.message : String(error)
+      });
+    });
+  }
+  confirmPendingVoucherPayments(options) {
+    const tempOrder = this.ensureTempOrder();
+    const payments = tempOrder.payments || [];
+    const hasPendingVoucher = payments.some((payment) => isPendingVoucherPaymentRecord(payment));
+    if (!hasPendingVoucher)
+      return payments;
+    tempOrder.payments = this.confirmPendingVoucherPaymentsInList(payments);
+    this.applyPaymentLifecycleChange(tempOrder, {
+      ...options,
+      logContext: "confirmPendingVoucherPayments"
+    });
+    return tempOrder.payments;
+  }
+  discardPendingVoucherPayments(options) {
+    const tempOrder = this.ensureTempOrder();
+    const payments = tempOrder.payments || [];
+    const nextPayments = this.discardPendingVoucherPaymentsFromList(payments);
+    if (nextPayments.length === payments.length)
+      return payments;
+    tempOrder.payments = nextPayments;
+    this.applyPaymentLifecycleChange(tempOrder, {
+      ...options,
+      logContext: "discardPendingVoucherPayments"
+    });
+    return tempOrder.payments;
+  }
   /**
    * 覆盖当前订单中的 wallet pass 支付项。
    *
    * 判断口径与 PaymentModal 保持一致：voucher_id 存在且不为 0 的支付项
    * 视为 wallet pass；其它支付项保持不变。
    */
-  updateVoucherOrderPayments(payments) {
+  updateVoucherOrderPayments(payments, options) {
     const tempOrder = this.ensureTempOrder();
-    const isVoucherPayment = (payment) => {
-      return payment.voucher_id !== void 0 && Number(payment.voucher_id) !== 0;
+    const isOrderPaymentType = (value) => {
+      return value === "normal" || value === "deposit";
+    };
+    const voucherOrderPaymentType = this.resolveNextOrderPaymentType(tempOrder);
+    const withVoucherPaymentType = (payment) => {
+      const paymentRecord = payment;
+      if (!isVoucherPaymentRecord(paymentRecord))
+        return payment;
+      const explicitPaymentType = isOrderPaymentType(paymentRecord.order_payment_type) ? paymentRecord.order_payment_type : isOrderPaymentType(paymentRecord.type) ? paymentRecord.type : void 0;
+      const nextPaymentType = explicitPaymentType || voucherOrderPaymentType;
+      const shouldPreserveCustomPaymentType = paymentRecord.custom_payment_type === void 0 && paymentRecord.type !== void 0 && !isOrderPaymentType(paymentRecord.type);
+      return {
+        ...paymentRecord,
+        ...shouldPreserveCustomPaymentType ? { custom_payment_type: paymentRecord.type } : {},
+        type: nextPaymentType,
+        order_payment_type: nextPaymentType
+      };
     };
-    const hasSyncedOrderPayment = (payment) => {
-      return payment.order_payment_id !== void 0 && payment.order_payment_id !== null;
+    const normalizeVoucherPaymentStatus = (payment) => {
+      const paymentRecord = payment;
+      if (!isVoucherPaymentRecord(paymentRecord))
+        return payment;
+      if (hasSyncedOrderPaymentRecord(paymentRecord) && (paymentRecord.status === void 0 || paymentRecord.status === "active")) {
+        return {
+          ...paymentRecord,
+          status: ORDER_PAYMENT_STATUS_PAID
+        };
+      }
+      if (paymentRecord.status !== void 0 && paymentRecord.status !== "active") {
+        return payment;
+      }
+      return {
+        ...paymentRecord,
+        status: (options == null ? void 0 : options.status) || ORDER_PAYMENT_STATUS_PENDING
+      };
     };
     const mappedVouchers = (0, import_utils.mapPaymentItemsToOrderPayments)(
       payments.map(
-        (payment) => this.normalizePaymentSource(payment, { defaultPaid: true })
+        (payment) => this.normalizePaymentSource(
+          normalizeVoucherPaymentStatus(withVoucherPaymentType(payment)),
+          { defaultPaid: false }
+        )
       )
     ).filter((payment) => {
-      return isVoucherPayment(payment);
+      return isVoucherPaymentRecord(payment);
     });
     const nonVoucherPayments = (tempOrder.payments || []).filter((payment) => {
-      return !isVoucherPayment(payment);
-    });
-    const syncedVoucherPayments = (tempOrder.payments || []).filter((payment) => {
-      return isVoucherPayment(payment) && hasSyncedOrderPayment(payment);
+      return !isVoucherPaymentRecord(payment);
     });
-    const syncedVoucherPaymentIds = new Set(
-      syncedVoucherPayments.map((payment) => String(payment.order_payment_id))
+    const normalizeCommittedVoucherPayment = (payment) => {
+      if (hasSyncedOrderPaymentRecord(payment) && (payment.status === void 0 || payment.status === "active")) {
+        return {
+          ...payment,
+          status: ORDER_PAYMENT_STATUS_PAID
+        };
+      }
+      return payment;
+    };
+    const committedVoucherPayments = (tempOrder.payments || []).filter((payment) => isCommittedVoucherPaymentRecord(payment)).map((payment) => normalizeCommittedVoucherPayment(payment));
+    const committedVoucherPaymentIds = new Set(
+      committedVoucherPayments.filter((payment) => hasSyncedOrderPaymentRecord(payment)).map((payment) => String(payment.order_payment_id))
+    );
+    const committedVoucherIds = new Set(
+      committedVoucherPayments.map((payment) => String(payment.voucher_id))
     );
     const replaceableVouchers = mappedVouchers.filter((payment) => {
-      if (!hasSyncedOrderPayment(payment))
-        return true;
-      return !syncedVoucherPaymentIds.has(String(payment.order_payment_id));
+      if (hasSyncedOrderPaymentRecord(payment) && committedVoucherPaymentIds.has(String(payment.order_payment_id))) {
+        return false;
+      }
+      if (payment.voucher_id !== void 0 && committedVoucherIds.has(String(payment.voucher_id))) {
+        return false;
+      }
+      return true;
     });
     const cappedVouchers = this.capVoucherPaymentsByRemainingAmount({
       vouchers: replaceableVouchers,
       nonVoucherPayments: [
         ...nonVoucherPayments,
-        ...syncedVoucherPayments
+        ...committedVoucherPayments
       ]
     });
-    tempOrder.payments = [...nonVoucherPayments, ...syncedVoucherPayments, ...cappedVouchers];
+    tempOrder.payments = [...nonVoucherPayments, ...committedVoucherPayments, ...cappedVouchers];
     this.updateTempOrderPaymentStatus(tempOrder);
     this.persistTempOrder();
     void this.recalculateSummary({ createIfMissing: true }).catch((error) => {
@@ -2444,12 +2819,15 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const hasIncomingBookingUid = this.hasLinkedBookingUid(productToAdd) || this.hasLinkedBookingUid(normalizedIncoming);
     const shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingBookingUid;
     const matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex((item) => {
+      var _a2;
       if (this.hasGoodPassDiscount(item))
         return false;
       if (this.hasOrderProductLineNote(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)
+        return false;
       if (item.product_id !== productToAdd.product_id)
         return false;
       if (item.product_variant_id !== productToAdd.product_variant_id)
@@ -2561,7 +2939,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    */
   async addProductToOrder(product, booking) {
     const tempOrder = this.ensureTempOrder();
-    debugger;
     if (booking) {
       const productRecord = product;
       const splitCount = (0, import_utils3.getSafeProductNum)(
@@ -2584,6 +2961,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     await this.appendProductLineToTempOrder(tempOrder, product, booking);
     await this.finalizeProductOrderMutation(tempOrder);
+    this.logInfo("addProductToOrder success", {
+      product_id: product.product_id,
+      with_booking: !!booking
+    });
     return tempOrder.products;
   }
   /**
@@ -2625,6 +3006,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       await this.appendProductLineToTempOrder(tempOrder, product, booking);
     }
     await this.finalizeProductOrderMutation(tempOrder, options);
+    this.logInfo("addProductsToOrder success", {
+      itemsCount: items.length
+    });
     return tempOrder.products;
   }
   hasGoodPassDiscount(product) {
@@ -2674,6 +3058,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         return bundle;
       return {
         ...bundle,
+        ...(bundle.cover === void 0 || bundle.cover === null || bundle.cover === "") && previous.cover !== void 0 && previous.cover !== null && previous.cover !== "" ? { cover: previous.cover } : {},
         price: previous.price,
         custom_price: previous.custom_price,
         bundle_payment_price: previous.bundle_payment_price,
@@ -2684,7 +3069,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
   }
   applyOrderProductUpdateToTempOrder(tempOrder, params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
     const {
       product_id,
       product_variant_id,
@@ -2748,9 +3133,22 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     nextProduct.num = (0, import_utils3.getSafeProductNum)(nextProduct.num);
     const callerUpdatesTopPrice = Object.prototype.hasOwnProperty.call(updates || {}, "selling_price") || Object.prototype.hasOwnProperty.call(updates || {}, "original_price");
     const callerUpdatesMainMeta = ((_c = updates == null ? void 0 : updates.metadata) == null ? void 0 : _c.main_product_selling_price) !== void 0 || ((_d = updates == null ? void 0 : updates.metadata) == null ? void 0 : _d.main_product_original_price) !== void 0 || ((_e = updates == null ? void 0 : updates.metadata) == null ? void 0 : _e.source_product_price) !== void 0;
+    const callerUpdatesSourcePrice = ((_f = updates == null ? void 0 : updates.metadata) == null ? void 0 : _f.source_product_price) !== void 0;
+    const callerUpdatesMainSellingPrice = ((_g = updates == null ? void 0 : updates.metadata) == null ? void 0 : _g.main_product_selling_price) !== void 0;
+    const callerUpdatesMainOriginalPrice = ((_h = updates == null ? void 0 : updates.metadata) == null ? void 0 : _h.main_product_original_price) !== void 0;
+    const previousLineFingerprint = (0, import_utils3.buildProductLineFingerprint)(
+      (0, import_utils.getProductSkuOptions)(targetProduct),
+      targetProduct.product_bundle
+    );
+    const nextLineFingerprint = (0, import_utils3.buildProductLineFingerprint)(
+      (0, import_utils.getProductSkuOptions)(nextProduct),
+      nextProduct.product_bundle
+    );
+    const callerChangesVariant = Number(product_variant_id || 0) !== Number(targetProduct.product_variant_id || 0);
+    const callerChangesLineConfiguration = callerChangesVariant || previousLineFingerprint !== nextLineFingerprint;
     const isPersistedOrderLine = targetProduct.order_detail_id !== void 0 && targetProduct.order_detail_id !== null;
     const callerChangesDiscountList = Array.isArray(updates == null ? void 0 : updates.discount_list) && updates.discount_list.length > 0 && !isSameDiscountList(updates.discount_list, targetProduct.discount_list);
-    const callerUpdatesManualPrice = ((_f = updates == null ? void 0 : updates.metadata) == null ? void 0 : _f.price_override) !== void 0 || ((_g = updates == null ? void 0 : updates.metadata) == null ? void 0 : _g.is_manual_discount) !== void 0 || ((_h = updates == null ? void 0 : updates.metadata) == null ? void 0 : _h.product_discount_reason) !== void 0 || callerChangesDiscountList;
+    const callerUpdatesManualPrice = ((_i = updates == null ? void 0 : updates.metadata) == null ? void 0 : _i.price_override) !== void 0 || ((_j = updates == null ? void 0 : updates.metadata) == null ? void 0 : _j.is_manual_discount) !== void 0 || ((_k = updates == null ? void 0 : updates.metadata) == null ? void 0 : _k.product_discount_reason) !== void 0 || callerChangesDiscountList;
     const callerAllowsBookingReprice = (() => {
       if (params.allow_booking_reprice !== true || !booking || !callerUpdatesTopPrice || !callerUpdatesMainMeta) {
         return false;
@@ -2765,21 +3163,69 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       };
       return hasChangedPrice(updates.selling_price, targetProduct.selling_price) || hasChangedPrice(updates.original_price, targetProduct.original_price);
     })();
-    if (isPersistedOrderLine && !callerUpdatesManualPrice && !callerAllowsBookingReprice) {
+    if (isPersistedOrderLine && !callerChangesLineConfiguration && !callerUpdatesManualPrice && !callerAllowsBookingReprice) {
       nextProduct.selling_price = targetProduct.selling_price;
       nextProduct.original_price = targetProduct.original_price;
       nextProduct.payment_price = targetProduct.payment_price;
       nextProduct.metadata = {
         ...nextProduct.metadata || {},
-        source_product_price: (_i = targetProduct.metadata) == null ? void 0 : _i.source_product_price,
-        main_product_selling_price: (_j = targetProduct.metadata) == null ? void 0 : _j.main_product_selling_price,
-        main_product_original_price: (_k = targetProduct.metadata) == null ? void 0 : _k.main_product_original_price,
-        price_schema_version: ((_l = targetProduct.metadata) == null ? void 0 : _l.price_schema_version) ?? 2
+        source_product_price: (_l = targetProduct.metadata) == null ? void 0 : _l.source_product_price,
+        main_product_selling_price: (_m = targetProduct.metadata) == null ? void 0 : _m.main_product_selling_price,
+        main_product_original_price: (_n = targetProduct.metadata) == null ? void 0 : _n.main_product_original_price,
+        price_schema_version: ((_o = targetProduct.metadata) == null ? void 0 : _o.price_schema_version) ?? 2
       };
       nextProduct.product_bundle = this.preservePersistedBundlePriceFields(
         targetProduct.product_bundle,
         nextProduct.product_bundle
       );
+    } else if (callerChangesLineConfiguration && callerUpdatesSourcePrice && (!callerUpdatesMainSellingPrice || !callerUpdatesMainOriginalPrice)) {
+      const previousMainOriginal = new import_decimal.default(
+        Number((_p = targetProduct.metadata) == null ? void 0 : _p.main_product_original_price) || 0
+      );
+      const previousMainSelling = new import_decimal.default(
+        Number((_q = targetProduct.metadata) == null ? void 0 : _q.main_product_selling_price) || previousMainOriginal.toNumber()
+      );
+      const preservedDiscount = previousMainOriginal.minus(previousMainSelling);
+      const nextMainOriginal = new import_decimal.default(
+        Number(updates.metadata.source_product_price) || 0
+      ).plus((0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(nextProduct)));
+      nextProduct.metadata = {
+        ...nextProduct.metadata || {},
+        source_product_price: String(updates.metadata.source_product_price),
+        main_product_original_price: callerUpdatesMainOriginalPrice ? String(updates.metadata.main_product_original_price) : nextMainOriginal.toDecimalPlaces(2).toFixed(2),
+        main_product_selling_price: callerUpdatesMainSellingPrice ? String(updates.metadata.main_product_selling_price) : nextMainOriginal.minus(preservedDiscount).toDecimalPlaces(2).toFixed(2),
+        price_schema_version: 2
+      };
+    } else if (callerChangesVariant && !callerUpdatesTopPrice && !callerUpdatesMainMeta) {
+      const existedMeta = nextProduct.metadata || {};
+      nextProduct.metadata = { ...existedMeta };
+      delete nextProduct.metadata.source_product_price;
+      delete nextProduct.metadata.main_product_selling_price;
+      delete nextProduct.metadata.main_product_original_price;
+      delete nextProduct.metadata.price_schema_version;
+    } else if (callerChangesLineConfiguration && !callerUpdatesTopPrice && !callerUpdatesMainMeta) {
+      const previousOptionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(targetProduct));
+      const nextOptionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(nextProduct));
+      const previousMainOriginal = new import_decimal.default(
+        Number(
+          ((_r = targetProduct.metadata) == null ? void 0 : _r.main_product_original_price) ?? targetProduct.original_price ?? 0
+        ) || 0
+      );
+      const previousMainSelling = new import_decimal.default(
+        Number(
+          ((_s = targetProduct.metadata) == null ? void 0 : _s.main_product_selling_price) ?? targetProduct.selling_price ?? previousMainOriginal.toNumber()
+        ) || 0
+      );
+      const preservedDiscount = previousMainOriginal.minus(previousMainSelling);
+      const previousSource = ((_t = targetProduct.metadata) == null ? void 0 : _t.source_product_price) != null ? new import_decimal.default(Number(targetProduct.metadata.source_product_price) || 0) : previousMainOriginal.minus(previousOptionSum);
+      const nextMainOriginal = previousSource.plus(nextOptionSum);
+      nextProduct.metadata = {
+        ...nextProduct.metadata || {},
+        source_product_price: previousSource.toDecimalPlaces(2).toFixed(2),
+        main_product_original_price: nextMainOriginal.toDecimalPlaces(2).toFixed(2),
+        main_product_selling_price: nextMainOriginal.minus(preservedDiscount).toDecimalPlaces(2).toFixed(2),
+        price_schema_version: 2
+      };
     } else if (callerUpdatesTopPrice && !callerUpdatesMainMeta) {
       const existedMeta = nextProduct.metadata || {};
       nextProduct.metadata = { ...existedMeta };
@@ -2795,7 +3241,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     normalizedProduct.discount_list = (0, import_utils.normalizeOrderProductDiscountList)(
       normalizedProduct.discount_list
     );
-    const preservedBookingUid = nextProduct.booking_uid || ((_m = nextProduct.metadata) == null ? void 0 : _m.booking_uid) || targetProduct.booking_uid || ((_n = targetProduct.metadata) == null ? void 0 : _n.booking_uid);
+    const preservedBookingUid = nextProduct.booking_uid || ((_u = nextProduct.metadata) == null ? void 0 : _u.booking_uid) || targetProduct.booking_uid || ((_v = targetProduct.metadata) == null ? void 0 : _v.booking_uid);
     if (!booking && preservedBookingUid) {
       normalizedProduct.booking_uid = preservedBookingUid;
       normalizedProduct.metadata = {
@@ -2805,7 +3251,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     if (booking) {
       const productUid = String(
-        ((_o = normalizedProduct.metadata) == null ? void 0 : _o.unique_identification_number) || ((_p = targetProduct.metadata) == null ? void 0 : _p.unique_identification_number) || unique_identification_number || (0, import_utils.createUuidV4)()
+        ((_w = normalizedProduct.metadata) == null ? void 0 : _w.unique_identification_number) || ((_x = targetProduct.metadata) == null ? void 0 : _x.unique_identification_number) || unique_identification_number || (0, import_utils.createUuidV4)()
       );
       normalizedProduct.metadata = {
         ...normalizedProduct.metadata || {},
@@ -2836,17 +3282,23 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       tempOrder,
       updates,
       tempOrder.products[productIndex],
-      (_q = tempOrder.products[productIndex].metadata) == null ? void 0 : _q.unique_identification_number
+      (_y = tempOrder.products[productIndex].metadata) == null ? void 0 : _y.unique_identification_number
     );
+    return (_z = tempOrder.products[productIndex].metadata) == null ? void 0 : _z.unique_identification_number;
   }
   async updateOrderProduct(params) {
     const tempOrder = this.ensureTempOrder();
-    this.applyOrderProductUpdateToTempOrder(tempOrder, params);
+    const updatedProductUid = this.applyOrderProductUpdateToTempOrder(tempOrder, params);
     await this.applyPromotion();
-    this.applyDiscount();
+    this.applyDiscount({
+      reapplyBookingDiscountProductUids: params.allow_booking_discount_reapply && updatedProductUid ? [String(updatedProductUid)] : void 0
+    });
     this.sanitizeTempOrderProducts(tempOrder);
     await this.recalculateSummary({ createIfMissing: true });
     this.persistTempOrder();
+    this.logInfo("updateOrderProduct success", {
+      params
+    });
     return tempOrder.products;
   }
   async updateOrderProducts(paramsList) {
@@ -2854,10 +3306,19 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (!paramsList.length) {
       return tempOrder.products;
     }
-    paramsList.forEach((params) => {
-      this.applyOrderProductUpdateToTempOrder(tempOrder, params);
+    const reapplyBookingDiscountProductUids = paramsList.reduce((acc, params) => {
+      const updatedProductUid = this.applyOrderProductUpdateToTempOrder(tempOrder, params);
+      if (params.allow_booking_discount_reapply && updatedProductUid) {
+        acc.push(String(updatedProductUid));
+      }
+      return acc;
+    }, []);
+    await this.finalizeAfterProductsMutation(tempOrder, {
+      reapplyBookingDiscountProductUids: reapplyBookingDiscountProductUids.length ? reapplyBookingDiscountProductUids : void 0
+    });
+    this.logInfo("updateOrderProduct success", {
+      paramsList
     });
-    await this.finalizeAfterProductsMutation(tempOrder);
     return tempOrder.products;
   }
   async updateOrderProductQuantity(params) {
@@ -2922,6 +3383,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.sanitizeTempOrderProducts(tempOrder);
     await this.recalculateSummary({ createIfMissing: true });
     this.persistTempOrder();
+    this.logInfo("updateOrderProductQuantity success", {
+      params
+    });
     return tempOrder.products;
   }
   updateOrderBooking(params) {
@@ -2960,10 +3424,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * @example
    * await this.finalizeAfterProductsMutation(tempOrder);
    */
-  async finalizeAfterProductsMutation(tempOrder) {
+  async finalizeAfterProductsMutation(tempOrder, options) {
     this.syncTempOrderHolderFromBookings(tempOrder);
     await this.applyPromotion();
-    this.applyDiscount();
+    this.applyDiscount({
+      reapplyBookingDiscountProductUids: options == null ? void 0 : options.reapplyBookingDiscountProductUids
+    });
     this.sanitizeTempOrderProducts(tempOrder);
     await this.recalculateSummary({ createIfMissing: true });
     this.persistTempOrder();
@@ -3023,6 +3489,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       });
     }
     await this.finalizeAfterProductsMutation(tempOrder);
+    this.logInfo("removeProductsFromOrder success", {
+      identities
+    });
     return tempOrder.products;
   }
   async removeProductFromOrder(identity) {
@@ -3048,6 +3517,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.sanitizeTempOrderProducts(tempOrder);
     await this.recalculateSummary({ createIfMissing: true });
     this.persistTempOrder();
+    this.logInfo("clearOrderCartLines success", {});
     return tempOrder;
   }
   // ─── TempOrder: 提交 ───
@@ -3108,37 +3578,55 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   async runSubmitTempOrder(params) {
     var _a, _b, _c, _d, _e;
     const tempOrder = this.ensureTempOrder();
+    const shouldConfirmPendingVoucherPayments = (params == null ? void 0 : params.confirmPendingVoucherPayments) !== false;
+    const hasPaymentOverride = (params == null ? void 0 : params.payments) !== void 0;
+    const preparedPaymentOverride = hasPaymentOverride ? this.prepareVoucherPaymentsForSubmit(
+      (params == null ? void 0 : params.payments) || [],
+      shouldConfirmPendingVoucherPayments
+    ) : void 0;
+    if (!hasPaymentOverride) {
+      if (shouldConfirmPendingVoucherPayments) {
+        this.confirmPendingVoucherPayments({
+          persist: false,
+          recalculateSummary: false
+        });
+      } else {
+        this.discardPendingVoucherPayments({
+          persist: false,
+          recalculateSummary: false
+        });
+      }
+    }
     this.persistTempOrder();
     const latestSummary = await this.recalculateSummary({ createIfMissing: true }) || this.store.summary || (0, import_utils.createEmptySummary)();
     const effectiveCacheId = (params == null ? void 0 : params.cacheId) ?? this.cacheId;
-    const hasPaymentOverride = (params == null ? void 0 : params.payments) !== void 0;
     const hasPaymentStatusOverride = (params == null ? void 0 : params.paymentStatus) !== void 0;
     const hasSmallTicketDataFlagOverride = (params == null ? void 0 : params.smallTicketDataFlag) !== void 0;
     const enhancePayload = hasPaymentOverride || hasPaymentStatusOverride || hasSmallTicketDataFlagOverride || (params == null ? void 0 : params.enhancePayload) ? (payload2, ctx) => {
       const nextPayload = {
         ...payload2,
         ...hasPaymentOverride ? {
-          payments: (0, import_utils.mapPaymentItemsToOrderPayments)(
-            (params == null ? void 0 : params.payments) || []
-          )
+          payments: preparedPaymentOverride || []
         } : {},
-        ...hasPaymentStatusOverride ? { payment_status: params == null ? void 0 : params.paymentStatus } : {},
+        ...hasPaymentStatusOverride && !shouldConfirmPendingVoucherPayments ? { payment_status: params == null ? void 0 : params.paymentStatus } : {},
         ...hasSmallTicketDataFlagOverride ? { small_ticket_data_flag: params == null ? void 0 : params.smallTicketDataFlag } : {}
       };
       const enhancedPayload = (params == null ? void 0 : params.enhancePayload) ? params.enhancePayload(nextPayload, ctx) : nextPayload;
       return enhancedPayload;
     } : void 0;
+    const submitSnapshot = this.getLastOrderSubmitSnapshot();
     const payload = (0, import_utils.buildSubmitPayload)({
       tempOrder,
       cacheId: effectiveCacheId,
       platform: (params == null ? void 0 : params.platform) || ((_a = this.otherParams) == null ? void 0 : _a.platform),
-      businessCode: (params == null ? void 0 : params.businessCode) ?? ((_b = this.otherParams) == null ? void 0 : _b.businessCode) ?? ((_c = this.otherParams) == null ? void 0 : _c.business_code),
+      businessCode: submitSnapshot.businessCode ?? (params == null ? void 0 : params.businessCode) ?? ((_b = this.otherParams) == null ? void 0 : _b.businessCode) ?? ((_c = this.otherParams) == null ? void 0 : _c.business_code),
       channel: params == null ? void 0 : params.channel,
-      type: params == null ? void 0 : params.type,
+      type: submitSnapshot.type ?? (params == null ? void 0 : params.type),
       summary: latestSummary,
       request_unique_idempotency_token: params == null ? void 0 : params.request_unique_idempotency_token,
       enhance: enhancePayload
     });
+    console.log("[Order.runSubmitTempOrder.payload]", payload);
     if (params == null ? void 0 : params.syncMode) {
       payload.sync_mode = true;
     }
@@ -3186,7 +3674,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.logInfo("runSubmitTempOrder: 提交成功", {
       submittedOrderId,
       result,
-      tempOrder
+      tempOrder: {
+        ...tempOrder,
+        _extend: void 0
+      }
     });
     if (submittedOrderId !== null && submittedOrderId !== void 0) {
       tempOrder.order_id = submittedOrderId;
@@ -3272,31 +3763,33 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const mappedPayments = (0, import_utils.mapPaymentItemsToOrderPayments)(
       params.payments || []
     );
-    const paymentTotal = this.calculatePaymentTotal(mappedPayments);
-    const targetAmount = this.getPaymentTargetAmount();
-    const isFullyPaid = targetAmount.lte(0) ? true : paymentTotal.gte(targetAmount);
-    const paymentStatus = isFullyPaid ? params.paymentStatus || "paid" : "partially_paid";
-    tempOrder.payments = mappedPayments;
+    const shouldConfirmPendingVoucherPayments = params.confirmPendingVoucherPayments ?? params.submitWhenPaid === true;
+    const effectivePayments = shouldConfirmPendingVoucherPayments ? this.confirmPendingVoucherPaymentsInList(mappedPayments) : params.confirmPendingVoucherPayments === false ? this.discardPendingVoucherPaymentsFromList(mappedPayments) : mappedPayments;
+    const completion = this.getPaymentCompletion(effectivePayments);
+    const orderPaidPaymentTotal = this.calculateOrderPaidPaymentTotal(effectivePayments);
+    const paymentStatus = completion.isOrderFullyPaid ? params.paymentStatus || "paid" : orderPaidPaymentTotal.gt(0) ? "partially_paid" : "payment_processing";
+    tempOrder.payments = effectivePayments;
     tempOrder.payment_status = paymentStatus;
     this.persistTempOrder();
     await this.saveDraft();
     if (!params.submitWhenPaid) {
-      return { isFullyPaid };
+      return completion;
     }
     if (this.store.syncState === "submitting") {
-      return { isFullyPaid };
+      return completion;
     }
     this.store.syncState = "submitting";
     const paymentSyncIdempotencyToken = this.buildPaymentSyncIdempotencyToken(
       tempOrder,
-      mappedPayments
+      effectivePayments
     );
     const submitResult = await this.submitTempOrder({
-      payments: mappedPayments,
+      payments: effectivePayments,
       paymentStatus,
       smallTicketDataFlag: params.smallTicketDataFlag,
       businessCode: params.businessCode,
       channel: params.channel,
+      confirmPendingVoucherPayments: true,
       enhancePayload: (payload) => {
         const nextPayload = {
           ...payload,
@@ -3305,7 +3798,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         return nextPayload;
       }
     });
-    return { isFullyPaid, submitResult };
+    return { ...completion, submitResult };
   }
   createOrder(params) {
     var _a;
@@ -3614,8 +4107,36 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    */
   async hydrateTempOrderFromRecord(record, options) {
     var _a, _b, _c;
-    const raw = record && typeof record === "object" && record.data && record.order_id == null ? record.data : record || {};
-    const nextTempOrder = this.normalizeTempOrderForRuntime(raw);
+    const sourceRaw = record && typeof record === "object" && record.data && record.order_id == null ? record.data : record || {};
+    const identityReadySource = this.seedAnonymousBookingUidsFromProducts(
+      sourceRaw
+    );
+    const normalizedCollections = (0, import_orderCollectionIdentity.normalizeOrderCollections)(identityReadySource);
+    const raw = normalizedCollections.order;
+    const hasIdentityChanges = 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
+      };
+      const hasIdentityWarnings = Object.values(normalizedCollections.stats).some(
+        (stats) => stats.uidConflictCount > 0 || stats.anonymousRowCount > 0
+      );
+      if (hasIdentityWarnings) {
+        this.logWarning(
+          "Normalized hydrated order collection identities",
+          identityLogMetadata
+        );
+      } else {
+        this.logInfo(
+          "Normalized hydrated order collection identities",
+          identityLogMetadata
+        );
+      }
+    }
+    const nextTempOrder = this.normalizeTempOrderForRuntime(raw, { makeEditMark: true });
     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;
@@ -3629,18 +4150,35 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       originalSalesSnapshot: {
         summary: (0, import_lodash_es.cloneDeep)(this.store.summary),
         products: (0, import_lodash_es.cloneDeep)(nextTempOrder.products || []),
+        bookings: (0, import_lodash_es.cloneDeep)(nextTempOrder.bookings || []),
         payments: (0, import_lodash_es.cloneDeep)(nextTempOrder.payments || []),
         surcharges: (0, import_lodash_es.cloneDeep)(nextTempOrder.surcharges || []),
+        shop_discount: nextTempOrder.shop_discount || "0.00",
         productFingerprint: this.buildOrderProductsFingerprint(nextTempOrder.products || [])
       }
     };
-    this.store.lastOrderInfo = raw.lastOrderInfo || raw;
+    this.store.lastOrderInfo = sourceRaw.lastOrderInfo || sourceRaw;
     const hydratedEditDiscounts = this.collectHydratedEditDiscounts(nextTempOrder.products);
     const currentDiscounts = typeof ((_a = this.store.discount) == null ? void 0 : _a.getDiscountList) === "function" ? this.store.discount.getDiscountList() || [] : [];
-    const shouldSkipEmptyDiscountSync = hydratedEditDiscounts.length === 0 && currentDiscounts.length === 0;
+    const currentScanDiscounts = currentDiscounts.filter((discount) => discount == null ? void 0 : discount.isScan);
+    const hydratedDiscountIds = new Set(
+      hydratedEditDiscounts.map((discount) => discount == null ? void 0 : discount.id)
+    );
+    const retainedScanDiscounts = currentScanDiscounts.filter(
+      (discount) => !hydratedDiscountIds.has(discount == null ? void 0 : discount.id)
+    );
+    const nextDiscounts = [
+      ...hydratedEditDiscounts,
+      ...retainedScanDiscounts
+    ];
+    const shouldSkipEmptyDiscountSync = nextDiscounts.length === 0 && currentDiscounts.length === 0;
     if (!shouldSkipEmptyDiscountSync) {
-      await ((_b = this.store.discount) == null ? void 0 : _b.setOriginalDiscountList(hydratedEditDiscounts));
-      await ((_c = this.store.discount) == null ? void 0 : _c.setDiscountList(hydratedEditDiscounts));
+      OrderModule.populateSavedAmounts(
+        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));
     }
     if (options == null ? void 0 : options.recalcOnHydrate) {
       await this.recalculateSummary({ createIfMissing: false });
@@ -3672,6 +4210,64 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     return next;
   }
+  /**
+   * 匿名 booking 没有服务端行 ID 时，商品侧已有的 booking_uid 就是唯一可用的强引用。
+   * 在统一规范化生成 UUID 前先复用它；已落库 booking 仍按 schedule_event_id 派生稳定 UID。
+   */
+  seedAnonymousBookingUidsFromProducts(raw) {
+    var _a, _b;
+    if (!raw || typeof raw !== "object")
+      return {};
+    if (!Array.isArray(raw.bookings) || !Array.isArray(raw.products))
+      return raw;
+    const bookingUidsByProductUid = /* @__PURE__ */ new Map();
+    for (const product of raw.products) {
+      const productUid = (0, import_orderCollectionIdentity.getOrderCollectionUid)("product", product);
+      const bookingUid = (product == null ? void 0 : product.booking_uid) || ((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.booking_uid);
+      if (!productUid || bookingUid === void 0 || bookingUid === null || bookingUid === "") {
+        continue;
+      }
+      const candidates = bookingUidsByProductUid.get(productUid) || /* @__PURE__ */ new Set();
+      candidates.add(String(bookingUid));
+      bookingUidsByProductUid.set(productUid, candidates);
+    }
+    if (bookingUidsByProductUid.size === 0)
+      return raw;
+    const anonymousBookingCountByProductUid = /* @__PURE__ */ new Map();
+    for (const booking of raw.bookings) {
+      if ((0, import_orderCollectionIdentity.getOrderCollectionPersistentId)("booking", booking) || (0, import_orderCollectionIdentity.getOrderCollectionUid)("booking", booking)) {
+        continue;
+      }
+      const productUid = (booking == null ? void 0 : booking.product_uid) || ((_b = booking == null ? void 0 : booking.metadata) == null ? void 0 : _b.product_uid);
+      if (productUid === void 0 || productUid === null || productUid === "")
+        continue;
+      const key = String(productUid);
+      anonymousBookingCountByProductUid.set(
+        key,
+        (anonymousBookingCountByProductUid.get(key) || 0) + 1
+      );
+    }
+    return {
+      ...raw,
+      bookings: raw.bookings.map((booking) => {
+        var _a2;
+        if ((0, import_orderCollectionIdentity.getOrderCollectionPersistentId)("booking", booking) || (0, import_orderCollectionIdentity.getOrderCollectionUid)("booking", booking)) {
+          return booking;
+        }
+        const productUid = (booking == null ? void 0 : booking.product_uid) || ((_a2 = booking == null ? void 0 : booking.metadata) == null ? void 0 : _a2.product_uid);
+        if (productUid === void 0 || productUid === null || productUid === "") {
+          return booking;
+        }
+        const productUidKey = String(productUid);
+        if (anonymousBookingCountByProductUid.get(productUidKey) !== 1) {
+          return booking;
+        }
+        const bookingUidCandidates = bookingUidsByProductUid.get(productUidKey);
+        const bookingUid = (bookingUidCandidates == null ? void 0 : bookingUidCandidates.size) === 1 ? [...bookingUidCandidates][0] : null;
+        return bookingUid ? (0, import_orderCollectionIdentity.setOrderCollectionUid)("booking", booking, bookingUid) : booking;
+      })
+    };
+  }
   normalizeTempOrderForRuntime(raw, options) {
     var _a, _b;
     const nextTempOrder = {
@@ -3697,7 +4293,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     nextTempOrder.metadata = raw.metadata && typeof raw.metadata === "object" ? { ...raw.metadata } : {};
     nextTempOrder.holder = raw.holder && typeof raw.holder === "object" ? { ...raw.holder } : null;
     const rawProducts = Array.isArray(raw.products) ? raw.products : [];
-    nextTempOrder.products = rawProducts.length > 0 ? rawProducts.map((p) => this.normalizeHydratedOrderProduct(p)) : [];
+    nextTempOrder.products = rawProducts.length > 0 ? rawProducts.map((p) => this.normalizeHydratedOrderProduct(p, { makeEditMark: options == null ? void 0 : options.makeEditMark })) : [];
     nextTempOrder.bookings = Array.isArray(raw.bookings) ? raw.bookings.map((b) => {
       const booking = this.normalizeHydratedBookingHolder(b || {});
       return {
@@ -3786,12 +4382,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       if (!product.metadata || typeof product.metadata !== "object") {
         product.metadata = {};
       }
-      const linkedBookingUid = String(
-        product.booking_uid || product.metadata.booking_uid || bookingUid
-      );
+      const linkedBookingUid = String(bookingUid);
       product.booking_uid = linkedBookingUid;
       product.metadata.booking_uid = linkedBookingUid;
     });
+    this.syncLinkedBookingHoldersToProducts(tempOrder);
   }
   pickHydratedDisplayText(value) {
     if (value === void 0 || value === null)
@@ -3842,8 +4437,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       normalized.id = optionItem.id;
     return normalized;
   }
-  normalizeHydratedOrderProduct(product) {
-    const row = { ...product || {} };
+  normalizeHydratedOrderProduct(product, options) {
+    let row = { ...product || {} };
     if (row.num === void 0 && row.product_quantity !== void 0) {
       row.num = row.product_quantity;
     }
@@ -3864,10 +4459,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (row.booking_uid && !row.metadata.booking_uid) {
       row.metadata.booking_uid = row.booking_uid;
     }
+    row = (0, import_bundleDiscountHydration.restoreHydratedBundleDiscounts)(row, import_utils.normalizeOrderProductDiscountList);
     const existingIdentity = row.metadata.unique_identification_number || row.unique_identification_number;
     if (!existingIdentity) {
       row.metadata.unique_identification_number = (0, import_utils.createUuidV4)();
     }
+    if (options == null ? void 0 : options.makeEditMark) {
+      row.metadata.is_edit_for_runtime = true;
+    }
     const normalized = (0, import_utils3.normalizeOrderProduct)(row);
     normalized.discount_list = (0, import_utils.normalizeOrderProductDiscountList)(
       normalized.discount_list
@@ -3883,7 +4482,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     };
     if (result.metadata)
       delete result.metadata.price_schema_version;
-    return this.sanitizeOrderProductForTempOrder(result);
+    const restored = (0, import_bundleDiscountHydration.restoreHydratedBundleDiscounts)(result, import_utils.normalizeOrderProductDiscountList);
+    return this.sanitizeOrderProductForTempOrder(restored);
   }
   getLastOrderInfo() {
     var _a;
@@ -3897,6 +4497,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
     return res;
   }
+  getVouchers() {
+    var _a;
+    return ((_a = this.store.tempOrder) == null ? void 0 : _a.vouchers) || [];
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {