@pisell/pisellos 0.0.479 → 0.0.481

package/lib/modules/Payment/index.js

@@ -68,11 +68,38 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     this.defaultName = "pay";
     this.defaultVersion = "1.0.0";
     // LoggerManager 实例
+    this.voucherUpdateLockByOrderUuid = /* @__PURE__ */ new Map();
     this.otherParams = {};
     this.cash = new import_cash.CashPaymentImpl(this);
     this.eftpos = new import_eftpos.EftposPaymentImpl(this);
     this.wallet = new import_walletpass.WalletPassPaymentImpl(this);
   }
+  runVoucherUpdateLocked(orderUuid, task) {
+    const previous = this.voucherUpdateLockByOrderUuid.get(orderUuid) || Promise.resolve();
+    const next = previous.catch(() => void 0).then(task).finally(() => {
+      if (this.voucherUpdateLockByOrderUuid.get(orderUuid) === next) {
+        this.voucherUpdateLockByOrderUuid.delete(orderUuid);
+      }
+    });
+    this.voucherUpdateLockByOrderUuid.set(orderUuid, next);
+    return next;
+  }
+  normalizeVoucherPaymentItems(voucherPaymentItems) {
+    const normalized = /* @__PURE__ */ new Map();
+    for (const item of voucherPaymentItems || []) {
+      if (!(item == null ? void 0 : item.voucher_id)) {
+        throw new Error(`代金券支付项缺少 voucher_id: ${JSON.stringify(item)}`);
+      }
+      const orderPaymentType = item.order_payment_type || "normal";
+      const key = `${item.voucher_id}|${orderPaymentType}`;
+      normalized.set(key, { ...item, order_payment_type: orderPaymentType });
+    }
+    return {
+      items: Array.from(normalized.values()),
+      originalCount: (voucherPaymentItems == null ? void 0 : voucherPaymentItems.length) || 0,
+      normalizedCount: normalized.size
+    };
+  }
   async initialize(core, options) {
     this.core = core;
     this.store = options.store;
@@ -176,6 +203,20 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       }
     });
   }
+  async filterPayMethods(payMethods) {
+    payMethods = payMethods.filter((method) => method.status === 1 && method.disable === 0);
+    const walletPassMethod = payMethods.find((method) => method.code === "WALLET_PASS");
+    if (walletPassMethod) {
+      payMethods.forEach((method) => {
+        if (method.code === "PRODUCTVOUCHER" || method.code === "GIFTCARD" || method.code === "POINTCARD") {
+          method.channel_application = walletPassMethod.channel_application;
+        }
+      });
+    } else {
+      payMethods = payMethods.filter((method) => method.code !== "PRODUCTVOUCHER" && method.code !== "GIFTCARD" && method.code !== "POINTCARD");
+    }
+    return payMethods;
+  }
   /**
    * 获取支付方式列表
    */
@@ -193,7 +234,8 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         this.refreshPaymentMethodsInBackground(cachedMethods);
         return cachedMethods;
       }
