@pisell/pisellos 1.0.142 → 1.0.143

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

@@ -20,9 +20,47 @@ var defaultStrategyMetadataCustom = {
   allowCrossProduct: true,
   applicableProductLimit: 0,
   deductTaxAndFee: true,
-  maxPassesPerItem: 0
+  maxPassesPerItem: 0,
+  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 可以在当前订单中使用
@@ -33,6 +71,7 @@ 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
@@ -41,7 +80,10 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
   _createClass(WalletPassEvaluator, [{
     key: "setStrategyConfigs",
     value: function setStrategyConfigs(strategyConfigs) {
-      this.strategyConfigs = strategyConfigs;
+      var newStrategyConfigs = strategyConfigs.filter(function (item) {
+        return item.metadata.type === 'wallet_pass';
+      });
+      this.strategyConfigs = newStrategyConfigs;
     }
   }, {
     key: "getStrategyConfigs",
@@ -53,6 +95,11 @@ 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) {
@@ -187,13 +234,17 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
               strategyResult: evaluationResult
             });
           } else {
-            // 根据策略评估结果的 code 映射到 locales 中的原因
-            var reasonCode = 'not_meet_the_required_conditions'; // 默认原因
-
-            // 根据策略引擎返回的 code 映射到本地化的 reasonCode
-            if (evaluationResult.code) {
-              // 可以根据具体的 code 映射到不同的原因
-              // 例如：如果是金额不足、使用次数限制等
+            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 映射
               var codeMapping = {
                 INSUFFICIENT_AMOUNT: 'not_meet_the_required_conditions',
                 USAGE_LIMIT_EXCEEDED: 'usage_limit_reached',
@@ -203,6 +254,11 @@ 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,
@@ -210,7 +266,7 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
               maxDeduction: 0,
               deductTaxAndFee: false,
               applicableProductIds: [],
-              reason: this.getText(reasonCode),
+              reason: reason,
               reasonCode: reasonCode,
               strategyResult: evaluationResult
             });
@@ -450,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;
 

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

@@ -5,7 +5,10 @@ export var locales = {
     'usage_limit_reached': '已达到使用次数上限',
     'max_passes_per_item_reached': '该商品已达到卡券使用上限',
     'not_available_for_this_channel': '当前渠道不可使用',
-    'not_valid_for_this_order_type': '当前订单类型不适用'
+    '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} 件'
   },
   'en': {
     'not_meet_the_required_conditions': 'Not meet the required conditions.',
@@ -13,7 +16,10 @@ 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.'
+    '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}'
   },
   'zh-HK': {
     'not_meet_the_required_conditions': '未達使用條件',
@@ -21,6 +27,9 @@ export var locales = {
     'usage_limit_reached': '已達使用次數上限',
     'max_passes_per_item_reached': '該商品已達卡券使用上限',
     'not_available_for_this_channel': '當前渠道不可使用',
-    'not_valid_for_this_order_type': '當前訂單類型不適用'
+    '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} 件'
   }
 };

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

@@ -41,8 +41,10 @@ export interface Voucher {
         allowCrossProduct: boolean;
         /** 可用商品数量上限 （仅多商品） 默认为0，表示不限制商品数量。 */
         applicableProductLimit: number;
-        /** 单商品可用卡券上限（同一 Wallet Pass 商品生成的卡券对同一商品行最多抵扣次数）。默认为 0，表示不限制。 */
+        /** 单订单行每单位可用同一 Wallet Pass 券次数；该行总券次上限 = maxPassesPerItem × 该行 quantity（按行唯一键区分）。0 表示不限制。 */
         maxPassesPerItem: number;
+        /** 是否抵扣单规格价格 (Option Price)，默认 false。开启后折扣范围包含 option 的 add_price */
+        deductOptionPrice: boolean;
     };
 }
 /**
@@ -50,6 +52,10 @@ export interface Voucher {
  */
 export interface Product {
     product_id: number;
+    /** 订单明细 id，参与行唯一键兜底解析 */
+    id?: number;
+    /** 行级唯一串，参与行唯一键解析 */
+    product_unique_string?: string;
     price: number;
     quantity: number;
     name?: string;
@@ -58,9 +64,19 @@ export interface Product {
     main_product_original_price?: number;
     /** 主商品折扣后金额，不包含套餐子商品 */
     main_product_selling_price?: number;
+    /** 单规格（Option）列表 */
+    product_options?: {
+        id: number;
+        add_price: number | string;
+        num: number;
+        [key: string]: any;
+    }[];
     /** 主商品税费 */
     tax_fee: number;
     metadata: {
+        /** 行唯一标识，优先用于 Wallet Pass 按行配额 */
+        product_unique?: string;
+        unique_identification_number?: string;
         main_product_attached_bundle_tax_fee?: number;
         main_product_attached_bundle_surcharge_fee?: number;
         surcharge_rounding_remainder?: number;
@@ -132,8 +148,10 @@ export interface EvaluatorInput {
         allowCrossProduct: boolean;
         /** 可用商品数量上限 （仅多商品） 默认为0，表示不限制商品数量。 */
         applicableProductLimit: number;
-        /** 单商品可用卡券上限（同一 Wallet Pass 商品生成的卡券对同一商品行最多抵扣次数）。默认为 0，表示不限制。 */
+        /** 单订单行每单位可用同一 Wallet Pass 券次数；行总上限 = maxPassesPerItem × 该行 quantity（按行唯一键计）。0 表示不限制。 */
         maxPassesPerItem: number;
+        /** 是否抵扣单规格价格 (Option Price)，默认 false */
+        deductOptionPrice: boolean;
     }>[];
 }
 /**

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

@@ -1,4 +1,10 @@
 import { Product, Voucher } from './type';
+/** 订单商品数量 */
+export declare const getProductQuantity: (product: any) => any;
+/**
+ * 订单商品行唯一键，用于 maxPassesPerItem 按行、按件配额（同 SPU 不同规格视为不同行）。
+ */
+export declare function resolveWalletPassLineKey(product: any, indexInOrder: number): string;
 export declare const getApplicableProductIds: (voucher: Voucher) => number[] | null;
 /**
  * 优惠券处理函数
@@ -64,12 +70,6 @@ export declare const getBundleItemDiscountDifference: (bundleItem: any) => numbe
  * @returns 子商品总价格（不含舍入余数）
  */
 export declare const getBundleItemPrice: (bundleItem: any, parentQuantity: number, isDeductTaxAndFee: boolean) => number;
-/**
- * 获取商品数量
- * @param product 商品
- * @returns 商品数量
- */
-export declare const getProductQuantity: (product: any) => any;
 export declare const getBundleItemIsOriginalPrice: (item: any) => boolean;
 export declare const getBundleItemIsMarkupPrice: (item: any) => boolean;
 export declare const getBundleItemIsDiscountPrice: (item: any) => boolean;