@pisell/pisellos 2.2.244 → 2.2.246

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

@@ -80,6 +80,16 @@ export interface OrderProductMetadata {
     unique_identification_number?: string;
     [key: string]: unknown;
 }
+export interface OrderProductTitleSnapshot {
+    en: string | null;
+    ja: string | null;
+    pt: string | null;
+    auto: string | null;
+    'zh-CN': string | null;
+    'zh-HK': string | null;
+    kitchen: string | null;
+    original: string | null;
+}
 /**
  * 订单级商品行（3.3 products）。
  * 订单级别的非预约关联商品；预约关联商品在 bookings 内。
@@ -92,10 +102,10 @@ export interface OrderProductLineItem {
     product_id?: number | null;
     /** 数量。创建/更新时必填。来源：Detail.product_quantity */
     num: number;
+    /** 商品标题快照；本地待同步订单会补齐为多语言对象。 */
+    product_title?: OrderProductTitleSnapshot | string | null;
     /** 多规格 ID。来源：Detail.product_variant_id */
     product_variant_id?: number;
-    /** 选项配置 */
-    product_option_item?: unknown[];
     /**
      * 销售单价（交易快照，仅输出）。
      * 来源：Detail.selling_price
@@ -229,8 +239,10 @@ export interface OrderPaymentItem {
     rounding_amount?: OrderMoneyString;
     /** 支付状态：paid / voided / payment_pending 等 */
     status?: OrderPaymentRecordStatus;
-    /** 支付时间（仅输出）。来源：OrderPayment.payment_time */
+    /** 支付时间（输入/输出均保留）。来源：OrderPayment.payment_time */
     payment_time?: string | null;
+    /** 支付创建时间（输入/输出均保留）。来源：OrderPayment.created_at */
+    created_at?: string | null;
     /** 手续费配置。来源：OrderPayment.service_charge */
     service_charge?: Record<string, unknown> | null;
     /** Wallet Pass 使用单位 */
@@ -395,6 +407,8 @@ export interface OrderData {
     /** 本地辅助字段 */
     shop_id?: number;
     create_date?: string;
+    /** 本地待同步标记：1 表示需要后续同步到云端 */
+    need_sync?: 0 | 1 | number;
     /** 兼容：部分场景仍使用顶层 total_amount */
     total_amount?: OrderMoneyString | number;
     /** 扩展字段（物流、标签等）；使用 any 以便筛选与数据源扩展 */
@@ -524,6 +538,21 @@ export interface OrderAblyEventPayload {
     order_id?: OrderId;
     timestamp: number;
 }
+/**
+ * 订单变更广播载荷。
+ * 用于保留原有全量列表通知能力，同时让订阅方可按 changedOrders 做增量处理。
+ *
+ * @example
+ * const changedOrders = payload.changedOrders
+ */
+export interface OrderChangedPayload {
+    /** 当前订单 store 全量列表，兼容既有重算列表订阅 */
+    list: OrderData[];
+    /** 本次明确发生变更的订单；全量刷新等无法确定 delta 的场景可为空 */
+    changedOrders: OrderData[];
+    /** 触发来源，便于订阅者区分 pubsub / 远端覆盖 / 清空等场景 */
+    source?: string;
+}
 /**
  * OrderSyncMessage - pubsub 同步消息结构
  */

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

@@ -71,6 +71,21 @@ function bookingDateTimeString(datePart, timePart) {
   }
   return `${d} ${t}`.trim();
 }
