@pisell/pisellos 0.0.568 → 0.10.1

package/dist/core/index.js

@@ -45,6 +45,7 @@ var PisellOSCore = /*#__PURE__*/function () {
       this.serverOptions = options.server;
     }
     this.initialize(options);
+    console.log('constructor1234');
   }
   _createClass(PisellOSCore, [{
     key: "initialize",
@@ -106,20 +107,21 @@ var PisellOSCore = /*#__PURE__*/function () {
               _context.next = 16;
               return this.server.initialize(this.serverOptions.modules, this.serverOptions.autoInitData !== false, options);
             case 16:
+              console.log('[PisellOS] ✅ Server 初始化完成，所有数据已预加载');
               this.log('[PisellOS] Server 初始化完成');
-              _context.next = 24;
+              _context.next = 25;
               break;
-            case 19:
-              _context.prev = 19;
+            case 20:
+              _context.prev = 20;
               _context.t0 = _context["catch"](6);
               console.error('[PisellOS] ❌ Server 初始化失败:', _context.t0);
               this.log("Server \u521D\u59CB\u5316\u5931\u8D25: ".concat(_context.t0), 'error');
               throw _context.t0;
-            case 24:
+            case 25:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[6, 19]]);
+        }, _callee, this, [[6, 20]]);
       }));
       function initializeServer(_x) {
         return _initializeServer.apply(this, arguments);
@@ -137,10 +139,11 @@ var PisellOSCore = /*#__PURE__*/function () {
       var prefix = '[PisellOS]';
       switch (level) {
         case 'info':
+          console.log("".concat(prefix, " ").concat(message));
           break;
         case 'warn':
           // 使用 console.log 避免显示堆栈跟踪，提升性能
-
+          console.log("%c".concat(prefix, "%c ").concat(message), 'color: #f59e0b; font-weight: bold;', 'color: #f59e0b;');
           break;
         case 'error':
           console.error("".concat(prefix, " ").concat(message));
@@ -247,6 +250,7 @@ var PisellOSCore = /*#__PURE__*/function () {
       }
       // 预先给模块初始化值系统
       var _createStore = createStore((options === null || options === void 0 ? void 0 : options.initialState) || {}, module.name, function (path, value) {
+          console.log('core 检测到模块值更新', module.name, path, value);
           _this3.effects.emit("".concat(module.name, ":changed"), {
             path: path,
             value: value

package/dist/index.d.ts

@@ -8,6 +8,5 @@ export * from './plugins';
 export * from './solution';
 export * from './model';
 export { PisellOSCore } from './core';
-export { DataVariantEvaluator } from './model/strategy/adapter/dataVariant/evaluator';
 import PisellOSCore from './core';
 export default PisellOSCore;

package/dist/index.js

@@ -13,9 +13,6 @@ export * from "./model";
 // 导出核心实现
 export { PisellOSCore } from "./core";
 
-// 策略评估器（宿主注入 smart pricing / promotion 等场景使用）
-export { DataVariantEvaluator } from "./model/strategy/adapter/dataVariant/evaluator";
-
 // 导出框架主类
 import PisellOSCore from "./core";
 export default PisellOSCore;

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

@@ -747,9 +747,10 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
         return b.price - a.price;
       });
 
-      // 3. 计算可以凑成多少组
+      // 3. 计算可以凑成多少组（cumulative 缺省视为 true，与 adapter 一致）
       var totalUnits = unitProducts.length;
-      var groupCount = cumulative ? Math.floor(totalUnits / x) : totalUnits >= x ? 1 : 0;
+      var isCumulative = cumulative !== false;
+      var groupCount = isCumulative ? Math.floor(totalUnits / x) : totalUnits >= x ? 1 : 0;
       var promotionUnits = groupCount * x;
 
       // 4. 分离参与促销的和不参与的商品

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

@@ -11,7 +11,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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); }
 import { StrategyEngine } from "../../index";
-import { processVouchers as _processVouchers, recalculateVouchers as _recalculateVouchers, getApplicableProductIds, getMainProductPrice, getBundleItemPrice, getProductQuantity, getBundleItemIsOriginalPrice, getTaxAndFeeRoundingRemainder, getBundleItemTaxAndFeeRoundingRemainder, getProductDiscountDifference, getBundleItemDiscountDifference } from "./utils";
+import { processVouchers as _processVouchers, recalculateVouchers as _recalculateVouchers, getApplicableProductIds, getMainProductPrice, getBundleItemPrice, getProductQuantity, getBundleItemIsOriginalPrice } from "./utils";
 import { locales } from "./locales";
 import Decimal from 'decimal.js';
 var defaultStrategyMetadataCustom = {
@@ -257,6 +257,7 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
             var rawText = this.getText(reasonCode);
             // 金额类型字段：从 otherParams.getData 取货币符号；非金额或取不到则留空
             var currency = failedField && AMOUNT_FIELDS.has(failedField) ? ((_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 || (_this$otherParams$get = (_this$otherParams2 = _this$otherParams).getData) === null || _this$otherParams$get === void 0 ? void 0 : _this$otherParams$get.call(_this$otherParams2, 'shop_symbol')) || '' : '';
+            console.log(currency, 'currency12345');
             var reason = thresholdValue !== undefined ? formatReason(rawText, thresholdValue, currency) : rawText;
             results.push({
               voucher: voucher,
@@ -505,6 +506,7 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
   }, {
     key: "calculateApplicableProducts",
     value: function calculateApplicableProducts(products, applicableProductIds, deductTaxAndFee) {
+      console.log(products, 'products1234');
       var total = 0;
       var count = 0;
 
@@ -521,8 +523,8 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
         // 检查主商品是否适用
         var isMainProductApplicable = applicableProductIds === null || applicableProductIds.includes(product.product_id);
         if (isMainProductApplicable) {
-          // 计算主商品价格（包含加减价子商品）= 单价 * 数量 + 舍入余数 - 商品差额
-          total += getMainProductPrice(product, deductTaxAndFee) * productQuantity + getTaxAndFeeRoundingRemainder(product, deductTaxAndFee) - getProductDiscountDifference(product);
+          // 计算主商品价格（包含加减价子商品）
+          total += getMainProductPrice(product, deductTaxAndFee) * productQuantity;
           count += productQuantity;
         }
 
@@ -534,9 +536,9 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
               // 检查子商品是否适用
               var isBundleItemApplicable = applicableProductIds === null || applicableProductIds.includes(bundleItem.bundle_product_id);
               if (isBundleItemApplicable) {
-                // 计算原价子商品价格 = 总价 + 舍入余数 - 商品差额
+                // 计算原价子商品价格
                 var bundleItemQuantity = bundleItem.num * productQuantity;
-                total += getBundleItemPrice(bundleItem, productQuantity, deductTaxAndFee) + getBundleItemTaxAndFeeRoundingRemainder(bundleItem, deductTaxAndFee) - getBundleItemDiscountDifference(bundleItem);
+                total += getBundleItemPrice(bundleItem, productQuantity, deductTaxAndFee);
                 count += bundleItemQuantity;
               }
             }

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

@@ -164,6 +164,8 @@ var strategyConfigs = [
 // ============================================
 
 function runExample() {
+  console.log('========== WalletPass 评估器示例 ==========\n');
+
   // 创建评估器实例
   var evaluator = new WalletPassEvaluator();
 
@@ -176,17 +178,38 @@ function runExample() {
   });
 
   // 输出结果
-
+  console.log('订单信息：');
+  console.log("- \u603B\u91D1\u989D: ".concat(180, " \u5143"));
+  console.log("- \u5546\u54C1: ".concat(products.map(function (p) {
+    return "".concat(p.name, "(").concat(p.quantity, "\u4EF6)");
+  }).join(', '), "\n"));
+  console.log('评估结果：\n');
   results.forEach(function (result, index) {
-    if (result.isApplicable) {} else {}
+    console.log("Voucher ".concat(index + 1, ": ").concat(result.voucher.id));
+    console.log("  \u9762\u989D: ".concat(result.voucher.amount, " \u5143"));
+    console.log("  \u53EF\u7528: ".concat(result.isApplicable ? '✅ 是' : '❌ 否'));
+    if (result.isApplicable) {
+      console.log("  \u6700\u5927\u62B5\u6263: ".concat(result.maxDeduction, " \u5143"));
+      console.log("  \u6BCF\u5355\u53EF\u7528: ".concat(result.canUseCount, " \u5F20"));
+      console.log("  \u62B5\u6263\u7A0E\u8D39: ".concat(result.deductTaxAndFee ? '是' : '否'));
+      console.log("  \u9002\u7528\u5546\u54C1: ".concat(result.applicableProductIds.join(', ')));
+    } else {
+      console.log("  \u539F\u56E0: ".concat(result.reason));
+      console.log("  \u539F\u56E0\u7801: ".concat(result.reasonCode));
+    }
+    console.log('');
   });
 
   // 筛选可用的 vouchers
   var availableVouchers = results.filter(function (r) {
     return r.isApplicable;
   });
+  console.log("\n\u5171 ".concat(availableVouchers.length, " \u5F20\u53EF\u7528"));
   if (availableVouchers.length > 0) {
-    availableVouchers.forEach(function (v) {});
+    console.log('可用 voucher ID:');
+    availableVouchers.forEach(function (v) {
+      console.log("  - ".concat(v.voucher.id, ": \u6700\u591A\u62B5\u6263 ").concat(v.maxDeduction, " \u5143"));
+    });
   }
 }
 

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

@@ -5,7 +5,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 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); }
-import { getApplicableProductIds, getMainProductPrice, getBundleItemPrice, getProductQuantity, getBundleItemIsOriginalPrice, getTaxAndFeeRoundingRemainder, getBundleItemTaxAndFeeRoundingRemainder, getProductDiscountDifference, getBundleItemDiscountDifference } from "./utils";
+import { getApplicableProductIds, getMainProductPrice, getBundleItemPrice, getProductQuantity, getBundleItemIsOriginalPrice } from "./utils";
 
 /**
  * Wallet Pass 适配器
@@ -149,8 +149,8 @@ var WalletPassAdapter = /*#__PURE__*/function () {
         // 检查主商品是否适用
         var isMainProductApplicable = applicableProductIds === null || applicableProductIds.includes(product.product_id);
         if (isMainProductApplicable) {
-          // 计算主商品价格（包含加减价子商品）= 单价 * 数量 + 舍入余数 - 商品差额
-          total += getMainProductPrice(product, deductTaxAndFee) * productQuantity + getTaxAndFeeRoundingRemainder(product, deductTaxAndFee) - getProductDiscountDifference(product);
+          // 计算主商品价格（包含加减价子商品）
+          total += getMainProductPrice(product, deductTaxAndFee) * productQuantity;
           count += productQuantity;
         }
 
@@ -162,9 +162,9 @@ var WalletPassAdapter = /*#__PURE__*/function () {
               // 检查子商品是否适用
               var isBundleItemApplicable = applicableProductIds === null || applicableProductIds.includes(bundleItem.bundle_product_id);
               if (isBundleItemApplicable) {
-                // 计算原价子商品价格 = 总价 + 舍入余数 - 商品差额
+                // 计算原价子商品价格
                 var bundleItemQuantity = bundleItem.num * productQuantity;
-                total += getBundleItemPrice(bundleItem, productQuantity, deductTaxAndFee) + getBundleItemTaxAndFeeRoundingRemainder(bundleItem, deductTaxAndFee) - getBundleItemDiscountDifference(bundleItem);
+                total += getBundleItemPrice(bundleItem, productQuantity, deductTaxAndFee);
                 count += bundleItemQuantity;
               }
             }

package/dist/model/strategy/adapter/walletPass/type.d.ts

@@ -82,8 +82,6 @@ export interface Product {
         surcharge_rounding_remainder?: number;
         tax_fee_rounding_remainder?: number;
         main_product_selling_price: number;
-        /** 商品折扣差额 */
-        product_discount_difference?: number;
     };
     is_price_include_tax: 0 | 1;
     product_bundle: {
@@ -101,7 +99,6 @@ export interface Product {
             surcharge_fee: number;
             surcharge_rounding_remainder?: number;
             tax_fee_rounding_remainder?: number;
-            product_discount_difference?: number;
         };
     }[];
 }

package/dist/model/strategy/adapter/walletPass/utils.d.ts

@@ -29,19 +29,6 @@ export declare function recalculateVouchers(allVouchers: any[], selectedVouchers
     allWithUpdatedStatus: any[];
     selectedWithDetails: any[];
 };
-/**
- * 获取税费和附加费的舍入余数
- * @param product 商品
- * @param isDeductTaxAndFee 是否抵扣税费与附加费
- * @returns 舍入余数（税费 + 附加费的舍入余数）
- */
-export declare const getTaxAndFeeRoundingRemainder: (product: Product, isDeductTaxAndFee: boolean) => number;
-/**
- * 获取主商品的商品差额
- * @param product 商品
- * @returns 商品差额（与数量无关，计算总价时需要减去）
- */
-export declare const getProductDiscountDifference: (product: Product) => number;
 /**
  * 获取主商品价格（单价，不含舍入余数）
  * @param product 商品
@@ -49,19 +36,6 @@ export declare const getProductDiscountDifference: (product: Product) => number;
  * @returns 商品单价
  */
 export declare const getMainProductPrice: (product: Product, isDeductTaxAndFee: boolean) => number;
-/**
- * 获取套餐子商品税费和附加费的舍入余数
- * @param bundleItem 套餐子商品
- * @param isDeductTaxAndFee 是否抵扣税费与附加费
- * @returns 舍入余数（税费 + 附加费的舍入余数）
- */
-export declare const getBundleItemTaxAndFeeRoundingRemainder: (bundleItem: any, isDeductTaxAndFee: boolean) => number;
-/**
- * 获取套餐子商品的商品差额
- * @param bundleItem 套餐子商品
- * @returns 商品差额（与数量无关，计算总价时需要减去）
- */
-export declare const getBundleItemDiscountDifference: (bundleItem: any) => number;
 /**
  * 获取套餐子商品价格（不含舍入余数）
  * @param bundleItem 套餐子商品

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

@@ -72,6 +72,7 @@ function applyMaxPassUsageIncrements(usageMap, walletPassProductId, maxPassesPer
 // 辅助函数：根据 deductTaxAndFee 配置获取推荐使用金额
 var getRecommendedAmount = function getRecommendedAmount(voucher) {
   var _config$deductTaxAndF;
+  console.log('voucher312', voucher);
   var config = voucher.config,
     recommended_usage_amount = voucher.recommended_usage_amount,
     recommended_pure_product_usage_amount = voucher.recommended_pure_product_usage_amount;
@@ -165,6 +166,8 @@ var getApplicableProducts = function getApplicableProducts(voucher, productsData
  * @returns 返回推荐券列表和全部列表，每个券包含 _available_max_amount 和 _unified_available_status
  */
 export function processVouchers(applicableVouchers, orderTotalAmount, products) {
+  console.log(products, 'products123');
+
   // 拆分商品数据，同时维护含税和不含税两个金额池
   // remainingAmountWithTax: 含税费的剩余可抵扣金额
   // remainingAmountPure: 纯商品金额（不含税费）的剩余可抵扣金额
@@ -491,7 +494,7 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
     // ======================================================================================
 
     // 计算本次抵扣金额（使用同样的 usageAmount）
-    var maxDeduction = Decimal.min(new Decimal(usageAmount), new Decimal(maxDeductionAmount));
+    var maxDeduction = Decimal.min(new Decimal(usageAmount), new Decimal(maxDeductionAmount), remainingOrderAmount);
     var deductionLeft = maxDeduction;
     var deductionDetails = [];
     if (allowCrossProduct) {
@@ -674,6 +677,7 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
 
   // 第一步：按顺序应用已选中的券，计算实际抵扣
   selectedVouchers.forEach(function (selectedVoucher) {
+    var _selectedVoucher$_ava;
     var config = selectedVoucher.config,
       id = selectedVoucher.id;
     var maxDeductionAmount = config.maxDeductionAmount,
@@ -707,9 +711,11 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
       return;
     }
 
-    // 计算本次抵扣金额
-    // 优先使用用户手动编辑的金额，否则根据 deductTaxAndFee 配置获取推荐金额
-    var usageAmount = typeof selectedVoucher.edit_current_amount === 'number' ? selectedVoucher.edit_current_amount : getRecommendedAmount(selectedVoucher);
+    // 计算本次抵扣金额：
+    // - 用户手动编辑时以编辑金额为准；
+    // - 自动推荐/重算时沿用上一轮基于剩余待付金额算出的 _available_max_amount，
+    //   避免 recalculateVouchers 又回退到后端单券 recommended_usage_amount 造成超付。
+    var usageAmount = typeof selectedVoucher.edit_current_amount === 'number' ? selectedVoucher.edit_current_amount : (_selectedVoucher$_ava = selectedVoucher._available_max_amount) !== null && _selectedVoucher$_ava !== void 0 ? _selectedVoucher$_ava : getRecommendedAmount(selectedVoucher);
     var maxDeduction = Decimal.min(new Decimal(usageAmount), new Decimal(maxDeductionAmount), remainingOrderAmount);
     var deductionLeft = maxDeduction;
     var deductionDetails = [];
@@ -936,40 +942,6 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
   };
 }
 
-/**
- * 获取税费和附加费的舍入余数
- * @param product 商品
- * @param isDeductTaxAndFee 是否抵扣税费与附加费
- * @returns 舍入余数（税费 + 附加费的舍入余数）
- */
-export var getTaxAndFeeRoundingRemainder = function getTaxAndFeeRoundingRemainder(product, isDeductTaxAndFee) {
-  var _product$metadata2;
-  if (!isDeductTaxAndFee) {
-    return 0;
-  }
-
-  // 税费舍入余数（如果价格包含税则为0）
-  var taxFeeRoundingRemainder = new Decimal(0);
-  if (product.is_price_include_tax !== 1) {
-    var _product$metadata;
-    taxFeeRoundingRemainder = new Decimal((product === null || product === void 0 || (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.tax_fee_rounding_remainder) || 0);
-  }
-
-  // 附加费舍入余数
-  var surchargeFeeRoundingRemainder = new Decimal((product === null || product === void 0 || (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.surcharge_rounding_remainder) || 0);
-  return taxFeeRoundingRemainder.add(surchargeFeeRoundingRemainder).toNumber();
-};
-
-/**
- * 获取主商品的商品差额
- * @param product 商品
- * @returns 商品差额（与数量无关，计算总价时需要减去）
- */
-export var getProductDiscountDifference = function getProductDiscountDifference(product) {
-  var _product$metadata3;
-  return new Decimal((product === null || product === void 0 || (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.product_discount_difference) || 0).toNumber();
-};
-
 /**
  * 获取主商品价格（单价，不含舍入余数）
  * @param product 商品
@@ -977,8 +949,8 @@ export var getProductDiscountDifference = function getProductDiscountDifference(
  * @returns 商品单价
  */
 export var getMainProductPrice = function getMainProductPrice(product, isDeductTaxAndFee) {
-  var _product$metadata4, _product$metadata5, _product$metadata6, _product$metadata7, _product$metadata8;
-  var mainProductPrice = new Decimal((product === null || product === void 0 ? void 0 : product.main_product_selling_price) || ((_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.main_product_selling_price) || 0);
+  var _product$metadata, _product$metadata2, _product$metadata3, _product$metadata4, _product$metadata5;
+  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 _iterator6 = _createForOfIteratorHelper((product === null || product === void 0 ? void 0 : product.product_bundle) || []),
     _step6;
   try {
@@ -997,14 +969,14 @@ export var getMainProductPrice = function getMainProductPrice(product, isDeductT
   } finally {
     _iterator6.f();
   }
-  var taxFee = new Decimal((product === null || product === void 0 ? void 0 : product.tax_fee) || (product === null || product === void 0 || (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.main_product_attached_bundle_tax_fee) || 0).add((product === null || product === void 0 || (_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.tax_fee_rounding_remainder) || 0);
+  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).add((product === null || product === void 0 || (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.tax_fee_rounding_remainder) || 0);
   if (product.is_price_include_tax === 1) {
     taxFee = new Decimal(0);
   }
 
   // 税费
   // 附加费
-  var surchargeFee = new Decimal((product === null || product === void 0 || (_product$metadata7 = product.metadata) === null || _product$metadata7 === void 0 ? void 0 : _product$metadata7.main_product_attached_bundle_surcharge_fee) || 0).add((product === null || product === void 0 || (_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.surcharge_rounding_remainder) || 0);
+  var surchargeFee = new Decimal((product === null || product === void 0 || (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.main_product_attached_bundle_surcharge_fee) || 0).add((product === null || product === void 0 || (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.surcharge_rounding_remainder) || 0);
 
   // 税费附加费总额
   var taxAndFeeTotal = taxFee.add(surchargeFee);
@@ -1016,40 +988,6 @@ export var getMainProductPrice = function getMainProductPrice(product, isDeductT
   return mainProductPrice.toNumber();
 };
 
-/**
- * 获取套餐子商品税费和附加费的舍入余数
- * @param bundleItem 套餐子商品
- * @param isDeductTaxAndFee 是否抵扣税费与附加费
- * @returns 舍入余数（税费 + 附加费的舍入余数）
- */
-export var getBundleItemTaxAndFeeRoundingRemainder = function getBundleItemTaxAndFeeRoundingRemainder(bundleItem, isDeductTaxAndFee) {
-  var _bundleItem$metadata2;
-  if (!isDeductTaxAndFee) {
-    return 0;
-  }
-
-  // 税费舍入余数（如果价格包含税则为0）
-  var taxFeeRoundingRemainder = new Decimal(0);
-  if (bundleItem.is_price_include_tax !== 1) {
-    var _bundleItem$metadata;
-    taxFeeRoundingRemainder = new Decimal(((_bundleItem$metadata = bundleItem.metadata) === null || _bundleItem$metadata === void 0 ? void 0 : _bundleItem$metadata.tax_fee_rounding_remainder) || 0);
-  }
-
-  // 附加费舍入余数
-  var surchargeFeeRoundingRemainder = new Decimal(((_bundleItem$metadata2 = bundleItem.metadata) === null || _bundleItem$metadata2 === void 0 ? void 0 : _bundleItem$metadata2.surcharge_rounding_remainder) || 0);
-  return taxFeeRoundingRemainder.add(surchargeFeeRoundingRemainder).toNumber();
-};
-
-/**
- * 获取套餐子商品的商品差额
- * @param bundleItem 套餐子商品
- * @returns 商品差额（与数量无关，计算总价时需要减去）
- */
-export var getBundleItemDiscountDifference = function getBundleItemDiscountDifference(bundleItem) {
-  var _bundleItem$metadata3;
-  return new Decimal(((_bundleItem$metadata3 = bundleItem.metadata) === null || _bundleItem$metadata3 === void 0 ? void 0 : _bundleItem$metadata3.product_discount_difference) || 0).toNumber();
-};
-
 /**
  * 获取套餐子商品价格（不含舍入余数）
  * @param bundleItem 套餐子商品
@@ -1065,14 +1003,14 @@ export var getBundleItemPrice = function getBundleItemPrice(bundleItem, parentQu
 
   // 根据 deductTaxAndFee 配置决定是否加上税费和附加费
   if (isDeductTaxAndFee) {
-    var _bundleItem$tax_fee, _bundleItem$metadata$, _bundleItem$metadata4;
+    var _bundleItem$tax_fee, _bundleItem$metadata$, _bundleItem$metadata;
     // 税费
     var taxFee = new Decimal((_bundleItem$tax_fee = bundleItem.tax_fee) !== null && _bundleItem$tax_fee !== void 0 ? _bundleItem$tax_fee : 0).times(totalQuantity);
     if (bundleItem.is_price_include_tax === 1) {
       taxFee = new Decimal(0);
     }
     // 附加费
-    var surchargeFee = new Decimal((_bundleItem$metadata$ = (_bundleItem$metadata4 = bundleItem.metadata) === null || _bundleItem$metadata4 === void 0 ? void 0 : _bundleItem$metadata4.surcharge_fee) !== null && _bundleItem$metadata$ !== void 0 ? _bundleItem$metadata$ : 0).times(totalQuantity);
+    var surchargeFee = new Decimal((_bundleItem$metadata$ = (_bundleItem$metadata = bundleItem.metadata) === null || _bundleItem$metadata === void 0 ? void 0 : _bundleItem$metadata.surcharge_fee) !== null && _bundleItem$metadata$ !== void 0 ? _bundleItem$metadata$ : 0).times(totalQuantity);
     bundleItemPrice = bundleItemPrice.add(taxFee).add(surchargeFee);
   }
   return bundleItemPrice.toNumber();
@@ -1094,11 +1032,6 @@ var expandProductsWithBundleItems = function expandProductsWithBundleItems(produ
     var unitPriceWithTax = getMainProductPrice(product, true);
     var unitPricePure = getMainProductPrice(product, false);
 
-    // 获取舍入余数（与数量无关，只加一次）
-    var roundingRemainderWithTax = getTaxAndFeeRoundingRemainder(product, true);
-    // 获取商品差额（与数量无关，计算总价时需要减去）
-    var discountDifference = getProductDiscountDifference(product);
-
     // 1. 添加主商品（同时计算含税和不含税两个金额，以及单价和剩余数量）
     expandedProducts.push(_objectSpread(_objectSpread({}, product), {}, {
       is_bundle_item: false,
@@ -1110,10 +1043,10 @@ var expandProductsWithBundleItems = function expandProductsWithBundleItems(produ
       unitPricePure: new Decimal(unitPricePure),
       // 剩余可抵扣数量
       remainingQuantity: productQuantity,
-      // 含税费的剩余金额（单价 * 数量 + 舍入余数 - 商品差额）
-      remainingAmountWithTax: new Decimal(unitPriceWithTax).times(productQuantity).add(roundingRemainderWithTax).sub(discountDifference),
-      // 纯商品金额（不含税费，也需要减去商品差额）
-      remainingAmountPure: new Decimal(unitPricePure).times(productQuantity).sub(discountDifference)
+      // 含税费的剩余金额
+      remainingAmountWithTax: new Decimal(unitPriceWithTax).times(productQuantity),
+      // 纯商品金额（不含税费）
+      remainingAmountPure: new Decimal(unitPricePure).times(productQuantity)
     }));
 
     // 2. 添加原价子商品（作为独立商品项）
@@ -1126,11 +1059,6 @@ var expandProductsWithBundleItems = function expandProductsWithBundleItems(produ
           var bundleUnitPriceWithTax = new Decimal(getBundleItemPrice(bundleItem, 1, true)).dividedBy(bundleItem.num);
           var bundleUnitPricePure = new Decimal(getBundleItemPrice(bundleItem, 1, false)).dividedBy(bundleItem.num);
 
-          // 获取子商品舍入余数（与数量无关，只加一次）
-          var bundleRoundingRemainder = getBundleItemTaxAndFeeRoundingRemainder(bundleItem, true);
-          // 获取子商品差额（与数量无关，计算总价时需要减去）
-          var bundleDiscountDifference = getBundleItemDiscountDifference(bundleItem);
-
           // 原价子商品作为独立商品
           expandedProducts.push(_objectSpread(_objectSpread({}, bundleItem), {}, {
             product_id: bundleItem.bundle_product_id,
@@ -1146,10 +1074,10 @@ var expandProductsWithBundleItems = function expandProductsWithBundleItems(produ
             unitPricePure: bundleUnitPricePure,
             // 剩余可抵扣数量
             remainingQuantity: bundleQuantity,
-            // 含税费的剩余金额（总价 + 舍入余数 - 商品差额）
-            remainingAmountWithTax: new Decimal(getBundleItemPrice(bundleItem, productQuantity, true)).add(bundleRoundingRemainder).sub(bundleDiscountDifference),
-            // 纯商品金额（不含税费，也需要减去商品差额）
-            remainingAmountPure: new Decimal(getBundleItemPrice(bundleItem, productQuantity, false)).sub(bundleDiscountDifference)
+            // 含税费的剩余金额
+            remainingAmountWithTax: new Decimal(getBundleItemPrice(bundleItem, productQuantity, true)),
+            // 纯商品金额（不含税费）
+            remainingAmountPure: new Decimal(getBundleItemPrice(bundleItem, productQuantity, false))
           }));
         }
       });

package/dist/model/strategy/strategy-example.js

@@ -246,6 +246,8 @@ var codeContext = {
 // ============================================
 
 function runExamples() {
+  console.log('====== 策略模型使用示例 ======\n');
+
   // 创建引擎实例（开启调试和追踪）
   var engine = createStrategyEngine({
     debug: true,
@@ -253,23 +255,32 @@ function runExamples() {
   });
 
   // 示例1: 代金券
-
+  console.log('示例1: 10元代金券');
   var result1 = engine.evaluate(voucherConfig, voucherContext);
+  console.log('结果:', JSON.stringify(result1, null, 2));
+  console.log('\n');
 
   // 示例2: 阶梯满减
-
+  console.log('示例2: 阶梯满减（订单金额250）');
   var result2 = engine.evaluate(tieredDiscountConfig, tieredContext);
+  console.log('结果:', JSON.stringify(result2, null, 2));
+  console.log('\n');
 
   // 示例3: Code 模式
-
+  console.log('示例3: Code 模式条件');
   var result3 = engine.evaluate(codeConditionConfig, codeContext);
+  console.log('结果:', JSON.stringify(result3, null, 2));
+  console.log('\n');
 
   // 快速评估（不需要创建引擎实例）
-
+  console.log('示例4: 快速评估');
   var result4 = evaluate(voucherConfig, voucherContext);
+  console.log('适用:', result4.applicable);
+  console.log('匹配动作数:', result4.matchedActions.length);
+  console.log('\n');
 
   // 注册自定义运算符
-
+  console.log('示例5: 自定义运算符');
   engine.registerOperator('divisible_by', function (fieldValue, compareValue) {
     return Number(fieldValue) % Number(compareValue) === 0;
   });
@@ -306,8 +317,11 @@ function runExamples() {
     }
   };
   var result5 = engine.evaluate(customOperatorConfig, customContext);
+  console.log('结果:', result5.applicable ? '适用' : '不适用');
+  console.log('匹配动作:', result5.matchedActions);
 
   // 调试信息
+  console.log('\n引擎调试信息:', engine.getDebugInfo());
 }
 
 // 运行示例（如果直接执行此文件）

package/dist/modules/BaseModule.d.ts

@@ -14,9 +14,9 @@ export declare class BaseModule {
         store: any;
         cacheKey: string[];
     }): void;
-    effectsOn(eventType: string, callback: (payload: any) => void, force?: boolean): void;
+    effectsOn(eventType: string, callback: (payload: any) => void): () => void;
     effectsOff(eventType: string, callback: (payload: any) => void): void;
-    effectsOnce(eventType: string, callback: (payload: any) => void, force?: boolean): void;
+    effectsOnce(eventType: string, callback: (payload: any) => void): () => void;
     effectsEmit(eventType: string, payload: any): Promise<{
         status: boolean;
         data: any;

package/dist/modules/BaseModule.js

@@ -1,6 +1,4 @@
 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 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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -41,7 +39,7 @@ export var BaseModule = /*#__PURE__*/function () {
           var currentCacheData = window.sessionStorage.getItem(fatherModule);
           var currentCacheDataObj = JSON.parse(currentCacheData || '{}');
           if (!currentCacheData || !currentCacheDataObj[cacheId]) {
-            currentCacheDataObj = _objectSpread(_defineProperty({}, cacheId, _defineProperty({}, this.name, {})), currentCacheDataObj);
+            currentCacheDataObj = _defineProperty({}, cacheId, _defineProperty({}, this.name, {}));
           }
           if (!currentCacheDataObj[cacheId][this.name]) {
             currentCacheDataObj[cacheId][this.name] = {};
@@ -52,24 +50,24 @@ export var BaseModule = /*#__PURE__*/function () {
           window.sessionStorage.setItem(fatherModule, JSON.stringify(currentCacheDataObj));
         } else {
           var _currentCacheData = window.sessionStorage.getItem(cacheId);
-          var _currentCacheDataObj = JSON.parse(_currentCacheData || '{}');
-          if (!_currentCacheDataObj) {
-            _currentCacheDataObj = {};
+          var _currentCacheDataObj2 = JSON.parse(_currentCacheData || '{}');
+          if (!_currentCacheDataObj2) {
+            _currentCacheDataObj2 = {};
           }
-          if (!_currentCacheDataObj[this.name]) {
-            _currentCacheDataObj[this.name] = {};
+          if (!_currentCacheDataObj2[this.name]) {
+            _currentCacheDataObj2[this.name] = {};
           }
           cacheKey.forEach(function (key) {
-            _currentCacheDataObj[_this.name][key] = store[key];
+            _currentCacheDataObj2[_this.name][key] = store[key];
           });
-          window.sessionStorage.setItem(cacheId, JSON.stringify(_currentCacheDataObj));
+          window.sessionStorage.setItem(cacheId, JSON.stringify(_currentCacheDataObj2));
         }
       }
     }
   }, {
     key: "effectsOn",
-    value: function effectsOn(eventType, callback, force) {
-      return this.core.effects.on("".concat(this.name, ":").concat(eventType), callback, force);
+    value: function effectsOn(eventType, callback) {
+      return this.core.effects.on("".concat(this.name, ":").concat(eventType), callback);
     }
   }, {
     key: "effectsOff",
@@ -78,8 +76,8 @@ export var BaseModule = /*#__PURE__*/function () {
     }
   }, {
     key: "effectsOnce",
-    value: function effectsOnce(eventType, callback, force) {
-      return this.core.effects.once("".concat(this.name, ":").concat(eventType), callback, force);
+    value: function effectsOnce(eventType, callback) {
+      return this.core.effects.once("".concat(this.name, ":").concat(eventType), callback);
     }
   }, {
     key: "effectsEmit",