-      const response = await this.request.get("/pay/custom-payment/available", { channel: "pos" });
+      const response = await this.request.get("/pay/custom-payment/all");
+      response.data = this.filterPayMethods(response.data);
       const payMethods = response.data || [];
       try {
         for (const method of payMethods) {
@@ -207,8 +249,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         payMethods
       );
       this.logInfo("getPayMethodListAsync completed successfully", {
-        methodCount: payMethods.length,
-        hasCache: cachedMethods.length > 0
+        payMethods
       });
       return payMethods;
     } catch (error) {
@@ -226,7 +267,8 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     });
     try {
       console.log("[PaymentModule] 后台刷新支付方式列表...");
-      const response = await this.request.get("/pay/custom-payment/available", { channel: "pos" });
+      const response = await this.request.get("/pay/custom-payment/all");
+      response.data = this.filterPayMethods(response.data);
       const newPayMethods = response.data || [];
       const hasChanges = this.hasPaymentMethodsChanged(
         cachedMethods,
@@ -713,76 +755,102 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
    * 这是一个覆盖式更新，确保代金券支付项的一致性
    */
   async updateVoucherPaymentItemsAsync(orderUuid, voucherPaymentItems) {
-    this.logInfo("Starting updateVoucherPaymentItemsAsync", {
-      orderUuid,
-      newVoucherCount: voucherPaymentItems.length,
-      voucherItems: voucherPaymentItems.map((item) => ({
-        code: item.code,
-        amount: item.amount,
-        voucher_id: item.voucher_id,
-        order_payment_type: item.order_payment_type
-      }))
-    });
-    try {
-      const order = await this.getPaymentOrderByUuidAsync(orderUuid);
-      if (!order) {
-        throw new Error(`订单不存在: ${orderUuid}`);
-      }
-      const existingVoucherItems = order.payment.filter(
-        (payment) => payment.voucher_id && payment.status !== "voided" && !payment.isSynced
-      );
-      console.log("[PaymentModule] 发现现有代金券支付项:", {
+    return this.runVoucherUpdateLocked(orderUuid, async () => {
+      const { items: normalizedVoucherItems, originalCount, normalizedCount } = this.normalizeVoucherPaymentItems(voucherPaymentItems);
+      this.logInfo("Starting updateVoucherPaymentItemsAsync", {
         orderUuid,
-        existingVoucherCount: existingVoucherItems.length,
-        existingItems: existingVoucherItems.map((item) => ({
-          uuid: item.uuid,
+        originalVoucherCount: originalCount,
+        normalizedVoucherCount: normalizedCount,
+        voucherItems: normalizedVoucherItems.map((item) => ({
           code: item.code,
           amount: item.amount,
           voucher_id: item.voucher_id,
-          isSynced: item.isSynced
+          order_payment_type: item.order_payment_type
         }))
       });
-      for (const voucherItem of existingVoucherItems) {
-        console.log(`[PaymentModule] 删除现有代金券支付项: ${voucherItem.uuid}`);
-        await this.deletePaymentAsync(orderUuid, voucherItem.uuid);
+      if (originalCount !== normalizedCount) {
+        console.warn("[PaymentModule] voucherPaymentItems detected duplicates (deduped by voucher_id + order_payment_type)", {
+          orderUuid,
+          originalCount,
+          normalizedCount
+        });
       }
-      console.log("[PaymentModule] 添加新的代金券支付项:", {
-        orderUuid,
-        newItemCount: voucherPaymentItems.length
-      });
-      for (const voucherItem of voucherPaymentItems) {
-        if (!voucherItem.voucher_id) {
-          throw new Error(`代金券支付项缺少 voucher_id: ${JSON.stringify(voucherItem)}`);
+      try {
+        const order = await this.getPaymentOrderByUuidAsync(orderUuid);
+        if (!order) {
+          throw new Error(`订单不存在: ${orderUuid}`);
+        }
+        const existingVoucherItems = order.payment.filter(
+          (payment) => payment.voucher_id && payment.status !== "voided" && !payment.isSynced
+        );
+        console.log("[PaymentModule] 发现现有代金券支付项:", {
+          orderUuid,
+          existingVoucherCount: existingVoucherItems.length,
+          existingItems: existingVoucherItems.map((item) => ({
+            uuid: item.uuid,
+            code: item.code,
+            amount: item.amount,
+            voucher_id: item.voucher_id,
+            isSynced: item.isSynced
+          }))
+        });
+        for (const voucherItem of existingVoucherItems) {
+          console.log(`[PaymentModule] 删除现有代金券支付项: ${voucherItem.uuid}`);
+          await this.deletePaymentAsync(orderUuid, voucherItem.uuid);
+        }
+        const orderAfterDelete = await this.getPaymentOrderByUuidAsync(orderUuid);
+        if (!orderAfterDelete) {
+          throw new Error(`订单不存在: ${orderUuid}`);
         }
-        console.log(`[PaymentModule] 添加代金券支付项:`, {
-          code: voucherItem.code,
-          amount: voucherItem.amount,
-          voucher_id: voucherItem.voucher_id,
-          order_payment_type: voucherItem.order_payment_type
+        const existingActiveVoucherKeys = new Set(
+          orderAfterDelete.payment.filter((p) => p.voucher_id && p.status !== "voided" && !p.isSynced).map((p) => `${p.voucher_id}|${p.order_payment_type || "normal"}`)
+        );
+        console.log("[PaymentModule] 添加新的代金券支付项:", {
+          orderUuid,
+          newItemCount: normalizedVoucherItems.length
+        });
+        for (const voucherItem of normalizedVoucherItems) {
+          const orderPaymentType = voucherItem.order_payment_type || "normal";
+          const key = `${voucherItem.voucher_id}|${orderPaymentType}`;
+          if (existingActiveVoucherKeys.has(key)) {
+            console.warn("[PaymentModule] Skip adding voucher payment item because it already exists (active)", {
+              orderUuid,
+              voucher_id: voucherItem.voucher_id,
+              order_payment_type: orderPaymentType
+            });
+            continue;
+          }
+          console.log(`[PaymentModule] 添加代金券支付项:`, {
+            code: voucherItem.code,
+            amount: voucherItem.amount,
+            voucher_id: voucherItem.voucher_id,
+            order_payment_type: orderPaymentType
+          });
+          await this.addPaymentItemAsync(orderUuid, voucherItem);
+          existingActiveVoucherKeys.add(key);
+        }
+        const updatedOrder = await this.getPaymentOrderByUuidAsync(orderUuid);
+        await this.core.effects.emit(`${this.name}:onPaymentAdded`, {
+          orderUuid,
+          order: updatedOrder,
+          payment: null
+          // 批量操作不提供单个支付项
+        });
+        this.logInfo("updateVoucherPaymentItemsAsync completed successfully", {
+          orderUuid,
+          removedVoucherCount: existingVoucherItems.length,
+          addedVoucherCount: normalizedVoucherItems.length,
+          finalExpectAmount: updatedOrder == null ? void 0 : updatedOrder.expect_amount
         });
-        await this.addPaymentItemAsync(orderUuid, voucherItem);
+      } catch (error) {
+        console.error("[PaymentModule] 批量更新代金券支付项失败:", error);
+        this.logError("updateVoucherPaymentItemsAsync failed", error, {
+          orderUuid,
+          voucherPaymentItems
+        });
+        throw error;
       }
-      const updatedOrder = await this.getPaymentOrderByUuidAsync(orderUuid);
-      await this.core.effects.emit(`${this.name}:onPaymentAdded`, {
-        orderUuid,
-        order: updatedOrder,
-        payment: null
-        // 批量操作不提供单个支付项
-      });
-      this.logInfo("updateVoucherPaymentItemsAsync completed successfully", {
-        orderUuid,
-        removedVoucherCount: existingVoucherItems.length,
-        addedVoucherCount: voucherPaymentItems.length,
-        finalExpectAmount: updatedOrder == null ? void 0 : updatedOrder.expect_amount
-      });
-    } catch (error) {
-      console.error("[PaymentModule] 批量更新代金券支付项失败:", error);
-      this.logError("updateVoucherPaymentItemsAsync failed", error, {
-        orderUuid,
-        voucherPaymentItems
-      });
-      throw error;
-    }
+    });
   }
   /**
    * 更新一个支付项
@@ -963,7 +1031,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
           }
           const paymentAmount = new import_decimal.Decimal(payment.amount || 0);
           const roundingAmount = new import_decimal.Decimal(payment.rounding_amount || 0);
-          const effectiveAmount = paymentAmount.plus(roundingAmount.isNegative() ? roundingAmount.abs() : 0);
+          const effectiveAmount = paymentAmount.minus(roundingAmount);
           return sum.plus(effectiveAmount);
         } catch (error) {
           console.warn(`[PaymentModule] 无效的支付金额: amount=${payment.amount}, rounding_amount=${payment.rounding_amount}，跳过计算`);
@@ -985,7 +1053,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         code: p.code,
         amount: p.amount,
         rounding_amount: p.rounding_amount || "0.00",
-        effective_amount: new import_decimal.Decimal(p.amount || 0).plus(new import_decimal.Decimal(Number(p.rounding_amount) > 0 ? 0 : p.rounding_amount || 0).abs()).toFixed(2)
+        effective_amount: new import_decimal.Decimal(p.amount || 0).minus(new import_decimal.Decimal(p.rounding_amount || 0)).toFixed(2)
       })),
       说明: "有效支付金额包含抹零计算（amount + |rounding_amount|）"
     });

package/lib/modules/Payment/walletpass.js

@@ -90,6 +90,11 @@ var WalletPassPaymentImpl = class {
       order_wait_pay_amount: walletParams.order_wait_pay_amount,
       products_count: ((_b = walletParams.products) == null ? void 0 : _b.length) || 0
     });
+    this.walletInitData = {
+      transformList: [],
+      noApplicableVoucher: [],
+      products: products || []
+    };
     return walletParams;
   }
   /**
@@ -124,6 +129,12 @@ var WalletPassPaymentImpl = class {
         products: []
       };
     }
+    if ([1, 0].includes((walletParams == null ? void 0 : walletParams.customer_id) || 0)) {
+      return {
+        walletRecommendList: [],
+        userIdentificationCodes: []
+      };
+    }
     this.emitEvent(import_types.WalletPassHooks.OnWalletInitializationStarted, {
       businessData,
       startTime
@@ -335,6 +346,7 @@ var WalletPassPaymentImpl = class {
    * 特殊逻辑：当识别码长度为9位且前3位为"000"时，调用 /wallet/detail/search 接口
    */
   async searchIdentificationCodeAsync(params, config = {}) {
+    var _a;
     try {
       const { code } = params;
       this.paymentModule.logInfo("[WalletPass] 开始搜索识别码", {
@@ -392,10 +404,17 @@ var WalletPassPaymentImpl = class {
         multiple: searchParams.multiple,
         payment_order_id: baseWalletParams == null ? void 0 : baseWalletParams.payment_order_id
       });
-      const response = await this.paymentModule.request.post(
-        "/machinecode/prepare/deduction/search",
-        searchParams
-      );
+      let response;
+      if (!searchParams.products || ((_a = searchParams.products || []) == null ? void 0 : _a.length) === 0) {
+        response = {
+          data: []
+        };
+      } else {
+        response = await this.paymentModule.request.post(
+          "/machinecode/prepare/deduction/search",
+          searchParams
+        );
+      }
       const searchResults = (response == null ? void 0 : response.data) || [];
       if (config.noCache) {
         return {

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

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

@@ -162,6 +162,8 @@ export interface ProductData {
     categories: ProductCategory[];
     /** 套餐组 */
     bundle_groups: ProductBundleGroup[];
+    /** 套餐组 */
+    bundle_group: ProductBundleGroup[];
     /** 商品资源 */
     product_resource?: {
         resources?: ProductResourceItem[];

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

@@ -22,6 +22,9 @@ export declare class ProductList extends BaseModule implements Module {
         schedule_datetime?: string;
         with_count?: string[];
         with_schedule?: number;
+    }, options?: {
+        callback?: (result: any) => void;
+        subscriberId?: string;
     }): Promise<any>;
     loadProductsPrice({ ids, customer_id, schedule_date, channel, }: {
         ids?: number[];

package/lib/modules/ProductList/index.js

@@ -60,7 +60,7 @@ var ProductList = class extends import_BaseModule.BaseModule {
     schedule_date,
     cacheId,
     with_schedule
-  }) {
+  }, options) {
     var _a, _b;
     let userPlugin = this.core.getPlugin("user");
     let customer_id = void 0;
@@ -100,7 +100,7 @@ var ProductList = class extends import_BaseModule.BaseModule {
         application_code: (_b = this.otherParams) == null ? void 0 : _b.channel,
         is_eject: 1
       },
-      { osServer: true }
+      { osServer: true, callback: options == null ? void 0 : options.callback, subscriberId: options == null ? void 0 : options.subscriberId }
     );
     const sortedList = (productsData.data.list || []).slice().sort((a, b) => Number(b.sort) - Number(a.sort));
     this.addProduct(sortedList);

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

@@ -33,14 +33,14 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     };
     filterDiscountListByType(discountList: Discount[], type: string): Discount[];
     private getUnavailableReason;
-    calcDiscount({ discountList, productList, orderTotalAmount, holders, isFormSubject, }: {
+    calcDiscount({ discountList, productList, holders, isFormSubject, orderTotalAmount }: {
         discountList: Discount[];
         productList: any[];
-        orderTotalAmount: number;
         holders: {
             form_record_id: number;
         }[];
         isFormSubject: boolean;
+        orderTotalAmount: number;
     }, options?: {
         isSelected?: boolean;
         discountId?: number;

package/lib/modules/Rules/index.js

@@ -39,6 +39,8 @@ var import_utils2 = require("../Cart/utils");
 var import_decimal = __toESM(require("decimal.js"));
 var import_lodash_es = require("lodash-es");
 var import_dayjs = __toESM(require("dayjs"));
+var import_utils3 = require("../../solution/ShopDiscount/utils");
+var import_utils4 = require("../../solution/ShopDiscount/utils");
 var RulesModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -111,18 +113,15 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       ...filteredOldDiscountList,
       ...newDiscountList
     ]);
-    const result = this.calcDiscount(
-      {
-        discountList: mergedDiscountList,
-        productList: [...productList],
-        orderTotalAmount,
-        holders,
-        isFormSubject
-      },
-      {
-        scan: true
-      }
-    );
+    const result = this.calcDiscount({
+      discountList: mergedDiscountList,
+      productList: [...productList],
+      holders,
+      orderTotalAmount,
+      isFormSubject
+    }, {
+      scan: true
+    });
     let hasApplicableDiscount = false;
     const newDiscountIds = newDiscountList.map((discount) => discount.id);
     result.productList.forEach((product) => {
@@ -192,9 +191,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
   calcDiscount({
     discountList,
     productList,
-    orderTotalAmount,
     holders,
-    isFormSubject
+    isFormSubject,
+    orderTotalAmount
   }, options) {
     const editModeDiscount = [];
     const addModeDiscount = [];
@@ -481,7 +480,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       return isLimitedProduct && isBundleAvailable;
     };
     const selectedOrderLevelDiscounts = sortedDiscountList.filter((discount) => {
-      return (0, import_utils.isOrderLevelFixedAmountDiscount)(discount) && discount.isSelected !== false;
+      return (0, import_utils3.isOrderLevelFixedAmountDiscount)(discount) && discount.isSelected !== false;
     });
     selectedOrderLevelDiscounts.forEach((discount) => {
       const applicableItemIds = /* @__PURE__ */ new Set();
@@ -513,7 +512,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     });
     console.log("occupiedItems", occupiedItems, "orderLevelDiscountApplicableItems", orderLevelDiscountApplicableItems);
     sortedDiscountList.forEach((discount) => {
-      if (!(0, import_utils.isOrderLevelFixedAmountDiscount)(discount)) {
+      if (!(0, import_utils3.isOrderLevelFixedAmountDiscount)(discount)) {
         return;
       }
       const applicableProducts = [];
@@ -551,7 +550,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         applicableProducts.push(productData);
       });
       if (applicableProducts.length > 0) {
-        const allocation = (0, import_utils.calculateOrderLevelDiscountAllocation)(discount, applicableProducts);
+        const allocation = (0, import_utils4.calculateOrderLevelDiscountAllocation)(discount, applicableProducts);
         orderLevelDiscountAllocations.set(discount.id, allocation);
       }
     });
@@ -712,11 +711,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           }
         }
         const limitedData = discount.limited_relation_product_data;
-        let timeLimit = true;
-        timeLimit = !!(0, import_utils.filterDiscountListByBookingTime)([discount], (product.startDate || (0, import_dayjs.default)()).format("YYYY-MM-DD HH:mm:ss")).length;
-        if (!timeLimit) {
-          return false;
-        }
         const _tempVar = (flatItem == null ? void 0 : flatItem.type) === "bundle" ? flatItem == null ? void 0 : flatItem.parentProduct : flatItem == null ? void 0 : flatItem.product;
         const isHolderMatch = this.checkHolderMatch(
           discount,
@@ -728,6 +722,11 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         );
         if (!isHolderMatch)
           return false;
+        let timeLimit = true;
+        timeLimit = !!(0, import_utils.filterDiscountListByBookingTime)([discount], (product.startDate || (0, import_dayjs.default)()).format("YYYY-MM-DD HH:mm:ss")).length;
+        if (!timeLimit) {
+          return false;
+        }
         if (limitedData.type === "product_all") {
           if (limitedData.filter === 1 && limitedData.exclude_product_ids.includes(product.id)) {
             return false;
@@ -930,12 +929,16 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       const arr = [];
       if (flatItem.type === "main") {
         if (splitCount < totalQuantity && isNeedSplit) {
+          let total = product.origin_total ?? product.total;
+          if ((product.discount_list || []).some((item) => item.type === "promotion")) {
+            total = product.total ?? product.origin_total;
+          }
           arr.push(
             this.hooks.setProduct(originProduct, {
               discount_list: this.filterDiscountListByType(product.discount_list, "promotion"),
               quantity: totalQuantity - splitCount,
               _id: product._id.split("___")[0],
-              total: product.origin_total || product.total
+              total
             })
           );
         }
@@ -959,7 +962,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           if (Number(((_x = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _x.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
             productOriginTotal = product.total;
           }
-          const isOrderLevel = (0, import_utils.isOrderLevelFixedAmountDiscount)(selectedDiscount);
+          const isOrderLevel = (0, import_utils3.isOrderLevelFixedAmountDiscount)(selectedDiscount);
           const orderLevelAllocation = isOrderLevel ? orderLevelDiscountAllocations.get(selectedDiscount.id) : null;
           const productAllocation = orderLevelAllocation == null ? void 0 : orderLevelAllocation.get(flatItem._id);
           let targetProductTotal;
@@ -974,17 +977,17 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             amount = new import_decimal.default(product.price).minus(new import_decimal.default(targetProductTotal)).toNumber();
           }
           const currentDiscountType = currentSelectedDiscount.tag === "product_discount_card" ? "discount_card" : currentSelectedDiscount.tag;
-          const actualDiscountAmount = new import_decimal.default(product.price).minus(new import_decimal.default(targetProductTotal)).toNumber();
+          const discountType2 = selectedDiscount.tag || selectedDiscount.type;
           const currentIsGoodPass = currentDiscountType === "good_pass";
           const discountDetail = {
-            amount: actualDiscountAmount,
-            type: currentDiscountType,
+            amount,
+            type: selectedDiscount.tag === "product_discount_card" ? "discount_card" : discountType2,
             discount: {
-              discount_card_type: (_y = currentSelectedDiscount == null ? void 0 : currentSelectedDiscount.metadata) == null ? void 0 : _y.discount_card_type,
-              fixed_amount: actualDiscountAmount,
-              discount_calculation_mode: (_z = currentSelectedDiscount == null ? void 0 : currentSelectedDiscount.metadata) == null ? void 0 : _z.discount_calculation_mode,
-              resource_id: currentSelectedDiscount.id,
-              title: currentSelectedDiscount.format_title,
+              discount_card_type: (_y = selectedDiscount == null ? void 0 : selectedDiscount.metadata) == null ? void 0 : _y.discount_card_type,
+              fixed_amount: amount,
+              discount_calculation_mode: (_z = selectedDiscount == null ? void 0 : selectedDiscount.metadata) == null ? void 0 : _z.discount_calculation_mode,
+              resource_id: selectedDiscount.id,
+              title: selectedDiscount.format_title,
               original_amount: product.price,
               product_id: originProduct.id,
               percent: currentSelectedDiscount.par_value,
@@ -1025,7 +1028,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                 }),
                 variant: originProduct._productInit.variant,
                 original_price: new import_decimal.default(product.price || 0).toNumber(),
-                total: targetProductTotal
+                total
               })
             );
           } else {
@@ -1035,7 +1038,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                 _id: product._id.split("___")[0] + "___" + currentSelectedDiscount.id + "_" + i + "_" + index,
                 price: currentIsGoodPass ? 0 : product.price,
                 quantity: isNeedSplit ? 1 : product.quantity,
-                total: targetProductTotal,
+                total,
                 origin_total: productOriginTotal,
                 main_product_selling_price: targetProductTotal
               })
@@ -1339,7 +1342,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             usedDiscountCardLimitCounts.set(currentBundleDiscount.id, currentNoSplitCount + bundleQuantity);
           }
           const productOriginTotal = product.original_price || product.price || 0;
-          const isOrderLevel = (0, import_utils.isOrderLevelFixedAmountDiscount)(selectedDiscount);
+          const isOrderLevel = (0, import_utils3.isOrderLevelFixedAmountDiscount)(selectedDiscount);
           const orderLevelAllocation = isOrderLevel ? orderLevelDiscountAllocations.get(selectedDiscount.id) : null;
           const productAllocation = orderLevelAllocation == null ? void 0 : orderLevelAllocation.get(flatItem._id);
           let targetProductTotal;
@@ -1663,48 +1666,41 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               const mainProductData = this.hooks.getProduct(mainProduct);
               const newBundle = [];
               if (product.bundle && Array.isArray(product.bundle)) {
-                product.bundle.forEach(
-                  (bundleItem, bundleIndex) => {
-                    const bundleItemId = `${product._id}_bundle_${bundleIndex}`;
-                    const processedBundleItems = processedFlatItemsMap2.get(bundleItemId);
-                    if (!processedBundleItems || processedBundleItems.length === 0) {
-                      newBundle.push(bundleItem);
-                    } else {
-                      processedBundleItems.forEach((item) => {
-                        const updatedDiscountList2 = (item.discount_list || []).map((discount) => {
-                          var _a2;
-                          return {
-                            ...discount,
-                            metadata: {
-                              ...discount.metadata,
-                              num: item.num,
-                              custom_product_bundle_map_id: (_a2 = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id
-                            }
-                            // num: item.num, // 使用拆分后的 num
-                          };
-                        });
-                        newBundle.push({
-                          ...bundleItem,
-                          _id: item._id,
-                          product_id: bundleItem.product_id,
-                          price: item.price,
-                          num: item.num,
-                          quantity: item.num,
-                          discount_list: updatedDiscountList2
-                        });
+                product.bundle.forEach((bundleItem, bundleIndex) => {
+                  const bundleItemId = `${product._id}_bundle_${bundleIndex}`;
+                  const processedBundleItems = processedFlatItemsMap2.get(bundleItemId);
+                  if (!processedBundleItems || processedBundleItems.length === 0) {
+                    newBundle.push(bundleItem);
+                  } else {
+                    processedBundleItems.forEach((item) => {
+                      const updatedDiscountList2 = (item.discount_list || []).map((discount) => {
+                        var _a2;
+                        return {
+                          ...discount,
+                          metadata: {
+                            ...discount.metadata,
+                            num: item.num,
+                            custom_product_bundle_map_id: (_a2 = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id
+                          }
+                          // num: item.num, // 使用拆分后的 num
+                        };
                       });
-                    }
+                      newBundle.push({
+                        ...bundleItem,
+                        _id: item._id,
+                        product_id: bundleItem.product_id,
+                        price: item.price,
+                        num: item.num,
+                        discount_list: updatedDiscountList2,
+                        bundle_selling_price: bundleItem.bundle_selling_price !== void 0 ? item.price : void 0
+                      });
+                    });
                   }
-                );
+                });
               }
               let newTotal = Number(mainProductData.price || 0);
-              let newOriginTotal = Number(
-                mainProductData.original_price || mainProductData.price || 0
-              );
-              const isManualDiscount = typeof mainProductData.isManualDiscount === "boolean" ? mainProductData.isManualDiscount : mainProductData.total != mainProductData.origin_total && (!((_a = mainProductData.discount_list) == null ? void 0 : _a.length) || ((_c = (_b = mainProductData == null ? void 0 : mainProductData.discount_list) == null ? void 0 : _b.every) == null ? void 0 : _c.call(
-                _b,
-                (item) => item.type === "product"
-              )));
+              let newOriginTotal = Number(mainProductData.original_price || mainProductData.price || 0);
+              const isManualDiscount = typeof mainProductData.isManualDiscount === "boolean" ? mainProductData.isManualDiscount : mainProductData.total != mainProductData.origin_total && (!((_a = mainProductData.discount_list) == null ? void 0 : _a.length) || ((_c = (_b = mainProductData == null ? void 0 : mainProductData.discount_list) == null ? void 0 : _b.every) == null ? void 0 : _c.call(_b, (item) => item.type === "product")));
               if (isManualDiscount) {
                 newTotal = mainProductData.total ?? newTotal;
                 newOriginTotal = mainProductData.origin_total ?? newOriginTotal;