@pisell/pisellos 2.2.264 → 2.2.266

package/lib/modules/Order/index.js

@@ -37,10 +37,13 @@ var import_types = require("./types");
 var import_utils = require("./utils");
 var import_utils2 = require("../Product/utils");
 var import_dayjs = __toESM(require("dayjs"));
+var import_payment_utils = require("./payment-utils");
+var import_payment_number = require("../../utils/payment-number");
 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");
@@ -82,6 +85,11 @@ function isPaidPaymentRecord(payment) {
 function isCommittedVoucherPaymentRecord(payment) {
   return isVoucherPaymentRecord(payment) && (payment == null ? void 0 : payment.status) !== "voided" && (hasSyncedOrderPaymentRecord(payment) || isPaidPaymentRecord(payment));
 }
+function getVoucherPaymentLifecycleKey(payment) {
+  if (!isVoucherPaymentRecord(payment))
+    return null;
+  return `${String(payment.voucher_id)}::${String(payment.status || "")}`;
+}
 var OrderModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name || "order", version);
@@ -107,7 +115,7 @@ 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 (0, import_bundleDiscountHydration.expandHydratedProductsForDiscountCollection)(products)) {
       for (const item of (product == null ? void 0 : product.discount_list) || []) {
@@ -137,6 +145,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           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
@@ -153,9 +168,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           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: {
@@ -185,8 +200,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]
@@ -301,12 +316,15 @@ 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) {
+    this.appPlugin = this.core.getPlugin("app");
+    if (!this.appPlugin) {
       throw new Error("Order 模块需要 app 插件支持");
     }
-    const app = appPlugin.getApp();
+    const app = this.appPlugin.getApp();
     this.logger = app.logger;
     this.window = this.core.getPlugin("window");
     const otherParams = options.otherParams || {};
@@ -428,19 +446,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);
@@ -448,6 +477,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       });
       const mergedDiscountList = [
         ...currentEditDiscounts,
+        ...currentScanDiscounts,
         ...runtimeDiscounts
       ];
       await ((_d = this.store.discount) == null ? void 0 : _d.setOriginalDiscountList(mergedDiscountList));
@@ -462,6 +492,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;
@@ -510,6 +556,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,
@@ -530,6 +577,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (isAvailable && newDiscountList) {
       (_d = this.store.discount) == null ? void 0 : _d.setDiscountList(newDiscountList);
       this.applyDiscount();
+      await this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
     }
     return {
       type: "clientCalc",
@@ -539,8 +587,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       unavailableReason
     };
   }
-  applyDiscount() {
-    var _a, _b, _c, _d;
+  applyDiscount(options) {
+    var _a, _b, _c;
     const tempOrder = this.store.tempOrder;
     if (!tempOrder)
       return;
@@ -553,13 +601,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const rulesModule = this.store.rules;
     if (!rulesModule)
       return;
-    const holders = ((_b = tempOrder.holder) == null ? void 0 : _b.form_record) || [];
     const result = rulesModule.calcDiscount({
       productList: tempOrder.products,
       discountList,
-      holders,
+      holders: [],
       isFormSubject: (product) => (0, import_utils.resolveIsFormSubject)(tempOrder, product),
-      orderTotalAmount: Number(((_c = this.store.summary) == null ? void 0 : _c.total_amount) || 0)
+      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);
@@ -588,7 +637,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         result.productList || tempOrder.products,
         result.discountList
       );
-      (_d = this.store.discount) == null ? void 0 : _d.setDiscountList(result.discountList);
+      (_c = this.store.discount) == null ? void 0 : _c.setDiscountList(result.discountList);
     }
     this.hasActiveCustomerBoundDiscount = (tempOrder.products || []).some(
       (product) => this.productHasCustomerBoundDiscount(product)
@@ -871,6 +920,15 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       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");
   }
@@ -961,7 +1019,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const paymentList = payments || tempOrder.payments || [];
     const refundAmount = this.getSummaryRefundAmount(summary);
     const netPaidAmount = import_decimal.default.max(
-      this.calculatePaymentTotal(paymentList).minus(refundAmount),
+      this.calculateOrderPaidPaymentTotal(paymentList).minus(refundAmount),
       0
     );
     const depositAmount = this.getDepositAmount(tempOrder, summary);
@@ -990,11 +1048,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       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) {
@@ -1006,17 +1060,40 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const depositPaidAmount = this.calculateDepositPaidAmount(tempOrder.payments || []);
     return depositPaidAmount.lt(depositAmount) ? "deposit" : "normal";
   }
