@pisell/pisellos 0.0.377 → 0.0.379

package/dist/model/strategy/adapter/walletPass/utils.js

@@ -1,10 +1,10 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -49,19 +49,21 @@ export var getApplicableProductIds = function getApplicableProductIds(voucher) {
   return [];
 };
 
-// 辅助函数：计算适用商品的总金额
+// 辅助函数：计算适用商品的总金额（基于剩余金额）
 var getApplicableProductsAmount = function getApplicableProductsAmount(voucher, productsData) {
   var _config$deductTaxAndF2;
   var applicableProductIds = getApplicableProductIds(voucher);
   var config = voucher.config;
   var deductTaxAndFee = (_config$deductTaxAndF2 = config === null || config === void 0 ? void 0 : config.deductTaxAndFee) !== null && _config$deductTaxAndF2 !== void 0 ? _config$deductTaxAndF2 : true;
 
-  // 根据券的配置选择使用哪个金额
+  // 根据券的配置选择使用哪个金额字段
   var amountField = deductTaxAndFee ? 'remainingAmountWithTax' : 'remainingAmountPure';
 
   // 如果为 null，适用于所有商品
   if (applicableProductIds === null) {
-    return productsData.reduce(function (sum, p) {
+    return productsData.filter(function (p) {
+      return p[amountField].greaterThan(0);
+    }).reduce(function (sum, p) {
       return sum.plus(p[amountField]);
     }, new Decimal(0));
   }
@@ -73,7 +75,7 @@ var getApplicableProductsAmount = function getApplicableProductsAmount(voucher,
 
   // 计算指定商品的总金额
   return productsData.filter(function (p) {
-    return applicableProductIds.includes(p.product_id);
+    return applicableProductIds.includes(p.product_id) && p[amountField].greaterThan(0);
   }).reduce(function (sum, p) {
     return sum.plus(p[amountField]);
   }, new Decimal(0));
@@ -135,39 +137,64 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
     // 基础值 = min(recommendedAmount, maxDeductionAmount)
     var baseAmount = Decimal.min(new Decimal(recommendedAmount), new Decimal(maxDeductionAmount));
 
-    // 获取适用商品列表
-    var applicableProducts = getApplicableProducts(voucher, productsData);
+    // 根据券的配置选择使用哪个单价字段和金额字段
+    var unitPriceField = deductTaxAndFee ? 'unitPriceWithTax' : 'unitPricePure';
+    var amountField = deductTaxAndFee ? 'remainingAmountWithTax' : 'remainingAmountPure';
+
+    // 获取适用商品列表（只筛选有剩余金额的商品）
+    var applicableProducts = getApplicableProducts(voucher, productsData).filter(function (p) {
+      return p[amountField].greaterThan(0);
+    });
     if (applicableProducts.length === 0) {
       return new Decimal(0);
     }
 
-    // 根据券的配置选择使用哪个金额字段
-    var amountField = deductTaxAndFee ? 'remainingAmountWithTax' : 'remainingAmountPure';
-
     // 根据跨商品配置计算适用商品金额
     var finalApplicableAmount = new Decimal(0);
     if (allowCrossProduct) {
       // 跨商品券：可以抵扣多个商品
       if (applicableProductLimit > 0) {
-        // 有商品数量限制：按金额从高到低排序，取前 N 个商品
+        // 有数量限制：按单价从高到低排序，按动态计算的可抵扣数量累计直到达到 limit
         var sortedProducts = _toConsumableArray(applicableProducts).sort(function (a, b) {
-          return a[amountField].comparedTo(b[amountField]) > 0 ? -1 : 1;
-        }).slice(0, applicableProductLimit);
-        finalApplicableAmount = sortedProducts.reduce(function (sum, p) {
-          return sum.plus(p[amountField]);
-        }, new Decimal(0));
+          return a[unitPriceField].comparedTo(b[unitPriceField]) > 0 ? -1 : 1;
+        });
+        var remainingLimit = applicableProductLimit;
+        var _iterator = _createForOfIteratorHelper(sortedProducts),
+          _step;
+        try {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            var product = _step.value;
+            if (remainingLimit <= 0) break;
+            // 动态计算当前可抵扣数量 = ceil(剩余金额 / 单价)
+            var currentAvailableQty = Math.ceil(product[amountField].dividedBy(product[unitPriceField]).toNumber());
+            var deductQty = Math.min(currentAvailableQty, remainingLimit);
+            // 实际可抵扣金额 = min(数量 * 单价, 剩余金额)
+            var deductAmount = Decimal.min(product[unitPriceField].times(deductQty), product[amountField]);
+            finalApplicableAmount = finalApplicableAmount.plus(deductAmount);
+            remainingLimit -= deductQty;
+          }
+        } catch (err) {
+          _iterator.e(err);
+        } finally {
+          _iterator.f();
+        }
       } else {
-        // 无商品数量限制：所有适用商品的总和
+        // 无数量限制：所有适用商品的剩余金额总和
         finalApplicableAmount = applicableProducts.reduce(function (sum, p) {
           return sum.plus(p[amountField]);
         }, new Decimal(0));
       }
     } else {
-      // 非跨商品券：只能抵扣单个商品，取金额最高的商品
+      // 非跨商品券：只能抵扣单个商品（单价最高的）
       var maxProduct = applicableProducts.reduce(function (max, p) {
-        return p[amountField].greaterThan(max[amountField]) ? p : max;
+        return p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max;
       });
-      finalApplicableAmount = maxProduct[amountField];
+      // 动态计算当前可抵扣数量
+      var _currentAvailableQty = Math.ceil(maxProduct[amountField].dividedBy(maxProduct[unitPriceField]).toNumber());
+      // 非跨商品券也受 applicableProductLimit 限制
+      var _deductQty = applicableProductLimit > 0 ? Math.min(_currentAvailableQty, applicableProductLimit) : _currentAvailableQty;
+      // 实际可抵扣金额 = min(数量 * 单价, 剩余金额)
+      finalApplicableAmount = Decimal.min(maxProduct[unitPriceField].times(_deductQty), maxProduct[amountField]);
     }
 
     // 返回最小值
@@ -292,38 +319,63 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
       _ref3$deductTaxAndFee = _ref3.deductTaxAndFee,
       deductTaxAndFee = _ref3$deductTaxAndFee === void 0 ? true : _ref3$deductTaxAndFee;
 
-    // 根据券的配置选择使用哪个金额字段
+    // 根据券的配置选择使用哪个单价字段和金额字段
+    var unitPriceField = deductTaxAndFee ? 'unitPriceWithTax' : 'unitPricePure';
     var amountField = deductTaxAndFee ? 'remainingAmountWithTax' : 'remainingAmountPure';
 
-    // 获取适用商品
+    // 获取适用商品（只筛选有剩余金额的商品）
     var applicableProducts = getApplicableProducts(voucher, productsForRecommendation).filter(function (p) {
       return p[amountField].greaterThan(0);
     });
     if (applicableProducts.length === 0) return false;
 
-    // 考虑 applicableProductLimit
-    if (allowCrossProduct && applicableProductLimit > 0) {
-      applicableProducts = applicableProducts.sort(function (a, b) {
-        return a[amountField].comparedTo(b[amountField]) > 0 ? -1 : 1;
-      }).slice(0, applicableProductLimit);
-    }
-
     // ========== 关键修改：在应用券之前，基于当前剩余金额计算 _available_max_amount ==========
     // 优先使用用户手动编辑的金额，否则根据 deductTaxAndFee 配置获取推荐金额
     var usageAmount = typeof voucher.edit_current_amount === 'number' ? voucher.edit_current_amount : getRecommendedAmount(voucher);
     var baseAmount = Decimal.min(new Decimal(usageAmount), new Decimal(maxDeductionAmount));
     var calculatedAvailableMaxAmount = new Decimal(0);
     if (allowCrossProduct) {
-      // 跨商品券：所有适用商品的剩余金额之和
-      calculatedAvailableMaxAmount = applicableProducts.reduce(function (sum, p) {
-        return sum.plus(p[amountField]);
-      }, new Decimal(0));
+      // 跨商品券：按 quantity 限制计算可抵扣金额
+      if (applicableProductLimit > 0) {
+        var sortedProducts = _toConsumableArray(applicableProducts).sort(function (a, b) {
+          return a[unitPriceField].comparedTo(b[unitPriceField]) > 0 ? -1 : 1;
+        });
+        var remainingLimit = applicableProductLimit;
+        var _iterator2 = _createForOfIteratorHelper(sortedProducts),
+          _step2;
+        try {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var product = _step2.value;
+            if (remainingLimit <= 0) break;
+            // 动态计算当前可抵扣数量 = ceil(剩余金额 / 单价)
+            var currentAvailableQty = Math.ceil(product[amountField].dividedBy(product[unitPriceField]).toNumber());
+            var deductQty = Math.min(currentAvailableQty, remainingLimit);
+            // 实际可抵扣金额 = min(数量 * 单价, 剩余金额)
+            var deductAmount = Decimal.min(product[unitPriceField].times(deductQty), product[amountField]);
+            calculatedAvailableMaxAmount = calculatedAvailableMaxAmount.plus(deductAmount);
+            remainingLimit -= deductQty;
+          }
+        } catch (err) {
+          _iterator2.e(err);
+        } finally {
+          _iterator2.f();
+        }
+      } else {
+        // 无数量限制：所有适用商品的剩余金额总和
+        calculatedAvailableMaxAmount = applicableProducts.reduce(function (sum, p) {
+          return sum.plus(p[amountField]);
+        }, new Decimal(0));
+      }
     } else {
-      // 非跨商品券：单个最高金额商品
+      // 非跨商品券：单个最高单价商品，也受 applicableProductLimit 限制
       var maxProduct = applicableProducts.reduce(function (max, p) {
-        return p[amountField].greaterThan(max[amountField]) ? p : max;
+        return p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max;
       });
-      calculatedAvailableMaxAmount = maxProduct[amountField];
+      // 动态计算当前可抵扣数量
+      var _currentAvailableQty2 = Math.ceil(maxProduct[amountField].dividedBy(maxProduct[unitPriceField]).toNumber());
+      var _deductQty2 = applicableProductLimit > 0 ? Math.min(_currentAvailableQty2, applicableProductLimit) : _currentAvailableQty2;
+      // 实际可抵扣金额 = min(数量 * 单价, 剩余金额)
+      calculatedAvailableMaxAmount = Decimal.min(maxProduct[unitPriceField].times(_deductQty2), maxProduct[amountField]);
     }
 
     // 取最小值：min(recommended_usage_amount, maxDeductionAmount, 适用商品金额, 订单剩余金额)
