@pisell/pisellos 2.2.143 → 2.2.144

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

@@ -9,6 +9,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import dayjs from 'dayjs';
 /** 预约状态：协议 appointment_status 优先，兼容历史 status */
 function getBookingAppointmentStatus(booking) {
   var _ref, _booking$appointment_;
@@ -22,7 +23,23 @@ function getBookingAppointmentStatus(booking) {
 function toTimestamp(value) {
   if (value === undefined || value === null || value === '') return 0;
   if (typeof value === 'number') return value;
-  return new Date(value).getTime();
+  // 使用 dayjs 按本地时区解析，避免 new Date("YYYY-MM-DD") 被当作 UTC 0 点
+  var d = dayjs(value);
+  return d.isValid() ? d.valueOf() : 0;
+}
+
+/** 日期范围端点解析：纯日期串自动对齐到当天起止边界（本地时区） */
+var 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;
+  var str = String(value).trim();
+  var d = dayjs(str);
+  if (!d.isValid()) return 0;
+  if (DATE_ONLY_RE.test(str)) {
+    return (isEnd ? d.endOf('day') : d.startOf('day')).valueOf();
+  }
+  return d.valueOf();
 }
 
 /**
@@ -39,8 +56,8 @@ function bookingDateTimeString(datePart, timePart) {
 }
 function parseDateRange(range) {
   if (!Array.isArray(range) || range.length < 2) return null;
-  var start = toTimestamp(range[0]);
-  var end = toTimestamp(range[1]);
+  var start = toRangeBoundary(range[0], false);
+  var end = toRangeBoundary(range[1], true);
   if (!start && !end) return null;
   return [start, end];
 }

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

@@ -1,3 +1,4 @@
+import dayjs from 'dayjs';
 /**
  * 订单过滤函数
  * @param orders 原始订单列表
@@ -347,9 +348,11 @@ export function filterOrders(orders, filters) {
 
     // start_time / end_time - 创建时间范围
     if (safeFilters.start_time || safeFilters.end_time) {
-      var orderTime = order.created_at ? typeof order.created_at === 'number' ? order.created_at : new Date(String(order.created_at)).getTime() : 0;
+      // 统一用 dayjs 按本地时区解析，避免 new Date("YYYY-MM-DD") 被当作 UTC 0 点
+      // 与含时分的本地时间字符串比较时产生时区错位
+      var orderTime = order.created_at ? typeof order.created_at === 'number' ? order.created_at : dayjs(String(order.created_at)).valueOf() : 0;
       if (safeFilters.start_time) {
-        var startTs = new Date(safeFilters.start_time).getTime();
+        var startTs = dayjs(safeFilters.start_time).startOf('day').valueOf();
         if (orderTime < startTs) {
           rejected.push({
             order_id: order.order_id,
@@ -364,8 +367,7 @@ export function filterOrders(orders, filters) {
         }
       }
       if (safeFilters.end_time) {
-        // end_time 为当天结束（23:59:59.999）
-        var endTs = new Date(safeFilters.end_time).getTime() + 86400000 - 1;
+        var endTs = dayjs(safeFilters.end_time).endOf('day').valueOf();
         if (orderTime > endTs) {
           rejected.push({
             order_id: order.order_id,

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

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/server/modules/order/utils/filterBookings.ts
@@ -26,6 +36,7 @@ __export(filterBookings_exports, {
   sortBookings: () => sortBookings
 });
 module.exports = __toCommonJS(filterBookings_exports);
+var import_dayjs = __toESM(require("dayjs"));
 function getBookingAppointmentStatus(booking) {
   return String(booking.appointment_status ?? booking.status ?? "");
 }
@@ -34,7 +45,23 @@ function toTimestamp(value) {
     return 0;
   if (typeof value === "number")
     return value;
-  return new Date(value).getTime();
+  const d = (0, import_dayjs.default)(value);
+  return d.isValid() ? d.valueOf() : 0;
+}
+var DATE_ONLY_RE = /^\d{4}-\d{2}-\d{2}$/;
+function toRangeBoundary(value, isEnd) {
+  if (value === void 0 || value === null || value === "")
+    return 0;
+  if (typeof value === "number")
+    return value;
+  const str = String(value).trim();
+  const d = (0, import_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();
 }
 function bookingDateTimeString(datePart, timePart) {
   const d = (datePart ?? "").trim();
@@ -47,8 +74,8 @@ function bookingDateTimeString(datePart, timePart) {
 function parseDateRange(range) {
   if (!Array.isArray(range) || range.length < 2)
     return null;
-  const start = toTimestamp(range[0]);
-  const end = toTimestamp(range[1]);
+  const start = toRangeBoundary(range[0], false);
+  const end = toRangeBoundary(range[1], true);
   if (!start && !end)
     return null;
   return [start, end];

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

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/server/modules/order/utils/filterOrders.ts
@@ -22,6 +32,7 @@ __export(filterOrders_exports, {
   filterOrders: () => filterOrders
 });
 module.exports = __toCommonJS(filterOrders_exports);
+var import_dayjs = __toESM(require("dayjs"));
 function filterOrders(orders, filters) {
   const safeFilters = filters || {};
   if (!orders || !Array.isArray(orders)) {
@@ -316,9 +327,9 @@ function filterOrders(orders, filters) {
       }
     }
     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;
+      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) {
-        const startTs = new Date(safeFilters.start_time).getTime();
+        const startTs = (0, import_dayjs.default)(safeFilters.start_time).startOf("day").valueOf();
         if (orderTime < startTs) {
           rejected.push({
             order_id: order.order_id,
@@ -333,7 +344,7 @@ function filterOrders(orders, filters) {
         }
       }
       if (safeFilters.end_time) {
-        const endTs = new Date(safeFilters.end_time).getTime() + 864e5 - 1;
+        const endTs = (0, import_dayjs.default)(safeFilters.end_time).endOf("day").valueOf();
         if (orderTime > endTs) {
           rejected.push({
             order_id: order.order_id,

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.143",
+  "version": "2.2.144",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",