@pisell/pisellos 2.1.93 → 2.1.95

package/dist/modules/Rules/index.js

@@ -31,6 +31,7 @@ import { getProductOriginTotalPrice, getProductTotalPrice } from "../Cart/utils"
 import Decimal from 'decimal.js';
 import { isBoolean } from 'lodash-es';
 import dayjs from 'dayjs';
+
 // 临时变量
 var flatItem;
 export var RulesModule = /*#__PURE__*/function (_BaseModule) {
@@ -43,8 +44,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "defaultName", 'rules');
     _defineProperty(_assertThisInitialized(_this), "defaultVersion", '1.0.0');
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
-    _defineProperty(_assertThisInitialized(_this), "window", void 0);
-    // WindowPlugin 实例
     _defineProperty(_assertThisInitialized(_this), "hooks", void 0);
     _this.hooks = {};
     return _this;
@@ -59,8 +58,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               this.core = core;
               this.hooks = options === null || options === void 0 ? void 0 : options.hooks;
               this.store = options === null || options === void 0 ? void 0 : options.store;
-              this.window = core.getPlugin('window');
-            case 4:
+            case 3:
             case "end":
               return _context.stop();
           }
@@ -115,12 +113,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 最终直接匹配 holder 是否相同
       return (productHolderId || orderHolderId) === discount.holder.holder_id;
     }