@@ -335,44 +387,74 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
     var deductionLeft = maxDeduction;
     var deductionDetails = [];
     if (allowCrossProduct) {
-      // 跨商品券：按剩余应付金额从高到低抵扣
-      var sortedProducts = _toConsumableArray(applicableProducts).sort(function (a, b) {
-        return a[amountField].comparedTo(b[amountField]) > 0 ? -1 : 1;
+      // 跨商品券：按单价从高到低抵扣，受 applicableProductLimit 限制
+      var _sortedProducts = _toConsumableArray(applicableProducts).sort(function (a, b) {
+        return a[unitPriceField].comparedTo(b[unitPriceField]) > 0 ? -1 : 1;
       });
-      var _iterator = _createForOfIteratorHelper(sortedProducts),
-        _step;
+      var _remainingLimit = applicableProductLimit > 0 ? applicableProductLimit : Infinity;
+      var _iterator3 = _createForOfIteratorHelper(_sortedProducts),
+        _step3;
       try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var product = _step.value;
-          if (deductionLeft.lessThanOrEqualTo(0)) break;
-          var deductAmount = Decimal.min(deductionLeft, product[amountField]);
-          product[amountField] = product[amountField].minus(deductAmount);
-          deductionLeft = deductionLeft.minus(deductAmount);
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var _product = _step3.value;
+          if (deductionLeft.lessThanOrEqualTo(0) || _remainingLimit <= 0) break;
+
+          // 动态计算当前可抵扣数量 = ceil(剩余金额 / 单价)
+          var _currentAvailableQty3 = Math.ceil(_product[amountField].dividedBy(_product[unitPriceField]).toNumber());
+          var availableQty = Math.min(_currentAvailableQty3, _remainingLimit);
+
+          // 计算本商品最大可抵扣金额 = min(数量 * 单价, 剩余金额)
+          var maxDeductForProduct = Decimal.min(_product[unitPriceField].times(availableQty), _product[amountField]);
+          var actualDeductAmount = Decimal.min(deductionLeft, maxDeductForProduct);
+
+          // 计算实际抵扣的数量（用于记录和配额计算）
+          var actualDeductQty = Math.ceil(actualDeductAmount.dividedBy(_product[unitPriceField]).toNumber());
+
+          // 只更新商品的剩余金额，不更新 remainingQuantity
+          _product[amountField] = _product[amountField].minus(actualDeductAmount);
+          deductionLeft = deductionLeft.minus(actualDeductAmount);
+          _remainingLimit -= actualDeductQty;
           deductionDetails.push({
-            product_id: product.product_id,
-            parent_product_id: product.parent_product_id || null,
-            is_bundle_item: product.is_bundle_item || false,
-            deductAmount: deductAmount.toNumber() // 转换为数字
+            product_id: _product.product_id,
+            parent_product_id: _product.parent_product_id || null,
+            is_bundle_item: _product.is_bundle_item || false,
+            deductAmount: actualDeductAmount.toNumber(),
+            // 转换为数字
+            deductQuantity: actualDeductQty // 抵扣涉及的数量（用于记录）
           });
         }
       } catch (err) {
-        _iterator.e(err);
+        _iterator3.e(err);
       } finally {
-        _iterator.f();
+        _iterator3.f();
       }
     } else {
-      // 非跨商品券：只抵扣一个商品（金额最高的）
+      // 非跨商品券：只抵扣一个商品（单价最高的），也受 applicableProductLimit 限制
       var targetProduct = applicableProducts.reduce(function (max, p) {
-        return p[amountField].greaterThan(max[amountField]) ? p : max;
+        return p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max;
       });
-      var _deductAmount = Decimal.min(deductionLeft, targetProduct[amountField]);
-      targetProduct[amountField] = targetProduct[amountField].minus(_deductAmount);
-      deductionLeft = deductionLeft.minus(_deductAmount);
+
+      // 动态计算当前可抵扣数量
+      var _currentAvailableQty4 = Math.ceil(targetProduct[amountField].dividedBy(targetProduct[unitPriceField]).toNumber());
+      var _availableQty = applicableProductLimit > 0 ? Math.min(_currentAvailableQty4, applicableProductLimit) : _currentAvailableQty4;
+
+      // 计算本商品最大可抵扣金额 = min(数量 * 单价, 剩余金额)
+      var _maxDeductForProduct = Decimal.min(targetProduct[unitPriceField].times(_availableQty), targetProduct[amountField]);
+      var _actualDeductAmount = Decimal.min(deductionLeft, _maxDeductForProduct);
+
+      // 计算实际抵扣的数量
+      var _actualDeductQty = Math.ceil(_actualDeductAmount.dividedBy(targetProduct[unitPriceField]).toNumber());
+
+      // 只更新商品的剩余金额，不更新 remainingQuantity
+      targetProduct[amountField] = targetProduct[amountField].minus(_actualDeductAmount);
+      deductionLeft = deductionLeft.minus(_actualDeductAmount);
       deductionDetails.push({
         product_id: targetProduct.product_id,
         parent_product_id: targetProduct.parent_product_id || null,
         is_bundle_item: targetProduct.is_bundle_item || false,
-        deductAmount: _deductAmount.toNumber() // 转换为数字
+        deductAmount: _actualDeductAmount.toNumber(),
+        // 转换为数字
+        deductQuantity: _actualDeductQty // 抵扣涉及的数量（用于记录）
       });
     }
     var totalDeducted = maxDeduction.minus(deductionLeft);
