@pisell/pisellos 2.3.7 → 2.3.9

package/dist/solution/BookingByStep/index.d.ts

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 6 | 3 | 4 | 5;
+        weekNum: 0 | 2 | 1 | 6 | 3 | 4 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/model/strategy/adapter/promotion/index.js

@@ -0,0 +1,49 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/model/strategy/adapter/promotion/index.ts
+var promotion_exports = {};
+__export(promotion_exports, {
+  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter: () => import_adapter.PromotionAdapter,
+  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
+  default: () => import_adapter2.default
+});
+module.exports = __toCommonJS(promotion_exports);
+var import_evaluator = require("./evaluator");
+var import_adapter = require("./adapter");
+var import_adapter2 = __toESM(require("./adapter"));
+var import_examples = require("./examples");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter,
+  PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY
+});

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;

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,23 @@ function isManualProductDiscountProduct(product) {
   var _a, _b;
   return ((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.is_manual_discount) === true || ((_b = product == null ? void 0 : product.metadata) == null ? void 0 : _b.is_manual_discount) === 1 || ((product == null ? void 0 : product.discount_list) || []).some((item) => (item == null ? void 0 : item.type) === "product");
 }
+var ORDER_PAYMENT_STATUS_PAID = "paid";
+var ORDER_PAYMENT_STATUS_PENDING = "payment_pending";
+function isVoucherPaymentRecord(payment) {
+  return (payment == null ? void 0 : payment.voucher_id) !== void 0 && Number(payment.voucher_id) !== 0;
+}
+function hasSyncedOrderPaymentRecord(payment) {
+  return (payment == null ? void 0 : payment.order_payment_id) !== void 0 && payment.order_payment_id !== null;
+}
+function isPendingVoucherPaymentRecord(payment) {
+  return isVoucherPaymentRecord(payment) && (payment == null ? void 0 : payment.status) === ORDER_PAYMENT_STATUS_PENDING;
+}
+function isPaidPaymentRecord(payment) {
+  return (payment == null ? void 0 : payment.status) === ORDER_PAYMENT_STATUS_PAID;
+}
+function isCommittedVoucherPaymentRecord(payment) {
+  return isVoucherPaymentRecord(payment) && (payment == null ? void 0 : payment.status) !== "voided" && (hasSyncedOrderPaymentRecord(payment) || isPaidPaymentRecord(payment));
+}
 var OrderModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name || "order", version);
@@ -91,7 +109,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 +132,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: "",
@@ -832,6 +865,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));
   }
@@ -949,7 +984,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)
@@ -1100,7 +1135,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),
@@ -1526,6 +1561,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;
@@ -2394,27 +2430,78 @@ 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 hasSyncedOrderPayment = (payment) => {
-      return payment.order_payment_id !== void 0 && payment.order_payment_id !== null;
-    };
     const isOrderPaymentType = (value) => {
       return value === "normal" || value === "deposit";
     };
     const voucherOrderPaymentType = this.resolveNextOrderPaymentType(tempOrder);
     const withVoucherPaymentType = (payment) => {
       const paymentRecord = payment;
-      if (!isVoucherPayment(paymentRecord))
+      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;
@@ -2426,35 +2513,70 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         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(withVoucherPaymentType(payment), { defaultPaid: true })
+        (payment) => this.normalizePaymentSource(
+          normalizeVoucherPaymentStatus(withVoucherPaymentType(payment)),
+          { defaultPaid: false }
+        )
       )
     ).filter((payment) => {
-      return isVoucherPayment(payment);
+      return isVoucherPaymentRecord(payment);
     });
     const nonVoucherPayments = (tempOrder.payments || []).filter((payment) => {
-      return !isVoucherPayment(payment);
-    });
-    const syncedVoucherPayments = (tempOrder.payments || []).filter((payment) => {
-      return isVoucherPayment(payment) && hasSyncedOrderPayment(payment);
+      return !isVoucherPaymentRecord(payment);
     });
