@pisell/pisellos 2.1.41 → 2.2.2

package/lib/modules/Order/index.js

@@ -104,8 +104,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       schedule_date: "",
       is_deposit: 0,
       relation_products: [],
-      relation_forms: [],
-      ...(params == null ? void 0 : params.extraData) || {}
+      relation_forms: []
     };
     let is_deposit = 0;
     if (params.cartItems.length > 0) {
@@ -121,9 +120,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           order.relation_forms.push(...relationForms);
           delete item._origin.relation_forms;
         } else {
-          const relationForms = (0, import_utils.mergeRelationForms)(
-            item._origin.relation_forms || []
-          );
+          const relationForms = (0, import_utils.mergeRelationForms)(item._origin.relation_forms || []);
           item._origin.relation_forms = relationForms;
           order.bookings.push(item._origin);
         }

package/lib/modules/Order/types.d.ts

@@ -16,7 +16,6 @@ export interface CommitOrderParams {
         cartItems: CartItem[];
         type: 'virtual' | 'appointment_booking';
         platform?: 'pc' | 'h5';
-        extraData?: Record<string, any>;
     };
 }
 /**

package/lib/modules/Product/types.d.ts

@@ -1,3 +1,14 @@
+/**
+ * 商品集合接口
+ */
+export interface ProductCollection {
+    /** 商品集合id */
+    id: number;
+    /** 商品集合名称 */
+    title: string;
+    /** 商品集合封面 */
+    cover: string;
+}
 /**
  * 商品基本信息接口
  */
@@ -8,6 +19,8 @@ export interface ProductData {
     id: number;
     /** 商品所属账户id */
     account_id: number | string;
+    /** 商品集合 */
+    collection?: ProductCollection[];
     /** 扩展类型id */
     extension_id: number;
     /** 扩展类型 */
@@ -189,6 +202,12 @@ export interface ProductData {
     };
     /** 购物车行键，用于唯一标识购物车中的商品，用于相同 SKU商品合并 */
     rowKey?: string;
+    /** 套餐组数量 */
+    bundle_group_count: number;
+    /** 选项组数量 */
+    option_group_count: number;
+    /** 服务时长 */
+    service_times?: any;
 }
 /**
  * 商品媒体信息接口

package/lib/modules/ProductList/index.js

@@ -95,21 +95,13 @@ var ProductList = class extends import_BaseModule.BaseModule {
         with_count,
         // client_schedule_ids: schedule_ids,
         schedule_date,
-        application_code: (_b = this.otherParams) == null ? void 0 : _b.channel,
         with_schedule,
         schedule_datetime,
-        is_eject: 1
+        application_code: (_b = this.otherParams) == null ? void 0 : _b.channel
       },
-      { useCache: true }
+      { osServer: true }
     );
     const sortedList = (productsData.data.list || []).slice().sort((a, b) => Number(b.sort) - Number(a.sort));
-    if (sortedList.length) {
-      sortedList.forEach((n) => {
-        if (n.is_eject !== 1 && n["schedule.ids"] && n["schedule.ids"].length) {
-          n.is_eject = 1;
-        }
-      });
-    }
     this.addProduct(sortedList);
     return sortedList;
   }

package/lib/modules/Schedule/types.d.ts

@@ -1,6 +1,8 @@
 import dayjs from 'dayjs';
 export interface ScheduleState {
     scheduleList: ScheduleItem[];
+    /** 日程 Map 缓存（以 id 为 key，加速查询） */
+    map: Map<number, ScheduleItem>;
     availabilityDateList: ScheduleAvailabilityDateItem[];
     otherProductsIds: number[];
 }

package/lib/plugins/request.d.ts

@@ -35,6 +35,23 @@ export interface RequestPlugin extends Plugin {
      */
     request: <T = any>(options: RequestOptions) => Promise<T>;
 }
+export declare enum RequestModeENUM {
+    LOCAL = "local",
+    REMOTE = "remote",
+    LOCAL_REMOTE = "local_remote",
+    REMOTE_LOCAL = "remote_local",
+    OS_SERVER = "os_server"
+}
+export type RequestModeType = RequestModeENUM.LOCAL | RequestModeENUM.REMOTE | RequestModeENUM.LOCAL_REMOTE | RequestModeENUM.REMOTE_LOCAL | RequestModeENUM.OS_SERVER;
+export type CacheType = 'memory' | 'storage' | 'indexDB';
+export interface CacheProps {
+    key?: string;
+    type?: CacheType;
+    updateCache?: boolean;
+    cacheUpdateChange?: (data: any) => void;
+    mode?: RequestModeType;
+    cacheKeyData?: any;
+}
 /**
  * 请求配置
  */