@@ -474,10 +556,11 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
       _config$deductTaxAndF3 = config.deductTaxAndFee,
       deductTaxAndFee = _config$deductTaxAndF3 === void 0 ? true : _config$deductTaxAndF3;
 
-    // 根据券的配置选择使用哪个金额字段
+    // 根据券的配置选择使用哪个单价字段和金额字段
+    var unitPriceField = deductTaxAndFee ? 'unitPriceWithTax' : 'unitPricePure';
     var amountField = deductTaxAndFee ? 'remainingAmountWithTax' : 'remainingAmountPure';
 
-    // 获取适用商品
+    // 获取适用商品（只筛选有剩余金额的商品）
     var applicableProducts = getApplicableProducts(selectedVoucher, productsForCalc).filter(function (p) {
       return p[amountField].greaterThan(0);
     });
@@ -493,13 +576,6 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
       return;
     }
 
-    // 考虑 applicableProductLimit
-    if (allowCrossProduct && applicableProductLimit > 0) {
-      applicableProducts = applicableProducts.sort(function (a, b) {
-        return a[amountField].comparedTo(b[amountField]) > 0 ? -1 : 1;
-      }).slice(0, applicableProductLimit);
-    }
-
     // 计算本次抵扣金额
     // 优先使用用户手动编辑的金额，否则根据 deductTaxAndFee 配置获取推荐金额
     var usageAmount = typeof selectedVoucher.edit_current_amount === 'number' ? selectedVoucher.edit_current_amount : getRecommendedAmount(selectedVoucher);
