@pisell/pisellos 0.0.365 → 0.0.367

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

@@ -259,7 +259,7 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
               allowCrossProduct: true,
               applicableProductLimit: 0,
               deductTaxAndFee: true
-            }, item === null || item === void 0 || (_item$strategyResult2 = item.strategyResult) === null || _item$strategyResult2 === void 0 ? void 0 : _item$strategyResult2.config.metadata.custom)
+            }, (item === null || item === void 0 || (_item$strategyResult2 = item.strategyResult) === null || _item$strategyResult2 === void 0 || (_item$strategyResult2 = _item$strategyResult2.config) === null || _item$strategyResult2 === void 0 || (_item$strategyResult2 = _item$strategyResult2.metadata) === null || _item$strategyResult2 === void 0 ? void 0 : _item$strategyResult2.custom) || {})
           }));
         } else {
           // 不可用的券，添加原因信息

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

@@ -51,12 +51,18 @@ export var getApplicableProductIds = function getApplicableProductIds(voucher) {
 
 // 辅助函数：计算适用商品的总金额
 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 sum.plus(p.remainingAmount);
+      return sum.plus(p[amountField]);
     }, new Decimal(0));
   }
 
@@ -69,7 +75,7 @@ var getApplicableProductsAmount = function getApplicableProductsAmount(voucher,
   return productsData.filter(function (p) {
     return applicableProductIds.includes(p.product_id);
   }).reduce(function (sum, p) {
-    return sum.plus(p.remainingAmount);
+    return sum.plus(p[amountField]);
   }, new Decimal(0));
 };
 
