@pisell/pisellos 0.0.568 → 0.0.569

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

@@ -4,6 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 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?.code).filter(code => typeof code === 'string' && code.length > 0);
+}
+
 /**
  * 订单过滤函数
  * @param orders 原始订单列表
@@ -24,19 +35,45 @@ 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 = [];
 
   // 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: '',
+            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',
+            actual: order.status,
+            expected: safeFilters.status
+          }
+        });
         return false;
       }
     }
@@ -44,6 +81,15 @@ 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 +97,15 @@ 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 +113,15 @@ 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,17 +129,45 @@ 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;
       }
     }
 
-    // payment_methods - 支付方式
+    // payment_methods - 支付方式（按 payments[].code 匹配，不再使用 order.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) {
+      const orderPaymentCodes = getOrderPaymentCodes(order);
+      if (orderPaymentCodes.length === 0) {
+        rejected.push({
+          order_id: order.order_id,
+          order_number: order.order_number,
+          reason: {
+            field: 'payment_methods',
+            actual: order.payments,
+            expected: safeFilters.payment_methods
+          }
+        });
         return false;
       }
-      const hasMatch = order.payment_methods.some(pm => safeFilters.payment_methods.includes(pm));
+      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',
+            actual: orderPaymentCodes,
+            expected: safeFilters.payment_methods
+          }
+        });
         return false;
       }
     }
@@ -84,9 +176,27 @@ function filterOrders(orders, filters) {
     if (safeFilters.min_total_amount !== undefined || safeFilters.max_total_amount !== undefined) {
       const 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;
       }
     }
@@ -94,11 +204,29 @@ 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;
       }
       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;
       }
     }
@@ -106,6 +234,15 @@ 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;
       }
     }
@@ -113,6 +250,15 @@ 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;
       }
     }
@@ -120,6 +266,15 @@ 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;
       }
     }
@@ -127,6 +282,15 @@ 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;
       }
     }
@@ -134,11 +298,29 @@ 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;
       }
       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;
       }
     }
@@ -146,6 +328,15 @@ 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;
       }
     }
@@ -153,21 +344,54 @@ 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;
       }
     }
 
     // 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;
-      if (safeFilters.start_time) {
-        const startTs = new Date(safeFilters.start_time).getTime();
-        if (orderTime < startTs) return false;
+      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, _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',
+              actual: order.created_at,
+              expected: safeFilters.start_time
+            }
+          });
+          return false;
+        }
       }
-      if (safeFilters.end_time) {
-        // end_time 为当天结束（23:59:59.999）
-        const endTs = new Date(safeFilters.end_time).getTime() + 86400000 - 1;
-        if (orderTime > endTs) return false;
+      if (safeFilters.end_time && !isCreatedIsUndefined) {
+        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',
+              actual: order.created_at,
+              expected: safeFilters.end_time
+            }
+          });
+          return false;
+        }
       }
     }
     return true;
@@ -221,6 +445,7 @@ function filterOrders(orders, filters) {
     list: paginatedList,
     count: totalCount,
     size,
-    skip: page
+    skip: page,
+    rejected
   };
 }

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

@@ -0,0 +1,28 @@
+import { Module, ModuleOptions, PisellCore } from '../../../types';
+import { BaseModule } from '../../../modules/BaseModule';
+import type { PaymentMethod } from './types';
+export declare class PaymentServerModule extends BaseModule implements Module {
+    protected defaultName: string;
+    protected defaultVersion: string;
+    private request;
+    private app;
+    private logger;
+    private store;
+    private payMethodMemoryCache;
+    private payMethodListInFlight;
+    constructor(name?: string, version?: string);
+    initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
+    getPayMethodListAsync(options?: {
+        shouldFilter?: boolean;
+    }): Promise<PaymentMethod[]>;
+    clearPayMethodCache(): void;
+    private loadPayMethodListAsync;
+    private fetchRemotePayMethods;
+    private shouldFilterPayMethods;
+    private resolvePayMethods;
+    private filterPayMethods;
+    private setPayMethodCache;
+    private logInfo;
+    private logWarning;
+    private logError;
+}

package/lib/server/modules/payment/index.js

@@ -0,0 +1,168 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.PaymentServerModule = void 0;
+var _BaseModule = require("../../../modules/BaseModule");
+const WALLET_PASS_CODE = 'WALLET_PASS';
+const WALLET_DEPENDENT_CODES = new Set(['PRODUCTVOUCHER', 'GIFTCARD', 'POINTCARD']);
+const PAYMENT_METHODS_LOADED_EVENT = 'payment:onPaymentMethodsLoaded';
+class PaymentServerModule extends _BaseModule.BaseModule {
+  defaultName = 'payment';
+  defaultVersion = '1.0.0';
+  request;
+  app;
+  logger;
+  store;
+  payMethodMemoryCache = null;
+  payMethodListInFlight = null;
+  constructor(name, version) {
+    super(name || 'payment', version);
+  }
+  async initialize(core, options) {
+    this.core = core;
+    this.store = options?.store;
+    if (!this.store) this.store = {
+      payMethods: []
+    };
+    if (!Array.isArray(this.store.payMethods)) this.store.payMethods = [];
+    this.request = core.getPlugin('request');
+    const appPlugin = core.getPlugin('app');
+    this.app = appPlugin?.getApp();
+    this.logger = this.app?.logger;
+    if (!this.request && !this.app?.request) {
+      throw new Error('PaymentServerModule 需要 request 插件或 app.request 支持');
+    }
+    this.logInfo('PaymentServerModule initialized successfully', {
+      hasAppRequest: !!this.app?.request
+    });
+  }
+
+  // getRoutes(): RouteDefinition[] {
+  //   return [
+  //     {
+  //       method: 'get',
+  //       path: '/pay/custom-payment/all',
+  //       handler: async ({ data, config }) => {
+  //         const payMethods = await this.getPayMethodListAsync({
+  //           shouldFilter: this.shouldFilterPayMethods(data, config),
+  //         });
+  //         return {
+  //           code: 200,
+  //           status: true,
+  //           data: payMethods,
+  //         };
+  //       },
+  //     },
+  //   ];
+  // }
+
+  async getPayMethodListAsync(options = {}) {
+    this.logInfo('Starting getPayMethodListAsync');
+    if (this.payMethodMemoryCache?.length) {
+      return this.resolvePayMethods(this.payMethodMemoryCache, options);
+    }
+    if (this.payMethodListInFlight) {
+      const payMethods = await this.payMethodListInFlight;
+      return this.resolvePayMethods(payMethods, options);
+    }
+    this.payMethodListInFlight = this.loadPayMethodListAsync().finally(() => {
+      this.payMethodListInFlight = null;
+    });
+    const payMethods = await this.payMethodListInFlight;
+    return this.resolvePayMethods(payMethods, options);
+  }
+  clearPayMethodCache() {
+    this.payMethodMemoryCache = null;
+    this.store.payMethods = [];
+  }
+  async loadPayMethodListAsync() {
+    try {
+      const payMethods = await this.fetchRemotePayMethods();
+      this.setPayMethodCache(payMethods);
+      await this.core.effects.emit(PAYMENT_METHODS_LOADED_EVENT, payMethods);
+      this.logInfo('getPayMethodListAsync completed successfully', {
+        payMethods
+      });
+      return payMethods;
+    } catch (error) {
+      console.error('[PaymentServerModule] 获取支付方式列表失败', error);
+      this.logError('getPayMethodListAsync failed', error);
+      return [];
+    }
+  }
+  async fetchRemotePayMethods() {
+    const requester = this.app?.request || this.request;
+    const response = await requester.get('/shop/pay/custom-payment/all', undefined);
+    const payMethods = response?.data || response || [];
+    return Array.isArray(payMethods) ? payMethods : [];
+  }
+  shouldFilterPayMethods(data, config) {
+    return data?.filterPaymentMethods === true || config?.filterPaymentMethods === true;
+  }
+  resolvePayMethods(payMethods, options) {
+    if (!options.shouldFilter) return payMethods;
+    return this.filterPayMethods(payMethods);
+  }
+  filterPayMethods(payMethods) {
+    if (!Array.isArray(payMethods)) return [];
+    let availableMethods = payMethods.filter(method => method.status === 1 && method.disable === 0);
+    const walletPassMethod = availableMethods.find(method => method.code === WALLET_PASS_CODE);
+    if (!walletPassMethod) {
+      return availableMethods.filter(method => !WALLET_DEPENDENT_CODES.has(method.code));
+    }
+    availableMethods = availableMethods.map(method => {
+      if (!WALLET_DEPENDENT_CODES.has(method.code)) return method;
+      return {
+        ...method,
+        channel_application: walletPassMethod.channel_application
+      };
+    });
+    return availableMethods;
+  }
+  setPayMethodCache(payMethods) {
+    this.payMethodMemoryCache = payMethods;
+    this.store.payMethods = payMethods;
+  }
+  logInfo(title, metadata) {
+    try {
+      if (this.logger) {
+        this.logger.addLog({
+          type: 'info',
+          title: `[PaymentServerModule] ${title}`,
+          metadata: metadata || {}
+        });
+      }
+    } catch {
+      // 日志记录失败不影响主流程
+    }
+  }
+  logWarning(title, metadata) {
+    try {
+      if (this.logger) {
+        this.logger.addLog({
+          type: 'warning',
+          title: `[PaymentServerModule] ${title}`,
+          metadata: metadata || {}
+        });
+      }
+    } catch {
+      // 日志记录失败不影响主流程
+    }
+  }
+  logError(title, metadata) {
+    try {
+      if (this.logger) {
+        this.logger.addLog({
+          type: 'error',
+          title: `[PaymentServerModule] ${title}`,
+          metadata: metadata || {}
+        });
+      }
+    } catch {
+      // 日志记录失败不影响主流程
+    }
+  }
+}
+exports.PaymentServerModule = PaymentServerModule;

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

@@ -0,0 +1,9 @@
+import type { PaymentMethod } from '../../../modules/Payment/types';
+export interface PaymentServerState {
+    payMethods: PaymentMethod[];
+}
+export interface PaymentMethodsChangedEventData {
+    oldMethods: PaymentMethod[];
+    newMethods: PaymentMethod[];
+}
+export type { PaymentMethod };

package/lib/server/modules/payment/types.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});