@pisell/pisellos 2.1.151 → 2.1.152

package/dist/apis/picoding.js

@@ -0,0 +1 @@
+// picoding 相关公共 api

package/dist/index.d.ts

@@ -6,7 +6,6 @@ export * from './types';
 export * from './modules';
 export * from './plugins';
 export * from './solution';
-export * from './model';
 export { PisellOSCore } from './core';
 import PisellOSCore from './core';
 export default PisellOSCore;

package/dist/index.js

@@ -8,7 +8,6 @@ export * from "./types";
 export * from "./modules";
 export * from "./plugins";
 export * from "./solution";
-export * from "./model";
 
 // 导出核心实现
 export { PisellOSCore } from "./core";

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

@@ -719,8 +719,7 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
             unitProducts.push({
               product: product,
               price: product.price,
-              productId: product.id,
-              sourceAvailableQty: availableQty
+              productId: product.id
             });
           }
         }
@@ -737,13 +736,8 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
         };
       }
 
-      // 2. 排序：优先选择来源数量是 x 倍数的商品（可完整凑组不拆分），然后按价格从高到低
+      // 2. 按价格从高到低排序（优先使用高价商品）
       unitProducts.sort(function (a, b) {
-        // 优先级1：来源购物车项数量是 x 的倍数的排前面（这些商品可以完整凑组，避免拆分）
-        var aIsMultiple = a.sourceAvailableQty > 0 && a.sourceAvailableQty % x === 0 ? 1 : 0;
-        var bIsMultiple = b.sourceAvailableQty > 0 && b.sourceAvailableQty % x === 0 ? 1 : 0;
-        if (aIsMultiple !== bIsMultiple) return bIsMultiple - aIsMultiple;
-        // 优先级2：按价格从高到低（优先使用高价商品）
         return b.price - a.price;
       });
 
@@ -839,10 +833,7 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
             var totalAllocated = allocatedPrices.reduce(function (sum, p) {
               return sum.plus(p);
             }, new Decimal(0));
-            // 取促销价和原价的最小值，避免促销反而加价
-            var productOriginalAmount = new Decimal(_product.price).mul(promoQty);
-            var actualTotal = Decimal.min(totalAllocated, productOriginalAmount);
-            var finalPricePerUnit = this.formatPrice(actualTotal.div(promoQty));
+            var finalPricePerUnit = this.formatPrice(totalAllocated.div(promoQty));
             result.push(_objectSpread(_objectSpread({}, _product), {}, {
               quantity: promoQty,
               finalPrice: finalPricePerUnit,
@@ -852,8 +843,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
               isSplit: false,
               matchedBundleIndex: matchedBundleIndex
             }));
+            var productOriginalAmount = new Decimal(_product.price).mul(promoQty);
             originalAmount = originalAmount.plus(productOriginalAmount);