-  }, {
-    key: "getWalletPassEvaluator",
-    value: function getWalletPassEvaluator() {
-      var _this$window$getWalle, _this$window;
-      return (_this$window$getWalle = (_this$window = this.window).getWalletPassEvaluator) === null || _this$window$getWalle === void 0 ? void 0 : _this$window$getWalle.call(_this$window);
-    }
 
     // 判断discountList 是否可以对当前productList生效
   }, {
@@ -130,7 +122,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var oldDiscountList = _ref.oldDiscountList,
         newDiscountList = _ref.newDiscountList,
         productList = _ref.productList,
-        orderTotalAmount = _ref.orderTotalAmount,
         holders = _ref.holders,
         isFormSubject = _ref.isFormSubject;
       // 首先检查是否有新的优惠券可应用
@@ -165,7 +156,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var result = this.calcDiscount({
         discountList: mergedDiscountList,
         productList: _toConsumableArray(productList),
-        orderTotalAmount: orderTotalAmount,
         holders: holders,
         isFormSubject: isFormSubject
       }, {
@@ -292,15 +282,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var discountList = _ref2.discountList,
         productList = _ref2.productList,
         holders = _ref2.holders,
-        isFormSubject = _ref2.isFormSubject,
-        orderTotalAmount = _ref2.orderTotalAmount;
-      // 识别出来是不是在编辑的界面里又新增了商品
-      // 这种情况下，如果有可用的优惠券，也会自动勾选上
-      var isEditModeAddNewProduct = productList.find(function (n) {
-        return n.booking_id;
-      }) && productList.find(function (n) {
-        return !n.booking_id;
-      });
+        isFormSubject = _ref2.isFormSubject;
       var editModeDiscount = [];
       var addModeDiscount = [];
       discountList.forEach(function (discount) {
@@ -514,6 +496,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 🔥 扁平化商品列表（包含主商品和bundle子商品）
       var flattenedList = flattenProductsWithBundle(productList);
 
+      // 识别出来是不是在编辑的界面里又新增了商品
+      // 这种情况下，如果有可用的优惠券，也会自动勾选上
+      var isEditModeAddNewProduct = flattenedList.find(function (n) {
+        return n.booking_id;
+      }) && flattenedList.find(function (n) {
+        return !n.booking_id;
+      });
+
       // 对扁平化后的列表按价格降序排序（用于应用优惠券时优先选择高价商品）
       var sortedFlattenedList = flattenedList.sort(function (a, b) {
         var _ref3, _a$original_price, _ref4, _b$original_price;
@@ -541,57 +531,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         return priceB.minus(priceA).toNumber();
       });
 
-      // 🔥 为每个折扣卡/商品券执行策略检查并附加config
-      var evaluator = this.getWalletPassEvaluator();
-      if (evaluator) {
-        addModeDiscount.forEach(function (discount) {
-          var discountType = discount.tag || discount.type;
-          // 只对 good_pass 和 discount_card 类型执行策略检查
-          if (['good_pass', 'discount_card', 'product_discount_card'].includes(discountType)) {
-            var _discount$limited_rel, _discount$limited_rel2;
-            // 转换 discount 为 Voucher 格式
-            var voucher = {
-              id: discount.id,
-              amount: Number(discount.par_value || 0),
-              balance: Number(discount.balance || 0),
-              type: discountType,
-              product_id: discount.product_id,
-              unified_available_status: 1,
-              available_product_type: (_discount$limited_rel = discount.limited_relation_product_data) === null || _discount$limited_rel === void 0 ? void 0 : _discount$limited_rel.type,
-              available_product_ids: (_discount$limited_rel2 = discount.limited_relation_product_data) === null || _discount$limited_rel2 === void 0 ? void 0 : _discount$limited_rel2.product_ids
-            };
-
-            // 转换 sortedFlattenedList 为 Product 格式
-            var productsForEvaluate = sortedFlattenedList.map(function (item) {
-              return {
-                product_id: item.id,
-                price: item.price || 0,
-                quantity: item.quantity || item.num || 1,
-                selling_price: item.price || 0
-              };
-            });
-
-            // 调用策略检查
-            var result = evaluator.checkVoucherAvailability({
-              orderTotalAmount: orderTotalAmount,
-              products: productsForEvaluate,
-              vouchers: [voucher]
-            });
-
-            // 将 config 附加到 discount 对象
-            if (result.isAvailable) {
-              discount.config = _objectSpread(_objectSpread({}, result.config), {}, {
-                isAvailable: true
-              });
-            } else {
-              discount.config = {
-                isAvailable: false
-              };
-            }
-          }
-        });
-      }
-
       /**
       // 对productList按价格降序排序（用于应用优惠券时优先选择高价商品） 价格相同时使用quantity 排序
       const sortedProductList = [...productList].sort((a, b) => {
@@ -612,22 +551,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 标记已使用的优惠券
       var usedDiscounts = new Map();
 
-      // 🔥 统计每个 product_id（商品券商品id）已使用的数量，用于 maxUsagePerOrder 限制
-      var usedProductIdCounts = new Map();
-
-      // 🔥 统计每张折扣卡的 applicableProductLimit 已使用次数（跨商品全局计数）
-      var usedDiscountCardLimitCounts = new Map();
-
-      // 🔥 预先将 editModeDiscount 中的折扣卡计入 applicableProductLimit 已使用次数
-      editModeDiscount.forEach(function (discount) {
-        var discountType = discount.tag || discount.type;
-        if (['discount_card', 'product_discount_card'].includes(discountType)) {
-          var _discount$metadata4;
-          var currentCount = usedDiscountCardLimitCounts.get(discount.id) || 0;
-          usedDiscountCardLimitCounts.set(discount.id, currentCount + (((_discount$metadata4 = discount.metadata) === null || _discount$metadata4 === void 0 ? void 0 : _discount$metadata4.num) || 1));
-        }
-      });
-
       // 记录每个优惠券适用的商品ID
       var discountApplicability = new Map();
 
@@ -857,7 +780,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           originProduct = flatItem.originProduct;
         }
         addModeDiscount.forEach(function (discount) {
-          var _product6, _product7, _product8, _product9, _flatItem$bundleItem3, _flatItem$bundleItem4, _discount$config;
+          var _product6, _product7, _product8, _product9, _flatItem$bundleItem3, _flatItem$bundleItem4;
           var limitedData = discount === null || discount === void 0 ? void 0 : discount.limited_relation_product_data;
           // 拿到discount配置的holder信息 product信息 product.holder 加在 isLimitedProduct
           var _tempVar = (flatItem === null || flatItem === void 0 ? void 0 : flatItem.type) === 'bundle' ? flatItem === null || flatItem === void 0 ? void 0 : flatItem.parentProduct : flatItem === null || flatItem === void 0 ? void 0 : flatItem.product;
@@ -868,7 +791,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var timeLimit = true;
           timeLimit = !!filterDiscountListByBookingTime([discount], (((_product6 = product) === null || _product6 === void 0 ? void 0 : _product6.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss')).length;
           // 是符合折扣的商品
-          var isLimitedProduct = (limitedData.type === 'product_all' && limitedData.filter !== 1 || limitedData.type === 'product_all' && limitedData.filter === 1 && !limitedData.exclude_product_ids.includes(product.id) || limitedData.product_ids && limitedData.product_ids.includes(product.id)) && isHolderMatch;
+          var isLimitedProduct = (limitedData.type === 'product_all' || limitedData.product_ids && limitedData.product_ids.includes(product.id)) && isHolderMatch;
 
           // 编辑的商品 使用了优惠券不可用
           var isAvailableProduct = flatItem.type === 'main' ? !((_product7 = product) !== null && _product7 !== void 0 && _product7.booking_id && (_product8 = product) !== null && _product8 !== void 0 && (_product8 = _product8.discount_list) !== null && _product8 !== void 0 && _product8.length && (_product9 = product) !== null && _product9 !== void 0 && (_product9 = _product9.discount_list) !== null && _product9 !== void 0 && _product9.every(function (discount) {
@@ -881,8 +804,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var isBundleAvailable = _this3.checkPackageSubItemUsageRules(discount, flatItem);
 
           // 判断优惠券是否适用于该商品
-          if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable && (_discount$config = discount.config) !== null && _discount$config !== void 0 && _discount$config.isAvailable) {
-            var _discountApplicabilit, _discount$metadata5, _discount$metadata6;
+          if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable) {
+            var _discountApplicabilit, _discount$metadata4, _discount$metadata5;
             // 记录此优惠券适用的商品
             (_discountApplicabilit = discountApplicability.get(discount.id)) === null || _discountApplicabilit === void 0 || _discountApplicabilit.push(product.id);
 
@@ -898,15 +821,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               type: discountType,
               tag: discountType,
               discount: {
-                discount_card_type: discount === null || discount === void 0 || (_discount$metadata5 = discount.metadata) === null || _discount$metadata5 === void 0 ? void 0 : _discount$metadata5.discount_card_type,
+                discount_card_type: discount === null || discount === void 0 || (_discount$metadata4 = discount.metadata) === null || _discount$metadata4 === void 0 ? void 0 : _discount$metadata4.discount_card_type,
                 fixed_amount: product.price,
-                discount_calculation_mode: discount === null || discount === void 0 || (_discount$metadata6 = discount.metadata) === null || _discount$metadata6 === void 0 ? void 0 : _discount$metadata6.discount_calculation_mode,
+                discount_calculation_mode: discount === null || discount === void 0 || (_discount$metadata5 = discount.metadata) === null || _discount$metadata5 === void 0 ? void 0 : _discount$metadata5.discount_calculation_mode,
                 resource_id: discount.id,
                 title: discount.format_title,
                 original_amount: product.price || product.origin_total,
                 pre_value: discount.par_value,
-                product_id: originProduct.id,
-                discount_product_id: discount.product_id
+                product_id: originProduct.id
               },
               metadata: {
                 num: num,
@@ -925,7 +847,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 然后再处理应用哪些优惠券，此时只考虑filteredDiscountList中的优惠券
       // 🔥 使用扁平化后的列表进行处理
       sortedFlattenedList.forEach(function (flatItem, index) {
-        var _product10, _product$discount_lis2, _product11, _selectedDiscount$con;
+        var _product10, _product$discount_lis2, _product11;
         // 获取商品数据
         var product, originProduct;
         if (flatItem.type === 'main') {
@@ -967,16 +889,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 找到适用于此商品的所有优惠券，仅考虑isSelected不为false的优惠券
         var applicableDiscounts = sortedDiscountList.filter(function (discount) {
           var _product$discount_lis3, _product$discount_lis4;
-          // 🔥 检查策略可用性（针对 good_pass 和折扣卡）
-          var discountType = discount.tag || discount.type;
-          if (['good_pass', 'discount_card', 'product_discount_card'].includes(discountType)) {
-            var _discount$config2;
-            // 如果策略检查后没有config，说明不可用
-            if (discount.config === undefined || !(discount !== null && discount !== void 0 && (_discount$config2 = discount.config) !== null && _discount$config2 !== void 0 && _discount$config2.isAvailable)) {
-              return false;
-            }
-          }
-
           // 如果商品价格为 0，其实不需要使用任何优惠券，直接 return true
           // 商品券时主商品价格为0不可用
           if ((Number(product.price) <= 0 || !product.price) && !((_product$discount_lis3 = product.discount_list) !== null && _product$discount_lis3 !== void 0 && _product$discount_lis3.length) && (discount.tag || discount.type) === 'good_pass') return false;
@@ -989,37 +901,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 如果优惠券已被使用，则跳过
           var targetUsedDiscounts = usedDiscounts.get(discount.id);
           if (targetUsedDiscounts && (discount.tag || discount.type) === 'good_pass') return false;
-
-          // 🔥 检查 maxUsagePerOrder 限制：同一 product_id 的商品券使用数量不能超过配置值
-          if ((discount.tag || discount.type) === 'good_pass') {
-            var _discount$config3;
-            var maxUsagePerOrder = (_discount$config3 = discount.config) === null || _discount$config3 === void 0 ? void 0 : _discount$config3.maxUsagePerOrder;
-            if (maxUsagePerOrder && maxUsagePerOrder > 0) {
-              var currentUsedCount = usedProductIdCounts.get(discount.product_id) || 0;
-              if (currentUsedCount >= maxUsagePerOrder) {
-                return false;
-              }
-            }
-          }
-
-          // 🔥 检查折扣卡的 applicableProductLimit 限制：折扣卡可使用的最大次数（跨商品全局）
-          var discountTypeForLimit = discount.tag || discount.type;
-          if (['discount_card', 'product_discount_card'].includes(discountTypeForLimit)) {
-            var _discount$config4;
-            var applicableProductLimitConfig = ((_discount$config4 = discount.config) === null || _discount$config4 === void 0 ? void 0 : _discount$config4.applicableProductLimit) || 0;
-            if (applicableProductLimitConfig > 0) {
-              var currentUsedLimitCount = usedDiscountCardLimitCounts.get(discount.id) || 0;
-              if (currentUsedLimitCount >= applicableProductLimitConfig) {
-                return false;
-              }
-            }
-          }
           var limitedData = discount.limited_relation_product_data;
-          var timeLimit = true;
-          timeLimit = !!filterDiscountListByBookingTime([discount], (product.startDate || dayjs()).format('YYYY-MM-DD HH:mm:ss')).length;
-          if (!timeLimit) {
-            return false;
-          }
+
           // 拿到discount配置的holder信息 product信息 product.holder 不可用return false
           var _tempVar = (flatItem === null || flatItem === void 0 ? void 0 : flatItem.type) === 'bundle' ? flatItem === null || flatItem === void 0 ? void 0 : flatItem.parentProduct : flatItem === null || flatItem === void 0 ? void 0 : flatItem.product;
           var isHolderMatch = _this3.checkHolderMatch(discount, {
@@ -1028,12 +911,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }, holders);
           // 如果 holder 不匹配，则不适用
           if (!isHolderMatch) return false;
+          var timeLimit = true;
+          timeLimit = !!filterDiscountListByBookingTime([discount], (product.startDate || dayjs()).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;
-            }
             // 检查 package_sub_item_usage_rules
             if (!_this3.checkPackageSubItemUsageRules(discount, flatItem)) {
               return false;
@@ -1166,14 +1051,15 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 discount_list: []
               }))]);
             } else {
+              var _product$main_product, _product$main_product2;
               processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {
                 price: product.price,
-                main_product_selling_price: product.price
+                main_product_selling_price: (_product$main_product = product.main_product_selling_price) !== null && _product$main_product !== void 0 ? _product$main_product : product.price
               } : {
                 _id: product._id.split('___')[0] + '___' + index,
                 total: product.origin_total || product.total,
                 price: product.price,
-                main_product_selling_price: product.price
+                main_product_selling_price: (_product$main_product2 = product.main_product_selling_price) !== null && _product$main_product2 !== void 0 ? _product$main_product2 : product.price
               }), {}, {
                 discount_list: []
               }))]);
@@ -1192,39 +1078,15 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return;
         }
 
-        // 是否需要拆分（商品券需要拆分，折扣卡在 applicableProductLimit > 0 时也需要拆分）
-        var discountType = selectedDiscount.tag || selectedDiscount.type;
-        var isGoodPass = discountType === 'good_pass';
-        var isDiscountCard = ['discount_card', 'product_discount_card'].includes(discountType);
-        var applicableProductLimit = ((_selectedDiscount$con = selectedDiscount.config) === null || _selectedDiscount$con === void 0 ? void 0 : _selectedDiscount$con.applicableProductLimit) || 0;
-
-        // 商品券始终需要拆分，折扣卡在 applicableProductLimit > 0 时需要拆分
-        var isNeedSplit = isGoodPass || isDiscountCard && applicableProductLimit > 0;
+        // 是否需要拆分（商品券需要拆分）
+        var isNeedSplit = (selectedDiscount.tag || selectedDiscount.type) === 'good_pass';
 
         // 需要拆分出来的数量
         var totalQuantity = product.quantity || product.num || 1;
         var availableGoodPassCount = applicableDiscounts.filter(function (item) {
           return (item.tag || item.type) === 'good_pass';
         }).length;
-
-        // 🔥 计算最大使用次数限制
-        var maxUsageLimit;
-        if (isGoodPass) {
-          // 商品券：使用 maxUsagePerOrder 限制
-          maxUsageLimit = availableGoodPassCount;
-          if (selectedDiscount.config && selectedDiscount.config.maxUsagePerOrder) {
-            maxUsageLimit = Math.min(availableGoodPassCount, selectedDiscount.config.maxUsagePerOrder);
-          }
-        } else if (isDiscountCard && applicableProductLimit > 0) {
-          // 折扣卡：使用 applicableProductLimit 限制（一个商品使用一次折扣卡算1次）
-          // 需要减去已使用次数（跨商品全局计数）
-          var usedLimitCount = usedDiscountCardLimitCounts.get(selectedDiscount.id) || 0;
-          maxUsageLimit = Math.max(0, applicableProductLimit - usedLimitCount);
-        } else {
-          // 其他情况不拆分
-          maxUsageLimit = 1;
-        }
-        var splitCount = isNeedSplit ? Math.min(product.quantity || product.num || 1, maxUsageLimit) : 1;
+        var splitCount = isNeedSplit ? Math.min(totalQuantity, availableGoodPassCount) : 1;
         var arr = [];
 
         // 🔥 主商品和bundle子商品分别处理
@@ -1234,31 +1096,18 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             arr.push(_this3.hooks.setProduct(originProduct, {
               discount_list: [],
               quantity: totalQuantity - splitCount,
-              _id: product._id.split('___')[0],
-              total: product.origin_total || product.total
+              _id: product._id.split('___')[0]
             }));
           }
           for (var i = 0; i < splitCount; i++) {
-            var _product$discount_lis10, _originProduct, _currentSelectedDisco, _currentSelectedDisco2;
-            // 商品券：每个拆分商品使用不同的商品券（从 applicableDiscounts 按索引取）
-            // 折扣卡：所有拆分商品使用同一张折扣卡（selectedDiscountCard 或 applicableDiscounts[0]）
-            var currentSelectedDiscount = isGoodPass ? selectedDiscountCard || applicableDiscounts[i] : selectedDiscountCard || applicableDiscounts[0];
+            var _product$discount_lis10, _originProduct, _selectedDiscount$met, _selectedDiscount$met2;
+            // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
+            var _selectedDiscount = selectedDiscountCard || applicableDiscounts[i];
             // 标记优惠券为已使用
-            usedDiscounts.set(currentSelectedDiscount.id, true);
-            // 🔥 更新 product_id 使用计数
-            if ((currentSelectedDiscount.tag || currentSelectedDiscount.type) === 'good_pass') {
-              var currentCount = usedProductIdCounts.get(currentSelectedDiscount.product_id) || 0;
-              usedProductIdCounts.set(currentSelectedDiscount.product_id, currentCount + 1);
-            }
-            // 🔥 更新折扣卡 applicableProductLimit 使用计数（跨商品全局）
-            var currentDiscountTypeForCount = currentSelectedDiscount.tag || currentSelectedDiscount.type;
-            if (['discount_card', 'product_discount_card'].includes(currentDiscountTypeForCount)) {
-              var currentLimitCount = usedDiscountCardLimitCounts.get(currentSelectedDiscount.id) || 0;
-              usedDiscountCardLimitCounts.set(currentSelectedDiscount.id, currentLimitCount + 1);
-            }
+            usedDiscounts.set(_selectedDiscount.id, true);
 
             // 记录实际应用了优惠券的商品信息
-            var appliedProducts = appliedDiscountProducts.get(currentSelectedDiscount.id) || [];
+            var appliedProducts = appliedDiscountProducts.get(_selectedDiscount.id) || [];
 
             // 优先从 origin_total拿，可能会拿不到（比如用户端预约在没有配置 original_price 的情况下）
             var productOriginTotal = product.origin_total || product.total || 0;
@@ -1273,8 +1122,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
             // 计算使用折扣卡/商品券以后，单个商品的总 total
             // 🔥 检查是否是 order_level 固定金额折扣卡
-            var isOrderLevel = isOrderLevelFixedAmountDiscount(selectedDiscount);
-            var orderLevelAllocation = isOrderLevel ? orderLevelDiscountAllocations.get(selectedDiscount.id) : null;
+            var isOrderLevel = isOrderLevelFixedAmountDiscount(_selectedDiscount);
+            var orderLevelAllocation = isOrderLevel ? orderLevelDiscountAllocations.get(_selectedDiscount.id) : null;
             var productAllocation = orderLevelAllocation === null || orderLevelAllocation === void 0 ? void 0 : orderLevelAllocation.get(flatItem._id);
             var targetProductTotal = void 0;
             var amount = void 0;
@@ -1286,40 +1135,35 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               targetProductTotal = Math.max(new Decimal(product.price).minus(amount).toNumber(), 0);
             } else {
               // item_level 或其他类型：使用原有逻辑
-              targetProductTotal = getDiscountAmount(currentSelectedDiscount, product.price, product.price);
+              targetProductTotal = getDiscountAmount(_selectedDiscount, product.price, product.price);
               amount = new Decimal(product.price).minus(new Decimal(targetProductTotal)).toNumber();
             }
-            var currentDiscountType = currentSelectedDiscount.tag === 'product_discount_card' ? 'discount_card' : currentSelectedDiscount.tag;
-
-            // 计算实际折扣金额
-            var actualDiscountAmount = new Decimal(product.price).minus(new Decimal(targetProductTotal)).toNumber();
-            var currentIsGoodPass = currentDiscountType === 'good_pass';
+            var discountType = _selectedDiscount.tag || _selectedDiscount.type;
+            var isGoodPass = discountType === 'good_pass';
             var discountDetail = {
-              amount: actualDiscountAmount,
-              type: currentDiscountType,
+              amount: amount,
+              type: _selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : discountType,
               discount: {
-                discount_card_type: currentSelectedDiscount === null || currentSelectedDiscount === void 0 || (_currentSelectedDisco = currentSelectedDiscount.metadata) === null || _currentSelectedDisco === void 0 ? void 0 : _currentSelectedDisco.discount_card_type,
-                fixed_amount: actualDiscountAmount,
-                discount_calculation_mode: currentSelectedDiscount === null || currentSelectedDiscount === void 0 || (_currentSelectedDisco2 = currentSelectedDiscount.metadata) === null || _currentSelectedDisco2 === void 0 ? void 0 : _currentSelectedDisco2.discount_calculation_mode,
-                resource_id: currentSelectedDiscount.id,
-                title: currentSelectedDiscount.format_title,
+                discount_card_type: _selectedDiscount === null || _selectedDiscount === void 0 || (_selectedDiscount$met = _selectedDiscount.metadata) === null || _selectedDiscount$met === void 0 ? void 0 : _selectedDiscount$met.discount_card_type,
+                fixed_amount: amount,
+                discount_calculation_mode: _selectedDiscount === null || _selectedDiscount === void 0 || (_selectedDiscount$met2 = _selectedDiscount.metadata) === null || _selectedDiscount$met2 === void 0 ? void 0 : _selectedDiscount$met2.discount_calculation_mode,
+                resource_id: _selectedDiscount.id,
+                title: _selectedDiscount.format_title,
                 original_amount: product.price,
                 product_id: originProduct.id,
-                percent: currentSelectedDiscount.par_value,
-                discount_product_id: currentSelectedDiscount.product_id
+                percent: _selectedDiscount.par_value
               },
-              // 前端使用的num数量，为了计算优惠金额（拆分时为1）
-              _num: isNeedSplit ? 1 : product.num,
-              config: currentSelectedDiscount === null || currentSelectedDiscount === void 0 ? void 0 : currentSelectedDiscount.config,
+              // 前端使用的num数量，为了计算优惠金额
+              _num: isGoodPass ? 1 : product.num,
               metadata: _objectSpread({
                 num: 1,
-                discount_rule_uncheck_flag: selectedDiscount === null || selectedDiscount === void 0 ? void 0 : selectedDiscount.discount_rule_uncheck_flag
+                discount_rule_uncheck_flag: _selectedDiscount === null || _selectedDiscount === void 0 ? void 0 : _selectedDiscount.discount_rule_uncheck_flag
               }, productDiscountDifference !== undefined && {
                 product_discount_difference: productDiscountDifference
               })
             };
             appliedProducts.push(discountDetail);
-            appliedDiscountProducts.set(currentSelectedDiscount.id, appliedProducts);
+            appliedDiscountProducts.set(_selectedDiscount.id, appliedProducts);
             var total = targetProductTotal;
             if (product.options) {
               total = product.options.reduce(function (accumulator, currentValue) {
@@ -1332,9 +1176,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // 记录应用了优惠券的商品
             // 后续更新价格改为 getProductTotalPrice getProductOriginTotalPrice逻辑
             if (product.isClient) {
+              debugger;
               arr.push(_this3.hooks.setProduct(originProduct, {
                 discount_list: [discountDetail],
-                price: currentIsGoodPass ? product.price - discountDetail.amount : product.price,
+                price: _selectedDiscount.tag === 'good_pass' ? 0 : product.price,
                 quantity: isNeedSplit ? 1 : product.quantity,
                 origin_total: getProductOriginTotalPrice({
                   product: {
@@ -1345,15 +1190,15 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 }),
                 variant: originProduct._productInit.variant,
                 original_price: new Decimal(product.price || 0).toNumber(),
-                total: targetProductTotal
+                total: total
               }));
             } else {
               arr.push(_this3.hooks.setProduct(originProduct, {
                 discount_list: [discountDetail],
-                _id: product._id.split('___')[0] + '___' + currentSelectedDiscount.id + '_' + i + '_' + index,
-                price: currentIsGoodPass ? 0 : product.price,
+                _id: product._id.split('___')[0] + "___" + _selectedDiscount.id + index,
+                price: _selectedDiscount.tag === 'good_pass' ? 0 : product.price,
                 quantity: isNeedSplit ? 1 : product.quantity,
-                total: targetProductTotal,
+                total: total,
                 origin_total: productOriginTotal,
                 main_product_selling_price: targetProductTotal
               }));
@@ -1361,336 +1206,80 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           processedProductsMap.set(product._id, arr);
         } else {
-          // 🔥 bundle子商品：支持拆分（商品券和折扣卡在 applicableProductLimit > 0 时都需要拆分）
+          // 🔥 bundle子商品：支持拆分
           var processedItems = [];
           if (isNeedSplit) {
-            // 需要拆分数量（商品券或折扣卡有 applicableProductLimit 限制）
+            // 商品券：需要拆分数量
             var discountNum = splitCount;
             var normalNum = totalQuantity - discountNum;
 
-            // 生成有折扣的商品（每个拆分商品 num: 1）
+            // 生成有折扣的商品（每张商品券对应 num: 1）
             for (var _i = 0; _i < discountNum; _i++) {
-              var _currentBundleDiscoun, _currentBundleDiscoun2;
-              // 商品券：每个拆分商品使用不同的商品券
-              // 折扣卡：所有拆分商品使用同一张折扣卡
-              var currentBundleDiscount = isGoodPass ? selectedDiscountCard || applicableDiscounts[_i] : selectedDiscountCard || applicableDiscounts[0];
-              usedDiscounts.set(currentBundleDiscount.id, true);
-              // 🔥 更新 product_id 使用计数
-              if ((currentBundleDiscount.tag || currentBundleDiscount.type) === 'good_pass') {
-                var _currentCount = usedProductIdCounts.get(currentBundleDiscount.product_id) || 0;
-                usedProductIdCounts.set(currentBundleDiscount.product_id, _currentCount + 1);
-              }
-              // 🔥 更新折扣卡 applicableProductLimit 使用计数（跨商品全局）
-              var bundleDiscountTypeForCount = currentBundleDiscount.tag || currentBundleDiscount.type;
-              if (['discount_card', 'product_discount_card'].includes(bundleDiscountTypeForCount)) {
-                var currentBundleLimitCount = usedDiscountCardLimitCounts.get(currentBundleDiscount.id) || 0;
-                usedDiscountCardLimitCounts.set(currentBundleDiscount.id, currentBundleLimitCount + 1);
-              }
+              var _selectedDiscount2$me;
+              var _selectedDiscount2 = applicableDiscounts[_i];
+              usedDiscounts.set(_selectedDiscount2.id, true);
 
               // 🔥 生成唯一的 _id
               var uniqueId = "".concat(flatItem._id, "_split_").concat(_i);
-
-              // 计算折扣后的价格（使用 getDiscountAmount，内部已处理 maxDeductionAmount）
-              var discountedPrice = getDiscountAmount(currentBundleDiscount, product.origin_total, product.origin_total);
-              var bundleDiscountAmount = new Decimal(product.origin_total || 0).minus(discountedPrice).toNumber();
-
-              // 确定折扣类型
-              var bundleDiscountType = currentBundleDiscount.tag === 'product_discount_card' ? 'discount_card' : currentBundleDiscount.tag;
               var _discountDetail = {
-                amount: bundleDiscountAmount,
-                type: bundleDiscountType,
+                amount: product.origin_total,
+                type: 'good_pass',
                 discount: {
-                  discount_card_type: currentBundleDiscount === null || currentBundleDiscount === void 0 || (_currentBundleDiscoun = currentBundleDiscount.metadata) === null || _currentBundleDiscoun === void 0 ? void 0 : _currentBundleDiscoun.discount_card_type,
-                  discount_calculation_mode: currentBundleDiscount === null || currentBundleDiscount === void 0 || (_currentBundleDiscoun2 = currentBundleDiscount.metadata) === null || _currentBundleDiscoun2 === void 0 ? void 0 : _currentBundleDiscoun2.discount_calculation_mode,
-                  fixed_amount: bundleDiscountAmount,
-                  resource_id: currentBundleDiscount.id,
-                  title: currentBundleDiscount.format_title,
+                  fixed_amount: product.origin_total,
+                  discount_calculation_mode: _selectedDiscount2 === null || _selectedDiscount2 === void 0 || (_selectedDiscount2$me = _selectedDiscount2.metadata) === null || _selectedDiscount2$me === void 0 ? void 0 : _selectedDiscount2$me.discount_calculation_mode,
+                  resource_id: _selectedDiscount2.id,
+                  title: _selectedDiscount2.format_title,
                   original_amount: product.origin_total,
-                  product_id: product.id,
-                  percent: currentBundleDiscount.par_value,
-                  discount_product_id: currentBundleDiscount.product_id
+                  product_id: product.id
                 },
                 metadata: {
                   // 🔥 使用拆分后的唯一 _id
                   custom_product_bundle_map_id: uniqueId,
-                  discount_rule_uncheck_flag: selectedDiscount === null || selectedDiscount === void 0 ? void 0 : selectedDiscount.discount_rule_uncheck_flag,
+                  discount_rule_uncheck_flag: _selectedDiscount2 === null || _selectedDiscount2 === void 0 ? void 0 : _selectedDiscount2.discount_rule_uncheck_flag,
                   num: 1
                 },
-                _num: 1,
-                config: currentBundleDiscount === null || currentBundleDiscount === void 0 ? void 0 : currentBundleDiscount.config
+                _num: 1
               };
 
               // 记录实际应用的折扣
-              var _appliedProducts = appliedDiscountProducts.get(currentBundleDiscount.id) || [];
+              var _appliedProducts = appliedDiscountProducts.get(_selectedDiscount2.id) || [];
               _appliedProducts.push(_discountDetail);
-              appliedDiscountProducts.set(currentBundleDiscount.id, _appliedProducts);
+              appliedDiscountProducts.set(_selectedDiscount2.id, _appliedProducts);
               processedItems.push(_objectSpread(_objectSpread({}, flatItem), {}, {
                 // 🔥 使用唯一的 _id
                 _id: uniqueId,
                 num: 1,
                 quantity: 1,
-                price: discountedPrice,
-                // 折扣后的价格
-                total: discountedPrice,
+                price: 0,
+                // 商品券价格为0
+                total: 0,
                 discount_list: [_discountDetail],
                 processed: true,
-                _discountId: currentBundleDiscount.id
+                _discountId: _selectedDiscount2.id
               }));
             }
 
-            // 🔥 对拆分后的剩余商品继续匹配其他可用折扣（而不是等到下次执行才应用）
-            var remainingNum = normalNum;
-            var continueSplitIndex = discountNum;
-            while (remainingNum > 0) {
-              var _nextSelectedDiscount;
-              // 重新查找适用于剩余商品的可用折扣（已使用的会被自动过滤掉）
-              var nextApplicableDiscounts = sortedDiscountList.filter(function (nextDiscount) {
-                var _product$discount_lis11;
-                var nextDiscountType = nextDiscount.tag || nextDiscount.type;
-                // 检查策略可用性
-                if (['good_pass', 'discount_card', 'product_discount_card'].includes(nextDiscountType)) {
-                  var _nextDiscount$config;
-                  if (nextDiscount.config === undefined || !(nextDiscount !== null && nextDiscount !== void 0 && (_nextDiscount$config = nextDiscount.config) !== null && _nextDiscount$config !== void 0 && _nextDiscount$config.isAvailable)) {
-                    return false;
-                  }
-                }
-                // 折扣卡时总价为0时不可用
-                if ((Number(product.total) <= 0 || !product.total) && !((_product$discount_lis11 = product.discount_list) !== null && _product$discount_lis11 !== void 0 && _product$discount_lis11.find(function (n) {
-                  var _n$discount2;
-                  return ((_n$discount2 = n.discount) === null || _n$discount2 === void 0 ? void 0 : _n$discount2.resource_id) === nextDiscount.id;
-                })) && nextDiscountType !== 'good_pass') return false;
-
-                // 商品券已被使用则跳过
-                if (usedDiscounts.get(nextDiscount.id) && nextDiscountType === 'good_pass') return false;
-
-                // 检查 maxUsagePerOrder 限制
-                if (nextDiscountType === 'good_pass') {
-                  var _nextDiscount$config2;
-                  var maxUsagePerOrder = (_nextDiscount$config2 = nextDiscount.config) === null || _nextDiscount$config2 === void 0 ? void 0 : _nextDiscount$config2.maxUsagePerOrder;
-                  if (maxUsagePerOrder && maxUsagePerOrder > 0) {
-                    var currentUsedCount = usedProductIdCounts.get(nextDiscount.product_id) || 0;
-                    if (currentUsedCount >= maxUsagePerOrder) {
-                      return false;
-                    }
-                  }
-                }
-
-                // 检查折扣卡的 applicableProductLimit 限制
-                if (['discount_card', 'product_discount_card'].includes(nextDiscountType)) {
-                  var _nextDiscount$config3;
-                  var limitConfig = ((_nextDiscount$config3 = nextDiscount.config) === null || _nextDiscount$config3 === void 0 ? void 0 : _nextDiscount$config3.applicableProductLimit) || 0;
-                  if (limitConfig > 0) {
-                    var currentUsedLimitCount = usedDiscountCardLimitCounts.get(nextDiscount.id) || 0;
-                    if (currentUsedLimitCount >= limitConfig) {
-                      return false;
-                    }
-                  }
-                }
-                var limitedData = nextDiscount.limited_relation_product_data;
-                if (limitedData.type === 'product_all') {
-                  if (limitedData.filter === 1 && limitedData.exclude_product_ids.includes(product.id)) {
-                    return false;
-                  }
-                  if (!_this3.checkPackageSubItemUsageRules(nextDiscount, flatItem)) {
-                    return false;
-                  }
-                  return true;
-                } else if (limitedData.product_ids && limitedData.product_ids.includes(product.id)) {
-                  if (!_this3.checkPackageSubItemUsageRules(nextDiscount, flatItem)) {
-                    return false;
-                  }
-                  return true;
-                }
-                return false;
-              });
-
-              // 没有更多可用折扣，剩余商品无折扣存储
-              if (nextApplicableDiscounts.length === 0) {
-                processedItems.push(_objectSpread(_objectSpread({}, flatItem), {}, {
-                  _id: "".concat(flatItem._id, "_split_rest"),
-                  num: remainingNum,
-                  quantity: remainingNum,
-                  discount_list: [],
-                  processed: true
-                }));
-                break;
-              }
-
-              // 选择最优折扣
-              var nextSelectedDiscountCard = nextApplicableDiscounts.find(function (n) {
-                return n.isScan && n.isSelected && (n.tag || n.type) !== 'good_pass';
-              });
-              var nextSelectedDiscount = nextSelectedDiscountCard || nextApplicableDiscounts[0];
-
-              // 判断新折扣是否需要拆分
-              var nextDiscType = nextSelectedDiscount.tag || nextSelectedDiscount.type;
-              var nextIsGoodPass = nextDiscType === 'good_pass';
-              var nextIsDiscountCard = ['discount_card', 'product_discount_card'].includes(nextDiscType);
-              var nextApplicableProductLimit = ((_nextSelectedDiscount = nextSelectedDiscount.config) === null || _nextSelectedDiscount === void 0 ? void 0 : _nextSelectedDiscount.applicableProductLimit) || 0;
-              var nextIsNeedSplit = nextIsGoodPass || nextIsDiscountCard && nextApplicableProductLimit > 0;
-              if (!nextIsNeedSplit) {
-                var _nextBundleDiscount$m, _flatItem$parentProdu9;
-                // 🔥 不需要拆分：直接应用折扣到所有剩余商品
-                var nextBundleDiscount = nextSelectedDiscountCard || nextApplicableDiscounts[0];
-                usedDiscounts.set(nextBundleDiscount.id, true);
-                if ((nextBundleDiscount.tag || nextBundleDiscount.type) === 'good_pass') {
-                  var curCount = usedProductIdCounts.get(nextBundleDiscount.product_id) || 0;
-                  usedProductIdCounts.set(nextBundleDiscount.product_id, curCount + 1);
-                }
-                var nextNoSplitType = nextBundleDiscount.tag || nextBundleDiscount.type;
-                if (['discount_card', 'product_discount_card'].includes(nextNoSplitType)) {
-                  var _curCount = usedDiscountCardLimitCounts.get(nextBundleDiscount.id) || 0;
-                  usedDiscountCardLimitCounts.set(nextBundleDiscount.id, _curCount + remainingNum);
-                }
-                var nextOriginTotal = product.original_price || product.price || 0;
-                var nextTargetTotal = getDiscountAmount(nextBundleDiscount, nextOriginTotal, nextOriginTotal);
-                var nextDiscountAmount = new Decimal(nextOriginTotal).minus(nextTargetTotal).toNumber();
-                var nextUniqueId = "".concat(flatItem._id, "_split_").concat(continueSplitIndex);
-                var nextBundleDiscType = nextBundleDiscount.tag === 'product_discount_card' ? 'discount_card' : nextBundleDiscount.tag;
-                var nextDiscountDetail = {
-                  amount: nextDiscountAmount * remainingNum,
-                  type: nextBundleDiscType,
-                  discount: {
-                    discount_card_type: nextBundleDiscount === null || nextBundleDiscount === void 0 || (_nextBundleDiscount$m = nextBundleDiscount.metadata) === null || _nextBundleDiscount$m === void 0 ? void 0 : _nextBundleDiscount$m.discount_card_type,
-                    fixed_amount: nextDiscountAmount,
-                    resource_id: nextBundleDiscount.id,
-                    title: nextBundleDiscount.format_title,
-                    original_amount: product.original_price,
-                    product_id: product.id,
-                    percent: nextBundleDiscount.par_value,
-                    discount_product_id: nextBundleDiscount.product_id
-                  },
-                  metadata: {
-                    custom_product_bundle_map_id: nextUniqueId,
-                    num: remainingNum
-                  },
-                  config: nextBundleDiscount === null || nextBundleDiscount === void 0 ? void 0 : nextBundleDiscount.config,
-                  _num: remainingNum * ((flatItem === null || flatItem === void 0 || (_flatItem$parentProdu9 = flatItem.parentProduct) === null || _flatItem$parentProdu9 === void 0 ? void 0 : _flatItem$parentProdu9.num) || 1)
-                };
-                var nextAppliedProducts = appliedDiscountProducts.get(nextBundleDiscount.id) || [];
-                nextAppliedProducts.push(nextDiscountDetail);
-                appliedDiscountProducts.set(nextBundleDiscount.id, nextAppliedProducts);
-                processedItems.push(_objectSpread(_objectSpread({}, flatItem), {}, {
-                  _id: nextUniqueId,
-                  num: remainingNum,
-                  quantity: remainingNum,
-                  total: nextTargetTotal,
-                  price: new Decimal(nextOriginTotal || 0).minus(nextDiscountDetail.discount.fixed_amount).toNumber(),
-                  discount_list: [nextDiscountDetail],
-                  processed: true
-                }));
-                remainingNum = 0;
-                break;
-              }
-
-              // 🔥 需要拆分：计算最大使用次数
-              var nextMaxUsageLimit = void 0;
-              if (nextIsGoodPass) {
-                var _nextSelectedDiscount2;
-                var nextGoodPassCount = nextApplicableDiscounts.filter(function (item) {
-                  return (item.tag || item.type) === 'good_pass';
-                }).length;
-                nextMaxUsageLimit = nextGoodPassCount;
-                if ((_nextSelectedDiscount2 = nextSelectedDiscount.config) !== null && _nextSelectedDiscount2 !== void 0 && _nextSelectedDiscount2.maxUsagePerOrder) {
-                  var usedCount = usedProductIdCounts.get(nextSelectedDiscount.product_id) || 0;
-                  nextMaxUsageLimit = Math.min(nextGoodPassCount, Math.max(0, nextSelectedDiscount.config.maxUsagePerOrder - usedCount));
-                }
-              } else if (nextIsDiscountCard && nextApplicableProductLimit > 0) {
-                var _usedLimitCount = usedDiscountCardLimitCounts.get(nextSelectedDiscount.id) || 0;
-                nextMaxUsageLimit = Math.max(0, nextApplicableProductLimit - _usedLimitCount);
-              } else {
-                nextMaxUsageLimit = 1;
-              }
-              var nextSplitCount = Math.min(remainingNum, nextMaxUsageLimit);
-              if (nextSplitCount === 0) {
-                // 已达使用上限，剩余商品无折扣存储
-                processedItems.push(_objectSpread(_objectSpread({}, flatItem), {}, {
-                  _id: "".concat(flatItem._id, "_split_rest"),
-                  num: remainingNum,
-                  quantity: remainingNum,
-                  discount_list: [],
-                  processed: true
-                }));
-                break;
-              }
-
-              // 生成有折扣的商品
-              for (var j = 0; j < nextSplitCount; j++) {
-                var _nextBundleDiscount$m2;
-                var _nextBundleDiscount = nextIsGoodPass ? nextSelectedDiscountCard || nextApplicableDiscounts[j] : nextSelectedDiscountCard || nextApplicableDiscounts[0];
-                usedDiscounts.set(_nextBundleDiscount.id, true);
-                if ((_nextBundleDiscount.tag || _nextBundleDiscount.type) === 'good_pass') {
-                  var _curCount2 = usedProductIdCounts.get(_nextBundleDiscount.product_id) || 0;
-                  usedProductIdCounts.set(_nextBundleDiscount.product_id, _curCount2 + 1);
-                }
-                var nextBundleDiscTypeForCount = _nextBundleDiscount.tag || _nextBundleDiscount.type;
-                if (['discount_card', 'product_discount_card'].includes(nextBundleDiscTypeForCount)) {
-                  var curLimitCount = usedDiscountCardLimitCounts.get(_nextBundleDiscount.id) || 0;
-                  usedDiscountCardLimitCounts.set(_nextBundleDiscount.id, curLimitCount + 1);
-                }
-                var _nextUniqueId = "".concat(flatItem._id, "_split_").concat(continueSplitIndex);
-                var nextDiscountedPrice = getDiscountAmount(_nextBundleDiscount, product.origin_total, product.origin_total);
-                var nextBundleDiscAmount = new Decimal(product.origin_total || 0).minus(nextDiscountedPrice).toNumber();
-                var nextBundleDiscTypeStr = _nextBundleDiscount.tag === 'product_discount_card' ? 'discount_card' : _nextBundleDiscount.tag;
-                var _nextDiscountDetail = {
-                  amount: nextBundleDiscAmount,
-                  type: nextBundleDiscTypeStr,
-                  discount: {
-                    discount_card_type: _nextBundleDiscount === null || _nextBundleDiscount === void 0 || (_nextBundleDiscount$m2 = _nextBundleDiscount.metadata) === null || _nextBundleDiscount$m2 === void 0 ? void 0 : _nextBundleDiscount$m2.discount_card_type,
-                    fixed_amount: nextBundleDiscAmount,
-                    resource_id: _nextBundleDiscount.id,
-                    title: _nextBundleDiscount.format_title,
-                    original_amount: product.origin_total,
-                    product_id: product.id,
-                    percent: _nextBundleDiscount.par_value,
-                    discount_product_id: _nextBundleDiscount.product_id
-                  },
-                  metadata: {
-                    custom_product_bundle_map_id: _nextUniqueId,
-                    num: 1
-                  },
-                  _num: 1,
-                  config: _nextBundleDiscount === null || _nextBundleDiscount === void 0 ? void 0 : _nextBundleDiscount.config
-                };
-                var _nextAppliedProducts = appliedDiscountProducts.get(_nextBundleDiscount.id) || [];
-                _nextAppliedProducts.push(_nextDiscountDetail);
-                appliedDiscountProducts.set(_nextBundleDiscount.id, _nextAppliedProducts);
-                processedItems.push(_objectSpread(_objectSpread({}, flatItem), {}, {
-                  _id: _nextUniqueId,
-                  num: 1,
-                  quantity: 1,
-                  price: nextDiscountedPrice,
-                  total: nextDiscountedPrice,
-                  discount_list: [_nextDiscountDetail],
-                  processed: true,
-                  _discountId: _nextBundleDiscount.id
-                }));
-                continueSplitIndex++;
-              }
-              remainingNum -= nextSplitCount;
+            // 生成无折扣的商品（剩余数量）
+            if (normalNum > 0) {
+              processedItems.push(_objectSpread(_objectSpread({}, flatItem), {}, {
+                // 🔥 为剩余商品生成唯一的 _id
+                _id: "".concat(flatItem._id, "_split_rest"),
+                num: normalNum,
+                quantity: normalNum,
+                discount_list: [],
+                processed: true
+              }));
             }
           } else {
-            var _currentBundleDiscoun3, _currentBundleDiscoun4, _flatItem$parentProdu10;
-            // 不拆分：直接应用折扣
-            var _currentBundleDiscount = selectedDiscountCard || applicableDiscounts[0];
-            usedDiscounts.set(_currentBundleDiscount.id, true);
-            // 🔥 更新 product_id 使用计数
-            if ((_currentBundleDiscount.tag || _currentBundleDiscount.type) === 'good_pass') {
-              var _currentCount2 = usedProductIdCounts.get(_currentBundleDiscount.product_id) || 0;
-              usedProductIdCounts.set(_currentBundleDiscount.product_id, _currentCount2 + 1);
-            }
-            // 🔥 更新折扣卡 applicableProductLimit 使用计数（不拆分时按商品数量计数）
-            var noSplitDiscountType = _currentBundleDiscount.tag || _currentBundleDiscount.type;
-            if (['discount_card', 'product_discount_card'].includes(noSplitDiscountType)) {
-              var bundleQuantity = product.num || 1;
-              var currentNoSplitCount = usedDiscountCardLimitCounts.get(_currentBundleDiscount.id) || 0;
-              usedDiscountCardLimitCounts.set(_currentBundleDiscount.id, currentNoSplitCount + bundleQuantity);
-            }
+            var _selectedDiscount3$me, _selectedDiscount3$me2, _flatItem$parentProdu9;
+            // 折扣卡：不拆分数量，直接应用
+            var _selectedDiscount3 = selectedDiscountCard || applicableDiscounts[0];
+            usedDiscounts.set(_selectedDiscount3.id, true);
             var _productOriginTotal = product.original_price || product.price || 0;
 
             // 🔥 检查是否是 order_level 固定金额折扣卡
-            var _isOrderLevel = isOrderLevelFixedAmountDiscount(selectedDiscount);
-            var _orderLevelAllocation = _isOrderLevel ? orderLevelDiscountAllocations.get(selectedDiscount.id) : null;
+            var _isOrderLevel = isOrderLevelFixedAmountDiscount(_selectedDiscount3);
+            var _orderLevelAllocation = _isOrderLevel ? orderLevelDiscountAllocations.get(_selectedDiscount3.id) : null;
             var _productAllocation = _orderLevelAllocation === null || _orderLevelAllocation === void 0 ? void 0 : _orderLevelAllocation.get(flatItem._id);
             var _targetProductTotal;
             var fixedAmountPerItem;
@@ -1702,45 +1291,40 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               _targetProductTotal = Math.max(new Decimal(_productOriginTotal).minus(fixedAmountPerItem).toNumber(), 0);
             } else {
               // item_level 或其他类型：使用原有逻辑
-              _targetProductTotal = getDiscountAmount(_currentBundleDiscount, _productOriginTotal, _productOriginTotal);
+              _targetProductTotal = getDiscountAmount(_selectedDiscount3, _productOriginTotal, _productOriginTotal);
               fixedAmountPerItem = new Decimal(_productOriginTotal).minus(_targetProductTotal).toNumber();
             }
-
-            // 计算实际折扣金额
-            var bundleActualDiscountAmount = new Decimal(_productOriginTotal).minus(_targetProductTotal).toNumber();
-
+            debugger;
             // 🔥 使用当前的 _id 作为唯一标识
             var _uniqueId = flatItem._id;
             var _discountDetail2 = {
-              amount: bundleActualDiscountAmount * (product.num || 1),
-              type: _currentBundleDiscount.tag === 'product_discount_card' ? 'discount_card' : _currentBundleDiscount.tag,
+              amount: fixedAmountPerItem * (product.num || 1),
+              type: _selectedDiscount3.tag === 'product_discount_card' ? 'discount_card' : _selectedDiscount3.tag,
               discount: {
-                discount_card_type: _currentBundleDiscount === null || _currentBundleDiscount === void 0 || (_currentBundleDiscoun3 = _currentBundleDiscount.metadata) === null || _currentBundleDiscoun3 === void 0 ? void 0 : _currentBundleDiscoun3.discount_card_type,
-                fixed_amount: bundleActualDiscountAmount,
-                discount_calculation_mode: _currentBundleDiscount === null || _currentBundleDiscount === void 0 || (_currentBundleDiscoun4 = _currentBundleDiscount.metadata) === null || _currentBundleDiscoun4 === void 0 ? void 0 : _currentBundleDiscoun4.discount_calculation_mode,
-                resource_id: _currentBundleDiscount.id,
-                title: _currentBundleDiscount.format_title,
+                discount_card_type: _selectedDiscount3 === null || _selectedDiscount3 === void 0 || (_selectedDiscount3$me = _selectedDiscount3.metadata) === null || _selectedDiscount3$me === void 0 ? void 0 : _selectedDiscount3$me.discount_card_type,
+                fixed_amount: fixedAmountPerItem,
+                discount_calculation_mode: _selectedDiscount3 === null || _selectedDiscount3 === void 0 || (_selectedDiscount3$me2 = _selectedDiscount3.metadata) === null || _selectedDiscount3$me2 === void 0 ? void 0 : _selectedDiscount3$me2.discount_calculation_mode,
+                resource_id: _selectedDiscount3.id,
+                title: _selectedDiscount3.format_title,
                 original_amount: product.original_price,
                 product_id: product.id,
-                percent: _currentBundleDiscount.par_value,
-                discount_product_id: _currentBundleDiscount.product_id
+                percent: _selectedDiscount3.par_value
               },
               metadata: _objectSpread({
                 // 🔥 使用唯一的 _id
                 custom_product_bundle_map_id: _uniqueId,
-                discount_rule_uncheck_flag: selectedDiscount === null || selectedDiscount === void 0 ? void 0 : selectedDiscount.discount_rule_uncheck_flag,
+                discount_rule_uncheck_flag: _selectedDiscount3 === null || _selectedDiscount3 === void 0 ? void 0 : _selectedDiscount3.discount_rule_uncheck_flag,
                 num: product.num || 1
               }, _productDiscountDifference !== undefined && {
                 product_discount_difference: _productDiscountDifference
               }),
-              config: _currentBundleDiscount === null || _currentBundleDiscount === void 0 ? void 0 : _currentBundleDiscount.config,
-              _num: (product.num || 1) * ((flatItem === null || flatItem === void 0 || (_flatItem$parentProdu10 = flatItem.parentProduct) === null || _flatItem$parentProdu10 === void 0 ? void 0 : _flatItem$parentProdu10.num) || 1)
+              _num: (product.num || 1) * ((flatItem === null || flatItem === void 0 || (_flatItem$parentProdu9 = flatItem.parentProduct) === null || _flatItem$parentProdu9 === void 0 ? void 0 : _flatItem$parentProdu9.num) || 1)
             };
 
             // 记录实际应用的折扣
-            var _appliedProducts2 = appliedDiscountProducts.get(_currentBundleDiscount.id) || [];
+            var _appliedProducts2 = appliedDiscountProducts.get(_selectedDiscount3.id) || [];
             _appliedProducts2.push(_discountDetail2);
-            appliedDiscountProducts.set(_currentBundleDiscount.id, _appliedProducts2);
+            appliedDiscountProducts.set(_selectedDiscount3.id, _appliedProducts2);
             processedItems.push(_objectSpread(_objectSpread({}, flatItem), {}, {
               total: _targetProductTotal,
               price: new Decimal(_productOriginTotal || 0).minus(fixedAmountPerItem).toNumber(),
@@ -1865,7 +1449,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                       product_id: bundleItem.product_id,
                       price: item.price,
                       num: item.num,
-                      quantity: item.num,
                       discount_list: updatedDiscountList
                     }));
                   });
@@ -1889,7 +1472,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                       product_id: bundleItem.product_id,
                       price: item.price,
                       num: item.num,
-                      quantity: item.num,
                       discount_list: _updatedDiscountList
                     }));
                   } else {
@@ -1904,8 +1486,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
               // 🔥 更新主商品自己的 discount_list 中的 num（quantity=1）
               var updatedMainDiscountList = mainProductData.discount_list.map(function (discount) {
-                var _discount$metadata7, _discount$metadata8;
-                if (discount !== null && discount !== void 0 && (_discount$metadata7 = discount.metadata) !== null && _discount$metadata7 !== void 0 && _discount$metadata7.custom_product_bundle_map_id) {
+                var _discount$metadata6, _discount$metadata7;
+                if (discount !== null && discount !== void 0 && (_discount$metadata6 = discount.metadata) !== null && _discount$metadata6 !== void 0 && _discount$metadata6.custom_product_bundle_map_id) {
                   // bundle的discount_list保持不变
                   return discount;
                 }
@@ -1913,7 +1495,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 return _objectSpread(_objectSpread({}, discount), {}, {
                   // num: 1,
                   metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
-                    custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata8 = discount.metadata) === null || _discount$metadata8 === void 0 ? void 0 : _discount$metadata8.custom_product_bundle_map_id,
+                    custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata7 = discount.metadata) === null || _discount$metadata7 === void 0 ? void 0 : _discount$metadata7.custom_product_bundle_map_id,
                     num: 1
                   })
                 });
@@ -1958,8 +1540,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 quantity: 1,
                 discount_list: updatedMainDiscountList,
                 bundle: newBundleWithDiscount,
-                total: newTotalWithDiscount,
-                origin_total: newOriginTotalWithDiscount
+                total: new Decimal(newTotalWithDiscount).toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber(),
+                origin_total: new Decimal(newOriginTotalWithDiscount).toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber()
               })));
 
               // 第二个：包含原始bundle (qty=原quantity-1)
@@ -1978,8 +1560,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
                 // 🔥 更新主商品自己的 discount_list 中的 num（quantity=原quantity-1）
                 var updatedMainDiscountListOriginal = mainProductData.discount_list.map(function (discount) {
-                  var _discount$metadata9, _discount$metadata10;
-                  if (discount !== null && discount !== void 0 && (_discount$metadata9 = discount.metadata) !== null && _discount$metadata9 !== void 0 && _discount$metadata9.custom_product_bundle_map_id) {
+                  var _discount$metadata8, _discount$metadata9;
+                  if (discount !== null && discount !== void 0 && (_discount$metadata8 = discount.metadata) !== null && _discount$metadata8 !== void 0 && _discount$metadata8.custom_product_bundle_map_id) {
                     // bundle的discount_list保持不变
                     return discount;
                   }
@@ -1987,7 +1569,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   return _objectSpread(_objectSpread({}, discount), {}, {
                     metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
                       num: mainProductQuantity - 1,
-                      custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata10 = discount.metadata) === null || _discount$metadata10 === void 0 ? void 0 : _discount$metadata10.custom_product_bundle_map_id
+                      custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata9 = discount.metadata) === null || _discount$metadata9 === void 0 ? void 0 : _discount$metadata9.custom_product_bundle_map_id
                     })
                     // num: mainProductQuantity - 1,
                   });
@@ -2054,11 +1636,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                       processedBundleItems.forEach(function (item) {
                         // 🔥 更新 discount_list 中的 num，使其与拆分后的 item.num 一致
                         var updatedDiscountList = (item.discount_list || []).map(function (discount) {
-                          var _discount$metadata11;
+                          var _discount$metadata10;
                           return _objectSpread(_objectSpread({}, discount), {}, {
                             metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
                               num: item.num,
-                              custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata11 = discount.metadata) === null || _discount$metadata11 === void 0 ? void 0 : _discount$metadata11.custom_product_bundle_map_id
+                              custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata10 = discount.metadata) === null || _discount$metadata10 === void 0 ? void 0 : _discount$metadata10.custom_product_bundle_map_id
                             })
                             // num: item.num, // 使用拆分后的 num
                           });
@@ -2068,7 +1650,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                           product_id: bundleItem.product_id,
                           price: item.price,
                           num: item.num,
-                          quantity: item.num,
                           discount_list: updatedDiscountList
                         }));
                       });
@@ -2108,8 +1689,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   // 累加bundle的价格（只累加一次）
                   if (newBundle.length > 0) {
                     newBundle.forEach(function (item) {
-                      var _item$discount_list3;
                       newTotal += Number(item.price) * Number(item.num);
+                    });
+
+                    // 计算原始总价（不考虑折扣）
+                    newBundle.forEach(function (item) {
+                      var _item$discount_list3;
                       var originalPrice = ((_item$discount_list3 = item.discount_list) === null || _item$discount_list3 === void 0 || (_item$discount_list3 = _item$discount_list3[0]) === null || _item$discount_list3 === void 0 || (_item$discount_list3 = _item$discount_list3.discount) === null || _item$discount_list3 === void 0 ? void 0 : _item$discount_list3.original_amount) || item.price;
                       newOriginTotal += Number(originalPrice) * Number(item.num);
                     });
@@ -2124,6 +1709,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                     return accumulator.add(currentPrice.mul(currentNum));
                   }, new Decimal(newTotal)).toNumber();
                 }
+                newTotal = new Decimal(newTotal).toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
+                newOriginTotal = new Decimal(newOriginTotal).toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
 
                 // 生成最终的主商品
                 result.push(_this3.hooks.setProduct(mainProduct, _objectSpread(_objectSpread({}, mainProductData), {}, {