@@ -103,8 +109,10 @@ var getApplicableProducts = function getApplicableProducts(voucher, productsData
 export function processVouchers(applicableVouchers, orderTotalAmount, products) {
   console.log(products, 'products123');
 
-  // 统一使用包含税费的价格来拆分商品（remainingAmount 追踪商品实际剩余可抵扣金额）
-  // 每个券的实际可用金额通过 getRecommendedAmount(voucher) 获取，会根据券的 deductTaxAndFee 配置返回正确的值
+  // 拆分商品数据，同时维护含税和不含税两个金额池
+  // remainingAmountWithTax: 含税费的剩余可抵扣金额
+  // remainingAmountPure: 纯商品金额（不含税费）的剩余可抵扣金额
+  // 在抵扣时，会根据券的 deductTaxAndFee 配置选择从哪个金额池扣除
   var productsCopy = expandProductsWithBundleItems(products, true);
   var remainingOrderAmount = new Decimal(orderTotalAmount); // 订单剩余应付金额
 
@@ -117,7 +125,9 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
       _ref2$allowCrossProdu = _ref2.allowCrossProduct,
       allowCrossProduct = _ref2$allowCrossProdu === void 0 ? true : _ref2$allowCrossProdu,
       _ref2$applicableProdu = _ref2.applicableProductLimit,
-      applicableProductLimit = _ref2$applicableProdu === void 0 ? 0 : _ref2$applicableProdu;
+      applicableProductLimit = _ref2$applicableProdu === void 0 ? 0 : _ref2$applicableProdu,
+      _ref2$deductTaxAndFee = _ref2.deductTaxAndFee,
+      deductTaxAndFee = _ref2$deductTaxAndFee === void 0 ? true : _ref2$deductTaxAndFee;
 
     // 根据 deductTaxAndFee 配置获取推荐金额
     var recommendedAmount = getRecommendedAmount(voucher);
@@ -131,6 +141,9 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
       return new Decimal(0);
     }
 
+    // 根据券的配置选择使用哪个金额字段
+    var amountField = deductTaxAndFee ? 'remainingAmountWithTax' : 'remainingAmountPure';
+
     // 根据跨商品配置计算适用商品金额
     var finalApplicableAmount = new Decimal(0);
     if (allowCrossProduct) {
@@ -138,23 +151,23 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
       if (applicableProductLimit > 0) {
         // 有商品数量限制：按金额从高到低排序，取前 N 个商品
         var sortedProducts = _toConsumableArray(applicableProducts).sort(function (a, b) {
-          return a.remainingAmount.comparedTo(b.remainingAmount) > 0 ? -1 : 1;
+          return a[amountField].comparedTo(b[amountField]) > 0 ? -1 : 1;
         }).slice(0, applicableProductLimit);
         finalApplicableAmount = sortedProducts.reduce(function (sum, p) {
-          return sum.plus(p.remainingAmount);
+          return sum.plus(p[amountField]);
         }, new Decimal(0));
       } else {
         // 无商品数量限制：所有适用商品的总和
         finalApplicableAmount = applicableProducts.reduce(function (sum, p) {
-          return sum.plus(p.remainingAmount);
+          return sum.plus(p[amountField]);
         }, new Decimal(0));
       }
     } else {
       // 非跨商品券：只能抵扣单个商品，取金额最高的商品
       var maxProduct = applicableProducts.reduce(function (max, p) {
-        return p.remainingAmount.greaterThan(max.remainingAmount) ? p : max;
+        return p[amountField].greaterThan(max[amountField]) ? p : max;
       });
-      finalApplicableAmount = maxProduct.remainingAmount;
+      finalApplicableAmount = maxProduct[amountField];
     }
 
     // 返回最小值
@@ -229,39 +242,35 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
   var recommendedVouchers = [];
   var usedVoucherCounts = new Map(); // 跟踪每个券 ID 的使用次数
 
-  // 重置商品余额追踪（统一使用含税价格）
+  // 重置商品余额追踪（同时维护含税和不含税两个金额池）
   var productsForRecommendation = expandProductsWithBundleItems(products, true);
   remainingOrderAmount = new Decimal(orderTotalAmount);
 
+  /**
   // 分类券：未跨商品券 vs 跨商品券
-  var nonCrossProductVouchers = applicableVouchers.filter(function (v) {
-    var _v$config;
-    return !((_v$config = v.config) !== null && _v$config !== void 0 && _v$config.allowCrossProduct);
-  });
-  var crossProductVouchers = applicableVouchers.filter(function (v) {
-    var _v$config2;
-    return (_v$config2 = v.config) === null || _v$config2 === void 0 ? void 0 : _v$config2.allowCrossProduct;
-  });
-
-  // 按 tag 分组
-  var groupByType = function groupByType(vouchers) {
-    var groups = new Map();
-    vouchers.forEach(function (v) {
-      var tag = v.tag;
+  const nonCrossProductVouchers = applicableVouchers.filter(
+    (v) => !v.config?.allowCrossProduct,
+  );
+  const crossProductVouchers = applicableVouchers.filter(
+    (v) => v.config?.allowCrossProduct,
+  );
+   // 按 tag 分组
+  const groupByType = (vouchers: any[]) => {
+    const groups = new Map<string, any[]>();
+    vouchers.forEach((v) => {
+      const tag = v.tag;
       if (!groups.has(tag)) {
         groups.set(tag, []);
       }
-      groups.get(tag).push(v);
+      groups.get(tag)!.push(v);
     });
     return groups;
   };
-
-  // 对每组券按金额（balance）从大到小排序
-  var sortVouchersByAmount = function sortVouchersByAmount(vouchers) {
-    return _toConsumableArray(vouchers).sort(function (a, b) {
-      return getRecommendedAmount(b) - getRecommendedAmount(a);
-    });
+   // 对每组券按金额（balance）从大到小排序
+  const sortVouchersByAmount = (vouchers: Voucher[]) => {
+    return [...vouchers].sort((a, b) => getRecommendedAmount(b) - getRecommendedAmount(a));
   };
+   */
 
   // 处理单张券的抵扣
   var applyVoucher = function applyVoucher(voucher) {
@@ -279,18 +288,23 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
       _ref3$allowCrossProdu = _ref3.allowCrossProduct,
       allowCrossProduct = _ref3$allowCrossProdu === void 0 ? true : _ref3$allowCrossProdu,
       _ref3$applicableProdu = _ref3.applicableProductLimit,
-      applicableProductLimit = _ref3$applicableProdu === void 0 ? 0 : _ref3$applicableProdu;
+      applicableProductLimit = _ref3$applicableProdu === void 0 ? 0 : _ref3$applicableProdu,
+      _ref3$deductTaxAndFee = _ref3.deductTaxAndFee,
+      deductTaxAndFee = _ref3$deductTaxAndFee === void 0 ? true : _ref3$deductTaxAndFee;
+
+    // 根据券的配置选择使用哪个金额字段
+    var amountField = deductTaxAndFee ? 'remainingAmountWithTax' : 'remainingAmountPure';
 
     // 获取适用商品
     var applicableProducts = getApplicableProducts(voucher, productsForRecommendation).filter(function (p) {
-      return p.remainingAmount.greaterThan(0);
+      return p[amountField].greaterThan(0);
     });
     if (applicableProducts.length === 0) return false;
 
     // 考虑 applicableProductLimit
     if (allowCrossProduct && applicableProductLimit > 0) {
       applicableProducts = applicableProducts.sort(function (a, b) {
-        return a.remainingAmount.comparedTo(b.remainingAmount) > 0 ? -1 : 1;
+        return a[amountField].comparedTo(b[amountField]) > 0 ? -1 : 1;
       }).slice(0, applicableProductLimit);
     }
 
@@ -302,14 +316,14 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
     if (allowCrossProduct) {
       // 跨商品券：所有适用商品的剩余金额之和
       calculatedAvailableMaxAmount = applicableProducts.reduce(function (sum, p) {
-        return sum.plus(p.remainingAmount);
+        return sum.plus(p[amountField]);
       }, new Decimal(0));
     } else {
       // 非跨商品券：单个最高金额商品
       var maxProduct = applicableProducts.reduce(function (max, p) {
-        return p.remainingAmount.greaterThan(max.remainingAmount) ? p : max;
+        return p[amountField].greaterThan(max[amountField]) ? p : max;
       });
-      calculatedAvailableMaxAmount = maxProduct.remainingAmount;
+      calculatedAvailableMaxAmount = maxProduct[amountField];
     }
 
     // 取最小值：min(recommended_usage_amount, maxDeductionAmount, 适用商品金额, 订单剩余金额)
@@ -323,7 +337,7 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
     if (allowCrossProduct) {
       // 跨商品券：按剩余应付金额从高到低抵扣
       var sortedProducts = _toConsumableArray(applicableProducts).sort(function (a, b) {
-        return a.remainingAmount.comparedTo(b.remainingAmount) > 0 ? -1 : 1;
+        return a[amountField].comparedTo(b[amountField]) > 0 ? -1 : 1;
       });
       var _iterator = _createForOfIteratorHelper(sortedProducts),
         _step;
@@ -331,8 +345,8 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var product = _step.value;
           if (deductionLeft.lessThanOrEqualTo(0)) break;
-          var deductAmount = Decimal.min(deductionLeft, product.remainingAmount);
-          product.remainingAmount = product.remainingAmount.minus(deductAmount);
+          var deductAmount = Decimal.min(deductionLeft, product[amountField]);
+          product[amountField] = product[amountField].minus(deductAmount);
           deductionLeft = deductionLeft.minus(deductAmount);
           deductionDetails.push({
             product_id: product.product_id,
@@ -349,10 +363,10 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
     } else {
       // 非跨商品券：只抵扣一个商品（金额最高的）
       var targetProduct = applicableProducts.reduce(function (max, p) {
-        return p.remainingAmount.greaterThan(max.remainingAmount) ? p : max;
+        return p[amountField].greaterThan(max[amountField]) ? p : max;
       });
-      var _deductAmount = Decimal.min(deductionLeft, targetProduct.remainingAmount);
-      targetProduct.remainingAmount = targetProduct.remainingAmount.minus(_deductAmount);
+      var _deductAmount = Decimal.min(deductionLeft, targetProduct[amountField]);
+      targetProduct[amountField] = targetProduct[amountField].minus(_deductAmount);
       deductionLeft = deductionLeft.minus(_deductAmount);
       deductionDetails.push({
         product_id: targetProduct.product_id,
@@ -383,23 +397,29 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
     return false;
   };
 
+  /**
   // 第一轮：处理未跨商品券
-  var nonCrossGroups = groupByType(nonCrossProductVouchers);
-  nonCrossGroups.forEach(function (vouchersInGroup) {
-    var sortedVouchers = sortVouchersByAmount(vouchersInGroup);
-    sortedVouchers.forEach(function (voucher) {
+  const nonCrossGroups = groupByType(nonCrossProductVouchers);
+  nonCrossGroups.forEach((vouchersInGroup) => {
+    const sortedVouchers = sortVouchersByAmount(vouchersInGroup);
+    sortedVouchers.forEach((voucher) => {
       applyVoucher(voucher);
     });
   });
-
-  // 第二轮：处理跨商品券
-  var crossGroups = groupByType(crossProductVouchers);
-  crossGroups.forEach(function (vouchersInGroup) {
-    var sortedVouchers = sortVouchersByAmount(vouchersInGroup);
-    sortedVouchers.forEach(function (voucher) {
+   // 第二轮：处理跨商品券
+  const crossGroups = groupByType(crossProductVouchers);
+  crossGroups.forEach((vouchersInGroup) => {
+    const sortedVouchers = sortVouchersByAmount(vouchersInGroup);
+    sortedVouchers.forEach((voucher) => {
       applyVoucher(voucher);
     });
   });
+  */
+
+  // 直接按 applicableVouchers 的顺序处理所有券
+  applicableVouchers.forEach(function (voucher) {
+    applyVoucher(voucher);
+  });
 
   // recommendedVouchers 已经包含了基于应用时计算的 _available_max_amount 和 _unified_available_status
 
@@ -439,7 +459,7 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
  * @returns 返回更新后的所有券列表和已选券的详细抵扣信息
  */
 export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, products) {
-  // 深拷贝并拆分商品列表（包含主商品和原价子商品），用于计算
+  // 深拷贝并拆分商品列表（包含主商品和原价子商品，同时维护含税和不含税两个金额池），用于计算
   var productsForCalc = expandProductsWithBundleItems(products, true);
   var remainingOrderAmount = new Decimal(orderTotalAmount);
   var selectedWithDetails = [];
@@ -450,11 +470,16 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
       id = selectedVoucher.id;
     var maxDeductionAmount = config.maxDeductionAmount,
       allowCrossProduct = config.allowCrossProduct,
-      applicableProductLimit = config.applicableProductLimit;
+      applicableProductLimit = config.applicableProductLimit,
+      _config$deductTaxAndF3 = config.deductTaxAndFee,
+      deductTaxAndFee = _config$deductTaxAndF3 === void 0 ? true : _config$deductTaxAndF3;
+
+    // 根据券的配置选择使用哪个金额字段
+    var amountField = deductTaxAndFee ? 'remainingAmountWithTax' : 'remainingAmountPure';
 
     // 获取适用商品
     var applicableProducts = getApplicableProducts(selectedVoucher, productsForCalc).filter(function (p) {
-      return p.remainingAmount.greaterThan(0);
+      return p[amountField].greaterThan(0);
     });
     if (applicableProducts.length === 0) {
       // 无适用商品，跳过
@@ -471,7 +496,7 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
     // 考虑 applicableProductLimit
     if (allowCrossProduct && applicableProductLimit > 0) {
       applicableProducts = applicableProducts.sort(function (a, b) {
-        return a.remainingAmount.comparedTo(b.remainingAmount) > 0 ? -1 : 1;
+        return a[amountField].comparedTo(b[amountField]) > 0 ? -1 : 1;
       }).slice(0, applicableProductLimit);
     }
 
@@ -484,7 +509,7 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
     if (allowCrossProduct) {
       // 跨商品券：按剩余应付金额从高到低抵扣
       var sortedProducts = _toConsumableArray(applicableProducts).sort(function (a, b) {
-        return a.remainingAmount.comparedTo(b.remainingAmount) > 0 ? -1 : 1;
+        return a[amountField].comparedTo(b[amountField]) > 0 ? -1 : 1;
       });
       var _iterator2 = _createForOfIteratorHelper(sortedProducts),
         _step2;
@@ -492,8 +517,8 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
           var product = _step2.value;
           if (deductionLeft.lessThanOrEqualTo(0)) break;
-          var deductAmount = Decimal.min(deductionLeft, product.remainingAmount);
-          product.remainingAmount = product.remainingAmount.minus(deductAmount);
+          var deductAmount = Decimal.min(deductionLeft, product[amountField]);
+          product[amountField] = product[amountField].minus(deductAmount);
           deductionLeft = deductionLeft.minus(deductAmount);
           deductionDetails.push({
             product_id: product.product_id,
@@ -510,10 +535,10 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
     } else {
       // 非跨商品券：只抵扣一个商品（金额最高的）
       var targetProduct = applicableProducts.reduce(function (max, p) {
-        return p.remainingAmount.greaterThan(max.remainingAmount) ? p : max;
+        return p[amountField].greaterThan(max[amountField]) ? p : max;
       });
-      var _deductAmount2 = Decimal.min(deductionLeft, targetProduct.remainingAmount);
-      targetProduct.remainingAmount = targetProduct.remainingAmount.minus(_deductAmount2);
+      var _deductAmount2 = Decimal.min(deductionLeft, targetProduct[amountField]);
+      targetProduct[amountField] = targetProduct[amountField].minus(_deductAmount2);
       deductionLeft = deductionLeft.minus(_deductAmount2);
       deductionDetails.push({
         product_id: targetProduct.product_id,
@@ -559,7 +584,12 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
       product_id = voucher.product_id;
     var maxDeductionAmount = config.maxDeductionAmount,
       allowCrossProduct = config.allowCrossProduct,
-      applicableProductLimit = config.applicableProductLimit;
+      applicableProductLimit = config.applicableProductLimit,
+      _config$deductTaxAndF4 = config.deductTaxAndFee,
+      deductTaxAndFee = _config$deductTaxAndF4 === void 0 ? true : _config$deductTaxAndF4;
+
+    // 根据券的配置选择使用哪个金额字段
+    var amountField = deductTaxAndFee ? 'remainingAmountWithTax' : 'remainingAmountPure';
 
     // 根据 deductTaxAndFee 配置获取推荐金额
     var recommendedAmount = getRecommendedAmount(voucher);
@@ -586,7 +616,7 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
       if (isAvailable) {
         // 获取适用商品
         var applicableProducts = getApplicableProducts(voucher, productsForCalc).filter(function (p) {
-          return p.remainingAmount.greaterThan(0);
+          return p[amountField].greaterThan(0);
         });
         if (applicableProducts.length === 0) {
           isAvailable = false;
@@ -597,21 +627,21 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
           if (allowCrossProduct) {
             if (applicableProductLimit > 0) {
               var sortedProducts = _toConsumableArray(applicableProducts).sort(function (a, b) {
-                return a.remainingAmount.comparedTo(b.remainingAmount) > 0 ? -1 : 1;
+                return a[amountField].comparedTo(b[amountField]) > 0 ? -1 : 1;
               }).slice(0, applicableProductLimit);
               calculatedMaxAmount = sortedProducts.reduce(function (sum, p) {
-                return sum.plus(p.remainingAmount);
+                return sum.plus(p[amountField]);
               }, new Decimal(0));
             } else {
               calculatedMaxAmount = applicableProducts.reduce(function (sum, p) {
-                return sum.plus(p.remainingAmount);
+                return sum.plus(p[amountField]);
               }, new Decimal(0));
             }
           } else {
             var maxProduct = applicableProducts.reduce(function (max, p) {
-              return p.remainingAmount.greaterThan(max.remainingAmount) ? p : max;
+              return p[amountField].greaterThan(max[amountField]) ? p : max;
             });
-            calculatedMaxAmount = maxProduct.remainingAmount;
+            calculatedMaxAmount = maxProduct[amountField];
           }
           calculatedMaxAmount = Decimal.min(baseAmount, calculatedMaxAmount, remainingOrderAmount);
           if (calculatedMaxAmount.lessThanOrEqualTo(0)) {
@@ -701,17 +731,22 @@ export var getBundleItemPrice = function getBundleItemPrice(bundleItem, parentQu
 /**
  * 将商品数据拆分，包含主商品和原价子商品
  * @param products 原始商品列表
- * @param deductTaxAndFee 是否抵扣税费与附加费
- * @returns 拆分后的商品数据（包含主商品和子商品）
+ * @param deductTaxAndFee 是否抵扣税费与附加费（已废弃，保留参数以兼容旧代码）
+ * @returns 拆分后的商品数据（包含主商品和子商品，同时维护含税和不含税两个金额池）
  */
 var expandProductsWithBundleItems = function expandProductsWithBundleItems(products, deductTaxAndFee) {
   var expandedProducts = [];
   products.forEach(function (product) {
-    // 1. 添加主商品
+    var productQuantity = getProductQuantity(product);
+
+    // 1. 添加主商品（同时计算含税和不含税两个金额）
     expandedProducts.push(_objectSpread(_objectSpread({}, product), {}, {
       is_bundle_item: false,
       parent_product_id: null,
-      remainingAmount: new Decimal(getMainProductPrice(product, deductTaxAndFee)).times(getProductQuantity(product))
+      // 含税费的剩余金额
+      remainingAmountWithTax: new Decimal(getMainProductPrice(product, true)).times(productQuantity),
+      // 纯商品金额（不含税费）
+      remainingAmountPure: new Decimal(getMainProductPrice(product, false)).times(productQuantity)
     }));
 
     // 2. 添加原价子商品（作为独立商品项）
@@ -724,9 +759,12 @@ var expandProductsWithBundleItems = function expandProductsWithBundleItems(produ
             // 使用 bundle_product_id 作为 product_id
             is_bundle_item: true,
             parent_product_id: product.product_id,
-            quantity: bundleItem.num * getProductQuantity(product),
+            quantity: bundleItem.num * productQuantity,
             // 子商品数量 * 主商品数量
-            remainingAmount: new Decimal(getBundleItemPrice(bundleItem, getProductQuantity(product), deductTaxAndFee))
+            // 含税费的剩余金额
+            remainingAmountWithTax: new Decimal(getBundleItemPrice(bundleItem, productQuantity, true)),
+            // 纯商品金额（不含税费）
+            remainingAmountPure: new Decimal(getBundleItemPrice(bundleItem, productQuantity, false))
           }));
         }
       });

package/dist/modules/Rules/index.js

@@ -107,12 +107,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var _discount$holder;
       // 非表单类型 holder 视为匹配
       if (((_discount$holder = discount.holder) === null || _discount$holder === void 0 ? void 0 : _discount$holder.holder_type) !== 'form') return true;
-      // 卡券 holder 缺失视为不匹配
-      if (!discount.holder.holder_id) return false;
-
       // 主预约holder, 目前（20251124）默认只考虑单个holder的情况
       var orderHolderId = Array.isArray(holders) && holders.length > 0 ? holders[0].form_record_id : undefined;
       var productHolderId = Array.isArray(product.holder_id) ? product.holder_id[0] : product.holder_id;
+      // 父预约及商品都无holder, 则略过检查
+      if (!orderHolderId && !productHolderId) return true;
+
+      // 最终直接匹配 holder 是否相同
       return (productHolderId || orderHolderId) === discount.holder.holder_id;
     }
 

package/lib/model/strategy/adapter/walletPass/evaluator.js

@@ -210,7 +210,7 @@ var WalletPassEvaluator = class {
     });
     const newVouchers = [];
     results.forEach((item) => {
-      var _a;
+      var _a, _b, _c;
       if (item.isApplicable) {
         newVouchers.push({
           ...item.voucher,
@@ -220,7 +220,7 @@ var WalletPassEvaluator = class {
             allowCrossProduct: true,
             applicableProductLimit: 0,
             deductTaxAndFee: true,
-            ...(_a = item == null ? void 0 : item.strategyResult) == null ? void 0 : _a.config.metadata.custom
+            ...((_c = (_b = (_a = item == null ? void 0 : item.strategyResult) == null ? void 0 : _a.config) == null ? void 0 : _b.metadata) == null ? void 0 : _c.custom) || {}
           }
         });
       } else {

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

@@ -61,13 +61,16 @@ var getApplicableProductIds = (voucher) => {
 };
 var getApplicableProductsAmount = (voucher, productsData) => {
   const applicableProductIds = getApplicableProductIds(voucher);
+  const { config } = voucher;
+  const deductTaxAndFee = (config == null ? void 0 : config.deductTaxAndFee) ?? true;
+  const amountField = deductTaxAndFee ? "remainingAmountWithTax" : "remainingAmountPure";
   if (applicableProductIds === null) {
-    return productsData.reduce((sum, p) => sum.plus(p.remainingAmount), new import_decimal.default(0));
+    return productsData.reduce((sum, p) => sum.plus(p[amountField]), new import_decimal.default(0));
   }
   if (applicableProductIds.length === 0) {
     return new import_decimal.default(0);
   }
-  return productsData.filter((p) => applicableProductIds.includes(p.product_id)).reduce((sum, p) => sum.plus(p.remainingAmount), new import_decimal.default(0));
+  return productsData.filter((p) => applicableProductIds.includes(p.product_id)).reduce((sum, p) => sum.plus(p[amountField]), new import_decimal.default(0));
 };
 var getApplicableProducts = (voucher, productsData) => {
   const applicableProductIds = getApplicableProductIds(voucher);
@@ -85,7 +88,7 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
   let remainingOrderAmount = new import_decimal.default(orderTotalAmount);
   const calculateAvailableMaxAmount = (voucher, productsData) => {
     const { config } = voucher;
-    const { maxDeductionAmount = 0, allowCrossProduct = true, applicableProductLimit = 0 } = config ?? {};
+    const { maxDeductionAmount = 0, allowCrossProduct = true, applicableProductLimit = 0, deductTaxAndFee = true } = config ?? {};
     const recommendedAmount = getRecommendedAmount(voucher);
     const baseAmount = import_decimal.default.min(
       new import_decimal.default(recommendedAmount),
@@ -95,25 +98,26 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
     if (applicableProducts.length === 0) {
       return new import_decimal.default(0);
     }
+    const amountField = deductTaxAndFee ? "remainingAmountWithTax" : "remainingAmountPure";
     let finalApplicableAmount = new import_decimal.default(0);
     if (allowCrossProduct) {
       if (applicableProductLimit > 0) {
-        const sortedProducts = [...applicableProducts].sort((a, b) => a.remainingAmount.comparedTo(b.remainingAmount) > 0 ? -1 : 1).slice(0, applicableProductLimit);
+        const sortedProducts = [...applicableProducts].sort((a, b) => a[amountField].comparedTo(b[amountField]) > 0 ? -1 : 1).slice(0, applicableProductLimit);
         finalApplicableAmount = sortedProducts.reduce(
-          (sum, p) => sum.plus(p.remainingAmount),
+          (sum, p) => sum.plus(p[amountField]),
           new import_decimal.default(0)
         );
       } else {
         finalApplicableAmount = applicableProducts.reduce(
-          (sum, p) => sum.plus(p.remainingAmount),
+          (sum, p) => sum.plus(p[amountField]),
           new import_decimal.default(0)
         );
       }
     } else {
       const maxProduct = applicableProducts.reduce(
-        (max, p) => p.remainingAmount.greaterThan(max.remainingAmount) ? p : max
+        (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
       );
-      finalApplicableAmount = maxProduct.remainingAmount;
+      finalApplicableAmount = maxProduct[amountField];
     }
     return import_decimal.default.min(baseAmount, finalApplicableAmount, remainingOrderAmount);
   };
@@ -162,32 +166,6 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
   const usedVoucherCounts = /* @__PURE__ */ new Map();
   const productsForRecommendation = expandProductsWithBundleItems(products, true);
   remainingOrderAmount = new import_decimal.default(orderTotalAmount);
-  const nonCrossProductVouchers = applicableVouchers.filter(
-    (v) => {
-      var _a;
-      return !((_a = v.config) == null ? void 0 : _a.allowCrossProduct);
-    }
-  );
-  const crossProductVouchers = applicableVouchers.filter(
-    (v) => {
-      var _a;
-      return (_a = v.config) == null ? void 0 : _a.allowCrossProduct;
-    }
-  );
-  const groupByType = (vouchers) => {
-    const groups = /* @__PURE__ */ new Map();
-    vouchers.forEach((v) => {
-      const tag = v.tag;
-      if (!groups.has(tag)) {
-        groups.set(tag, []);
-      }
-      groups.get(tag).push(v);
-    });
-    return groups;
-  };
-  const sortVouchersByAmount = (vouchers) => {
-    return [...vouchers].sort((a, b) => getRecommendedAmount(b) - getRecommendedAmount(a));
-  };
   const applyVoucher = (voucher) => {
     const availabilityCheck = isVoucherAvailable(
       voucher,
@@ -198,15 +176,16 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
       return false;
     }
     const { config, id, product_id } = voucher;
-    const { maxDeductionAmount = 0, allowCrossProduct = true, applicableProductLimit = 0 } = config ?? {};
+    const { maxDeductionAmount = 0, allowCrossProduct = true, applicableProductLimit = 0, deductTaxAndFee = true } = config ?? {};
+    const amountField = deductTaxAndFee ? "remainingAmountWithTax" : "remainingAmountPure";
     let applicableProducts = getApplicableProducts(
       voucher,
       productsForRecommendation
-    ).filter((p) => p.remainingAmount.greaterThan(0));
+    ).filter((p) => p[amountField].greaterThan(0));
     if (applicableProducts.length === 0)
       return false;
     if (allowCrossProduct && applicableProductLimit > 0) {
-      applicableProducts = applicableProducts.sort((a, b) => a.remainingAmount.comparedTo(b.remainingAmount) > 0 ? -1 : 1).slice(0, applicableProductLimit);
+      applicableProducts = applicableProducts.sort((a, b) => a[amountField].comparedTo(b[amountField]) > 0 ? -1 : 1).slice(0, applicableProductLimit);
     }
     const usageAmount = typeof voucher.edit_current_amount === "number" ? voucher.edit_current_amount : getRecommendedAmount(voucher);
     const baseAmount = import_decimal.default.min(
@@ -216,14 +195,14 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
     let calculatedAvailableMaxAmount = new import_decimal.default(0);
     if (allowCrossProduct) {
       calculatedAvailableMaxAmount = applicableProducts.reduce(
-        (sum, p) => sum.plus(p.remainingAmount),
+        (sum, p) => sum.plus(p[amountField]),
         new import_decimal.default(0)
       );
     } else {
       const maxProduct = applicableProducts.reduce(
-        (max, p) => p.remainingAmount.greaterThan(max.remainingAmount) ? p : max
+        (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
       );
-      calculatedAvailableMaxAmount = maxProduct.remainingAmount;
+      calculatedAvailableMaxAmount = maxProduct[amountField];
     }
     const availableMaxAmount = import_decimal.default.min(
       baseAmount,
@@ -238,13 +217,13 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
     const deductionDetails = [];
     if (allowCrossProduct) {
       const sortedProducts = [...applicableProducts].sort(
-        (a, b) => a.remainingAmount.comparedTo(b.remainingAmount) > 0 ? -1 : 1
+        (a, b) => a[amountField].comparedTo(b[amountField]) > 0 ? -1 : 1
       );
       for (const product of sortedProducts) {
         if (deductionLeft.lessThanOrEqualTo(0))
           break;
-        const deductAmount = import_decimal.default.min(deductionLeft, product.remainingAmount);
-        product.remainingAmount = product.remainingAmount.minus(deductAmount);
+        const deductAmount = import_decimal.default.min(deductionLeft, product[amountField]);
+        product[amountField] = product[amountField].minus(deductAmount);
         deductionLeft = deductionLeft.minus(deductAmount);
         deductionDetails.push({
           product_id: product.product_id,
@@ -256,13 +235,13 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
       }
     } else {
       const targetProduct = applicableProducts.reduce(
-        (max, p) => p.remainingAmount.greaterThan(max.remainingAmount) ? p : max
+        (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
       );
       const deductAmount = import_decimal.default.min(
         deductionLeft,
-        targetProduct.remainingAmount
+        targetProduct[amountField]
       );
-      targetProduct.remainingAmount = targetProduct.remainingAmount.minus(deductAmount);
+      targetProduct[amountField] = targetProduct[amountField].minus(deductAmount);
       deductionLeft = deductionLeft.minus(deductAmount);
       deductionDetails.push({
         product_id: targetProduct.product_id,
@@ -289,19 +268,8 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
     }
     return false;
   };
-  const nonCrossGroups = groupByType(nonCrossProductVouchers);
-  nonCrossGroups.forEach((vouchersInGroup) => {
-    const sortedVouchers = sortVouchersByAmount(vouchersInGroup);
-    sortedVouchers.forEach((voucher) => {
-      applyVoucher(voucher);
-    });
-  });
-  const crossGroups = groupByType(crossProductVouchers);
-  crossGroups.forEach((vouchersInGroup) => {
-    const sortedVouchers = sortVouchersByAmount(vouchersInGroup);
-    sortedVouchers.forEach((voucher) => {
-      applyVoucher(voucher);
-    });
+  applicableVouchers.forEach((voucher) => {
+    applyVoucher(voucher);
   });
   const recommendedMap = /* @__PURE__ */ new Map();
   recommendedVouchers.forEach((v) => {
@@ -330,11 +298,12 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
   const selectedWithDetails = [];
   selectedVouchers.forEach((selectedVoucher) => {
     const { config, id } = selectedVoucher;
-    const { maxDeductionAmount, allowCrossProduct, applicableProductLimit } = config;
+    const { maxDeductionAmount, allowCrossProduct, applicableProductLimit, deductTaxAndFee = true } = config;
+    const amountField = deductTaxAndFee ? "remainingAmountWithTax" : "remainingAmountPure";
     let applicableProducts = getApplicableProducts(
       selectedVoucher,
       productsForCalc
-    ).filter((p) => p.remainingAmount.greaterThan(0));
+    ).filter((p) => p[amountField].greaterThan(0));
     if (applicableProducts.length === 0) {
       selectedWithDetails.push({
         ...selectedVoucher,
@@ -347,7 +316,7 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
       return;
     }
     if (allowCrossProduct && applicableProductLimit > 0) {
-      applicableProducts = applicableProducts.sort((a, b) => a.remainingAmount.comparedTo(b.remainingAmount) > 0 ? -1 : 1).slice(0, applicableProductLimit);
+      applicableProducts = applicableProducts.sort((a, b) => a[amountField].comparedTo(b[amountField]) > 0 ? -1 : 1).slice(0, applicableProductLimit);
     }
     const usageAmount = typeof selectedVoucher.edit_current_amount === "number" ? selectedVoucher.edit_current_amount : getRecommendedAmount(selectedVoucher);
     const maxDeduction = import_decimal.default.min(
@@ -359,13 +328,13 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
     const deductionDetails = [];
     if (allowCrossProduct) {
       const sortedProducts = [...applicableProducts].sort(
-        (a, b) => a.remainingAmount.comparedTo(b.remainingAmount) > 0 ? -1 : 1
+        (a, b) => a[amountField].comparedTo(b[amountField]) > 0 ? -1 : 1
       );
       for (const product of sortedProducts) {
         if (deductionLeft.lessThanOrEqualTo(0))
           break;
-        const deductAmount = import_decimal.default.min(deductionLeft, product.remainingAmount);
-        product.remainingAmount = product.remainingAmount.minus(deductAmount);
+        const deductAmount = import_decimal.default.min(deductionLeft, product[amountField]);
+        product[amountField] = product[amountField].minus(deductAmount);
         deductionLeft = deductionLeft.minus(deductAmount);
         deductionDetails.push({
           product_id: product.product_id,
@@ -377,13 +346,13 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
       }
     } else {
       const targetProduct = applicableProducts.reduce(
-        (max, p) => p.remainingAmount.greaterThan(max.remainingAmount) ? p : max
+        (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
       );
       const deductAmount = import_decimal.default.min(
         deductionLeft,
-        targetProduct.remainingAmount
+        targetProduct[amountField]
       );
-      targetProduct.remainingAmount = targetProduct.remainingAmount.minus(deductAmount);
+      targetProduct[amountField] = targetProduct[amountField].minus(deductAmount);
       deductionLeft = deductionLeft.minus(deductAmount);
       deductionDetails.push({
         product_id: targetProduct.product_id,
@@ -418,7 +387,8 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
       return selectedDetail || voucher;
     }
     const { config, id, product_id } = voucher;
-    const { maxDeductionAmount, allowCrossProduct, applicableProductLimit } = config;
+    const { maxDeductionAmount, allowCrossProduct, applicableProductLimit, deductTaxAndFee = true } = config;
+    const amountField = deductTaxAndFee ? "remainingAmountWithTax" : "remainingAmountPure";
     const recommendedAmount = getRecommendedAmount(voucher);
     let isAvailable = true;
     let calculatedMaxAmount = new import_decimal.default(0);
@@ -441,7 +411,7 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
         let applicableProducts = getApplicableProducts(
           voucher,
           productsForCalc
-        ).filter((p) => p.remainingAmount.greaterThan(0));
+        ).filter((p) => p[amountField].greaterThan(0));
         if (applicableProducts.length === 0) {
           isAvailable = false;
           reasonCode = "not_meet_the_required_conditions";
@@ -452,22 +422,22 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
           );
           if (allowCrossProduct) {
             if (applicableProductLimit > 0) {
-              const sortedProducts = [...applicableProducts].sort((a, b) => a.remainingAmount.comparedTo(b.remainingAmount) > 0 ? -1 : 1).slice(0, applicableProductLimit);
+              const sortedProducts = [...applicableProducts].sort((a, b) => a[amountField].comparedTo(b[amountField]) > 0 ? -1 : 1).slice(0, applicableProductLimit);
               calculatedMaxAmount = sortedProducts.reduce(
-                (sum, p) => sum.plus(p.remainingAmount),
+                (sum, p) => sum.plus(p[amountField]),
                 new import_decimal.default(0)
               );
             } else {
               calculatedMaxAmount = applicableProducts.reduce(
-                (sum, p) => sum.plus(p.remainingAmount),
+                (sum, p) => sum.plus(p[amountField]),
                 new import_decimal.default(0)
               );
             }
           } else {
             const maxProduct = applicableProducts.reduce(
-              (max, p) => p.remainingAmount.greaterThan(max.remainingAmount) ? p : max
+              (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
             );
-            calculatedMaxAmount = maxProduct.remainingAmount;
+            calculatedMaxAmount = maxProduct[amountField];
           }
           calculatedMaxAmount = import_decimal.default.min(
             baseAmount,
@@ -523,11 +493,15 @@ var getBundleItemPrice = (bundleItem, parentQuantity, isDeductTaxAndFee) => {
 var expandProductsWithBundleItems = (products, deductTaxAndFee) => {
   const expandedProducts = [];
   products.forEach((product) => {
+    const productQuantity = getProductQuantity(product);
     expandedProducts.push({
       ...product,
       is_bundle_item: false,
       parent_product_id: null,
-      remainingAmount: new import_decimal.default(getMainProductPrice(product, deductTaxAndFee)).times(getProductQuantity(product))
+      // 含税费的剩余金额
+      remainingAmountWithTax: new import_decimal.default(getMainProductPrice(product, true)).times(productQuantity),
+      // 纯商品金额（不含税费）
+      remainingAmountPure: new import_decimal.default(getMainProductPrice(product, false)).times(productQuantity)
     });
     if (product.product_bundle && product.product_bundle.length > 0) {
       product.product_bundle.forEach((bundleItem) => {
@@ -538,9 +512,12 @@ var expandProductsWithBundleItems = (products, deductTaxAndFee) => {
             // 使用 bundle_product_id 作为 product_id
             is_bundle_item: true,
             parent_product_id: product.product_id,
-            quantity: bundleItem.num * getProductQuantity(product),
+            quantity: bundleItem.num * productQuantity,
             // 子商品数量 * 主商品数量
-            remainingAmount: new import_decimal.default(getBundleItemPrice(bundleItem, getProductQuantity(product), deductTaxAndFee))
+            // 含税费的剩余金额
+            remainingAmountWithTax: new import_decimal.default(getBundleItemPrice(bundleItem, productQuantity, true)),
+            // 纯商品金额（不含税费）
+            remainingAmountPure: new import_decimal.default(getBundleItemPrice(bundleItem, productQuantity, false))
           });
         }
       });

package/lib/modules/Rules/index.js

@@ -67,10 +67,10 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     var _a;
     if (((_a = discount.holder) == null ? void 0 : _a.holder_type) !== "form")
       return true;
-    if (!discount.holder.holder_id)
-      return false;
     const orderHolderId = Array.isArray(holders) && holders.length > 0 ? holders[0].form_record_id : void 0;
     const productHolderId = Array.isArray(product.holder_id) ? product.holder_id[0] : product.holder_id;
+    if (!orderHolderId && !productHolderId)
+      return true;
     return (productHolderId || orderHolderId) === discount.holder.holder_id;
   }
   // 判断discountList 是否可以对当前productList生效

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.365",
+  "version": "0.0.367",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",