@@ -507,44 +583,74 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
     var deductionLeft = maxDeduction;
     var deductionDetails = [];
     if (allowCrossProduct) {
-      // 跨商品券：按剩余应付金额从高到低抵扣
+      // 跨商品券：按单价从高到低抵扣，受 applicableProductLimit 限制
       var sortedProducts = _toConsumableArray(applicableProducts).sort(function (a, b) {
-        return a[amountField].comparedTo(b[amountField]) > 0 ? -1 : 1;
+        return a[unitPriceField].comparedTo(b[unitPriceField]) > 0 ? -1 : 1;
       });
-      var _iterator2 = _createForOfIteratorHelper(sortedProducts),
-        _step2;
+      var remainingLimit = applicableProductLimit > 0 ? applicableProductLimit : Infinity;
+      var _iterator4 = _createForOfIteratorHelper(sortedProducts),
+        _step4;
       try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var product = _step2.value;
-          if (deductionLeft.lessThanOrEqualTo(0)) break;
-          var deductAmount = Decimal.min(deductionLeft, product[amountField]);
-          product[amountField] = product[amountField].minus(deductAmount);
-          deductionLeft = deductionLeft.minus(deductAmount);
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var product = _step4.value;
+          if (deductionLeft.lessThanOrEqualTo(0) || remainingLimit <= 0) break;
+
+          // 动态计算当前可抵扣数量 = ceil(剩余金额 / 单价)
+          var currentAvailableQty = Math.ceil(product[amountField].dividedBy(product[unitPriceField]).toNumber());
+          var availableQty = Math.min(currentAvailableQty, remainingLimit);
+
+          // 计算本商品最大可抵扣金额 = min(数量 * 单价, 剩余金额)
+          var maxDeductForProduct = Decimal.min(product[unitPriceField].times(availableQty), product[amountField]);
+          var actualDeductAmount = Decimal.min(deductionLeft, maxDeductForProduct);
+
+          // 计算实际抵扣的数量（用于记录和配额计算）
+          var actualDeductQty = Math.ceil(actualDeductAmount.dividedBy(product[unitPriceField]).toNumber());
+
+          // 只更新商品的剩余金额，不更新 remainingQuantity
+          product[amountField] = product[amountField].minus(actualDeductAmount);
+          deductionLeft = deductionLeft.minus(actualDeductAmount);
+          remainingLimit -= actualDeductQty;
           deductionDetails.push({
             product_id: product.product_id,
             parent_product_id: product.parent_product_id || null,
             is_bundle_item: product.is_bundle_item || false,
-            deductAmount: deductAmount.toNumber() // 转换为数字
+            deductAmount: actualDeductAmount.toNumber(),
+            // 转换为数字
+            deductQuantity: actualDeductQty // 抵扣涉及的数量（用于记录）
           });
         }
       } catch (err) {
-        _iterator2.e(err);
+        _iterator4.e(err);
       } finally {
-        _iterator2.f();
+        _iterator4.f();
       }
     } else {
-      // 非跨商品券：只抵扣一个商品（金额最高的）
+      // 非跨商品券：只抵扣一个商品（单价最高的），也受 applicableProductLimit 限制
       var targetProduct = applicableProducts.reduce(function (max, p) {
-        return p[amountField].greaterThan(max[amountField]) ? p : max;
+        return p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max;
       });
-      var _deductAmount2 = Decimal.min(deductionLeft, targetProduct[amountField]);
-      targetProduct[amountField] = targetProduct[amountField].minus(_deductAmount2);
-      deductionLeft = deductionLeft.minus(_deductAmount2);
+
+      // 动态计算当前可抵扣数量
+      var _currentAvailableQty5 = Math.ceil(targetProduct[amountField].dividedBy(targetProduct[unitPriceField]).toNumber());
+      var _availableQty2 = applicableProductLimit > 0 ? Math.min(_currentAvailableQty5, applicableProductLimit) : _currentAvailableQty5;
+
+      // 计算本商品最大可抵扣金额 = min(数量 * 单价, 剩余金额)
+      var _maxDeductForProduct2 = Decimal.min(targetProduct[unitPriceField].times(_availableQty2), targetProduct[amountField]);
+      var _actualDeductAmount2 = Decimal.min(deductionLeft, _maxDeductForProduct2);
+
+      // 计算实际抵扣的数量
+      var _actualDeductQty2 = Math.ceil(_actualDeductAmount2.dividedBy(targetProduct[unitPriceField]).toNumber());
+
+      // 只更新商品的剩余金额，不更新 remainingQuantity
+      targetProduct[amountField] = targetProduct[amountField].minus(_actualDeductAmount2);
+      deductionLeft = deductionLeft.minus(_actualDeductAmount2);
       deductionDetails.push({
         product_id: targetProduct.product_id,
         parent_product_id: targetProduct.parent_product_id || null,
         is_bundle_item: targetProduct.is_bundle_item || false,
-        deductAmount: _deductAmount2.toNumber() // 转换为数字
+        deductAmount: _actualDeductAmount2.toNumber(),
+        // 转换为数字
+        deductQuantity: _actualDeductQty2 // 抵扣涉及的数量（用于记录）
       });
     }
     var totalDeducted = maxDeduction.minus(deductionLeft);