+  getPaymentNumberAppData(key) {
+    var _a, _b, _c, _d, _e;
+    const appPlugin = this.appPlugin;
+    if (!appPlugin)
+      return void 0;
+    const getData = (_a = appPlugin.getData) == null ? void 0 : _a.call(appPlugin);
+    if (typeof getData === "function")
+      return getData(key);
+    const app = appPlugin.getApp();
+    const coreData = (_e = (_c = (_b = app == null ? void 0 : app.models) == null ? void 0 : _b.getStore) == null ? void 0 : (_d = _c.call(_b)).getDataByModel) == null ? void 0 : _e.call(_d, "core", "core");
+    return coreData == null ? void 0 : coreData[key];
+  }
+  getPaymentNumberDevicePrefixSync() {
+    return (0, import_payment_number.resolvePaymentNumberDevicePrefixFromDeviceId)(
+      (key) => this.getPaymentNumberAppData(key)
+    );
+  }
+  getPaymentNumberDevicePrefixAsync() {
+    return (0, import_payment_number.resolvePaymentNumberDevicePrefix)(
+      (key) => this.getPaymentNumberAppData(key)
+    );
+  }
   normalizePaymentSource(payment, options) {
     const paymentRecord = payment;
     const metadata = paymentRecord.metadata && typeof paymentRecord.metadata === "object" ? { ...paymentRecord.metadata } : {};
-    if (!metadata.unique_payment_number) {
-      metadata.unique_payment_number = (0, import_utils.createUuidV4)();
-    }
-    const normalized = {
-      ...paymentRecord,
-      metadata,
-      origin_amount: paymentRecord.origin_amount ?? paymentRecord.amount ?? "0.00"
-    };
+    const normalized = (0, import_payment_utils.ensureOrderPaymentNumber)(
+      {
+        ...paymentRecord,
+        metadata,
+        origin_amount: paymentRecord.origin_amount ?? paymentRecord.amount ?? "0.00"
+      },
+      (options == null ? void 0 : options.devicePrefix) || this.getPaymentNumberDevicePrefixSync(),
+      import_utils.createUuidV4
+    );
     if (paymentRecord.status !== void 0) {
       normalized.status = paymentRecord.status;
     } else if ((options == null ? void 0 : options.defaultPaid) !== false) {
@@ -1027,8 +1104,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,
@@ -1097,7 +1175,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(
@@ -1140,7 +1218,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           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))
@@ -1165,11 +1243,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 === "") {
@@ -1480,6 +1577,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   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(
@@ -1488,11 +1586,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);
@@ -1503,7 +1614,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) {
@@ -2192,6 +2308,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;
@@ -2247,12 +2366,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);
     });
@@ -2323,6 +2442,7 @@ 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();
@@ -2362,6 +2482,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();
@@ -2393,17 +2514,36 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * 用一组支付来源覆盖当前订单支付项。
    *
    * 入参允许来自 PaymentModule 的 PaymentItem，内部统一映射为 Sales 协议：
-   * uuid -> metadata.unique_payment_number，id -> custom_payment_id，
+   * 新支付来源的 uuid 会作为 payment_number 的唯一号段，id -> custom_payment_id，
    * isSynced 等运行态字段不会进入 tempOrder.payments。
    */
   setOrderPayments(payments) {
     const tempOrder = this.ensureTempOrder();
-    tempOrder.payments = (0, import_utils.mapPaymentItemsToOrderPayments)(payments);
+    tempOrder.payments = (0, import_utils.mapPaymentItemsToOrderPayments)(
+      (payments || []).map((payment) => this.normalizePaymentSource(payment, { defaultPaid: false }))
+    );
     this.persistTempOrder();
     return tempOrder.payments;
   }
-  /** 追加单个支付项，并立即持久化当前 tempOrder。 */
+  /** 同步兼容入口：按调用当下的 device_id 或 LOCAL 生成支付编号。 */
   addOrderPayment(payment) {
+    const hasPaymentNumber = String(
+      payment.payment_number || ""
+    ).trim() !== "";
+    return this.addOrderPaymentWithDevicePrefix(
+      payment,
+      hasPaymentNumber ? "LOCAL" : this.getPaymentNumberDevicePrefixSync()
+    );
+  }
+  /** 异步入口：创建支付项时读取最新 IoT 设备短号。 */
+  async addOrderPaymentAsync(payment) {
+    const hasPaymentNumber = String(
+      payment.payment_number || ""
+    ).trim() !== "";
+    const devicePrefix = hasPaymentNumber ? "LOCAL" : await this.getPaymentNumberDevicePrefixAsync();
+    return this.addOrderPaymentWithDevicePrefix(payment, devicePrefix);
+  }
+  addOrderPaymentWithDevicePrefix(payment, devicePrefix) {
     this.logInfo("addOrderPayment", {
       payment
     });
@@ -2416,7 +2556,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           type: orderPaymentType,
           order_payment_type: orderPaymentType
         },
