@pisell/pisellos 2.2.242 → 2.2.244

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

@@ -80,16 +80,6 @@ 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 内。
@@ -102,10 +92,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
@@ -239,10 +229,8 @@ 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 使用单位 */
@@ -407,8 +395,6 @@ export interface OrderData {
     /** 本地辅助字段 */
     shop_id?: number;
     create_date?: string;
-    /** 本地待同步标记：1 表示需要后续同步到云端 */
-    need_sync?: 0 | 1 | number;
     /** 兼容：部分场景仍使用顶层 total_amount */
     total_amount?: OrderMoneyString | number;
     /** 扩展字段（物流、标签等）；使用 any 以便筛选与数据源扩展 */
@@ -538,21 +524,6 @@ 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,21 +71,6 @@ 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;
@@ -183,13 +168,9 @@ function matchOrder(order, ctx) {
   return true;
 }
 function matchBooking(booking, orderInfo, ctx) {
-  if (ctx.enableChildBookingFilter && booking.booking_id) {
-    const parentId = Number(
-      booking.parent_id ?? 0
-    );
-    const itemType = String(
-      booking.item_type ?? ""
-    );
+  if (ctx.enableChildBookingFilter) {
+    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;
@@ -197,8 +178,8 @@ function matchBooking(booking, orderInfo, ctx) {
   if (ctx.appointmentStatusSet && !ctx.appointmentStatusSet.has(getBookingAppointmentStatus(booking)))
     return false;
   if (ctx.bookingTimeRange) {
-    const bookingRange = resolveBookingTimeRange(booking);
-    if (!bookingRange || !isRangeOverlapping(bookingRange, ctx.bookingTimeRange))
+    const ts = toTimestamp(bookingDateTimeString(booking.start_date, booking.start_time));
+    if (ts < ctx.bookingTimeRange[0] || ts > ctx.bookingTimeRange[1])
       return false;
   }
   if (ctx.afterExecutionTimeMs != null) {

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

@@ -33,13 +33,6 @@ __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)) {
@@ -140,27 +133,26 @@ function filterOrders(orders, filters) {
       }
     }
     if (safeFilters.payment_methods && safeFilters.payment_methods.length > 0) {
-      const orderPaymentCodes = getOrderPaymentCodes(order);
-      if (orderPaymentCodes.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.payments,
+            actual: order.payment_methods,
             expected: safeFilters.payment_methods
           }
         });
         return false;
       }
-      const hasMatch = orderPaymentCodes.some((code) => safeFilters.payment_methods.includes(code));
+      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: orderPaymentCodes,
+            actual: order.payment_methods,
             expected: safeFilters.payment_methods
           }
         });
@@ -335,9 +327,8 @@ 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 && !isCreatedIsUndefined) {
+      if (safeFilters.start_time) {
         const startTs = (0, import_dayjs.default)(safeFilters.start_time).startOf("day").valueOf();
         if (orderTime < startTs) {
           rejected.push({
@@ -352,7 +343,7 @@ function filterOrders(orders, filters) {
           return false;
         }
       }
-      if (safeFilters.end_time && !isCreatedIsUndefined) {
+      if (safeFilters.end_time) {
         const endTs = (0, import_dayjs.default)(safeFilters.end_time).endOf("day").valueOf();
         if (orderTime > endTs) {
           rejected.push({

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

@@ -21,18 +21,12 @@ export declare class ProductsModule extends BaseModule implements Module {
     private isPriceFormatterRegistered;
     private quotationPriceBridge?;
     private quotationBridgeChannel?;
-    private quotationBridgeLoadedKey?;
+    private quotationBridgeCustomerId?;
     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>;
     /**
@@ -215,28 +209,10 @@ export declare class ProductsModule extends BaseModule implements Module {
      */
     private loadProductsFromIndexDB;
     /**
-     * 串行执行商品 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 replaceProductsSnapshotInIndexDB;
-    /**
-     * 增量 upsert 商品到 IndexDB，不清空表；用于 pubsub 批次合并后的变更商品。
-     *
-     * @example
-     * await this.patchProductsInIndexDB(changedProducts, 'pubsub.processProductSyncMessages', mergeActions)
+     * 保存商品数据到 IndexDB（平铺存储）
+     * @private
      */
-    private patchProductsInIndexDB;
+    private saveProductsToIndexDB;
     /**
      * 同步更新商品 Map 缓存
      * 将 list 中的商品同步到 map，以 id 为 key
@@ -286,17 +262,14 @@ export declare class ProductsModule extends BaseModule implements Module {
     /**
      * 将 body 完整数据直接覆盖到本地 store（不调用报价单接口）
      * 已存在的 → 直接替换；不存在的 → 追加
-     *
-     * @example
-     * await this.applyBodyUpdatesToStore(bodyUpdates, { skipIndexDB: true })
+     * 同时更新 Map 缓存、IndexDB，触发 onProductsChanged
+     * 价格缓存由 processProductSyncMessages 末尾统一清除
      */
     private applyBodyUpdatesToStore;
     /**
      * 将增量拉取的商品合并到 store
      * 已存在的 → 替换；新的 → 追加
-     *
-     * @example
-     * await this.mergeProductsToStore(freshProducts, { skipIndexDB: true })
+     * 同时更新 store.map、IndexDB，触发 onProductsChanged
      */
     private mergeProductsToStore;
     /**