-    const syncedVoucherPaymentIds = new Set(
-      syncedVoucherPayments.map((payment) => String(payment.order_payment_id))
+    const normalizeCommittedVoucherPayment = (payment) => {
+      if (hasSyncedOrderPaymentRecord(payment) && (payment.status === void 0 || payment.status === "active")) {
+        return {
+          ...payment,
+          status: ORDER_PAYMENT_STATUS_PAID
+        };
+      }
+      return payment;
+    };
+    const committedVoucherPayments = (tempOrder.payments || []).filter((payment) => isCommittedVoucherPaymentRecord(payment)).map((payment) => normalizeCommittedVoucherPayment(payment));
+    const committedVoucherPaymentIds = new Set(
+      committedVoucherPayments.filter((payment) => hasSyncedOrderPaymentRecord(payment)).map((payment) => String(payment.order_payment_id))
+    );
+    const committedVoucherIds = new Set(
+      committedVoucherPayments.map((payment) => String(payment.voucher_id))
     );
     const replaceableVouchers = mappedVouchers.filter((payment) => {
-      if (!hasSyncedOrderPayment(payment))
-        return true;
-      return !syncedVoucherPaymentIds.has(String(payment.order_payment_id));
+      if (hasSyncedOrderPaymentRecord(payment) && committedVoucherPaymentIds.has(String(payment.order_payment_id))) {
+        return false;
+      }
+      if (payment.voucher_id !== void 0 && committedVoucherIds.has(String(payment.voucher_id))) {
+        return false;
+      }
+      return true;
     });
     const cappedVouchers = this.capVoucherPaymentsByRemainingAmount({
       vouchers: replaceableVouchers,
       nonVoucherPayments: [
         ...nonVoucherPayments,
-        ...syncedVoucherPayments
+        ...committedVoucherPayments
       ]
     });
-    tempOrder.payments = [...nonVoucherPayments, ...syncedVoucherPayments, ...cappedVouchers];
+    tempOrder.payments = [...nonVoucherPayments, ...committedVoucherPayments, ...cappedVouchers];
     this.updateTempOrderPaymentStatus(tempOrder);
     this.persistTempOrder();
     void this.recalculateSummary({ createIfMissing: true }).catch((error) => {
@@ -2692,6 +2814,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;
   }
   /**
@@ -2733,6 +2859,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) {
@@ -2955,6 +3084,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) {
@@ -2966,6 +3098,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) {
@@ -3030,6 +3165,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) {
@@ -3131,6 +3269,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       });
     }
     await this.finalizeAfterProductsMutation(tempOrder);
+    this.logInfo("removeProductsFromOrder success", {
+      identities
+    });
     return tempOrder.products;
   }
   async removeProductFromOrder(identity) {
@@ -3156,6 +3297,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: 提交 ───
@@ -3216,21 +3358,37 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   async runSubmitTempOrder(params) {
     var _a, _b, _c, _d, _e;
     const tempOrder = this.ensureTempOrder();
+    const shouldConfirmPendingVoucherPayments = (params == null ? void 0 : params.confirmPendingVoucherPayments) !== false;
+    const hasPaymentOverride = (params == null ? void 0 : params.payments) !== void 0;
+    const preparedPaymentOverride = hasPaymentOverride ? this.prepareVoucherPaymentsForSubmit(
+      (params == null ? void 0 : params.payments) || [],
+      shouldConfirmPendingVoucherPayments
+    ) : void 0;
+    if (!hasPaymentOverride) {
+      if (shouldConfirmPendingVoucherPayments) {
+        this.confirmPendingVoucherPayments({
+          persist: false,
+          recalculateSummary: false
+        });
+      } else {
+        this.discardPendingVoucherPayments({
+          persist: false,
+          recalculateSummary: false
+        });
+      }
+    }
     this.persistTempOrder();
     const latestSummary = await this.recalculateSummary({ createIfMissing: true }) || this.store.summary || (0, import_utils.createEmptySummary)();
     const effectiveCacheId = (params == null ? void 0 : params.cacheId) ?? this.cacheId;
-    const hasPaymentOverride = (params == null ? void 0 : params.payments) !== void 0;
     const hasPaymentStatusOverride = (params == null ? void 0 : params.paymentStatus) !== void 0;
     const hasSmallTicketDataFlagOverride = (params == null ? void 0 : params.smallTicketDataFlag) !== void 0;
     const enhancePayload = hasPaymentOverride || hasPaymentStatusOverride || hasSmallTicketDataFlagOverride || (params == null ? void 0 : params.enhancePayload) ? (payload2, ctx) => {
       const nextPayload = {
         ...payload2,
         ...hasPaymentOverride ? {
-          payments: (0, import_utils.mapPaymentItemsToOrderPayments)(
-            (params == null ? void 0 : params.payments) || []
-          )
+          payments: preparedPaymentOverride || []
         } : {},
-        ...hasPaymentStatusOverride ? { payment_status: params == null ? void 0 : params.paymentStatus } : {},
+        ...hasPaymentStatusOverride && !shouldConfirmPendingVoucherPayments ? { payment_status: params == null ? void 0 : params.paymentStatus } : {},
         ...hasSmallTicketDataFlagOverride ? { small_ticket_data_flag: params == null ? void 0 : params.smallTicketDataFlag } : {}
       };
       const enhancedPayload = (params == null ? void 0 : params.enhancePayload) ? params.enhancePayload(nextPayload, ctx) : nextPayload;
@@ -3248,6 +3406,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;
     }
@@ -3381,9 +3540,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();
@@ -3396,14 +3558,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,
@@ -3746,6 +3909,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));
     }
@@ -3950,7 +4117,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;
     }
@@ -3971,6 +4138,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)();
@@ -3990,7 +4158,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;

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

@@ -491,7 +491,7 @@ export interface OrderPaymentData {
     voucher_id?: string | number;
     origin_amount?: string;
     service_fee?: string;
-    status?: 'active' | 'voided' | string;
+    status?: 'active' | 'paid' | 'voided' | 'payment_pending' | string;
     /** 支付时间 (格式: YYYY-MM-DD HH:mm:ss) */
     payment_time?: string;
     wallet_pass_usage_unit?: unknown;
@@ -537,6 +537,7 @@ export interface SyncPaymentsToOrderParams {
     smallTicketDataFlag?: number;
     businessCode?: string;
     channel?: string;
+    confirmPendingVoucherPayments?: boolean;
 }
 export interface SyncPaymentsToOrderResult<T = any> {
     isFullyPaid: boolean;
@@ -696,6 +697,7 @@ export interface OrderModuleAPI {
         payments?: OrderPaymentSource[];
         paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
         smallTicketDataFlag?: number;
+        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }) => Promise<T>;
     submitTempOrderAsync: <T = any>(params?: {
@@ -707,6 +709,7 @@ export interface OrderModuleAPI {
         payments?: OrderPaymentSource[];
         paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
         smallTicketDataFlag?: number;
+        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }) => Promise<T>;
     getOrderPayments: () => OrderPaymentData[];
@@ -714,7 +717,17 @@ export interface OrderModuleAPI {
     addOrderPayment: (payment: OrderPaymentSource) => OrderPaymentData[];
     updateOrderPayment: (paymentIdentity: string | number, updates: Partial<OrderPaymentData> & Record<string, any>) => OrderPaymentData[];
     deleteOrderPayment: (paymentIdentity: string | number) => OrderPaymentData[];
-    updateVoucherOrderPayments: (payments: OrderPaymentSource[]) => OrderPaymentData[];
+    updateVoucherOrderPayments: (payments: OrderPaymentSource[], options?: {
+        status?: 'paid' | 'payment_pending';
+    }) => OrderPaymentData[];
+    confirmPendingVoucherPayments: (options?: {
+        persist?: boolean;
+        recalculateSummary?: boolean;
+    }) => OrderPaymentData[];
+    discardPendingVoucherPayments: (options?: {
+        persist?: boolean;
+        recalculateSummary?: boolean;
+    }) => OrderPaymentData[];
     sendCustomerPayLink: <T = any>(params: SendCustomerPayLinkParams) => Promise<T>;
     saveDraft: () => Promise<void>;
     hydrateTempOrderFromRecord: (record: Record<string, any>, options?: {

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

@@ -0,0 +1,5 @@
+import type { OrderProductDiscountItem } from '../types';
+type NormalizeDiscountList = (discountList?: unknown[] | null) => OrderProductDiscountItem[];
+export declare function restoreHydratedBundleDiscounts<T extends Record<string, any>>(product: T, normalizeDiscountList: NormalizeDiscountList): T;
+export declare function expandHydratedProductsForDiscountCollection(products: any[] | undefined | null): any[];
+export {};