@pisell/pisellos 2.2.141 → 2.2.143

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

@@ -165,6 +165,23 @@ export interface MatchedInfo {
     actionIds: string[];
     /** 详细匹配信息 */
     details: Record<string, any>;
+    /** 顶层第一个失败的 field（仅在 conditions=false 时存在，便于直接消费） */
+    failedField?: string;
+    /** 失败的原子规则列表（仅在 conditions=false 时存在；or 全失败时可能有多条） */
+    failedRules?: FailedRuleInfo[];
+}
+/**
+ * 失败规则信息
+ */
+export interface FailedRuleInfo {
+    /** 字段名 */
+    field?: string;
+    /** 运算符 */
+    operator?: string;
+    /** 配置的比较值（阈值） */
+    value?: any;
+    /** 实际取到的字段值 */
+    actualValue?: any;
 }
 /**
  * 执行轨迹

package/lib/server/index.js

@@ -1710,7 +1710,8 @@ var Server = class {
       rawCount: rawList.length,
       filteredCount: result.count,
       size: result.size,
-      skip: result.skip
+      skip: result.skip,
+      rejected: result.rejected
     });
     return {
       code: 200,

package/lib/server/modules/index.d.ts

@@ -14,7 +14,7 @@ export { QuotationHooks } from './quotation/types';
 export { ScheduleModuleEx } from './schedule';
 export type { ScheduleState, ScheduleItem } from './schedule/types';
 export { OrderModule } from './order';
-export type { OrderState, OrderData, OrderId, OrderSummary, OrderBookingItem, OrderProductLineItem, OrderPaymentItem, OrderSurchargeItem, OrderProductDiscountItem, OrderWithoutBookings, BookingData, OrderFilters, BookingFilters, OrderFilterResult, BookingFilterResult, OrderModulePagedResult, } from './order/types';
+export type { OrderState, OrderData, OrderId, OrderSummary, OrderBookingItem, OrderProductLineItem, OrderPaymentItem, OrderSurchargeItem, OrderProductDiscountItem, OrderWithoutBookings, BookingData, OrderFilters, BookingFilters, OrderFilterResult, OrderFilterRejectDetail, OrderFilterRejectedEntry, BookingFilterResult, OrderModulePagedResult, } from './order/types';
 export { OrderHooks } from './order/types';
 export { FloorPlanModule } from './floor-plan';
 export type { FloorPlanItem, FloorPlanState, FloorPlanSyncMessage } from './floor-plan/types';

package/lib/server/modules/order/types.d.ts

@@ -479,7 +479,27 @@ export interface OrderModulePagedResult<T> {
     size: number;
     skip: number;
 }
-export type OrderFilterResult = OrderModulePagedResult<OrderData>;
+/** 单条筛选未命中说明（用于排查过滤原因） */
+export interface OrderFilterRejectDetail {
+    /** 对应 OrderFilters 维度的标识 */
+    field: string;
+    /** 订单上该维度的当前值 */
+    actual: unknown;
+    /** 本次筛选的期望值/区间（便于对照） */
+    expected?: unknown;
+}
+/** 未通过筛选的订单及首个未满足条件（与过滤短路顺序一致） */
+export interface OrderFilterRejectedEntry {
+    order_id?: OrderId | null;
+    /** 系统订单号等，便于与业务「订单号」对照 */
+    order_number?: string;
+    /** 按筛选顺序命中的第一条未满足条件 */
+    reason: OrderFilterRejectDetail;
+}
+export type OrderFilterResult = OrderModulePagedResult<OrderData> & {
+    /** 被过滤掉的订单及首个命中原因（与筛选短路顺序一致；不含仅分页未展示的已通过订单） */
+    rejected: OrderFilterRejectedEntry[];
+};
 export type BookingFilterResult = OrderModulePagedResult<BookingData>;
 /**
  * SSE 同步配置

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

@@ -29,107 +29,289 @@ function filterOrders(orders, filters) {
       list: [],
       count: 0,
       size: 0,
-      skip: 0
+      skip: 0,
+      rejected: []
     };
   }
   const size = safeFilters.num || 20;
   const page = safeFilters.skip || 1;
+  const rejected = [];
   let filteredList = orders.filter((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;
       }
     }
     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;
       }
     }
     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;
       }
     }
     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;
       }
     }
     if (safeFilters.customer_id !== void 0 && 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;
       }
     }
     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;
       }
     }
     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;
       }
       const hasMatch = order.payment_methods.some((pm) => 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;
       }
     }
     if (safeFilters.min_total_amount !== void 0 || safeFilters.max_total_amount !== void 0) {
       const orderAmount = parseFloat(String(order.total_amount || 0));
       if (safeFilters.min_total_amount !== void 0 && 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 !== void 0 && 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;
       }
     }
     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;
       }
       const filterTagSet = new Set(safeFilters.tag_ids.map(String));
       const hasMatch = order.tag_ids.some((tag) => 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;
       }
     }
     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;
       }
     }
     if (safeFilters.delivery_zone_name !== void 0 && 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;
       }
     }
     if (safeFilters.location_id !== void 0 && 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;
       }
     }
     if (safeFilters.shipping_order_number !== void 0 && 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;
       }
     }
     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;
       }
       const orderLogisticsId = String(order.logistics_company_id);
       const hasMatch = safeFilters.logistics_company_id.some((id) => String(id) === orderLogisticsId);
       if (!hasMatch) {
+        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;
       }
     }
     if (safeFilters.zip !== void 0 && 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;
       }
     }
     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;
       }
     }
@@ -137,13 +319,33 @@ function filterOrders(orders, filters) {
       const orderTime = order.created_at ? typeof order.created_at === "number" ? order.created_at : new Date(String(order.created_at)).getTime() : 0;
       if (safeFilters.start_time) {
         const startTs = new Date(safeFilters.start_time).getTime();
-        if (orderTime < startTs)
+        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) {
         const endTs = new Date(safeFilters.end_time).getTime() + 864e5 - 1;
-        if (orderTime > endTs)
+        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;
@@ -193,7 +395,8 @@ function filterOrders(orders, filters) {
     list: paginatedList,
     count: totalCount,
     size,
-    skip: page
+    skip: page,
+    rejected
   };
 }
 // Annotate the CommonJS export names for ESM import in node:

package/lib/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/package.json

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