@pisell/pisellos 2.3.6 → 2.3.8

package/lib/modules/BookingContext/utils/buildCacheItemFromOrderLine.js

@@ -142,6 +142,14 @@ function resolveMainProductPrice(product, fallback) {
   const parsed = Number(value);
   return Number.isFinite(parsed) ? parsed : fallback;
 }
+function mapOrderBundleToOtherBundle(bundle) {
+  return bundle.map((item) => {
+    return {
+      ...item,
+      original_price: item.original_price ?? item.bundle_selling_price ?? item.price
+    };
+  });
+}
 function synthesizeProductResourceFromBooking(booking) {
   const rows = booking == null ? void 0 : booking.resources;
   if (!Array.isArray(rows) || rows.length === 0)
@@ -191,7 +199,9 @@ function buildCacheItemFromOrderLine(input) {
   const other = {
     product_variant_id: product.product_variant_id ?? 0,
     option: (0, import_utils.getProductSkuOptions)(product),
-    bundle: Array.isArray(product.product_bundle) ? [...product.product_bundle] : []
+    bundle: mapOrderBundleToOtherBundle(
+      Array.isArray(product.product_bundle) ? product.product_bundle : []
+    )
   };
   const extend = {
     start_date: startDate ? (0, import_dayjs.default)(startDate) : void 0,

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

@@ -312,13 +312,27 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     updateOrderPayment(paymentIdentity: string | number, updates: Partial<OrderPaymentData> & Record<string, any>): OrderPaymentData[];
     /** 从当前订单支付项中移除指定支付项。 */
     deleteOrderPayment(paymentIdentity: string | number): OrderPaymentData[];
+    private confirmPendingVoucherPaymentsInList;
+    private discardPendingVoucherPaymentsFromList;
+    private prepareVoucherPaymentsForSubmit;
+    private applyPaymentLifecycleChange;
+    confirmPendingVoucherPayments(options?: {
+        persist?: boolean;
+        recalculateSummary?: boolean;
+    }): OrderPaymentData[];
+    discardPendingVoucherPayments(options?: {
+        persist?: boolean;
+        recalculateSummary?: boolean;
+    }): OrderPaymentData[];
     /**
      * 覆盖当前订单中的 wallet pass 支付项。
      *
      * 判断口径与 PaymentModal 保持一致：voucher_id 存在且不为 0 的支付项
      * 视为 wallet pass；其它支付项保持不变。
      */
-    updateVoucherOrderPayments(payments: OrderPaymentSource[]): OrderPaymentData[];
+    updateVoucherOrderPayments(payments: OrderPaymentSource[], options?: {
+        status?: 'paid' | 'payment_pending';
+    }): OrderPaymentData[];
     private shouldMergeProductToOrder;
     private hasOrderProductLineNote;
     /**
@@ -418,6 +432,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         payments?: OrderPaymentSource[];
         paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
         smallTicketDataFlag?: number;
+        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     submitTempOrderAsync<T = any>(params?: {
@@ -429,6 +444,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         payments?: OrderPaymentSource[];
         paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
         smallTicketDataFlag?: number;
+        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     private runSubmitTempOrder;
@@ -442,7 +458,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Order/index.js

@@ -40,6 +40,7 @@ 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_Discount = require("../Discount");
 var import_Rules = require("../Rules");
 var import_types2 = require("../Rules/types");
@@ -64,6 +65,20 @@ 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;
+}
 var OrderModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name || "order", version);
@@ -91,7 +106,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   collectHydratedEditDiscounts(products) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     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,6 +129,21 @@ 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);
+          existed.applicableProductDetails = [
+            ...existed.applicableProductDetails || [],
+            detail
+          ];
+          existed.appliedProductDetails = [
+            ...existed.appliedProductDetails || [],
+            detail
+          ];
+          continue;
+        }
         discountMap.set(key, {
           id: key,
           product_name: "",
@@ -236,6 +266,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
@@ -434,7 +479,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;
@@ -470,17 +515,17 @@ 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();
     }
     return {
@@ -492,24 +537,25 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     };
   }
   applyDiscount() {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     const tempOrder = this.store.tempOrder;
     if (!tempOrder)
       return;
     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 holders = ((_b = tempOrder.holder) == null ? void 0 : _b.form_record) || [];
     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)
+      isFormSubject: (product) => (0, import_utils.resolveIsFormSubject)(tempOrder, product),
+      orderTotalAmount: Number(((_c = this.store.summary) == null ? void 0 : _c.total_amount) || 0)
     });
     if (result == null ? void 0 : result.productList) {
       const previousProductsByUid = (0, import_utils.indexOrderProductsByUid)(tempOrder.products);
@@ -538,7 +584,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);
+      (_d = this.store.discount) == null ? void 0 : _d.setDiscountList(result.discountList);
     }
     this.hasActiveCustomerBoundDiscount = (tempOrder.products || []).some(
       (product) => this.productHasCustomerBoundDiscount(product)
@@ -816,6 +862,8 @@ 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));
   }
@@ -886,11 +934,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       }
     };
     tempOrder.deposit_amount = snapshot.depositAmount;
-    tempOrder.is_deposit = snapshot.isDeposit;
+    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);
@@ -933,7 +981,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   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)
@@ -1084,7 +1132,7 @@ 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),
@@ -1510,6 +1558,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;
@@ -1588,7 +1637,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",
@@ -1873,8 +1922,9 @@ 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;
+    tempOrder.is_deposit = hasDepositAmount && !isExistingDepositDisabled ? 1 : 0;
     return this.applyLastOrderDepositSnapshot(tempOrder, nextSummary);
   }
   async recalculateSummary(options) {
@@ -2219,6 +2269,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (String(previousCustomerId ?? "") !== String(nextCustomerId ?? "")) {
       (0, import_utils.clearTempOrderHolderAssignments)(tempOrder);
       this.clearCustomerBoundDiscounts(tempOrder);
+      this.applyDiscount();
     }
     this.persistTempOrder();
     this.saveDraftInBackground();
@@ -2376,38 +2427,128 @@ 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 hasSyncedOrderPayment = (payment) => {
-      return payment.order_payment_id !== void 0 && payment.order_payment_id !== null;
+    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 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);
+      return !isVoucherPaymentRecord(payment);
     });
     const syncedVoucherPayments = (tempOrder.payments || []).filter((payment) => {
-      return isVoucherPayment(payment) && hasSyncedOrderPayment(payment);
+      return isVoucherPaymentRecord(payment) && hasSyncedOrderPaymentRecord(payment);
     });
     const syncedVoucherPaymentIds = new Set(
       syncedVoucherPayments.map((payment) => String(payment.order_payment_id))
     );
     const replaceableVouchers = mappedVouchers.filter((payment) => {
-      if (!hasSyncedOrderPayment(payment))
+      if (!hasSyncedOrderPaymentRecord(payment))
         return true;
       return !syncedVoucherPaymentIds.has(String(payment.order_payment_id));
     });
@@ -2634,7 +2775,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)(
@@ -2657,6 +2797,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;
   }
   /**
@@ -2698,6 +2842,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) {
@@ -2920,6 +3067,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.sanitizeTempOrderProducts(tempOrder);
     await this.recalculateSummary({ createIfMissing: true });
     this.persistTempOrder();
+    this.logInfo("updateOrderProduct success", {
+      params
+    });
     return tempOrder.products;
   }
   async updateOrderProducts(paramsList) {
@@ -2931,6 +3081,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       this.applyOrderProductUpdateToTempOrder(tempOrder, params);
     });
     await this.finalizeAfterProductsMutation(tempOrder);
+    this.logInfo("updateOrderProduct success", {
+      paramsList
+    });
     return tempOrder.products;
   }
   async updateOrderProductQuantity(params) {
@@ -2995,6 +3148,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) {
@@ -3096,6 +3252,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       });
     }
     await this.finalizeAfterProductsMutation(tempOrder);
+    this.logInfo("removeProductsFromOrder success", {
+      identities
+    });
     return tempOrder.products;
   }
   async removeProductFromOrder(identity) {
@@ -3121,6 +3280,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: 提交 ───
@@ -3181,19 +3341,35 @@ 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 } : {},
         ...hasSmallTicketDataFlagOverride ? { small_ticket_data_flag: params == null ? void 0 : params.smallTicketDataFlag } : {}
@@ -3213,6 +3389,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       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;
     }
@@ -3346,9 +3523,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const mappedPayments = (0, import_utils.mapPaymentItemsToOrderPayments)(
       params.payments || []
     );
-    const completion = this.getPaymentCompletion(mappedPayments);
-    const paymentStatus = completion.isOrderFullyPaid ? 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 paidPaymentTotal = this.calculatePaymentTotal(effectivePayments);
+    const paymentStatus = completion.isOrderFullyPaid ? params.paymentStatus || "paid" : paidPaymentTotal.gt(0) ? "partially_paid" : "payment_processing";
+    tempOrder.payments = effectivePayments;
     tempOrder.payment_status = paymentStatus;
     this.persistTempOrder();
     await this.saveDraft();
@@ -3361,14 +3541,15 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     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,
@@ -3711,6 +3892,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     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;
     if (!shouldSkipEmptyDiscountSync) {
+      OrderModule.populateSavedAmounts(
+        nextTempOrder.products,
+        hydratedEditDiscounts
+      );
       await ((_b = this.store.discount) == null ? void 0 : _b.setOriginalDiscountList(hydratedEditDiscounts));
       await ((_c = this.store.discount) == null ? void 0 : _c.setDiscountList(hydratedEditDiscounts));
     }
@@ -3915,7 +4100,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     return normalized;
   }
   normalizeHydratedOrderProduct(product) {
-    const row = { ...product || {} };
+    let row = { ...product || {} };
     if (row.num === void 0 && row.product_quantity !== void 0) {
       row.num = row.product_quantity;
     }
@@ -3936,6 +4121,7 @@ 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)();
@@ -3955,7 +4141,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;
@@ -3964,6 +4151,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   async getOrderInfo(order_id) {
     const res = await this.request.get(`/order/sales/${order_id}`, {
       with: ["products", "bookings"]
+    }, {
+      osServer: true
     });
     return res;
   }