@pisell/pisellos 2.2.145 → 2.2.146

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

@@ -160,7 +160,7 @@ function matchBooking(booking, orderInfo, ctx) {
   }
   if (ctx.appointmentStatusSet && !ctx.appointmentStatusSet.has(getBookingAppointmentStatus(booking))) return false;
   if (ctx.bookingTimeRange) {
-    var ts = toTimestamp(booking.start_date);
+    var ts = toTimestamp(bookingDateTimeString(booking.start_date, booking.start_time));
     if (ts < ctx.bookingTimeRange[0] || ts > ctx.bookingTimeRange[1]) return false;
   }
   if (ctx.afterExecutionTimeMs != null) {
@@ -308,6 +308,7 @@ export function filterBookingsFromOrders(orders, filters) {
 
     // 订单级预过滤
     if (!matchOrder(order, ctx)) continue;
+    debugger;
 
     // 订单通过，遍历其 bookings；orderInfo 延迟创建
     var orderInfo = null;

package/dist/solution/BookingTicket/index.d.ts

@@ -136,7 +136,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

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

@@ -178,7 +178,7 @@ function matchBooking(booking, orderInfo, ctx) {
   if (ctx.appointmentStatusSet && !ctx.appointmentStatusSet.has(getBookingAppointmentStatus(booking)))
     return false;
   if (ctx.bookingTimeRange) {
-    const ts = toTimestamp(booking.start_date);
+    const ts = toTimestamp(bookingDateTimeString(booking.start_date, booking.start_time));
     if (ts < ctx.bookingTimeRange[0] || ts > ctx.bookingTimeRange[1])
       return false;
   }
@@ -308,6 +308,7 @@ function filterBookingsFromOrders(orders, filters) {
       continue;
     if (!matchOrder(order, ctx))
       continue;
+    debugger;
     let orderInfo = null;
     for (let j = 0, bLen = bookings.length; j < bLen; j++) {
       const booking = bookings[j];

package/lib/solution/BookingTicket/index.d.ts

@@ -136,7 +136,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.2.145",
+  "version": "2.2.146",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",