@pisell/pisellos 0.0.567 → 0.0.569

package/lib/solution/RegisterAndLogin/utils.js

@@ -1,105 +1,126 @@
-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/solution/RegisterAndLogin/utils.ts
-var utils_exports = {};
-__export(utils_exports, {
-  debounce: () => debounce,
-  deepClone: () => deepClone,
-  formatEmailDisplay: () => formatEmailDisplay,
-  formatPhoneDisplay: () => formatPhoneDisplay,
-  formatTimestamp: () => formatTimestamp,
-  generateRandomString: () => generateRandomString,
-  getDeviceType: () => getDeviceType,
-  getOAuthProviderDisplayName: () => getOAuthProviderDisplayName,
-  getOAuthProviderIconUrl: () => getOAuthProviderIconUrl,
-  getTimeDifference: () => getTimeDifference,
-  isAndroidDevice: () => isAndroidDevice,
-  isIOSDevice: () => isIOSDevice,
-  isMobileDevice: () => isMobileDevice,
-  isTimestampExpired: () => isTimestampExpired,
-  isWebAuthnSupported: () => isWebAuthnSupported,
-  safeJsonParse: () => safeJsonParse,
-  safeJsonStringify: () => safeJsonStringify,
-  throttle: () => throttle,
-  validateEmail: () => validateEmail,
-  validatePassword: () => validatePassword,
-  validatePhone: () => validatePhone,
-  validateVerificationCode: () => validateVerificationCode
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(utils_exports);
-var import_types = require("./types");
+exports.debounce = debounce;
+exports.deepClone = deepClone;
+exports.formatEmailDisplay = formatEmailDisplay;
+exports.formatPhoneDisplay = formatPhoneDisplay;
+exports.formatTimestamp = formatTimestamp;
+exports.generateRandomString = generateRandomString;
+exports.getDeviceType = getDeviceType;
+exports.getOAuthProviderDisplayName = getOAuthProviderDisplayName;
+exports.getOAuthProviderIconUrl = getOAuthProviderIconUrl;
+exports.getTimeDifference = getTimeDifference;
+exports.isAndroidDevice = isAndroidDevice;
+exports.isIOSDevice = isIOSDevice;
+exports.isMobileDevice = isMobileDevice;
+exports.isTimestampExpired = isTimestampExpired;
+exports.isWebAuthnSupported = isWebAuthnSupported;
+exports.safeJsonParse = safeJsonParse;
+exports.safeJsonStringify = safeJsonStringify;
+exports.throttle = throttle;
+exports.validateEmail = validateEmail;
+exports.validatePassword = validatePassword;
+exports.validatePhone = validatePhone;
+exports.validateVerificationCode = validateVerificationCode;
+var _types = require("./types");
+/**
+ * 注册登录工具函数
+ */
+
+/**
+ * 验证邮箱格式
+ */
 function validateEmail(email) {
   const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
   return emailRegex.test(email);
 }
+
+/**
+ * 验证手机号格式（支持多种国际格式）
+ */
 function validatePhone(phone) {
-  const cleanPhone = phone.replace(/[^\d+]/g, "");
+  // 移除所有非数字字符（除了 + 号）
+  const cleanPhone = phone.replace(/[^\d+]/g, '');
+
+  // 基本的手机号验证规则
   const phoneRegex = /^(\+\d{1,3}[- ]?)?\d{10,14}$/;
   return phoneRegex.test(cleanPhone);
 }
+
+/**
+ * 验证密码强度
+ */
 function validatePassword(password) {
   const errors = [];
   if (password.length < 8) {
-    errors.push("密码长度至少为8位");
+    errors.push('密码长度至少为8位');
   }
   if (password.length > 128) {
-    errors.push("密码长度不能超过128位");
+    errors.push('密码长度不能超过128位');
   }
   if (!/[a-z]/.test(password)) {
-    errors.push("密码必须包含至少一个小写字母");
+    errors.push('密码必须包含至少一个小写字母');
   }
   if (!/[A-Z]/.test(password)) {
-    errors.push("密码必须包含至少一个大写字母");
+    errors.push('密码必须包含至少一个大写字母');
   }
   if (!/\d/.test(password)) {
-    errors.push("密码必须包含至少一个数字");
+    errors.push('密码必须包含至少一个数字');
   }
   if (!/[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]/.test(password)) {
-    errors.push("密码必须包含至少一个特殊字符");
+    errors.push('密码必须包含至少一个特殊字符');
   }
   return {
     isValid: errors.length === 0,
     errors
   };
 }
+
+/**
+ * 验证验证码格式
+ */
 function validateVerificationCode(code, type) {
-  const cleanCode = code.replace(/\s/g, "");
+  // 移除所有空格
+  const cleanCode = code.replace(/\s/g, '');
   switch (type) {
-    case import_types.VerificationCodeType.EMAIL:
-    case import_types.VerificationCodeType.SMS:
+    case _types.VerificationCodeType.EMAIL:
+    case _types.VerificationCodeType.SMS:
+      // 通常是4-8位数字
       return /^\d{4,8}$/.test(cleanCode);
     default:
       return false;
   }
 }
+
+/**
+ * 格式化手机号显示
+ */
 function formatPhoneDisplay(phone) {
-  const cleanPhone = phone.replace(/[^\d+]/g, "");
+  // 移除所有非数字字符（除了 + 号）
+  const cleanPhone = phone.replace(/[^\d+]/g, '');
+
+  // 如果是中国手机号（11位数字）
   if (/^\d{11}$/.test(cleanPhone)) {
-    return cleanPhone.replace(/(\d{3})(\d{4})(\d{4})/, "$1 $2 $3");
+    return cleanPhone.replace(/(\d{3})(\d{4})(\d{4})/, '$1 $2 $3');
   }
-  if (cleanPhone.startsWith("+")) {
+
+  // 如果是国际号码（以 + 开头）
+  if (cleanPhone.startsWith('+')) {
     return cleanPhone;
   }
+
+  // 其他格式保持原样
   return phone;
 }
+
+/**
+ * 格式化邮箱显示（隐藏部分字符）
+ */
 function formatEmailDisplay(email, maskLength = 3) {
-  const [localPart, domain] = email.split("@");
+  const [localPart, domain] = email.split('@');
   if (!localPart || !domain) {
     return email;
   }
@@ -108,76 +129,110 @@ function formatEmailDisplay(email, maskLength = 3) {
   }
   const visibleStart = localPart.substring(0, maskLength);
   const visibleEnd = localPart.substring(localPart.length - maskLength);
-  const maskedPart = "*".repeat(localPart.length - maskLength * 2);
+  const maskedPart = '*'.repeat(localPart.length - maskLength * 2);
   return `${visibleStart}${maskedPart}${visibleEnd}@${domain}`;
 }
+
+/**
+ * 生成随机字符串（用于状态参数等）
+ */
 function generateRandomString(length = 32) {
-  const chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-  let result = "";
+  const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+  let result = '';
   for (let i = 0; i < length; i++) {
     result += chars.charAt(Math.floor(Math.random() * chars.length));
   }
   return result;
 }
+
+/**
+ * 获取 OAuth 提供商的显示名称
+ */
 function getOAuthProviderDisplayName(provider) {
   const displayNames = {
-    [import_types.OAuthProvider.FACEBOOK]: "Facebook",
-    [import_types.OAuthProvider.APPLE]: "Apple",
-    [import_types.OAuthProvider.GOOGLE]: "Google",
-    [import_types.OAuthProvider.WECHAT]: "微信",
-    [import_types.OAuthProvider.GITHUB]: "GitHub"
+    [_types.OAuthProvider.FACEBOOK]: 'Facebook',
+    [_types.OAuthProvider.APPLE]: 'Apple',
+    [_types.OAuthProvider.GOOGLE]: 'Google',
+    [_types.OAuthProvider.WECHAT]: '微信',
+    [_types.OAuthProvider.GITHUB]: 'GitHub'
   };
   return displayNames[provider] || provider;
 }
+
+/**
+ * 获取 OAuth 提供商的图标 URL
+ */
 function getOAuthProviderIconUrl(provider) {
   const iconUrls = {
-    [import_types.OAuthProvider.FACEBOOK]: "https://cdn.jsdelivr.net/npm/simple-icons@v9/icons/facebook.svg",
-    [import_types.OAuthProvider.APPLE]: "https://cdn.jsdelivr.net/npm/simple-icons@v9/icons/apple.svg",
-    [import_types.OAuthProvider.GOOGLE]: "https://cdn.jsdelivr.net/npm/simple-icons@v9/icons/google.svg",
-    [import_types.OAuthProvider.WECHAT]: "https://cdn.jsdelivr.net/npm/simple-icons@v9/icons/wechat.svg",
-    [import_types.OAuthProvider.GITHUB]: "https://cdn.jsdelivr.net/npm/simple-icons@v9/icons/github.svg"
+    [_types.OAuthProvider.FACEBOOK]: 'https://cdn.jsdelivr.net/npm/simple-icons@v9/icons/facebook.svg',
+    [_types.OAuthProvider.APPLE]: 'https://cdn.jsdelivr.net/npm/simple-icons@v9/icons/apple.svg',
+    [_types.OAuthProvider.GOOGLE]: 'https://cdn.jsdelivr.net/npm/simple-icons@v9/icons/google.svg',
+    [_types.OAuthProvider.WECHAT]: 'https://cdn.jsdelivr.net/npm/simple-icons@v9/icons/wechat.svg',
+    [_types.OAuthProvider.GITHUB]: 'https://cdn.jsdelivr.net/npm/simple-icons@v9/icons/github.svg'
   };
-  return iconUrls[provider] || "";
+  return iconUrls[provider] || '';
 }
+
+/**
+ * 检查是否在移动设备上
+ */
 function isMobileDevice() {
-  if (typeof window === "undefined") {
+  if (typeof window === 'undefined') {
     return false;
   }
-  return /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(
-    navigator.userAgent
-  );
+  return /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
 }
+
+/**
+ * 检查是否支持 WebAuthn
+ */
 function isWebAuthnSupported() {
-  if (typeof window === "undefined") {
+  if (typeof window === 'undefined') {
     return false;
   }
   return !!(navigator.credentials && navigator.credentials.create);
 }
+
+/**
+ * 检查是否在 iOS 设备上
+ */
 function isIOSDevice() {
-  if (typeof window === "undefined") {
+  if (typeof window === 'undefined') {
     return false;
   }
   return /iPad|iPhone|iPod/.test(navigator.userAgent);
 }
+
+/**
+ * 检查是否在 Android 设备上
+ */
 function isAndroidDevice() {
-  if (typeof window === "undefined") {
+  if (typeof window === 'undefined') {
     return false;
   }
   return /Android/.test(navigator.userAgent);
 }
+
+/**
+ * 获取设备类型
+ */
 function getDeviceType() {
-  if (typeof window === "undefined") {
-    return "desktop";
+  if (typeof window === 'undefined') {
+    return 'desktop';
   }
   const userAgent = navigator.userAgent;
   if (/iPad/.test(userAgent)) {
-    return "tablet";
+    return 'tablet';
   }
   if (/Android|webOS|iPhone|iPod|BlackBerry|IEMobile|Opera Mini/i.test(userAgent)) {
-    return "mobile";
+    return 'mobile';
   }
-  return "desktop";
+  return 'desktop';
 }
+
+/**
+ * 防抖函数
+ */
 function debounce(func, wait) {
   let timeout = null;
   return (...args) => {
@@ -189,6 +244,10 @@ function debounce(func, wait) {
     }, wait);
   };
 }
+
+/**
+ * 节流函数
+ */
 function throttle(func, wait) {
   let lastTime = 0;
   return (...args) => {
@@ -199,17 +258,21 @@ function throttle(func, wait) {
     }
   };
 }
+
+/**
+ * 深拷贝对象
+ */
 function deepClone(obj) {
-  if (obj === null || typeof obj !== "object") {
+  if (obj === null || typeof obj !== 'object') {
     return obj;
   }
   if (obj instanceof Date) {
     return new Date(obj.getTime());
   }
   if (obj instanceof Array) {
-    return obj.map((item) => deepClone(item));
+    return obj.map(item => deepClone(item));
   }
-  if (typeof obj === "object") {
+  if (typeof obj === 'object') {
     const cloned = {};
     for (const key in obj) {
       if (obj.hasOwnProperty(key)) {
@@ -220,60 +283,55 @@ function deepClone(obj) {
   }
   return obj;
 }
+
+/**
+ * 安全的 JSON 解析
+ */
 function safeJsonParse(jsonString, defaultValue) {
   try {
     return JSON.parse(jsonString);
   } catch (error) {
-    console.warn("JSON 解析失败:", error);
+    console.warn('JSON 解析失败:', error);
     return defaultValue;
   }
 }
-function safeJsonStringify(obj, defaultValue = "{}") {
+
+/**
+ * 安全的 JSON 字符串化
+ */
+function safeJsonStringify(obj, defaultValue = '{}') {
   try {
     return JSON.stringify(obj);
   } catch (error) {
-    console.warn("JSON 字符串化失败:", error);
+    console.warn('JSON 字符串化失败:', error);
     return defaultValue;
   }
 }
-function formatTimestamp(timestamp, format = "YYYY-MM-DD HH:mm:ss") {
+
+/**
+ * 格式化时间戳为可读时间
+ */
+function formatTimestamp(timestamp, format = 'YYYY-MM-DD HH:mm:ss') {
   const date = new Date(timestamp);
   const year = date.getFullYear();
-  const month = String(date.getMonth() + 1).padStart(2, "0");
-  const day = String(date.getDate()).padStart(2, "0");
-  const hours = String(date.getHours()).padStart(2, "0");
-  const minutes = String(date.getMinutes()).padStart(2, "0");
-  const seconds = String(date.getSeconds()).padStart(2, "0");
-  return format.replace("YYYY", year.toString()).replace("MM", month).replace("DD", day).replace("HH", hours).replace("mm", minutes).replace("ss", seconds);
+  const month = String(date.getMonth() + 1).padStart(2, '0');
+  const day = String(date.getDate()).padStart(2, '0');
+  const hours = String(date.getHours()).padStart(2, '0');
+  const minutes = String(date.getMinutes()).padStart(2, '0');
+  const seconds = String(date.getSeconds()).padStart(2, '0');
+  return format.replace('YYYY', year.toString()).replace('MM', month).replace('DD', day).replace('HH', hours).replace('mm', minutes).replace('ss', seconds);
 }
+
+/**
+ * 计算两个时间戳之间的差值（秒）
+ */
 function getTimeDifference(timestamp1, timestamp2) {
-  return Math.abs(timestamp1 - timestamp2) / 1e3;
+  return Math.abs(timestamp1 - timestamp2) / 1000;
 }
-function isTimestampExpired(timestamp, expirationTime = 5 * 60 * 1e3) {
+
+/**
+ * 检查时间戳是否过期
+ */
+function isTimestampExpired(timestamp, expirationTime = 5 * 60 * 1000) {
   return Date.now() - timestamp > expirationTime;
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  debounce,
-  deepClone,
-  formatEmailDisplay,
-  formatPhoneDisplay,
-  formatTimestamp,
-  generateRandomString,
-  getDeviceType,
-  getOAuthProviderDisplayName,
-  getOAuthProviderIconUrl,
-  getTimeDifference,
-  isAndroidDevice,
-  isIOSDevice,
-  isMobileDevice,
-  isTimestampExpired,
-  isWebAuthnSupported,
-  safeJsonParse,
-  safeJsonStringify,
-  throttle,
-  validateEmail,
-  validatePassword,
-  validatePhone,
-  validateVerificationCode
-});
+}

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

@@ -2,7 +2,7 @@ import dayjs from 'dayjs';
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import type { RequestPlugin } from '../../plugins/request';
-import { SalesState, SalesModuleAPI, Reservation, SalesResourceBookingItem, SalesTimelineHighlights } from './types';
+import { SalesState, SalesModuleAPI, Reservation, SalesResourceBookingItem, SalesResourceBookingItemWithGroups, SalesTimelineHighlights, ChangeBookingStatusParams, GetResourceBookingItemParams } from './types';
 import type { BookingData } from '../../server/modules/order/types';
 export * from './types';
 /**
@@ -14,6 +14,7 @@ export * from './types';
  * - 基础生命周期占位
  *
  * 不提前实现 store 编排、初始化流程细节、状态计算逻辑。
+ * TIPS：这块应该改名叫 ReservationModule 更合适一些，目前这边只服务于 Reservation 的 floormap 展示。
  */
 export declare class SalesImpl extends BaseModule implements Module, SalesModuleAPI {
     protected defaultName: string;
@@ -24,6 +25,7 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     protected options: ModuleOptions;
     protected otherParams: Record<string, any>;
     protected request: RequestPlugin;
+    private logger;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     /** 获取当前 store 快照 */
@@ -38,6 +40,8 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     setReservationList(reservationList: Reservation[]): Reservation[];
     /** 重置预约列表为空 */
     resetReservationList(): Reservation[];
+    cancelOrder(orderIds: Array<number | string>): Promise<any>;
+    changeBookingStatus(params: ChangeBookingStatusParams): Promise<any>;
     destroy(): Promise<void>;
     /**
      * 时间轴粒度（分钟）
@@ -76,6 +80,14 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
      */
     private getBookingStatus;
     private getResourceId;
+    private getBookingAppointmentStatus;
+    private isBookingIncludedInStats;
+    private getBookingOrderPaymentStatus;
+    private countBookingOrders;
+    private countCompletedBookings;
+    private groupBookingsByResource;
+    private isBookingMatchedResource;
+    private sortMatchedBookings;
     /**
      * 资源下 bookings 的返回裁剪策略：
      * 1) 优先返回当前时刻正在进行中的预约（允许并发返回多条）
@@ -85,12 +97,45 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
      */
     private pickBookingsForCurrentPoint;
     /**
-     * 标准化单条 booking：
-     * - 过滤终态（rejected/cancelled/completed）
-     * - 注入 status / isTimeout / reserved_status
+     * 计算 booking 在 current 时刻的执行进度百分比（0-100）。
+     * - startAt/endAt 非法或 totalMinutes <= 0 返回 0
+     * - current 早于 startAt 返回 0，晚于 endAt 返回 100
+     */
+    private calcProgressPercent;
+    /**
+     * 标准化单条 booking 的分发入口：
+     * - 统一过滤 rejected / cancelled（视为没来过）
+     * - current === deviceCurrent 走实时分支（信任 appointment_status）
+     * - 否则走快照分支（纯时间窗判定，忽略 appointment_status 的 arrived/started/completed 差异）
      */
     private normalizeMatchedBooking;
-    getResourceBookingList(currentTime: string, bookingList?: BookingData[]): Promise<SalesResourceBookingItem[]>;
+    private normalizeResourceBookings;
+    private buildCompletedBooking;
+    /**
+     * 实时模式（current === deviceCurrent）：信任 appointment_status
+     * - 过滤 new / completed（实时视角下视为非活跃数据）
+     * - status 由 getBookingStatus 映射
+     * - occupied 且 current > endAt 标记 isTimeout + timeoutTime
+     * - reserved 且 current < startAt 标记 not_arrived，否则标记 late
+     */
+    private buildRealtimeBooking;
+    /**
+     * 快照模式（current !== deviceCurrent，过去或未来）：忽略 appointment_status
+     * 的实时态差异，仅按 booking 时间窗判定，为 current 提供时间点快照视图。
+     *
+     * - new：视作尚未成为真实预约，过滤
+     * - locked：保留 status=locked，不计算 timeout/late/progress
+     * - 其他非终态：
+     *   - startAt/endAt 非法 → 过滤
+     *   - current > endAt → 过滤（已结束，不入池）
+     *   - current ∈ [startAt, endAt] → occupied，附带 progressPercent
+     *   - current < startAt → reserved + not_arrived，附带 remainingReserveTime
+     *
+     * 快照模式下 isTimeout 恒为 false，lateTime / timeoutTime 始终置空。
+     */
+    private buildSnapshotBooking;
+    getResourceBookingList(currentTime: string, bookingList?: BookingData[], deviceTime?: string): Promise<SalesResourceBookingItem[]>;
+    getResourceBookingItem(params: GetResourceBookingItemParams): Promise<SalesResourceBookingItemWithGroups | null>;
 }
 export { SalesImpl as Sales };
 export default SalesImpl;