@@ -49,7 +66,8 @@ export interface RequestOptions {
     responseType?: 'json' | 'text' | 'arraybuffer' | 'blob';
     withCredentials?: boolean;
     useCache?: boolean;
-    customToast?: () => void;
+    cache?: CacheProps;
+    osServer?: boolean;
 }
 /**
  * 响应接口

package/lib/plugins/request.js

@@ -20,9 +20,18 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var request_exports = {};
 __export(request_exports, {
   RequestError: () => RequestError,
+  RequestModeENUM: () => RequestModeENUM,
   default: () => request_default
 });
 module.exports = __toCommonJS(request_exports);
+var RequestModeENUM = /* @__PURE__ */ ((RequestModeENUM2) => {
+  RequestModeENUM2["LOCAL"] = "local";
+  RequestModeENUM2["REMOTE"] = "remote";
+  RequestModeENUM2["LOCAL_REMOTE"] = "local_remote";
+  RequestModeENUM2["REMOTE_LOCAL"] = "remote_local";
+  RequestModeENUM2["OS_SERVER"] = "os_server";
+  return RequestModeENUM2;
+})(RequestModeENUM || {});
 var RequestError = class extends Error {
   constructor(message, config, request, response) {
     super(message);
@@ -314,5 +323,6 @@ var RequestPluginImpl = class {
 var request_default = new RequestPluginImpl();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  RequestError
+  RequestError,
+  RequestModeENUM
 });

package/lib/server/index.d.ts

@@ -0,0 +1,152 @@
+import { ProductsModule } from './modules/products';
+import { MenuModule } from './modules/menu';
+import { QuotationModule } from './modules/quotation';
+import { ScheduleModuleEx } from './modules/schedule';
+import { PisellCore, ServerModuleConfig, InitializeServerOptions } from '../types';
+import type { RouteHandler, HttpMethod, RouteDefinition, Router, ModuleRegistryConfig, RequestSetting } from './types';
+export type { RouteHandler, HttpMethod, RouteDefinition, Router, ModuleRegistryConfig, };
+/**
+ * Server 类
+ * 用于注册和管理服务端模块
+ */
+declare class Server {
+    private core;
+    products?: ProductsModule;
+    menu?: MenuModule;
+    quotation?: QuotationModule;
+    schedule?: ScheduleModuleEx;
+    router: Router;
+    private moduleRegistry;
+    constructor(core: PisellCore);
+    /**
+     * 注册路由
+     * @param routes 路由定义数组
+     */
+    private registerRoutes;
+    /**
+     * 注册单个模块并自动注册其路由
+     * @param module 模块实例
+     * @param options 模块配置
+     * @param moduleName 模块名称（用于日志）
+     */
+    private registerModuleWithRoutes;
+    /**
+     * 根据模块名称注册单个模块
+     * @param moduleConfig 模块配置（可以是字符串或配置对象）
+     */
+    private registerModuleByName;
+    /**
+     * 注册指定的服务端模块
+     * @param moduleConfigs 要注册的模块配置数组（模块名称或配置对象）
+     */
+    registerModules(moduleConfigs?: (string | ServerModuleConfig)[]): Promise<{
+        module: any;
+        config: ModuleRegistryConfig;
+        shouldPreload: boolean;
+    }[]>;
+    /**
+     * 预加载指定模块的数据
+     * @param registeredModules 已注册的模块信息
+     */
+    preloadModulesData(registeredModules: Array<{
+        module: any;
+        config: ModuleRegistryConfig;
+        shouldPreload: boolean;
+    }>, options?: InitializeServerOptions): Promise<void>;
+    /**
+     * 初始化 Server（注册模块并预加载数据）
+     * @param moduleConfigs 要注册的模块配置
+     * @param autoPreload 是否自动预加载数据
+     */
+    initialize(moduleConfigs?: (string | ServerModuleConfig)[], autoPreload?: boolean, options?: InitializeServerOptions): Promise<{
+        module: any;
+        config: ModuleRegistryConfig;
+        shouldPreload: boolean;
+    }[]>;
+    /**
+     * 获取 Products 模块实例
+     */
+    getProducts(): ProductsModule | undefined;
+    /**
+     * 获取 Menu 模块实例
+     */
+    getMenu(): MenuModule | undefined;
+    /**
+     * 获取 Quotation 模块实例
+     */
+    getQuotation(): QuotationModule | undefined;
+    /**
+     * 获取 Schedule 模块实例
+     */
+    getSchedule(): ScheduleModuleEx | undefined;
+    /**
+     * 获取所有已注册的模块列表
+     */
+    getRegisteredModules(): string[];
+    /**
+     * 清空所有server模块的IndexedDB缓存
+     * @returns Promise<void>
+     */
+    clearAllIndexDB(): Promise<void>;
+    /**
+     * 获取所有注册的路由
+     */
+    getRoutes(): Router;
+    /**
+     * 根据方法和路径获取路由处理函数
+     * @param method HTTP 方法
+     * @param path 路径
+     */
+    getRouteHandler(method: HttpMethod, path: string): RouteHandler | undefined;
+    /**
+     * 检查路由是否存在
+     * @param method HTTP 方法
+     * @param path 路径
+     */
+    hasRoute(method: HttpMethod, path: string): boolean;
+    /**
+     * 执行路由处理函数
+     * @param method HTTP 方法
+     * @param path 路径
+     * @param params 请求参数
+     */
+    handleRoute(method: HttpMethod, path: string, params: {
+        url: string;
+        method: HttpMethod;
+        data?: any;
+        config?: RequestSetting;
+    }): Promise<any>;
+    /**
+     * 获取所有路由列表（用于调试和文档）
+     */
+    getAllRoutes(): Array<{
+        method: HttpMethod;
+        path: string;
+    }>;
+    /**
+     * 注册 Server 层的业务路由
+     * 这些路由需要编排多个模块的数据
+     * @private
+     */
+    private registerServerRoutes;
+    /**
+     * 处理商品查询请求（编排 Products、Menu、Schedule 模块）
+     * 这是一个业务编排方法，协调多个模块完成复杂的业务需求
+     */
+    private handleProductQuery;
+    /**
+     * 根据餐牌配置过滤商品
+     * @param products 所有商品列表
+     * @param activeMenuList 生效的餐牌列表
+     * @returns 过滤后的商品列表
+     * @private
+     */
+    private filterProductsByMenuConfig;
+    /**
+     * 处理获取日程时间段点的请求
+     * 通过餐牌ID列表获取所有相关日程的时间段点
+     */
+    private handleGetScheduleTimePoints;
+}
+export default Server;
+export * from './modules';