-        { defaultPaid: true }
+        { defaultPaid: true, devicePrefix }
       )
     ]);
     tempOrder.payments = [...tempOrder.payments || [], ...mapped];
@@ -2429,57 +2569,55 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     return tempOrder.payments;
   }
   /**
-   * 按支付唯一号、后端支付 ID、自定义支付方式 ID 或旧 uuid 更新支付项。
-   *
-   * 该方法服务 PaymentModal 的 void / 编辑场景；更新 metadata 时会做浅合并，
-   * 避免覆盖 unique_payment_number、现金实付/找零等已有元数据。
+   * 默认按支付唯一号精确更新；仅显式指定 legacy 时兼容历史支付标识。
+   * metadata 与 transactions 会分别合并，避免覆盖支付会话号和已有交易记录。
    */
-  updateOrderPayment(paymentIdentity, updates) {
+  async updateOrderPayment(paymentIdentity, updates, options = {}) {
     const tempOrder = this.ensureTempOrder();
     const identity = String(paymentIdentity);
-    tempOrder.payments = (tempOrder.payments || []).map((payment) => {
-      var _a;
-      const uniquePaymentNumber = (_a = payment == null ? void 0 : payment.metadata) == null ? void 0 : _a.unique_payment_number;
-      const orderPaymentId = payment == null ? void 0 : payment.order_payment_id;
-      const customPaymentId = payment == null ? void 0 : payment.custom_payment_id;
-      const uuid = payment == null ? void 0 : payment.uuid;
-      const matched = [
-        uniquePaymentNumber,
-        orderPaymentId,
-        customPaymentId,
-        uuid
-      ].some((value) => value !== void 0 && String(value) === identity);
-      if (!matched)
+    const matchMode = options.matchBy === "compat" || options.matchBy === "legacy" ? "compat" : "payment_number";
+    const matchedPayment = (0, import_payment_utils.resolveOrderPaymentIdentity)(
+      tempOrder.payments || [],
+      identity,
+      matchMode
+    );
+    if (!matchedPayment) {
+      throw new Error(`未找到支付项: ${identity}`);
+    }
+    let updatedPayment = null;
+    tempOrder.payments = (tempOrder.payments || []).map((payment, index) => {
+      if (index !== matchedPayment.index)
         return payment;
-      return {
-        ...payment,
+      const nextPayment = (0, import_payment_utils.mergeOrderPaymentRecord)(payment, {
         ...updates,
-        metadata: {
-          ...payment.metadata || {},
-          ...updates.metadata || {}
-        }
-      };
+        updated_at: updates.updated_at || (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss")
+      });
+      updatedPayment = nextPayment;
+      return nextPayment;
     });
     this.persistTempOrder();
-    return tempOrder.payments;
+    const summary = await this.recalculateSummary({ createIfMissing: true });
+    this.persistTempOrder();
+    const payments = tempOrder.payments;
+    return {
+      updated: true,
+      payment: payments[matchedPayment.index] || updatedPayment,
+      payments,
+      summary
+    };
   }
   /** 从当前订单支付项中移除指定支付项。 */
   deleteOrderPayment(paymentIdentity) {
     const tempOrder = this.ensureTempOrder();
     const identity = String(paymentIdentity);
-    tempOrder.payments = (tempOrder.payments || []).filter((payment) => {
-      var _a;
-      const uniquePaymentNumber = (_a = payment == null ? void 0 : payment.metadata) == null ? void 0 : _a.unique_payment_number;
-      const orderPaymentId = payment == null ? void 0 : payment.order_payment_id;
-      const customPaymentId = payment == null ? void 0 : payment.custom_payment_id;
-      const uuid = payment == null ? void 0 : payment.uuid;
-      return ![
-        uniquePaymentNumber,
-        orderPaymentId,
-        customPaymentId,
-        uuid
-      ].some((value) => value !== void 0 && String(value) === identity);
-    });
+    const matchedPayment = (0, import_payment_utils.resolveOrderPaymentIdentity)(
+      tempOrder.payments || [],
+      identity,
+      "compat"
+    );
+    if (!matchedPayment)
+      return tempOrder.payments;
+    tempOrder.payments = (tempOrder.payments || []).filter((_, index) => index !== matchedPayment.index);
     this.persistTempOrder();
     return tempOrder.payments;
   }
@@ -2588,7 +2726,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       payments.map(
         (payment) => this.normalizePaymentSource(
           normalizeVoucherPaymentStatus(withVoucherPaymentType(payment)),
-          { defaultPaid: false }
+          {
+            defaultPaid: false,
+            devicePrefix: options == null ? void 0 : options.devicePrefix
+          }
         )
       )
     ).filter((payment) => {
@@ -2610,14 +2751,15 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     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 committedVoucherLifecycleKeys = new Set(
+      committedVoucherPayments.map((payment) => getVoucherPaymentLifecycleKey(payment)).filter((key) => key !== null)
     );
     const replaceableVouchers = mappedVouchers.filter((payment) => {
       if (hasSyncedOrderPaymentRecord(payment) && committedVoucherPaymentIds.has(String(payment.order_payment_id))) {
         return false;
       }
-      if (payment.voucher_id !== void 0 && committedVoucherIds.has(String(payment.voucher_id))) {
+      const lifecycleKey = getVoucherPaymentLifecycleKey(payment);
+      if (lifecycleKey && committedVoucherLifecycleKeys.has(lifecycleKey)) {
         return false;
       }
       return true;
@@ -2639,6 +2781,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
     return tempOrder.payments;
   }
+  async updateVoucherOrderPaymentsAsync(payments, options) {
+    const needsPaymentNumber = (payments || []).some((payment) => String(payment.payment_number || "").trim() === "");
+    const devicePrefix = needsPaymentNumber ? await this.getPaymentNumberDevicePrefixAsync() : "LOCAL";
+    return this.updateVoucherOrderPayments(payments, {
+      ...options,
+      devicePrefix
+    });
+  }
   async shouldMergeProductToOrder(params) {
     var _a;
     const onBeforeMergeProductToOrder = (_a = this.orderHooks) == null ? void 0 : _a.onBeforeMergeProductToOrder;
@@ -2728,12 +2878,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)
@@ -2964,6 +3117,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,
@@ -2974,7 +3128,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,
@@ -3038,9 +3192,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;
@@ -3055,21 +3222,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 };
@@ -3085,7 +3300,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 = {
@@ -3095,7 +3310,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 || {},
@@ -3126,14 +3341,17 @@ 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();
@@ -3147,10 +3365,16 @@ 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
     });
-    await this.finalizeAfterProductsMutation(tempOrder);
     this.logInfo("updateOrderProduct success", {
       paramsList
     });
@@ -3259,10 +3483,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();
@@ -3393,6 +3619,38 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     await this.saveDraft();
     return tempOrder;
   }
+  async saveTempOrderAsDraft(params) {
+    var _a, _b, _c, _d, _e;
+    const tempOrder = this.ensureTempOrder();
+    this.ensureExternalSaleNumber(tempOrder);
+    this.persistTempOrder();
+    const latestSummary = await this.recalculateSummary({ createIfMissing: true }) || this.store.summary || (0, import_utils.createEmptySummary)();
+    const payload = (0, import_utils.buildSubmitPayload)({
+      tempOrder,
+      cacheId: (params == null ? void 0 : params.cacheId) ?? this.cacheId,
+      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),
+      channel: params == null ? void 0 : params.channel,
+      type: (params == null ? void 0 : params.type) ?? ((_d = this.otherParams) == null ? void 0 : _d.type),
+      summary: latestSummary,
+      enhance: params == null ? void 0 : params.enhancePayload
+    });
+    if (!payload.created_at) {
+      payload.created_at = (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
+    }
+    payload.need_sync = 0;
+    payload.is_draft_order = 1;
+    this.logInfo("saveTempOrderAsDraft calling sales draft", {
+      orderId: payload.order_id,
+      externalSaleNumber: payload.external_sale_number,
+      productsCount: ((_e = payload.products) == null ? void 0 : _e.length) || 0
+    });
+    return this.request.post("/order/sales/draft", payload, {
+      osServer: true,
+      customToast: () => {
+      }
+    });
+  }
   /**
    * 提交当前 Sales tempOrder。
    *
@@ -3593,14 +3851,19 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   async syncPaymentsToOrder(params) {
     const tempOrder = this.ensureTempOrder();
+    const needsPaymentNumber = (params.payments || []).some((payment) => String(payment.payment_number || "").trim() === "");
+    const devicePrefix = needsPaymentNumber ? await this.getPaymentNumberDevicePrefixAsync() : "LOCAL";
     const mappedPayments = (0, import_utils.mapPaymentItemsToOrderPayments)(
-      params.payments || []
+      (params.payments || []).map((payment) => this.normalizePaymentSource(payment, {
+        defaultPaid: false,
+        devicePrefix
+      }))
     );
     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 paidPaymentTotal = this.calculatePaymentTotal(effectivePayments);
-    const paymentStatus = completion.isOrderFullyPaid ? params.paymentStatus || "paid" : paidPaymentTotal.gt(0) ? "partially_paid" : "payment_processing";
+    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();
@@ -3940,8 +4203,42 @@ 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 sourceLastOrderInfo = raw.lastOrderInfo || raw;
+    const isDraftOrder = Number(nextTempOrder.is_draft_order || 0) === 1;
+    const syntheticIdentityOptions = {
+      isDraftOrder,
+      externalSaleNumber: nextTempOrder.external_sale_number
+    };
     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;
@@ -3955,23 +4252,42 @@ 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 = this.withoutSyntheticDraftOrderIdForRuntime(
+      sourceLastOrderInfo,
+      syntheticIdentityOptions
+    );
+    const hadSyntheticDraftOrderId = this.isSyntheticDraftOrderIdForRuntime(raw, syntheticIdentityOptions) || this.isSyntheticDraftOrderIdForRuntime(sourceLastOrderInfo, syntheticIdentityOptions);
+    if (hadSyntheticDraftOrderId && this.store.syncState !== "submitting") {
+      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 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) {
       OrderModule.populateSavedAmounts(
         nextTempOrder.products,
-        hydratedEditDiscounts
+        nextDiscounts
       );
-      await ((_b = this.store.discount) == null ? void 0 : _b.setOriginalDiscountList(hydratedEditDiscounts));
-      await ((_c = this.store.discount) == null ? void 0 : _c.setDiscountList(hydratedEditDiscounts));
+      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 });
@@ -4003,14 +4319,73 @@ 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 runtimeRaw = this.withoutSyntheticDraftOrderIdForRuntime(raw);
     const nextTempOrder = {
       ...this.createDefaultTempOrderInstance(),
-      ...raw || {}
+      ...runtimeRaw || {}
     };
-    if ((nextTempOrder.order_id === void 0 || nextTempOrder.order_id === null) && (raw == null ? void 0 : raw.id) !== void 0 && (raw == null ? void 0 : raw.id) !== null) {
-      nextTempOrder.order_id = raw.id;
+    if ((nextTempOrder.order_id === void 0 || nextTempOrder.order_id === null) && (runtimeRaw == null ? void 0 : runtimeRaw.id) !== void 0 && (runtimeRaw == null ? void 0 : runtimeRaw.id) !== null) {
+      nextTempOrder.order_id = runtimeRaw.id;
     }
     delete nextTempOrder.summary;
     delete nextTempOrder.lastOrderInfo;
@@ -4028,7 +4403,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 {
@@ -4078,6 +4453,22 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     nextTempOrder.vouchers = raw.vouchers || [];
     return nextTempOrder;
   }
+  isSyntheticDraftOrderIdForRuntime(record, options) {
+    const isDraftOrder = (options == null ? void 0 : options.isDraftOrder) ?? Number((record == null ? void 0 : record.is_draft_order) || 0) === 1;
+    const externalSaleNumber = (record == null ? void 0 : record.external_sale_number) ?? (options == null ? void 0 : options.externalSaleNumber);
+    const orderId = record == null ? void 0 : record.order_id;
+    return Boolean(
+      isDraftOrder && orderId !== void 0 && orderId !== null && orderId !== "" && externalSaleNumber !== void 0 && externalSaleNumber !== null && externalSaleNumber !== "" && String(orderId) === String(externalSaleNumber)
+    );
+  }
+  withoutSyntheticDraftOrderIdForRuntime(record, options) {
+    if (!this.isSyntheticDraftOrderIdForRuntime(record, options))
+      return record;
+    return {
+      ...record,
+      order_id: null
+    };
+  }
   hydrateLinkedBookingIdentity(tempOrder) {
     const bookingUidByProductUid = /* @__PURE__ */ new Map();
     const productByUid = /* @__PURE__ */ new Map();
@@ -4117,9 +4508,7 @@ 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;
     });
@@ -4174,7 +4563,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       normalized.id = optionItem.id;
     return normalized;
   }
-  normalizeHydratedOrderProduct(product) {
+  normalizeHydratedOrderProduct(product, options) {
     let row = { ...product || {} };
     if (row.num === void 0 && row.product_quantity !== void 0) {
       row.num = row.product_quantity;
@@ -4201,6 +4590,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     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