@pisell/pisellos 2.2.141 → 2.2.143

package/dist/server/modules/order/utils/filterOrders.js

@@ -18,18 +18,29 @@ export function filterOrders(orders, filters) {
       list: [],
       count: 0,
       size: 0,
-      skip: 0
+      skip: 0,
+      rejected: []
     };
   }
 
   // 默认分页参数
   var size = safeFilters.num || 20;
   var page = safeFilters.skip || 1;
+  var rejected = [];
 
   // 1. 过滤
   var filteredList = orders.filter(function (order) {
     if (safeFilters.keyword) {
       if (!JSON.stringify(order).toLowerCase().includes(safeFilters.keyword.toLowerCase())) {
+        rejected.push({
+          order_id: order.order_id,
+          order_number: order.order_number,
+          reason: {
+            field: 'keyword',
+            actual: '',
+            expected: safeFilters.keyword
+          }
+        });
         return false;
       }
     }
@@ -37,6 +48,15 @@ export function filterOrders(orders, filters) {
     // status - 订单状态
     if (safeFilters.status && safeFilters.status.length > 0) {
       if (!order.status || !safeFilters.status.includes(order.status)) {
+        rejected.push({
+          order_id: order.order_id,
+          order_number: order.order_number,
+          reason: {
+            field: 'status',
+            actual: order.status,
+            expected: safeFilters.status
+          }
+        });
         return false;
       }
     }
@@ -44,6 +64,15 @@ export function filterOrders(orders, filters) {
     // payment_status - 支付状态
     if (safeFilters.payment_status && safeFilters.payment_status.length > 0) {
       if (!order.payment_status || !safeFilters.payment_status.includes(order.payment_status)) {
+        rejected.push({
+          order_id: order.order_id,
+          order_number: order.order_number,
+          reason: {
+            field: 'payment_status',
+            actual: order.payment_status,
+            expected: safeFilters.payment_status
+          }
+        });
         return false;
       }
     }
@@ -51,6 +80,15 @@ export function filterOrders(orders, filters) {
     // shipping_status - 处理状态
     if (safeFilters.shipping_status && safeFilters.shipping_status.length > 0) {
       if (!order.shipping_status || !safeFilters.shipping_status.includes(order.shipping_status)) {
+        rejected.push({
+          order_id: order.order_id,
+          order_number: order.order_number,
+          reason: {
+            field: 'shipping_status',
+            actual: order.shipping_status,
+            expected: safeFilters.shipping_status
+          }
+        });
         return false;
       }
     }
@@ -58,6 +96,15 @@ export function filterOrders(orders, filters) {
     // customer_id - 客户ID（精确匹配）
     if (safeFilters.customer_id !== undefined && safeFilters.customer_id !== null) {
       if (String(order.customer_id) !== String(safeFilters.customer_id)) {
+        rejected.push({
+          order_id: order.order_id,
+          order_number: order.order_number,
+          reason: {
+            field: 'customer_id',
+            actual: order.customer_id,
+            expected: safeFilters.customer_id
+          }
+        });
         return false;
       }
     }
@@ -65,6 +112,15 @@ export function filterOrders(orders, filters) {
     // order_sales_channel - 销售渠道
     if (safeFilters.order_sales_channel && safeFilters.order_sales_channel.length > 0) {
       if (!order.order_sales_channel || !safeFilters.order_sales_channel.includes(order.order_sales_channel)) {
+        rejected.push({
+          order_id: order.order_id,
+          order_number: order.order_number,
+          reason: {
+            field: 'order_sales_channel',
+            actual: order.order_sales_channel,
+            expected: safeFilters.order_sales_channel
+          }
+        });
         return false;
       }
     }
@@ -72,12 +128,30 @@ export function filterOrders(orders, filters) {
     // payment_methods - 支付方式
     if (safeFilters.payment_methods && safeFilters.payment_methods.length > 0) {
       if (!order.payment_methods || !Array.isArray(order.payment_methods) || order.payment_methods.length === 0) {
+        rejected.push({
+          order_id: order.order_id,
+          order_number: order.order_number,
+          reason: {
+            field: 'payment_methods',
+            actual: order.payment_methods,
+            expected: safeFilters.payment_methods
+          }
+        });
         return false;
       }
       var hasMatch = order.payment_methods.some(function (pm) {
         return safeFilters.payment_methods.includes(pm);
       });
       if (!hasMatch) {
+        rejected.push({
+          order_id: order.order_id,
+          order_number: order.order_number,
+          reason: {
+            field: 'payment_methods',
+            actual: order.payment_methods,
+            expected: safeFilters.payment_methods
+          }
+        });
         return false;
       }
     }
@@ -86,9 +160,27 @@ export function filterOrders(orders, filters) {
     if (safeFilters.min_total_amount !== undefined || safeFilters.max_total_amount !== undefined) {
       var orderAmount = parseFloat(String(order.total_amount || 0));
       if (safeFilters.min_total_amount !== undefined && orderAmount < safeFilters.min_total_amount) {
+        rejected.push({
+          order_id: order.order_id,
+          order_number: order.order_number,
+          reason: {
+            field: 'min_total_amount',
+            actual: order.total_amount,
+            expected: safeFilters.min_total_amount
+          }
+        });
         return false;
       }
       if (safeFilters.max_total_amount !== undefined && orderAmount > safeFilters.max_total_amount) {
+        rejected.push({
+          order_id: order.order_id,
+          order_number: order.order_number,
+          reason: {
+            field: 'max_total_amount',
+            actual: order.total_amount,
+            expected: safeFilters.max_total_amount
+          }
+        });
         return false;
       }
     }
@@ -96,6 +188,15 @@ export function filterOrders(orders, filters) {
     // tag_ids - 标签（统一 String 比较，兼容 number/string）
     if (safeFilters.tag_ids && safeFilters.tag_ids.length > 0) {
       if (!order.tag_ids || !Array.isArray(order.tag_ids) || order.tag_ids.length === 0) {
+        rejected.push({
+          order_id: order.order_id,
+          order_number: order.order_number,
+          reason: {
+            field: 'tag_ids',
+            actual: order.tag_ids,
+            expected: safeFilters.tag_ids
+          }
+        });
         return false;
       }
       var filterTagSet = new Set(safeFilters.tag_ids.map(String));
@@ -103,6 +204,15 @@ export function filterOrders(orders, filters) {
         return filterTagSet.has(String(tag));
       });
       if (!_hasMatch) {
+        rejected.push({
+          order_id: order.order_id,
+          order_number: order.order_number,
+          reason: {
+            field: 'tag_ids',
+            actual: order.tag_ids,
+            expected: safeFilters.tag_ids
+          }
+        });
         return false;
       }
     }
@@ -110,6 +220,15 @@ export function filterOrders(orders, filters) {
     // shipping_type - 配送方式
     if (safeFilters.shipping_type && safeFilters.shipping_type.length > 0) {
       if (!order.shipping_type || !safeFilters.shipping_type.includes(order.shipping_type)) {
+        rejected.push({
+          order_id: order.order_id,
+          order_number: order.order_number,
+          reason: {
+            field: 'shipping_type',
+            actual: order.shipping_type,
+            expected: safeFilters.shipping_type
+          }
+        });
         return false;
       }
     }
@@ -117,6 +236,15 @@ export function filterOrders(orders, filters) {
     // delivery_zone_name - 配送区域（模糊匹配）
     if (safeFilters.delivery_zone_name !== undefined && safeFilters.delivery_zone_name !== null && safeFilters.delivery_zone_name !== '') {
       if (!order.delivery_zone_name || !order.delivery_zone_name.toLowerCase().includes(safeFilters.delivery_zone_name.toLowerCase())) {
+        rejected.push({
+          order_id: order.order_id,
+          order_number: order.order_number,
+          reason: {
+            field: 'delivery_zone_name',
+            actual: order.delivery_zone_name,
+            expected: safeFilters.delivery_zone_name
+          }
+        });
         return false;
       }
     }
@@ -124,6 +252,15 @@ export function filterOrders(orders, filters) {
     // location_id - 取货地点（精确匹配）
     if (safeFilters.location_id !== undefined && safeFilters.location_id !== null) {
       if (String(order.location_id) !== String(safeFilters.location_id)) {
+        rejected.push({
+          order_id: order.order_id,
+          order_number: order.order_number,
+          reason: {
+            field: 'location_id',
+            actual: order.location_id,
+            expected: safeFilters.location_id
+          }
+        });
         return false;
       }
     }
@@ -131,6 +268,15 @@ export function filterOrders(orders, filters) {
     // shipping_order_number - 物流单号（模糊匹配）
     if (safeFilters.shipping_order_number !== undefined && safeFilters.shipping_order_number !== null && safeFilters.shipping_order_number !== '') {
       if (!order.shipping_order_number || !order.shipping_order_number.toLowerCase().includes(safeFilters.shipping_order_number.toLowerCase())) {
+        rejected.push({
+          order_id: order.order_id,
+          order_number: order.order_number,
+          reason: {
+            field: 'shipping_order_number',
+            actual: order.shipping_order_number,
+            expected: safeFilters.shipping_order_number
+          }
+        });
         return false;
       }
     }
@@ -138,6 +284,15 @@ export function filterOrders(orders, filters) {
     // logistics_company_id - 物流公司
     if (safeFilters.logistics_company_id && safeFilters.logistics_company_id.length > 0) {
       if (!order.logistics_company_id) {
+        rejected.push({
+          order_id: order.order_id,
+          order_number: order.order_number,
+          reason: {
+            field: 'logistics_company_id',
+            actual: order.logistics_company_id,
+            expected: safeFilters.logistics_company_id
+          }
+        });
         return false;
       }
       var orderLogisticsId = String(order.logistics_company_id);
@@ -145,6 +300,15 @@ export function filterOrders(orders, filters) {
         return String(id) === orderLogisticsId;
       });
       if (!_hasMatch2) {
+        rejected.push({
+          order_id: order.order_id,
+          order_number: order.order_number,
+          reason: {
+            field: 'logistics_company_id',
+            actual: order.logistics_company_id,
+            expected: safeFilters.logistics_company_id
+          }
+        });
         return false;
       }
     }
@@ -152,6 +316,15 @@ export function filterOrders(orders, filters) {
     // zip - 邮编（模糊匹配）
     if (safeFilters.zip !== undefined && safeFilters.zip !== null && safeFilters.zip !== '') {
       if (!order.zip || !order.zip.toLowerCase().includes(safeFilters.zip.toLowerCase())) {
+        rejected.push({
+          order_id: order.order_id,
+          order_number: order.order_number,
+          reason: {
+            field: 'zip',
+            actual: order.zip,
+            expected: safeFilters.zip
+          }
+        });
         return false;
       }
     }
@@ -159,6 +332,15 @@ export function filterOrders(orders, filters) {
     // business_code - 业务类型（精确匹配）
     if (safeFilters.business_code) {
       if (!order.business_code || order.business_code !== safeFilters.business_code) {
+        rejected.push({
+          order_id: order.order_id,
+          order_number: order.order_number,
+          reason: {
+            field: 'business_code',
+            actual: order.business_code,
+            expected: safeFilters.business_code
+          }
+        });
         return false;
       }
     }
@@ -168,12 +350,34 @@ export function filterOrders(orders, filters) {
       var orderTime = order.created_at ? typeof order.created_at === 'number' ? order.created_at : new Date(String(order.created_at)).getTime() : 0;
       if (safeFilters.start_time) {
         var startTs = new Date(safeFilters.start_time).getTime();
-        if (orderTime < startTs) return false;
+        if (orderTime < startTs) {
+          rejected.push({
+            order_id: order.order_id,
+            order_number: order.order_number,
+            reason: {
+              field: 'start_time',
+              actual: order.created_at,
+              expected: safeFilters.start_time
+            }
+          });
+          return false;
+        }
       }
       if (safeFilters.end_time) {
         // end_time 为当天结束（23:59:59.999）
         var endTs = new Date(safeFilters.end_time).getTime() + 86400000 - 1;
-        if (orderTime > endTs) return false;
+        if (orderTime > endTs) {
+          rejected.push({
+            order_id: order.order_id,
+            order_number: order.order_number,
+            reason: {
+              field: 'end_time',
+              actual: order.created_at,
+              expected: safeFilters.end_time
+            }
+          });
+          return false;
+        }
       }
     }
     return true;
@@ -227,6 +431,7 @@ export function filterOrders(orders, filters) {
     list: paginatedList,
     count: totalCount,
     size: size,
-    skip: page
+    skip: page,
+    rejected: rejected
   };
 }

package/dist/solution/BookingTicket/index.d.ts

@@ -136,7 +136,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

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

@@ -45,6 +45,17 @@ var defaultStrategyMetadataCustom = {
   maxPassesPerItem: 0,
   deductOptionPrice: false
 };
+var FIELD_REASON_CODE_MAP = {
+  orderTotalAmount: "order_total_amount_not_enough",
+  applicableProductTotalAmount: "applicable_product_total_amount_not_enough",
+  applicableProductCount: "applicable_product_count_not_enough"
+};
+function formatReason(template, value) {
+  if (!template)
+    return template;
+  const replacement = value === void 0 || value === null ? "" : String(value);
+  return template.replace(/\$\{value\}/g, replacement).replace(/\{value\}/g, replacement);
+}
 var WalletPassEvaluator = class {
   constructor() {
     this.strategyConfigs = [];
@@ -101,7 +112,7 @@ var WalletPassEvaluator = class {
    * 评估可用的 vouchers
    */
   evaluate(input) {
-    var _a, _b;
+    var _a, _b, _c, _d, _e;
     const { orderTotalAmount, products, vouchers, strategyConfigs } = input;
     const productIds = products.map((p) => p.product_id);
     const results = [];
@@ -176,7 +187,13 @@ var WalletPassEvaluator = class {
         });
       } else {
         let reasonCode = "not_meet_the_required_conditions";
-        if (evaluationResult.code) {
+        let thresholdValue = void 0;
+        const failedField = (_c = evaluationResult.matched) == null ? void 0 : _c.failedField;
+        const failedRule = (_e = (_d = evaluationResult.matched) == null ? void 0 : _d.failedRules) == null ? void 0 : _e[0];
+        if (failedField && FIELD_REASON_CODE_MAP[failedField]) {
+          reasonCode = FIELD_REASON_CODE_MAP[failedField];
+          thresholdValue = failedRule == null ? void 0 : failedRule.value;
+        } else if (evaluationResult.code) {
           const codeMapping = {
             INSUFFICIENT_AMOUNT: "not_meet_the_required_conditions",
             USAGE_LIMIT_EXCEEDED: "usage_limit_reached",
@@ -186,6 +203,8 @@ var WalletPassEvaluator = class {
           };
           reasonCode = codeMapping[evaluationResult.code] || "not_meet_the_required_conditions";
         }
+        const rawText = this.getText(reasonCode);
+        const reason = thresholdValue !== void 0 ? formatReason(rawText, thresholdValue) : rawText;
         results.push({
           voucher,
           isApplicable: false,
@@ -193,7 +212,7 @@ var WalletPassEvaluator = class {
           maxDeduction: 0,
           deductTaxAndFee: false,
           applicableProductIds: [],
-          reason: this.getText(reasonCode),
+          reason,
           reasonCode,
           strategyResult: evaluationResult
         });

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

@@ -29,7 +29,10 @@ 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": "订单满 ${value} 才可用",
+    "applicable_product_total_amount_not_enough": "适用商品满 ${value} 才可用",
+    "applicable_product_count_not_enough": "至少购买 {value} 件适用商品才可用"
   },
   "en": {
     "not_meet_the_required_conditions": "Not meet the required conditions.",
@@ -37,7 +40,10 @@ 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 ${value} to use",
+    "applicable_product_total_amount_not_enough": "${value} on eligible items",
+    "applicable_product_count_not_enough": "Buy {value} eligible items to use"
   },
   "zh-HK": {
     "not_meet_the_required_conditions": "未達使用條件",
@@ -45,7 +51,10 @@ 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": "訂單滿 ${value} 才可用",
+    "applicable_product_total_amount_not_enough": "適用商品滿 ${value} 才可用",
+    "applicable_product_count_not_enough": "至少購買 {value} 件適用商品才可用"
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

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

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

package/lib/model/strategy/engine.js

@@ -42,7 +42,7 @@ var StrategyEngine = class {
    * 评估策略
    */
   evaluate(config, context) {
-    var _a;
+    var _a, _b;
     const startTime = Date.now();
     const trace = {
       steps: [],
@@ -105,7 +105,11 @@ var StrategyEngine = class {
         matched: {
           conditions: applicable,
           actionIds: evaluationResult.actionIds,
-          details: {}
+          details: {},
+          ...applicable ? {} : {
+            failedField: (_a = evaluationResult.failedRules[0]) == null ? void 0 : _a.field,
+            failedRules: evaluationResult.failedRules
+          }
         },
         matchedActions: sortedActions,
         outputs: {},
@@ -119,7 +123,7 @@ var StrategyEngine = class {
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : "Unknown error";
       if (this.options.enableTrace) {
-        (_a = trace.errors) == null ? void 0 : _a.push({
+        (_b = trace.errors) == null ? void 0 : _b.push({
           step: "evaluation",
           error: errorMessage,
           timestamp: Date.now()
@@ -149,12 +153,15 @@ var StrategyEngine = class {
    *
    * @param group 条件组
    * @param context 运行时上下文
-   * @returns 评估结果对象，包含条件是否满足和收集到的 actionIds
+   * @returns 评估结果对象，包含条件是否满足、收集到的 actionIds、以及失败的原子规则信息
    */
   evaluateConditionGroup(group, context) {
     const collectedActionIds = [];
-    const isCurrentLayerSatisfied = this.evaluateGroupLogic(group, context);
-    if (isCurrentLayerSatisfied) {
+    const { satisfied, failedRules } = this.evaluateGroupLogicDetailed(
+      group,
+      context
+    );
+    if (satisfied) {
       collectedActionIds.push(...group.actionIds);
       for (const rule of group.rules) {
         if (this.isConditionGroup(rule)) {
@@ -164,41 +171,98 @@ var StrategyEngine = class {
       }
     }
     return {
-      satisfied: isCurrentLayerSatisfied,
-      actionIds: collectedActionIds
+      satisfied,
+      actionIds: collectedActionIds,
+      failedRules
     };
   }
   /**
-   * 评估条件组的逻辑运算
+   * 评估条件组的逻辑运算（带失败规则收集）
+   *
+   * 失败规则收集策略：
+   * - `and`：返回第一个失败的原子规则（嵌套 group 递归取其首个失败原子规则）
+   * - `or`：所有分支失败时，聚合每个分支的失败规则
+   * - `not`：被取反规则实际通过时，记录该规则
    */
-  evaluateGroupLogic(group, context) {
+  evaluateGroupLogicDetailed(group, context) {
     const { operator, rules } = group;
     switch (operator) {
-      case "and":
-        return rules.every((rule) => this.evaluateRule(rule, context));
-      case "or":
-        return rules.some((rule) => this.evaluateRule(rule, context));
-      case "not":
-        if (rules.length === 0)
-          return false;
-        return !this.evaluateRule(rules[0], context);
+      case "and": {
+        for (const rule of rules) {
+          const ruleResult = this.evaluateRuleDetailed(rule, context);
+          if (!ruleResult.satisfied) {
+            return {
+              satisfied: false,
+              failedRules: ruleResult.failedRules
+            };
+          }
+        }
+        return { satisfied: true, failedRules: [] };
+      }
+      case "or": {
+        const aggregated = [];
+        for (const rule of rules) {
+          const ruleResult = this.evaluateRuleDetailed(rule, context);
+          if (ruleResult.satisfied) {
+            return { satisfied: true, failedRules: [] };
+          }
+          aggregated.push(...ruleResult.failedRules);
+        }
+        return { satisfied: false, failedRules: aggregated };
+      }
+      case "not": {
+        if (rules.length === 0) {
+          return { satisfied: false, failedRules: [] };
+        }
+        const ruleResult = this.evaluateRuleDetailed(rules[0], context);
+        if (ruleResult.satisfied) {
+          const failed = this.isConditionGroup(rules[0]) ? [] : [this.buildFailedRuleInfo(rules[0], context)];
+          return { satisfied: false, failedRules: failed };
+        }
+        return { satisfied: true, failedRules: [] };
+      }
       default:
         throw new Error(`Unknown operator: ${operator}`);
     }
   }
   /**
-   * 评估单个规则
+   * 评估单个规则（带失败规则收集）
    */
-  evaluateRule(rule, context) {
+  evaluateRuleDetailed(rule, context) {
     if (this.isConditionGroup(rule)) {
-      return this.evaluateGroupLogic(rule, context);
+      return this.evaluateGroupLogicDetailed(rule, context);
     }
     const conditionRule = rule;
+    const satisfied = this.evaluateAtomicRule(conditionRule, context);
+    if (satisfied) {
+      return { satisfied: true, failedRules: [] };
+    }
+    return {
+      satisfied: false,
+      failedRules: [this.buildFailedRuleInfo(conditionRule, context)]
+    };
+  }
+  /**
+   * 评估原子规则（不收集失败信息，仅返回布尔结果）
+   */
+  evaluateAtomicRule(conditionRule, context) {
     if (conditionRule.type === "code" && conditionRule.code) {
       return this.evaluateCodeCondition(conditionRule.code, context);
     }
     return this.evaluateOperatorCondition(conditionRule, context);
   }
+  /**
+   * 构建失败规则信息
+   */
+  buildFailedRuleInfo(conditionRule, context) {
+    const actualValue = conditionRule.field ? this.getFieldValue(conditionRule.field, context) : void 0;
+    return {
+      field: conditionRule.field,
+      operator: conditionRule.operator,
+      value: conditionRule.value,
+      actualValue
+    };
+  }
   /**
    * 评估代码模式条件
    */