@pisell/pisellos 2.2.283 → 2.2.284

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

@@ -1,46 +1,34 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/server/modules/order/utils/filterOrders.ts
-var filterOrders_exports = {};
-__export(filterOrders_exports, {
-  filterOrders: () => filterOrders
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(filterOrders_exports);
-var import_dayjs = __toESM(require("dayjs"));
+exports.filterOrders = filterOrders;
+var _dayjs = _interopRequireDefault(require("dayjs"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/** 从订单 payments 提取支付方式 code，与 UI 筛选选项及 filterBookings 一致 */
 function getOrderPaymentCodes(order) {
   const payments = order.payments;
   if (!Array.isArray(payments) || payments.length === 0) {
     return [];
   }
-  return payments.map((item) => item == null ? void 0 : item.code).filter((code) => typeof code === "string" && code.length > 0);
+  return payments.map(item => item?.code).filter(code => typeof code === 'string' && code.length > 0);
 }
+
+/**
+ * 订单过滤函数
+ * @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 {
@@ -51,31 +39,37 @@ function filterOrders(orders, filters) {
       rejected: []
     };
   }
+
+  // 默认分页参数
   const size = safeFilters.num || 20;
   const page = safeFilters.skip || 1;
   const rejected = [];
-  let filteredList = orders.filter((order) => {
+
+  // 1. 过滤
+  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: "",
+            field: 'keyword',
+            actual: '',
             expected: safeFilters.keyword
           }
         });
         return false;
       }
     }
+
+    // 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",
+            field: 'status',
             actual: order.status,
             expected: safeFilters.status
           }
@@ -83,13 +77,15 @@ function filterOrders(orders, filters) {
         return false;
       }
     }
+
+    // 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",
+            field: 'payment_status',
             actual: order.payment_status,
             expected: safeFilters.payment_status
           }
@@ -97,13 +93,15 @@ function filterOrders(orders, filters) {
         return false;
       }
     }
+
+    // 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",
+            field: 'shipping_status',
             actual: order.shipping_status,
             expected: safeFilters.shipping_status
           }
@@ -111,13 +109,15 @@ function filterOrders(orders, filters) {
         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)) {
         rejected.push({
           order_id: order.order_id,
           order_number: order.order_number,
           reason: {
-            field: "customer_id",
+            field: 'customer_id',
             actual: order.customer_id,
             expected: safeFilters.customer_id
           }
@@ -125,13 +125,15 @@ function filterOrders(orders, filters) {
         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)) {
         rejected.push({
           order_id: order.order_id,
           order_number: order.order_number,
           reason: {
-            field: "order_sales_channel",
+            field: 'order_sales_channel',
             actual: order.order_sales_channel,
             expected: safeFilters.order_sales_channel
           }
@@ -139,6 +141,8 @@ function filterOrders(orders, filters) {
         return false;
       }
     }
+
+    // payment_methods - 支付方式（按 payments[].code 匹配，不再使用 order.payment_methods）
     if (safeFilters.payment_methods && safeFilters.payment_methods.length > 0) {
       const orderPaymentCodes = getOrderPaymentCodes(order);
       if (orderPaymentCodes.length === 0) {
@@ -146,20 +150,20 @@ function filterOrders(orders, filters) {
           order_id: order.order_id,
           order_number: order.order_number,
           reason: {
-            field: "payment_methods",
+            field: 'payment_methods',
             actual: order.payments,
             expected: safeFilters.payment_methods
           }
         });
         return false;
       }
-      const hasMatch = orderPaymentCodes.some((code) => safeFilters.payment_methods.includes(code));
+      const hasMatch = orderPaymentCodes.some(code => safeFilters.payment_methods.includes(code));
       if (!hasMatch) {
         rejected.push({
           order_id: order.order_id,
           order_number: order.order_number,
           reason: {
-            field: "payment_methods",
+            field: 'payment_methods',
             actual: orderPaymentCodes,
             expected: safeFilters.payment_methods
           }
@@ -167,26 +171,28 @@ function filterOrders(orders, filters) {
         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) {
         rejected.push({
           order_id: order.order_id,
           order_number: order.order_number,
           reason: {
-            field: "min_total_amount",
+            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) {
+      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",
+            field: 'max_total_amount',
             actual: order.total_amount,
             expected: safeFilters.max_total_amount
           }
@@ -194,13 +200,15 @@ function filterOrders(orders, filters) {
         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) {
         rejected.push({
           order_id: order.order_id,
           order_number: order.order_number,
           reason: {
-            field: "tag_ids",
+            field: 'tag_ids',
             actual: order.tag_ids,
             expected: safeFilters.tag_ids
           }
@@ -208,13 +216,13 @@ function filterOrders(orders, filters) {
         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) {
         rejected.push({
           order_id: order.order_id,
           order_number: order.order_number,
           reason: {
-            field: "tag_ids",
+            field: 'tag_ids',
             actual: order.tag_ids,
             expected: safeFilters.tag_ids
           }
@@ -222,13 +230,15 @@ function filterOrders(orders, filters) {
         return false;
       }
     }
+
+    // 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",
+            field: 'shipping_type',
             actual: order.shipping_type,
             expected: safeFilters.shipping_type
           }
@@ -236,13 +246,15 @@ function filterOrders(orders, filters) {
         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())) {
         rejected.push({
           order_id: order.order_id,
           order_number: order.order_number,
           reason: {
-            field: "delivery_zone_name",
+            field: 'delivery_zone_name',
             actual: order.delivery_zone_name,
             expected: safeFilters.delivery_zone_name
           }
@@ -250,13 +262,15 @@ function filterOrders(orders, filters) {
         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)) {
         rejected.push({
           order_id: order.order_id,
           order_number: order.order_number,
           reason: {
-            field: "location_id",
+            field: 'location_id',
             actual: order.location_id,
             expected: safeFilters.location_id
           }
@@ -264,13 +278,15 @@ function filterOrders(orders, filters) {
         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())) {
         rejected.push({
           order_id: order.order_id,
           order_number: order.order_number,
           reason: {
-            field: "shipping_order_number",
+            field: 'shipping_order_number',
             actual: order.shipping_order_number,
             expected: safeFilters.shipping_order_number
           }
@@ -278,13 +294,15 @@ function filterOrders(orders, filters) {
         return false;
       }
     }
+
+    // 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",
+            field: 'logistics_company_id',
             actual: order.logistics_company_id,
             expected: safeFilters.logistics_company_id
           }
@@ -292,13 +310,13 @@ function filterOrders(orders, filters) {
         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) {
         rejected.push({
           order_id: order.order_id,
           order_number: order.order_number,
           reason: {
-            field: "logistics_company_id",
+            field: 'logistics_company_id',
             actual: order.logistics_company_id,
             expected: safeFilters.logistics_company_id
           }
@@ -306,13 +324,15 @@ function filterOrders(orders, filters) {
         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())) {
         rejected.push({
           order_id: order.order_id,
           order_number: order.order_number,
           reason: {
-            field: "zip",
+            field: 'zip',
             actual: order.zip,
             expected: safeFilters.zip
           }
@@ -320,13 +340,15 @@ function filterOrders(orders, filters) {
         return false;
       }
     }
+
+    // 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",
+            field: 'business_code',
             actual: order.business_code,
             expected: safeFilters.business_code
           }
@@ -334,17 +356,21 @@ function filterOrders(orders, filters) {
         return false;
       }
     }
+
+    // start_time / end_time - 创建时间范围
     if (safeFilters.start_time || safeFilters.end_time) {
-      const isCreatedIsUndefined = order.created_at === void 0;
-      const orderTime = order.created_at ? typeof order.created_at === "number" ? order.created_at : (0, import_dayjs.default)(String(order.created_at)).valueOf() : 0;
+      const isCreatedIsUndefined = order.created_at === undefined;
+      // 统一用 dayjs 按本地时区解析，避免 new Date("YYYY-MM-DD") 被当作 UTC 0 点
+      // 与含时分的本地时间字符串比较时产生时区错位
+      const orderTime = order.created_at ? typeof order.created_at === 'number' ? order.created_at : (0, _dayjs.default)(String(order.created_at)).valueOf() : 0;
       if (safeFilters.start_time && !isCreatedIsUndefined) {
-        const startTs = (0, import_dayjs.default)(safeFilters.start_time).startOf("day").valueOf();
+        const startTs = (0, _dayjs.default)(safeFilters.start_time).startOf('day').valueOf();
         if (orderTime < startTs) {
           rejected.push({
             order_id: order.order_id,
             order_number: order.order_number,
             reason: {
-              field: "start_time",
+              field: 'start_time',
               actual: order.created_at,
               expected: safeFilters.start_time
             }
@@ -353,13 +379,13 @@ function filterOrders(orders, filters) {
         }
       }
       if (safeFilters.end_time && !isCreatedIsUndefined) {
-        const endTs = (0, import_dayjs.default)(safeFilters.end_time).endOf("day").valueOf();
+        const endTs = (0, _dayjs.default)(safeFilters.end_time).endOf('day').valueOf();
         if (orderTime > endTs) {
           rejected.push({
             order_id: order.order_id,
             order_number: order.order_number,
             reason: {
-              field: "end_time",
+              field: 'end_time',
               actual: order.created_at,
               expected: safeFilters.end_time
             }
@@ -370,43 +396,47 @@ function filterOrders(orders, filters) {
     }
     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;
@@ -418,8 +448,4 @@ function filterOrders(orders, filters) {
     skip: page,
     rejected
   };
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  filterOrders
-});
+}