-            finalAmount = finalAmount.plus(actualTotal);
+            finalAmount = finalAmount.plus(totalAllocated);
           } else if (promoQty === 0 && remainingQty > 0) {
             // 全部不参与促销：保留原 id，finalPrice = 原价
             result.push(_objectSpread(_objectSpread({}, _product), {}, {
@@ -873,10 +865,7 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
             var _totalAllocated = allocatedPrices.reduce(function (sum, p) {
               return sum.plus(p);
             }, new Decimal(0));
-            // 取促销价和原价的最小值，避免促销反而加价
-            var promoOriginalAmount = new Decimal(_product.price).mul(promoQty);
-            var _actualTotal = Decimal.min(_totalAllocated, promoOriginalAmount);
-            var _finalPricePerUnit = this.formatPrice(_actualTotal.div(promoQty));
+            var _finalPricePerUnit = this.formatPrice(_totalAllocated.div(promoQty));
             result.push(_objectSpread(_objectSpread({}, _product), {}, {
               id: this.generateRandomId(),
               originalId: _product.id,
@@ -888,8 +877,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
               matchedBundleIndex: matchedBundleIndex,
               isSplit: true
             }));
+            var promoOriginalAmount = new Decimal(_product.price).mul(promoQty);
             originalAmount = originalAmount.plus(promoOriginalAmount);
-            finalAmount = finalAmount.plus(_actualTotal);
+            finalAmount = finalAmount.plus(_totalAllocated);
 
             // 不参与促销的部分：保留原 id
             result.push(_objectSpread(_objectSpread({}, _product), {}, {
@@ -908,74 +898,11 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
           // 更新已处理数量
           processedQuantityMap.set(_key, _processedQty + _availableQty);
         }
-
-        // 8. 尾差调整：确保促销商品的 finalPrice × quantity 之和精确等于 groupPrice × groupCount
       } catch (err) {
         _iterator13.e(err);
       } finally {
         _iterator13.f();
       }
-      if (groupCount > 0) {
-        var expectedPromoTotal = new Decimal(groupPrice).mul(groupCount);
-        var promoItems = result.filter(function (p) {
-          return p.inPromotion;
-        });
-        var actualPromoTotal = new Decimal(0);
-        var _iterator14 = _createForOfIteratorHelper(promoItems),
-          _step14;
-        try {
-          for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
-            var _p = _step14.value;
-            actualPromoTotal = actualPromoTotal.plus(new Decimal(_p.finalPrice).mul(_p.quantity));
-          }
-        } catch (err) {
-          _iterator14.e(err);
-        } finally {
-          _iterator14.f();
-        }
-        var roundingDiff = actualPromoTotal.minus(expectedPromoTotal);
-        if (!roundingDiff.eq(0)) {
-          // 优先找 quantity=1 的促销商品调整（差额直接加减到单价上）
-          var adjustTarget = promoItems.find(function (p) {
-            return p.quantity === 1;
-          });
-          if (adjustTarget) {
-            adjustTarget.finalPrice = this.formatPrice(new Decimal(adjustTarget.finalPrice).minus(roundingDiff));
-          } else if (promoItems.length > 0) {
-            // 没有 quantity=1 的促销商品，从最后一个促销商品中拆出1件做尾差调整
-            var lastPromo = promoItems[promoItems.length - 1];
-            var adjustedUnitPrice = this.formatPrice(new Decimal(lastPromo.finalPrice).minus(roundingDiff));
-
-            // 原商品减少1件
-            lastPromo.quantity -= 1;
-            lastPromo.isSplit = true;
-
-            // 拆出1件用调整后的价格
-            result.push(_objectSpread(_objectSpread({}, lastPromo), {}, {
-              id: this.generateRandomId(),
-              originalId: lastPromo.originalId || lastPromo.id,
-              quantity: 1,
-              finalPrice: adjustedUnitPrice,
-              isSplit: true
-            }));
-          }
-
-          // 重新计算 finalAmount
-          finalAmount = new Decimal(0);
-          var _iterator15 = _createForOfIteratorHelper(result),
-            _step15;
-          try {
-            for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
-              var p = _step15.value;
-              finalAmount = finalAmount.plus(new Decimal(p.finalPrice).mul(p.quantity));
-            }
-          } catch (err) {
-            _iterator15.e(err);
-          } finally {
-            _iterator15.f();
-          }
-        }
-      }
       return {
         products: result,
         originalAmount: originalAmount.toNumber(),
@@ -1010,11 +937,11 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
       // 对于 bundle 子商品匹配，促销数量 = 主商品数量 × bundle子商品数量
       var totalPromoQty = 0;
       var productInfoMap = new Map();
-      var _iterator16 = _createForOfIteratorHelper(groupProducts),
-        _step16;
+      var _iterator14 = _createForOfIteratorHelper(groupProducts),
+        _step14;
       try {
-        for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
-          var product = _step16.value;
+        for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+          var product = _step14.value;
           var key = this.getProductKey(product);
           var processedQty = processedQuantityMap.get(key) || 0;
           var availableQty = product.quantity - processedQty;
@@ -1040,18 +967,18 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
 
         // 2. 判断是否满足促销条件
       } catch (err) {
-        _iterator16.e(err);
+        _iterator14.e(err);
       } finally {
-        _iterator16.f();
+        _iterator14.f();
       }
       var isFulfilled = totalPromoQty >= buyQuantity;
 
       // 3. 生成商品结果（第二次遍历）
-      var _iterator17 = _createForOfIteratorHelper(groupProducts),
-        _step17;
+      var _iterator15 = _createForOfIteratorHelper(groupProducts),
+        _step15;
       try {
-        for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
-          var _product2 = _step17.value;
+        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+          var _product2 = _step15.value;
           var _key2 = this.getProductKey(_product2);
           var info = productInfoMap.get(_key2);
           if (!info || info.availableQty <= 0) continue;
@@ -1079,9 +1006,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
 
         // 4. 计算赠品数量（使用促销数量）
       } catch (err) {
-        _iterator17.e(err);
+        _iterator15.e(err);
       } finally {
-        _iterator17.f();
+        _iterator15.f();
       }
       var giftCount = 0;
       if (isFulfilled) {
@@ -1110,11 +1037,11 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
     key: "getRemainingProducts",
     value: function getRemainingProducts(allProducts, processedQuantityMap) {
       var result = [];
-      var _iterator18 = _createForOfIteratorHelper(allProducts),
-        _step18;
+      var _iterator16 = _createForOfIteratorHelper(allProducts),
+        _step16;
       try {
-        for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
-          var product = _step18.value;
+        for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
+          var product = _step16.value;
           var key = this.getProductKey(product);
           var processedQty = processedQuantityMap.get(key) || 0;
           var remainingQty = product.quantity - processedQty;
@@ -1129,9 +1056,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator18.e(err);
+        _iterator16.e(err);
       } finally {
-        _iterator18.f();
+        _iterator16.f();
       }
       return result;
     }

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

@@ -8,12 +8,10 @@ export declare class WalletPassEvaluator {
     private engine;
     private strategyConfigs;
     private locale;
-    private otherParams;
     constructor();
     setStrategyConfigs(strategyConfigs: StrategyConfig[]): void;
     getStrategyConfigs(): StrategyConfig[];
     setLocale(locale: string): void;
-    setOtherParams(otherParams: any): void;
     getText(key: string): string;
     /**
      * 搜索券的格式

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

@@ -24,43 +24,6 @@ var defaultStrategyMetadataCustom = {
   deductOptionPrice: false
 };
 
-/**
- * 条件 field → reasonCode 映射
- * 用于将策略引擎返回的 failedField 转换为本地化文案 key
- */
-var FIELD_REASON_CODE_MAP = {
-  orderTotalAmount: 'order_total_amount_not_enough',
-  applicableProductTotalAmount: 'applicable_product_total_amount_not_enough',
-  applicableProductCount: 'applicable_product_count_not_enough'
-};
-
-/**
- * 金额类型 field 集合（需要在文案前拼货币符号）
- */
-var AMOUNT_FIELDS = new Set(['orderTotalAmount', 'applicableProductTotalAmount']);
-
-/**
- * 用阈值与货币符号替换文案中的占位符
- * 支持占位符：{value} / ${value} / {currency}
- */
-function formatReason(template, value) {
-  var currency = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
-  if (!template) return template;
-  var v = value === undefined || value === null ? '' : String(value);
-  var c = currency === undefined || currency === null ? '' : String(currency);
-  // 注意：必须先替换 value，再替换 currency
-  // 否则 currency 注入的 "$" 会被后续的 /\$\{value\}/ 正则误吞
-  // 使用函数作为替换参数，避免替换串中的 "$" 被 String.prototype.replace
-  // 当作特殊序列（如 $$ -> $、$& 等）处理
-  return template.replace(/\$\{value\}/g, function () {
-    return v;
-  }).replace(/\{value\}/g, function () {
-    return v;
-  }).replace(/\{currency\}/g, function () {
-    return c;
-  });
-}
-
 /**
  * Wallet Pass 评估器
  * 用于评估哪些 voucher 可以在当前订单中使用
@@ -71,7 +34,6 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
     _defineProperty(this, "engine", void 0);
     _defineProperty(this, "strategyConfigs", []);
     _defineProperty(this, "locale", 'en');
-    _defineProperty(this, "otherParams", {});
     this.engine = new StrategyEngine({
       debug: false,
       enableTrace: false
@@ -95,11 +57,6 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
     value: function setLocale(locale) {
       this.locale = locale;
     }
-  }, {
-    key: "setOtherParams",
-    value: function setOtherParams(otherParams) {
-      this.otherParams = otherParams;
-    }
   }, {
     key: "getText",
     value: function getText(key) {
@@ -234,17 +191,13 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
               strategyResult: evaluationResult
             });
           } else {
-            var _evaluationResult$mat, _evaluationResult$mat2, _this$otherParams, _this$otherParams$get, _this$otherParams2;
-            // 优先根据失败的 field 映射到具体的 reasonCode（更精确的失败原因）
-            var reasonCode = 'not_meet_the_required_conditions';
-            var thresholdValue = undefined;
-            var failedField = (_evaluationResult$mat = evaluationResult.matched) === null || _evaluationResult$mat === void 0 ? void 0 : _evaluationResult$mat.failedField;
-            var failedRule = (_evaluationResult$mat2 = evaluationResult.matched) === null || _evaluationResult$mat2 === void 0 || (_evaluationResult$mat2 = _evaluationResult$mat2.failedRules) === null || _evaluationResult$mat2 === void 0 ? void 0 : _evaluationResult$mat2[0];
-            if (failedField && FIELD_REASON_CODE_MAP[failedField]) {
-              reasonCode = FIELD_REASON_CODE_MAP[failedField];
-              thresholdValue = failedRule === null || failedRule === void 0 ? void 0 : failedRule.value;
-            } else if (evaluationResult.code) {
-              // 兜底：保留原有 code → reasonCode 映射
+            // 根据策略评估结果的 code 映射到 locales 中的原因
+            var reasonCode = 'not_meet_the_required_conditions'; // 默认原因
+
+            // 根据策略引擎返回的 code 映射到本地化的 reasonCode
+            if (evaluationResult.code) {
+              // 可以根据具体的 code 映射到不同的原因
+              // 例如：如果是金额不足、使用次数限制等
               var codeMapping = {
                 INSUFFICIENT_AMOUNT: 'not_meet_the_required_conditions',
                 USAGE_LIMIT_EXCEEDED: 'usage_limit_reached',
@@ -254,11 +207,6 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
               };
               reasonCode = codeMapping[evaluationResult.code] || 'not_meet_the_required_conditions';
             }
-            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,
               isApplicable: false,
@@ -266,7 +214,7 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
               maxDeduction: 0,
               deductTaxAndFee: false,
               applicableProductIds: [],
-              reason: reason,
+              reason: this.getText(reasonCode),
               reasonCode: reasonCode,
               strategyResult: evaluationResult
             });
@@ -506,7 +454,6 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
   }, {
     key: "calculateApplicableProducts",
     value: function calculateApplicableProducts(products, applicableProductIds, deductTaxAndFee) {
-      console.log(products, 'products1234');
       var total = 0;
       var count = 0;
 

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

@@ -5,10 +5,7 @@ export var locales = {
     'usage_limit_reached': '已达到使用次数上限',
     'max_passes_per_item_reached': '该商品已达到卡券使用上限',
     'not_available_for_this_channel': '当前渠道不可使用',
-    'not_valid_for_this_order_type': '当前订单类型不适用',
-    'order_total_amount_not_enough': '满 {currency}{value} 可用',
-    'applicable_product_total_amount_not_enough': '满 {currency}{value} 可用',
-    'applicable_product_count_not_enough': '至少 {value} 件'
+    'not_valid_for_this_order_type': '当前订单类型不适用'
   },
   'en': {
     'not_meet_the_required_conditions': 'Not meet the required conditions.',
@@ -16,10 +13,7 @@ export var locales = {
     'usage_limit_reached': 'Usage limit reached.',
     'max_passes_per_item_reached': 'Max passes per item reached.',
     'not_available_for_this_channel': 'Not available for this channel.',
-    'not_valid_for_this_order_type': 'Not valid for this order type.',
-    'order_total_amount_not_enough': 'Spend {currency}{value} to use',
-    'applicable_product_total_amount_not_enough': 'Spend {currency}{value} to use',
-    'applicable_product_count_not_enough': 'Min. Qty {value}'
+    'not_valid_for_this_order_type': 'Not valid for this order type.'
   },
   'zh-HK': {
     'not_meet_the_required_conditions': '未達使用條件',
@@ -27,9 +21,6 @@ export var locales = {
     'usage_limit_reached': '已達使用次數上限',
     'max_passes_per_item_reached': '該商品已達卡券使用上限',
     'not_available_for_this_channel': '當前渠道不可使用',
-    'not_valid_for_this_order_type': '當前訂單類型不適用',
-    'order_total_amount_not_enough': '滿 {currency}{value} 可用',
-    'applicable_product_total_amount_not_enough': '滿 {currency}{value} 可用',
-    'applicable_product_count_not_enough': '至少 {value} 件'
+    'not_valid_for_this_order_type': '當前訂單類型不適用'
   }
 };

package/dist/model/strategy/engine.d.ts

@@ -27,30 +27,17 @@ export declare class StrategyEngine {
      *
      * @param group 条件组
      * @param context 运行时上下文
-     * @returns 评估结果对象，包含条件是否满足、收集到的 actionIds、以及失败的原子规则信息
+     * @returns 评估结果对象，包含条件是否满足和收集到的 actionIds
      */
     private evaluateConditionGroup;
     /**
-     * 评估条件组的逻辑运算（带失败规则收集）
-     *
-     * 失败规则收集策略：
-     * - `and`：返回第一个失败的原子规则（嵌套 group 递归取其首个失败原子规则）
-     * - `or`：所有分支失败时，聚合每个分支的失败规则
-     * - `not`：被取反规则实际通过时，记录该规则
-     */
-    private evaluateGroupLogicDetailed;
-    /**
-     * 评估单个规则（带失败规则收集）
-     */
-    private evaluateRuleDetailed;
-    /**
-     * 评估原子规则（不收集失败信息，仅返回布尔结果）
+     * 评估条件组的逻辑运算
      */
-    private evaluateAtomicRule;
+    private evaluateGroupLogic;
     /**
-     * 构建失败规则信息
+     * 评估单个规则
      */
-    private buildFailedRuleInfo;
+    private evaluateRule;
     /**
      * 评估代码模式条件
      */