@@ -588,7 +694,8 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
       _config$deductTaxAndF4 = config.deductTaxAndFee,
       deductTaxAndFee = _config$deductTaxAndF4 === void 0 ? true : _config$deductTaxAndF4;
 
-    // 根据券的配置选择使用哪个金额字段
+    // 根据券的配置选择使用哪个单价字段和金额字段
+    var unitPriceField = deductTaxAndFee ? 'unitPriceWithTax' : 'unitPricePure';
     var amountField = deductTaxAndFee ? 'remainingAmountWithTax' : 'remainingAmountPure';
 
     // 根据 deductTaxAndFee 配置获取推荐金额
@@ -614,7 +721,7 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
         }
       }
       if (isAvailable) {
-        // 获取适用商品
+        // 获取适用商品（只筛选有剩余金额的商品）
         var applicableProducts = getApplicableProducts(voucher, productsForCalc).filter(function (p) {
           return p[amountField].greaterThan(0);
         });
@@ -626,22 +733,46 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
           var baseAmount = Decimal.min(new Decimal(recommendedAmount), new Decimal(maxDeductionAmount));
           if (allowCrossProduct) {
             if (applicableProductLimit > 0) {
+              // 按单价从高到低排序，按动态计算的可抵扣数量累计直到达到 limit
               var sortedProducts = _toConsumableArray(applicableProducts).sort(function (a, b) {
-                return a[amountField].comparedTo(b[amountField]) > 0 ? -1 : 1;
-              }).slice(0, applicableProductLimit);
-              calculatedMaxAmount = sortedProducts.reduce(function (sum, p) {
-                return sum.plus(p[amountField]);
-              }, new Decimal(0));
+                return a[unitPriceField].comparedTo(b[unitPriceField]) > 0 ? -1 : 1;
+              });
+              var remainingLimit = applicableProductLimit;
+              var _iterator5 = _createForOfIteratorHelper(sortedProducts),
+                _step5;
+              try {
+                for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+                  var product = _step5.value;
+                  if (remainingLimit <= 0) break;
+                  // 动态计算当前可抵扣数量 = ceil(剩余金额 / 单价)
+                  var currentAvailableQty = Math.ceil(product[amountField].dividedBy(product[unitPriceField]).toNumber());
+                  var deductQty = Math.min(currentAvailableQty, remainingLimit);
+                  // 实际可抵扣金额 = min(数量 * 单价, 剩余金额)
+                  var deductAmount = Decimal.min(product[unitPriceField].times(deductQty), product[amountField]);
+                  calculatedMaxAmount = calculatedMaxAmount.plus(deductAmount);
+                  remainingLimit -= deductQty;
+                }
+              } catch (err) {
+                _iterator5.e(err);
+              } finally {
+                _iterator5.f();
+              }
             } else {
+              // 无数量限制：所有适用商品的剩余金额总和
               calculatedMaxAmount = applicableProducts.reduce(function (sum, p) {
                 return sum.plus(p[amountField]);
               }, new Decimal(0));
             }
           } else {
+            // 非跨商品券：单个最高单价商品，也受 applicableProductLimit 限制
             var maxProduct = applicableProducts.reduce(function (max, p) {
-              return p[amountField].greaterThan(max[amountField]) ? p : max;
+              return p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max;
             });
-            calculatedMaxAmount = maxProduct[amountField];
+            // 动态计算当前可抵扣数量
+            var _currentAvailableQty6 = Math.ceil(maxProduct[amountField].dividedBy(maxProduct[unitPriceField]).toNumber());
+            var _deductQty3 = applicableProductLimit > 0 ? Math.min(_currentAvailableQty6, applicableProductLimit) : _currentAvailableQty6;
+            // 实际可抵扣金额 = min(数量 * 单价, 剩余金额)
+            calculatedMaxAmount = Decimal.min(maxProduct[unitPriceField].times(_deductQty3), maxProduct[amountField]);
           }
           calculatedMaxAmount = Decimal.min(baseAmount, calculatedMaxAmount, remainingOrderAmount);
           if (calculatedMaxAmount.lessThanOrEqualTo(0)) {
@@ -674,11 +805,11 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
 export var getMainProductPrice = function getMainProductPrice(product, isDeductTaxAndFee) {
   var _product$metadata, _product$metadata2, _product$metadata3;
   var mainProductPrice = new Decimal((product === null || product === void 0 ? void 0 : product.main_product_selling_price) || ((_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.main_product_selling_price) || 0);
-  var _iterator3 = _createForOfIteratorHelper((product === null || product === void 0 ? void 0 : product.product_bundle) || []),
-    _step3;
+  var _iterator6 = _createForOfIteratorHelper((product === null || product === void 0 ? void 0 : product.product_bundle) || []),
+    _step6;
   try {
-    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-      var bundleItem = _step3.value;
+    for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+      var bundleItem = _step6.value;
       // 子商品是加价或减价才需要计算
       if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
         var _bundleItem$bundle_se;
@@ -690,9 +821,9 @@ export var getMainProductPrice = function getMainProductPrice(product, isDeductT
 
     // 税费
   } catch (err) {
-    _iterator3.e(err);
+    _iterator6.e(err);
   } finally {
-    _iterator3.f();
+    _iterator6.f();
   }
   var taxFee = new Decimal((product === null || product === void 0 ? void 0 : product.tax_fee) || (product === null || product === void 0 || (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.main_product_attached_bundle_tax_fee) || 0);
   // 附加费
@@ -737,35 +868,54 @@ export var getBundleItemPrice = function getBundleItemPrice(bundleItem, parentQu
  * 将商品数据拆分，包含主商品和原价子商品
  * @param products 原始商品列表
  * @param deductTaxAndFee 是否抵扣税费与附加费（已废弃，保留参数以兼容旧代码）
- * @returns 拆分后的商品数据（包含主商品和子商品，同时维护含税和不含税两个金额池）
+ * @returns 拆分后的商品数据（包含主商品和子商品，同时维护含税和不含税两个金额池，以及单价和剩余数量）
  */
 var expandProductsWithBundleItems = function expandProductsWithBundleItems(products, deductTaxAndFee) {
   var expandedProducts = [];
   products.forEach(function (product) {
     var productQuantity = getProductQuantity(product);
 
-    // 1. 添加主商品（同时计算含税和不含税两个金额）
+    // 计算主商品单价（含税和不含税）
+    var unitPriceWithTax = getMainProductPrice(product, true);
+    var unitPricePure = getMainProductPrice(product, false);
+
+    // 1. 添加主商品（同时计算含税和不含税两个金额，以及单价和剩余数量）
     expandedProducts.push(_objectSpread(_objectSpread({}, product), {}, {
       is_bundle_item: false,
       parent_product_id: null,
+      // 单价（用于按 quantity 计算抵扣）
+      unitPriceWithTax: new Decimal(unitPriceWithTax),
+      unitPricePure: new Decimal(unitPricePure),
+      // 剩余可抵扣数量
+      remainingQuantity: productQuantity,
       // 含税费的剩余金额
-      remainingAmountWithTax: new Decimal(getMainProductPrice(product, true)).times(productQuantity),
+      remainingAmountWithTax: new Decimal(unitPriceWithTax).times(productQuantity),
       // 纯商品金额（不含税费）
-      remainingAmountPure: new Decimal(getMainProductPrice(product, false)).times(productQuantity)
+      remainingAmountPure: new Decimal(unitPricePure).times(productQuantity)
     }));
 
     // 2. 添加原价子商品（作为独立商品项）
     if (product.product_bundle && product.product_bundle.length > 0) {
       product.product_bundle.forEach(function (bundleItem) {
         if (getBundleItemIsOriginalPrice(bundleItem)) {
+          var bundleQuantity = bundleItem.num * productQuantity;
+          // 计算子商品单价（注意：getBundleItemPrice 返回的是总价，需要除以数量得到单价）
+          var bundleUnitPriceWithTax = new Decimal(getBundleItemPrice(bundleItem, 1, true)).dividedBy(bundleItem.num);
+          var bundleUnitPricePure = new Decimal(getBundleItemPrice(bundleItem, 1, false)).dividedBy(bundleItem.num);
+
           // 原价子商品作为独立商品
           expandedProducts.push(_objectSpread(_objectSpread({}, bundleItem), {}, {
             product_id: bundleItem.bundle_product_id,
             // 使用 bundle_product_id 作为 product_id
             is_bundle_item: true,
             parent_product_id: product.product_id,
-            quantity: bundleItem.num * productQuantity,
+            quantity: bundleQuantity,
             // 子商品数量 * 主商品数量
+            // 单价（用于按 quantity 计算抵扣）
+            unitPriceWithTax: bundleUnitPriceWithTax,
+            unitPricePure: bundleUnitPricePure,
+            // 剩余可抵扣数量
+            remainingQuantity: bundleQuantity,
             // 含税费的剩余金额
             remainingAmountWithTax: new Decimal(getBundleItemPrice(bundleItem, productQuantity, true)),
             // 纯商品金额（不含税费）