@pisell/pisellos 0.0.567 → 0.0.568

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

@@ -1,28 +1,23 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/server/modules/order/utils/filterOrders.ts
-var filterOrders_exports = {};
-__export(filterOrders_exports, {
-  filterOrders: () => filterOrders
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(filterOrders_exports);
+exports.filterOrders = filterOrders;
+/**
+ * 订单过滤函数
+ * @param orders 原始订单列表
+ * @param filters 过滤条件
+ * @returns 过滤 + 排序 + 分页后的结果
+ *
+ * @优化口子 性能优化预留：
+ * - 可在此函数入口加缓存（按 filters 签名缓存结果）
+ * - 可对枚举字段建倒排索引（status/payment_status/shipping_status/customer_id）
+ * - 可对文本字段加前缀树或分词索引
+ * - 可做增量过滤而非全量遍历
+ */
 function filterOrders(orders, filters) {
+  // Bug 1 修复：防护 filters 为 null/undefined
   const safeFilters = filters || {};
   if (!orders || !Array.isArray(orders)) {
     return {
@@ -32,154 +27,192 @@ function filterOrders(orders, filters) {
       skip: 0
     };
   }
+
+  // 默认分页参数
   const size = safeFilters.num || 20;
   const page = safeFilters.skip || 1;
-  let filteredList = orders.filter((order) => {
+
+  // 1. 过滤
+  let filteredList = orders.filter(order => {
+    // status - 订单状态
     if (safeFilters.status && safeFilters.status.length > 0) {
       if (!order.status || !safeFilters.status.includes(order.status)) {
         return false;
       }
     }
+
+    // payment_status - 支付状态
     if (safeFilters.payment_status && safeFilters.payment_status.length > 0) {
       if (!order.payment_status || !safeFilters.payment_status.includes(order.payment_status)) {
         return false;
       }
     }
+
+    // shipping_status - 处理状态
     if (safeFilters.shipping_status && safeFilters.shipping_status.length > 0) {
       if (!order.shipping_status || !safeFilters.shipping_status.includes(order.shipping_status)) {
         return false;
       }
     }
-    if (safeFilters.customer_id !== void 0 && safeFilters.customer_id !== null) {
+
+    // customer_id - 客户ID（精确匹配）
+    if (safeFilters.customer_id !== undefined && safeFilters.customer_id !== null) {
       if (String(order.customer_id) !== String(safeFilters.customer_id)) {
         return false;
       }
     }
+
+    // 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)) {
         return false;
       }
     }
+
+    // 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) {
         return false;
       }
-      const hasMatch = order.payment_methods.some((pm) => safeFilters.payment_methods.includes(pm));
+      const hasMatch = order.payment_methods.some(pm => safeFilters.payment_methods.includes(pm));
       if (!hasMatch) {
         return false;
       }
     }
-    if (safeFilters.min_total_amount !== void 0 || safeFilters.max_total_amount !== void 0) {
+
+    // min_total_amount / max_total_amount - 订单金额范围
+    if (safeFilters.min_total_amount !== undefined || safeFilters.max_total_amount !== undefined) {
       const orderAmount = parseFloat(String(order.total_amount || 0));
-      if (safeFilters.min_total_amount !== void 0 && orderAmount < safeFilters.min_total_amount) {
+      if (safeFilters.min_total_amount !== undefined && orderAmount < safeFilters.min_total_amount) {
         return false;
       }
-      if (safeFilters.max_total_amount !== void 0 && orderAmount > safeFilters.max_total_amount) {
+      if (safeFilters.max_total_amount !== undefined && orderAmount > safeFilters.max_total_amount) {
         return false;
       }
     }
+
+    // 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) {
         return false;
       }
       const filterTagSet = new Set(safeFilters.tag_ids.map(String));
-      const hasMatch = order.tag_ids.some((tag) => filterTagSet.has(String(tag)));
+      const hasMatch = order.tag_ids.some(tag => filterTagSet.has(String(tag)));
       if (!hasMatch) {
         return false;
       }
     }
+
+    // shipping_type - 配送方式
     if (safeFilters.shipping_type && safeFilters.shipping_type.length > 0) {
       if (!order.shipping_type || !safeFilters.shipping_type.includes(order.shipping_type)) {
         return false;
       }
     }
-    if (safeFilters.delivery_zone_name !== void 0 && safeFilters.delivery_zone_name !== null && safeFilters.delivery_zone_name !== "") {
+
+    // 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())) {
         return false;
       }
     }
-    if (safeFilters.location_id !== void 0 && safeFilters.location_id !== null) {
+
+    // location_id - 取货地点（精确匹配）
+    if (safeFilters.location_id !== undefined && safeFilters.location_id !== null) {
       if (String(order.location_id) !== String(safeFilters.location_id)) {
         return false;
       }
     }
-    if (safeFilters.shipping_order_number !== void 0 && safeFilters.shipping_order_number !== null && safeFilters.shipping_order_number !== "") {
+
+    // 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())) {
         return false;
       }
     }
+
+    // logistics_company_id - 物流公司
     if (safeFilters.logistics_company_id && safeFilters.logistics_company_id.length > 0) {
       if (!order.logistics_company_id) {
         return false;
       }
       const orderLogisticsId = String(order.logistics_company_id);
-      const hasMatch = safeFilters.logistics_company_id.some((id) => String(id) === orderLogisticsId);
+      const hasMatch = safeFilters.logistics_company_id.some(id => String(id) === orderLogisticsId);
       if (!hasMatch) {
         return false;
       }
     }
-    if (safeFilters.zip !== void 0 && safeFilters.zip !== null && safeFilters.zip !== "") {
+
+    // zip - 邮编（模糊匹配）
+    if (safeFilters.zip !== undefined && safeFilters.zip !== null && safeFilters.zip !== '') {
       if (!order.zip || !order.zip.toLowerCase().includes(safeFilters.zip.toLowerCase())) {
         return false;
       }
     }
+
+    // business_code - 业务类型（精确匹配）
     if (safeFilters.business_code) {
       if (!order.business_code || order.business_code !== safeFilters.business_code) {
         return false;
       }
     }
+
+    // start_time / end_time - 创建时间范围
     if (safeFilters.start_time || safeFilters.end_time) {
-      const orderTime = order.created_at ? typeof order.created_at === "number" ? order.created_at : new Date(String(order.created_at)).getTime() : 0;
+      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)
-          return false;
+        if (orderTime < startTs) return false;
       }
       if (safeFilters.end_time) {
-        const endTs = new Date(safeFilters.end_time).getTime() + 864e5 - 1;
-        if (orderTime > endTs)
-          return false;
+        // end_time 为当天结束（23:59:59.999）
+        const endTs = new Date(safeFilters.end_time).getTime() + 86400000 - 1;
+        if (orderTime > endTs) return false;
       }
     }
     return true;
   });
+
+  // 2. 排序
   if (safeFilters.order_by) {
     const sortField = safeFilters.order_by;
-    const sortOrder = safeFilters.sort || "desc";
+    const sortOrder = safeFilters.sort || 'desc';
     filteredList.sort((a, b) => {
       let aVal;
       let bVal;
       switch (sortField) {
-        case "created_at":
-          aVal = a.created_at ? typeof a.created_at === "number" ? a.created_at : new Date(String(a.created_at)).getTime() : 0;
-          bVal = b.created_at ? typeof b.created_at === "number" ? b.created_at : new Date(String(b.created_at)).getTime() : 0;
+        case 'created_at':
+          aVal = a.created_at ? typeof a.created_at === 'number' ? a.created_at : new Date(String(a.created_at)).getTime() : 0;
+          bVal = b.created_at ? typeof b.created_at === 'number' ? b.created_at : new Date(String(b.created_at)).getTime() : 0;
           break;
-        case "updated_at":
-          aVal = a.updated_at ? typeof a.updated_at === "number" ? a.updated_at : new Date(String(a.updated_at)).getTime() : 0;
-          bVal = b.updated_at ? typeof b.updated_at === "number" ? b.updated_at : new Date(String(b.updated_at)).getTime() : 0;
+        case 'updated_at':
+          aVal = a.updated_at ? typeof a.updated_at === 'number' ? a.updated_at : new Date(String(a.updated_at)).getTime() : 0;
+          bVal = b.updated_at ? typeof b.updated_at === 'number' ? b.updated_at : new Date(String(b.updated_at)).getTime() : 0;
           break;
-        case "total_amount":
+        case 'total_amount':
           aVal = parseFloat(String(a.total_amount || 0));
           bVal = parseFloat(String(b.total_amount || 0));
           break;
-        case "customer_name":
-          aVal = (a.customer_name || "").toLowerCase();
-          bVal = (b.customer_name || "").toLowerCase();
+        case 'customer_name':
+          aVal = (a.customer_name || '').toLowerCase();
+          bVal = (b.customer_name || '').toLowerCase();
           break;
-        case "amount_gap":
+        case 'amount_gap':
           return 0;
         default:
           return 0;
       }
       if (aVal < bVal) {
-        return sortOrder === "asc" ? -1 : 1;
+        return sortOrder === 'asc' ? -1 : 1;
       }
       if (aVal > bVal) {
-        return sortOrder === "asc" ? 1 : -1;
+        return sortOrder === 'asc' ? 1 : -1;
       }
       return 0;
     });
   }
+
+  // 3. 分页（skip 为页码，从 1 开始）
   const totalCount = filteredList.length;
   const startIndex = (page - 1) * size;
   const endIndex = startIndex + size;
@@ -190,8 +223,4 @@ function filterOrders(orders, filters) {
     size,
     skip: page
   };
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  filterOrders
-});
+}