+function resolveBookingTimeRange(booking) {
+  const start = toTimestamp(bookingDateTimeString(booking.start_date, booking.start_time));
+  if (!start)
+    return null;
+  const end = toTimestamp(
+    bookingDateTimeString(
+      booking.end_date || booking.start_date,
+      booking.end_time || booking.start_time
+    )
+  ) || start;
+  return end >= start ? [start, end] : [end, start];
+}
+function isRangeOverlapping(left, right) {
+  return left[0] <= right[1] && left[1] >= right[0];
+}
 function parseDateRange(range) {
   if (!Array.isArray(range) || range.length < 2)
     return null;
@@ -168,9 +183,13 @@ function matchOrder(order, ctx) {
   return true;
 }
 function matchBooking(booking, orderInfo, ctx) {
-  if (ctx.enableChildBookingFilter) {
-    const parentId = Number(booking.parent_id ?? 0);
-    const itemType = String(booking.item_type ?? "");
+  if (ctx.enableChildBookingFilter && booking.booking_id) {
+    const parentId = Number(
+      booking.parent_id ?? 0
+    );
+    const itemType = String(
+      booking.item_type ?? ""
+    );
     const isMatched = parentId !== 0 && itemType !== "recurring_booking" || parentId === 0 && itemType === "recurring_booking";
     if (!isMatched)
       return false;
@@ -178,8 +197,8 @@ function matchBooking(booking, orderInfo, ctx) {
   if (ctx.appointmentStatusSet && !ctx.appointmentStatusSet.has(getBookingAppointmentStatus(booking)))
     return false;
   if (ctx.bookingTimeRange) {
-    const ts = toTimestamp(bookingDateTimeString(booking.start_date, booking.start_time));
-    if (ts < ctx.bookingTimeRange[0] || ts > ctx.bookingTimeRange[1])
+    const bookingRange = resolveBookingTimeRange(booking);
+    if (!bookingRange || !isRangeOverlapping(bookingRange, ctx.bookingTimeRange))
       return false;
   }
   if (ctx.afterExecutionTimeMs != null) {

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

@@ -33,6 +33,13 @@ __export(filterOrders_exports, {
 });
 module.exports = __toCommonJS(filterOrders_exports);
 var import_dayjs = __toESM(require("dayjs"));
+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);
+}
 function filterOrders(orders, filters) {
   const safeFilters = filters || {};
   if (!orders || !Array.isArray(orders)) {
@@ -133,26 +140,27 @@ function filterOrders(orders, filters) {
       }
     }
     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.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: order.payment_methods,
+            actual: orderPaymentCodes,
             expected: safeFilters.payment_methods
           }
         });
@@ -327,8 +335,9 @@ function filterOrders(orders, filters) {
       }
     }
     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;
-      if (safeFilters.start_time) {
+      if (safeFilters.start_time && !isCreatedIsUndefined) {
         const startTs = (0, import_dayjs.default)(safeFilters.start_time).startOf("day").valueOf();
         if (orderTime < startTs) {
           rejected.push({
@@ -343,7 +352,7 @@ function filterOrders(orders, filters) {
           return false;
         }
       }
-      if (safeFilters.end_time) {
+      if (safeFilters.end_time && !isCreatedIsUndefined) {
         const endTs = (0, import_dayjs.default)(safeFilters.end_time).endOf("day").valueOf();
         if (orderTime > endTs) {
           rejected.push({

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,192 @@
+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/payment/index.ts
+var payment_exports = {};
+__export(payment_exports, {
+  PaymentServerModule: () => PaymentServerModule
+});
+module.exports = __toCommonJS(payment_exports);
+var import_BaseModule = require("../../../modules/BaseModule");
+var WALLET_PASS_CODE = "WALLET_PASS";
+var WALLET_DEPENDENT_CODES = /* @__PURE__ */ new Set(["PRODUCTVOUCHER", "GIFTCARD", "POINTCARD"]);
+var PAYMENT_METHODS_LOADED_EVENT = "payment:onPaymentMethodsLoaded";
+var PaymentServerModule = class extends import_BaseModule.BaseModule {
+  constructor(name, version) {
+    super(name || "payment", version);
+    this.defaultName = "payment";
+    this.defaultVersion = "1.0.0";
+    this.payMethodMemoryCache = null;
+    this.payMethodListInFlight = null;
+  }
+  async initialize(core, options) {
+    var _a, _b, _c;
+    this.core = core;
+    this.store = options == null ? void 0 : 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 == null ? void 0 : appPlugin.getApp();
+    this.logger = (_a = this.app) == null ? void 0 : _a.logger;
+    if (!this.request && !((_b = this.app) == null ? void 0 : _b.request)) {
+      throw new Error("PaymentServerModule 需要 request 插件或 app.request 支持");
+    }
+    this.logInfo("PaymentServerModule initialized successfully", {
+      hasAppRequest: !!((_c = this.app) == null ? void 0 : _c.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 = {}) {
+    var _a;
+    this.logInfo("Starting getPayMethodListAsync");
+    if ((_a = this.payMethodMemoryCache) == null ? void 0 : _a.length) {
+      return this.resolvePayMethods(this.payMethodMemoryCache, options);
+    }
+    if (this.payMethodListInFlight) {
+      const payMethods2 = await this.payMethodListInFlight;
+      return this.resolvePayMethods(payMethods2, 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() {
+    var _a;
+    const requester = ((_a = this.app) == null ? void 0 : _a.request) || this.request;
+    const response = await requester.get("/shop/pay/custom-payment/all", void 0);
+    const payMethods = (response == null ? void 0 : response.data) || response || [];
+    return Array.isArray(payMethods) ? payMethods : [];
+  }
+  shouldFilterPayMethods(data, config) {
+    return (data == null ? void 0 : data.filterPaymentMethods) === true || (config == null ? void 0 : 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 {
+    }
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  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,17 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+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/payment/types.ts
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);

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

@@ -21,12 +21,18 @@ export declare class ProductsModule extends BaseModule implements Module {
     private isPriceFormatterRegistered;
     private quotationPriceBridge?;
     private quotationBridgeChannel?;
-    private quotationBridgeCustomerId?;
+    private quotationBridgeLoadedKey?;
     private quotationBridgeRefreshPromise?;
     private quotationBridgeRefreshKey?;
     private productDataSource;
     private pendingSyncMessages;
     private syncTimer?;
+    /** 最近一次 SSE 全量拉取完成时间 */
+    private lastServerFullFetchAtMs;
+    /** 最近一次 preload 完成时间（含 IndexDB 命中） */
+    private lastPreloadCompletedAtMs;
+    /** IndexDB 写入串行队列，避免快照与 patch 并发交错 */
+    private productIndexDBSaveQueue;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: any): Promise<void>;
     /**
@@ -209,10 +215,28 @@ export declare class ProductsModule extends BaseModule implements Module {
      */
     private loadProductsFromIndexDB;
     /**
-     * 保存商品数据到 IndexDB（平铺存储）
-     * @private
+     * 串行执行商品 IndexDB 写入，避免快照替换与增量 patch 并发交错。
+     *
+     * @example
+     * await this.runInProductIndexDBSaveQueue(async () => {
+     *   await this.dbManager.bulkUpdate(INDEXDB_STORE_NAME, products)
+     * })
+     */
+    private runInProductIndexDBSaveQueue;
+    /**
+     * 全量快照写入 IndexDB：clear + bulkUpdate，仅用于 SSE/HTTP 全量拉取。
+     *
+     * @example
+     * await this.replaceProductsSnapshotInIndexDB(list, 'loadProductsByServer')
      */
-    private saveProductsToIndexDB;
+    private replaceProductsSnapshotInIndexDB;
+    /**
+     * 增量 upsert 商品到 IndexDB，不清空表；用于 pubsub 批次合并后的变更商品。
+     *
+     * @example
+     * await this.patchProductsInIndexDB(changedProducts, 'pubsub.processProductSyncMessages', mergeActions)
+     */
+    private patchProductsInIndexDB;
     /**
      * 同步更新商品 Map 缓存
      * 将 list 中的商品同步到 map，以 id 为 key
@@ -262,14 +286,17 @@ export declare class ProductsModule extends BaseModule implements Module {
     /**
      * 将 body 完整数据直接覆盖到本地 store（不调用报价单接口）
      * 已存在的 → 直接替换；不存在的 → 追加
-     * 同时更新 Map 缓存、IndexDB，触发 onProductsChanged
-     * 价格缓存由 processProductSyncMessages 末尾统一清除
+     *
+     * @example
+     * await this.applyBodyUpdatesToStore(bodyUpdates, { skipIndexDB: true })
      */
     private applyBodyUpdatesToStore;
     /**
      * 将增量拉取的商品合并到 store
      * 已存在的 → 替换；新的 → 追加
-     * 同时更新 store.map、IndexDB，触发 onProductsChanged
+     *
+     * @example
+     * await this.mergeProductsToStore(freshProducts, { skipIndexDB: true })
      */
     private mergeProductsToStore;
     /**