@pisell/pisellos 0.0.567 → 0.0.569

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

@@ -1,78 +1,118 @@
-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);
+"use strict";
 
-// src/server/modules/order/utils/filterBookings.ts
-var filterBookings_exports = {};
-__export(filterBookings_exports, {
-  filterBookings: () => filterBookings,
-  filterBookingsFromOrders: () => filterBookingsFromOrders,
-  flattenOrdersToBookings: () => flattenOrdersToBookings,
-  sortBookings: () => sortBookings
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(filterBookings_exports);
+exports.filterBookings = filterBookings;
+exports.filterBookingsFromOrders = filterBookingsFromOrders;
+exports.flattenOrdersToBookings = flattenOrdersToBookings;
+exports.productsForBooking = productsForBooking;
+exports.sortBookings = sortBookings;
+var _dayjs = _interopRequireDefault(require("dayjs"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/** 预约状态：协议 appointment_status 优先，兼容历史 status */
 function getBookingAppointmentStatus(booking) {
-  return String(booking.appointment_status ?? booking.status ?? "");
+  return String(booking.appointment_status ?? booking.status ?? '');
 }
+
+// ─────────────────────────────────────────────────────────────────
+// 时间戳 / 范围解析
+// ─────────────────────────────────────────────────────────────────
+
 function toTimestamp(value) {
-  if (value === void 0 || value === null || value === "")
-    return 0;
-  if (typeof value === "number")
-    return value;
-  return new Date(value).getTime();
+  if (value === undefined || value === null || value === '') return 0;
+  if (typeof value === 'number') return value;
+  // 使用 dayjs 按本地时区解析，避免 new Date("YYYY-MM-DD") 被当作 UTC 0 点
+  const d = (0, _dayjs.default)(value);
+  return d.isValid() ? d.valueOf() : 0;
+}
+
+/** 日期范围端点解析：纯日期串自动对齐到当天起止边界（本地时区） */
+const DATE_ONLY_RE = /^\d{4}-\d{2}-\d{2}$/;
+function toRangeBoundary(value, isEnd) {
+  if (value === undefined || value === null || value === '') return 0;
+  if (typeof value === 'number') return value;
+  const str = String(value).trim();
+  const d = (0, _dayjs.default)(str);
+  if (!d.isValid()) return 0;
+  if (DATE_ONLY_RE.test(str)) {
+    return (isEnd ? d.endOf('day') : d.startOf('day')).valueOf();
+  }
+  return d.valueOf();
 }
+
+/**
+ * 将 start_date / start_time（或 end_*）拼成可被 Date 稳定解析的字符串。
+ * 时间字段协议为 H:i（如 15:00）时补全为 H:i:00，避免部分环境对「无秒」非 ISO 串（空格分隔）解析不一致。
+ */
 function bookingDateTimeString(datePart, timePart) {
-  const d = (datePart ?? "").trim();
-  let t = (timePart ?? "").trim();
+  const d = (datePart ?? '').trim();
+  let t = (timePart ?? '').trim();
   if (t && /^\d{1,2}:\d{2}$/.test(t)) {
     t = `${t}:00`;
   }
   return `${d} ${t}`.trim();
 }
+
+/**
+ * 解析预约自身的起止时间区间，供 `sales_time_between` 做区间重叠匹配。
+ *
+ * @example
+ * const span = resolveBookingTimeRange({ start_date: '2026-06-09', start_time: '10:00', end_date: '2026-06-15', end_time: '10:00' })
+ */
+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];
+}
+
+/**
+ * 判断两个闭区间是否有交集。
+ *
+ * @example
+ * isRangeOverlapping([1, 10], [5, 6]) // true
+ */
+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;
-  const start = toTimestamp(range[0]);
-  const end = toTimestamp(range[1]);
-  if (!start && !end)
-    return null;
+  if (!Array.isArray(range) || range.length < 2) return null;
+  const start = toRangeBoundary(range[0], false);
+  const end = toRangeBoundary(range[1], true);
+  if (!start && !end) return null;
   return [start, end];
 }
 function parseNumberRange(range) {
-  if (!Array.isArray(range) || range.length < 2)
-    return null;
+  if (!Array.isArray(range) || range.length < 2) return null;
   const min = Number(range[0]);
   const max = Number(range[1]);
-  if (isNaN(min) || isNaN(max))
-    return null;
+  if (isNaN(min) || isNaN(max)) return null;
   return [min, max];
 }
+
+// ─────────────────────────────────────────────────────────────────
+// 预编译过滤上下文：将 filters 一次性解析为高效的 Set / Range，
+// 供 matchOrder、matchBooking 复用，避免重复计算
+// ─────────────────────────────────────────────────────────────────
+
+/** 预约列表搜索兼容前端通用 `keyword` 与后端协议 `keywords` 两种字段 */
+function resolveBookingKeyword(f) {
+  const keyword = f.keyword ?? f.keywords;
+  return typeof keyword === 'string' ? keyword.trim() : '';
+}
 function prepareFilters(f) {
-  var _a, _b, _c, _d, _e, _f;
-  const hasCustomerId = f.customer_id !== void 0 && f.customer_id !== null;
+  const hasCustomerId = f.customer_id !== undefined && f.customer_id !== null;
+  const keyword = resolveBookingKeyword(f);
   return {
-    orderPaymentStatusSet: ((_a = f.order_payment_status) == null ? void 0 : _a.length) ? new Set(f.order_payment_status) : null,
-    orderStatusSet: ((_b = f.order_status) == null ? void 0 : _b.length) ? new Set(f.order_status) : null,
-    orderSalesChannelSet: ((_c = f.order_sales_channel) == null ? void 0 : _c.length) ? new Set(f.order_sales_channel) : null,
-    paymentMethodSet: ((_d = f.payment_method) == null ? void 0 : _d.length) ? new Set(f.payment_method) : null,
-    appointmentStatusSet: ((_e = f.appointment_status) == null ? void 0 : _e.length) ? new Set(f.appointment_status) : null,
-    formRecordIdSet: ((_f = f.form_record_ids) == null ? void 0 : _f.length) ? new Set(f.form_record_ids) : null,
+    orderPaymentStatusSet: f.order_payment_status?.length ? new Set(f.order_payment_status) : null,
+    orderStatusSet: f.order_status?.length ? new Set(f.order_status) : null,
+    orderSalesChannelSet: f.order_sales_channel?.length ? new Set(f.order_sales_channel) : null,
+    paymentMethodSet: f.payment_method?.length ? new Set(f.payment_method) : null,
+    appointmentStatusSet: f.appointment_status?.length ? new Set(f.appointment_status) : null,
+    formRecordIdSet: f.form_record_ids?.length ? new Set(f.form_record_ids) : null,
     hasCustomerId,
-    customerIdStr: hasCustomerId ? String(f.customer_id) : "",
+    customerIdStr: hasCustomerId ? String(f.customer_id) : '',
     hasBusinessCode: !!f.business_code,
     businessCode: f.business_code,
     bookingTimeRange: parseDateRange(f.sales_time_between),
@@ -80,33 +120,30 @@ function prepareFilters(f) {
     updatedAtRange: parseDateRange(f.updated_at_between),
     numberRange: parseNumberRange(f.number_between),
     totalAmountRange: Array.isArray(f.total_amount_between) && f.total_amount_between.length === 2 ? f.total_amount_between : null,
-    keywordLower: f.keyword ? f.keyword.toLowerCase() : "",
+    keywordLower: keyword ? keyword.toLowerCase() : '',
     afterExecutionTimeMs: (() => {
       const raw = f.after_execution_time;
-      if (raw === void 0 || raw === null || raw === "")
-        return null;
+      if (raw === undefined || raw === null || raw === '') return null;
       const ms = toTimestamp(raw);
       return Number.isFinite(ms) ? ms : null;
     })(),
     enableChildBookingFilter: f.child_booking === 1
   };
 }
+
+// ─────────────────────────────────────────────────────────────────
+// 订单级匹配：不通过则整个 order 下所有 bookings 跳过
+// ─────────────────────────────────────────────────────────────────
+
 function matchOrder(order, ctx) {
-  var _a;
-  if (ctx.hasBusinessCode && order.business_code !== ctx.businessCode)
-    return false;
-  if (ctx.hasCustomerId && String(order.customer_id) !== ctx.customerIdStr)
-    return false;
-  if (ctx.orderPaymentStatusSet && !ctx.orderPaymentStatusSet.has(order.payment_status))
-    return false;
-  if (ctx.orderStatusSet && !ctx.orderStatusSet.has(order.status))
-    return false;
-  if (ctx.orderSalesChannelSet && !ctx.orderSalesChannelSet.has(order.order_sales_channel))
-    return false;
+  if (ctx.hasBusinessCode && order.business_code !== ctx.businessCode) return false;
+  if (ctx.hasCustomerId && String(order.customer_id) !== ctx.customerIdStr) return false;
+  if (ctx.orderPaymentStatusSet && !ctx.orderPaymentStatusSet.has(order.payment_status)) return false;
+  if (ctx.orderStatusSet && !ctx.orderStatusSet.has(order.status)) return false;
+  if (ctx.orderSalesChannelSet && !ctx.orderSalesChannelSet.has(order.order_sales_channel)) return false;
   if (ctx.paymentMethodSet) {
     const pm = order.payments;
-    if (!Array.isArray(pm) || pm.length === 0)
-      return false;
+    if (!Array.isArray(pm) || pm.length === 0) return false;
     let matched = false;
     for (let k = 0; k < pm.length; k++) {
       if (ctx.paymentMethodSet.has(pm[k].code)) {
@@ -114,101 +151,177 @@ function matchOrder(order, ctx) {
         break;
       }
     }
-    if (!matched)
-      return false;
+    if (!matched) return false;
   }
   if (ctx.createdAtRange) {
     const ts = toTimestamp(order.created_at);
-    if (ts < ctx.createdAtRange[0] || ts > ctx.createdAtRange[1])
-      return false;
+    if (ts < ctx.createdAtRange[0] || ts > ctx.createdAtRange[1]) return false;
   }
   if (ctx.updatedAtRange) {
     const ts = toTimestamp(order.updated_at);
-    if (ts < ctx.updatedAtRange[0] || ts > ctx.updatedAtRange[1])
-      return false;
+    if (ts < ctx.updatedAtRange[0] || ts > ctx.updatedAtRange[1]) return false;
   }
   if (ctx.totalAmountRange) {
-    const raw = ((_a = order.summary) == null ? void 0 : _a.total_amount) ?? order.total_amount;
+    const raw = order.summary?.total_amount ?? order.total_amount;
     const amt = Number(raw);
-    if (isNaN(amt))
-      return false;
-    if (ctx.totalAmountRange[0] != null && amt < ctx.totalAmountRange[0])
-      return false;
-    if (ctx.totalAmountRange[1] != null && amt > ctx.totalAmountRange[1])
-      return false;
+    if (isNaN(amt)) return false;
+    if (ctx.totalAmountRange[0] != null && amt < ctx.totalAmountRange[0]) return false;
+    if (ctx.totalAmountRange[1] != null && amt > ctx.totalAmountRange[1]) return false;
   }
   return true;
 }
+
+// ─────────────────────────────────────────────────────────────────
+// Booking 级匹配：在订单通过之后逐条检查每个 booking
+// orderInfo 用于 keyword 搜索时的 JSON 序列化
+// ─────────────────────────────────────────────────────────────────
+
 function matchBooking(booking, orderInfo, ctx) {
-  if (ctx.enableChildBookingFilter) {
+  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;
+    const itemType = String(booking.item_type ?? '');
+    const isMatched = parentId !== 0 && itemType !== 'recurring_booking' || parentId === 0 && itemType === 'recurring_booking';
+    if (!isMatched) return false;
   }
-  if (ctx.appointmentStatusSet && !ctx.appointmentStatusSet.has(getBookingAppointmentStatus(booking)))
-    return false;
+  if (ctx.appointmentStatusSet && !ctx.appointmentStatusSet.has(getBookingAppointmentStatus(booking))) return false;
   if (ctx.bookingTimeRange) {
-    const ts = toTimestamp(booking.start_date);
-    if (ts < ctx.bookingTimeRange[0] || ts > ctx.bookingTimeRange[1])
-      return false;
+    const bookingRange = resolveBookingTimeRange(booking);
+    if (!bookingRange || !isRangeOverlapping(bookingRange, ctx.bookingTimeRange)) return false;
   }
   if (ctx.afterExecutionTimeMs != null) {
     const bookingStartMs = toTimestamp(bookingDateTimeString(booking.start_date, booking.start_time));
-    if (!Number.isFinite(bookingStartMs) || bookingStartMs < ctx.afterExecutionTimeMs)
-      return false;
+    if (!Number.isFinite(bookingStartMs) || bookingStartMs < ctx.afterExecutionTimeMs) return false;
   }
   if (ctx.numberRange) {
     const num = Number(booking.number);
-    if (isNaN(num) || num < ctx.numberRange[0] || num > ctx.numberRange[1])
-      return false;
+    if (isNaN(num) || num < ctx.numberRange[0] || num > ctx.numberRange[1]) return false;
   }
   if (ctx.formRecordIdSet) {
     let formMatched = false;
     const resources = booking.resources;
     if (Array.isArray(resources)) {
       for (let r = 0; r < resources.length; r++) {
-        if (resources[r].relation_type === "form" && ctx.formRecordIdSet.has(resources[r].relation_id)) {
+        if (resources[r].relation_type === 'form' && ctx.formRecordIdSet.has(resources[r].relation_id)) {
           formMatched = true;
           break;
         }
       }
     }
-    if (!formMatched && booking.relation_type === "form" && booking.relation_id && booking.relation_id > 0) {
+    if (!formMatched && booking.relation_type === 'form' && booking.relation_id && booking.relation_id > 0) {
       formMatched = ctx.formRecordIdSet.has(booking.relation_id);
     }
-    if (!formMatched)
-      return false;
+    if (!formMatched) return false;
   }
   if (ctx.keywordLower) {
-    const target = orderInfo ? { ...booking, order: orderInfo } : booking;
+    const target = orderInfo ? {
+      ...booking,
+      order: orderInfo
+    } : booking;
     const str = JSON.stringify(target).toLowerCase();
-    if (!str.includes(ctx.keywordLower))
-      return false;
+    if (!str.includes(ctx.keywordLower)) return false;
   }
   return true;
 }
+
+// ─────────────────────────────────────────────────────────────────
+// 当前预约归属商品：先按 schedule_event_id 命中，再按 relation_items.resource_id 追加（去重保序）
+// ─────────────────────────────────────────────────────────────────
+
+/**
+ * 从整单 `order.products` 中归集属于指定 `booking` 的明细行。
+ * - 第一遍：`product.schedule_event_id === booking.schedule_event_id`（保持 products 原顺序）
+ * - 第二遍：按 `relation_items` 顺序追加 `resource_id` 与 `order_detail_id` 匹配且尚未收录的行
+ */
+function productsForBooking(order, booking) {
+  const products = order.products;
+  if (!Array.isArray(products) || products.length === 0) return [];
+  const bookingEventId = booking.schedule_event_id;
+  const byDetailId = new Map();
+  for (let i = 0, len = products.length; i < len; i++) {
+    const p = products[i];
+    const oid = p.order_detail_id;
+    if (oid === undefined || oid === null) continue;
+    const detailId = Number(oid);
+    if (Number.isNaN(detailId)) continue;
+    byDetailId.set(detailId, p);
+  }
+  const seen = new Set();
+  const out = [];
+  for (let i = 0, len = products.length; i < len; i++) {
+    const p = products[i];
+    const oid = p.order_detail_id;
+    if (oid === undefined || oid === null) continue;
+    const detailId = Number(oid);
+    if (Number.isNaN(detailId)) continue;
+    if (bookingEventId !== undefined && bookingEventId !== null && p.schedule_event_id !== undefined && p.schedule_event_id !== null && Number(p.schedule_event_id) === Number(bookingEventId)) {
+      if (!seen.has(detailId)) {
+        seen.add(detailId);
+        out.push(p);
+      }
+    }
+  }
+  const relationItems = booking.relation_items;
+  if (Array.isArray(relationItems) && relationItems.length > 0) {
+    for (let r = 0, rLen = relationItems.length; r < rLen; r++) {
+      const rid = relationItems[r]?.resource_id;
+      if (rid === undefined || rid === null) continue;
+      const detailId = Number(rid);
+      if (Number.isNaN(detailId) || seen.has(detailId)) continue;
+      const line = byDetailId.get(detailId);
+      if (line) {
+        seen.add(detailId);
+        out.push(line);
+      }
+    }
+  }
+  return out;
+}
+
+// ─────────────────────────────────────────────────────────────────
+// 转换：OrderData[] → BookingData[]（独立导出，供其他场景使用）
+// ─────────────────────────────────────────────────────────────────
+
 function flattenOrdersToBookings(orders) {
-  if (!orders || !Array.isArray(orders))
-    return [];
+  if (!orders || !Array.isArray(orders)) return [];
   const result = [];
   for (let i = 0, len = orders.length; i < len; i++) {
     const order = orders[i];
     const bookings = order.bookings;
-    if (!Array.isArray(bookings) || bookings.length === 0)
-      continue;
-    const { bookings: _omit, ...orderInfo } = order;
+    if (!Array.isArray(bookings) || bookings.length === 0) continue;
+    const {
+      bookings: _omit,
+      ...orderInfo
+    } = order;
     for (let j = 0, bLen = bookings.length; j < bLen; j++) {
-      result.push({ ...bookings[j], order: orderInfo });
+      const booking = bookings[j];
+      result.push({
+        ...booking,
+        order: orderInfo,
+        products: order.products
+      });
     }
   }
   return result;
 }
+
+// ─────────────────────────────────────────────────────────────────
+// 核心：单遍扫描 — 展开 + 过滤 + 分页
+//
+// 性能策略：
+//  1. 订单级条件在外层循环 matchOrder 预判，不匹配则整组 bookings 跳过
+//  2. orderInfo 延迟到有命中 booking 时才创建，同一 order 只创建一次
+//  3. 只对最终命中的 booking 做 object spread
+// ─────────────────────────────────────────────────────────────────
+
 function filterBookingsFromOrders(orders, filters) {
   const f = filters || {};
   if (!orders || !Array.isArray(orders)) {
-    return { list: [], count: 0, size: 0, skip: 0 };
+    return {
+      list: [],
+      count: 0,
+      size: 0,
+      skip: 0
+    };
   }
   const size = f.num || 20;
   const page = f.skip || 1;
@@ -219,25 +332,40 @@ function filterBookingsFromOrders(orders, filters) {
   for (let i = 0, oLen = orders.length; i < oLen; i++) {
     const order = orders[i];
     const bookings = order.bookings;
-    if (!Array.isArray(bookings) || bookings.length === 0)
-      continue;
-    if (!matchOrder(order, ctx))
-      continue;
+    if (!Array.isArray(bookings) || bookings.length === 0) continue;
+
+    // 订单级预过滤
+    if (!matchOrder(order, ctx)) continue;
+
+    // 订单通过，遍历其 bookings；orderInfo 延迟创建
     let orderInfo = null;
     for (let j = 0, bLen = bookings.length; j < bLen; j++) {
       const booking = bookings[j];
+
+      // keyword 匹配需要 orderInfo，提前创建
       if (ctx.keywordLower && !orderInfo) {
-        const { bookings: _omit, ...rest } = order;
+        const {
+          bookings: _omit,
+          ...rest
+        } = order;
         orderInfo = rest;
       }
-      if (!matchBooking(booking, orderInfo, ctx))
-        continue;
+      if (!matchBooking(booking, orderInfo, ctx)) continue;
+
+      // 命中：收集到分页窗口内
       if (totalCount >= startIndex && paginatedList.length < size) {
         if (!orderInfo) {
-          const { bookings: _omit, ...rest } = order;
+          const {
+            bookings: _omit,
+            ...rest
+          } = order;
           orderInfo = rest;
         }
-        paginatedList.push({ ...booking, order: orderInfo });
+        paginatedList.push({
+          ...booking,
+          order: orderInfo,
+          products: order.products
+        });
       }
       totalCount++;
     }
@@ -249,28 +377,32 @@ function filterBookingsFromOrders(orders, filters) {
     skip: page
   };
 }
+
+// ─────────────────────────────────────────────────────────────────
+// 排序预约列表
+// order_by 格式："field:direction"，如 "start_at:desc"
+// 不带方向后缀则不排序
+// ─────────────────────────────────────────────────────────────────
+
 function sortBookings(result, filters) {
   const f = filters || {};
   const orderBy = f.order_by;
-  if (!orderBy)
-    return result;
-  const separatorIdx = orderBy.lastIndexOf(":");
-  if (separatorIdx === -1)
-    return result;
+  if (!orderBy) return result;
+  const separatorIdx = orderBy.lastIndexOf(':');
+  if (separatorIdx === -1) return result;
   const field = orderBy.slice(0, separatorIdx);
   const direction = orderBy.slice(separatorIdx + 1);
-  if (direction !== "asc" && direction !== "desc")
-    return result;
-  const multiplier = direction === "asc" ? 1 : -1;
-  const getTimestamp = (booking) => {
+  if (direction !== 'asc' && direction !== 'desc') return result;
+  const multiplier = direction === 'asc' ? 1 : -1;
+  const getTimestamp = booking => {
     switch (field) {
-      case "start_at":
+      case 'start_at':
         return toTimestamp(bookingDateTimeString(booking.start_date, booking.start_time));
-      case "end_at":
+      case 'end_at':
         return toTimestamp(bookingDateTimeString(booking.end_date, booking.end_time));
-      case "created_at":
+      case 'created_at':
         return toTimestamp(booking.order.created_at);
-      case "updated_at":
+      case 'updated_at':
         return toTimestamp(booking.order.updated_at);
       default:
         return 0;
@@ -279,12 +411,26 @@ function sortBookings(result, filters) {
   const sorted = result.list.slice().sort((a, b) => {
     return (getTimestamp(a) - getTimestamp(b)) * multiplier;
   });
-  return { ...result, list: sorted };
+  return {
+    ...result,
+    list: sorted
+  };
 }
+
+// ─────────────────────────────────────────────────────────────────
+// 兼容独立调用：对已展开的 BookingData[] 做筛选
+// 复用 matchOrder + matchBooking，仅负责迭代与分页
+// ─────────────────────────────────────────────────────────────────
+
 function filterBookings(bookings, filters) {
   const f = filters || {};
   if (!bookings || !Array.isArray(bookings)) {
-    return { list: [], count: 0, size: 0, skip: 0 };
+    return {
+      list: [],
+      count: 0,
+      size: 0,
+      skip: 0
+    };
   }
   const size = f.num || 20;
   const page = f.skip || 1;
@@ -295,12 +441,15 @@ function filterBookings(bookings, filters) {
   for (let i = 0, len = bookings.length; i < len; i++) {
     const booking = bookings[i];
     const order = booking.order;
-    if (!matchOrder(order, ctx))
-      continue;
-    if (!matchBooking(booking, order, ctx))
-      continue;
+
+    // 订单级 + booking 级统一匹配
+    if (!matchOrder(order, ctx)) continue;
+    if (!matchBooking(booking, order, ctx)) continue;
     if (totalCount >= startIndex && paginatedList.length < size) {
-      paginatedList.push(booking);
+      paginatedList.push({
+        ...booking,
+        products: booking.order.products
+      });
     }
     totalCount++;
   }
@@ -310,11 +459,4 @@ function filterBookings(bookings, filters) {
     size,
     skip: page
   };
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  filterBookings,
-  filterBookingsFromOrders,
-  flattenOrdersToBookings,
-  sortBookings
-});
+}