@pisell/pisellos 2.1.36 → 2.2.1

package/lib/modules/Payment/index.js

@@ -55,7 +55,7 @@ function generateRequestUniqueId() {
 }
 var PaymentModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
-    super(name, version);
+    super(name || "payment", version);
     this.defaultName = "pay";
     this.defaultVersion = "1.0.0";
     // LoggerManager 实例
@@ -193,7 +193,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         console.warn("[PaymentModule] 无法缓存支付方式，pay_method 表不存在");
       }
       await this.core.effects.emit(
-        import_types.PaymentHooks.OnPaymentMethodsLoaded,
+        `${this.name}:onPaymentMethodsLoaded`,
         payMethods
       );
       this.logInfo("getPayMethodListAsync completed successfully", {
@@ -243,7 +243,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
           newMethods: newPayMethods
         };
         await this.core.effects.emit(
-          import_types.PaymentHooks.OnPaymentMethodsChanged,
+          `${this.name}:onPaymentMethodsChanged`,
           eventData
         );
       } else {
@@ -323,35 +323,48 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       totalAmount: params.total_amount
     });
     try {
-      const newOrder = {
-        uuid: (0, import_utils.getUniqueId)("pay_order_"),
-        id: params.order_id,
-        order_id: params.order_id,
-        order_info: params.order_info,
-        payment_status: import_types.PaymentStatus.Processing,
-        payment: [],
-        adjust_offline_payments: [],
-        total_amount: params.total_amount,
-        expect_amount: params.total_amount,
-        tax_fee: "0.00",
-        is_deposit: params.is_deposit || 0,
-        deposit_amount: params.deposit_amount || "0.00"
-      };
-      const dbAddStartTime = Date.now();
-      await this.dbManager.add("order", newOrder);
-      const dbAddDuration = Date.now() - dbAddStartTime;
-      this.logInfo("Database add operation completed", {
-        operation: "dbManager.add",
-        table: "order",
-        orderUuid: newOrder.uuid,
-        orderId: newOrder.order_id,
-        duration: `${dbAddDuration}ms`,
-        performance: dbAddDuration > 100 ? "slow" : dbAddDuration > 50 ? "medium" : "fast"
+      const existingOrder = await this.dbManager.get("order", params.order_id);
+      this.logInfo("createPaymentOrderAsync existingOrder", {
+        existingOrder
       });
-      setTimeout(() => {
+      if (existingOrder) {
+        this.logInfo(
+          `createPaymentOrderAsync found duplicate order ID: ${params.order_id}, updating existing payment order`
+        );
+        existingOrder.order_info = params.order_info;
+        existingOrder.total_amount = params.total_amount;
+        existingOrder.is_deposit = params.is_deposit || 0;
+        existingOrder.deposit_amount = params.deposit_amount || "0.00";
+        this.recalculateOrderAmount(existingOrder);
+        await this.dbManager.update("order", existingOrder);
+        await this.core.effects.emit(
+          `${this.name}:onOrderUpdated`,
+          existingOrder
+        );
+        return existingOrder;
+      } else {
+        const newOrder = {
+          uuid: (0, import_utils.getUniqueId)("pay_order_"),
+          id: params.order_id,
+          order_id: params.order_id,
+          order_info: params.order_info,
+          payment_status: import_types.PaymentStatus.Processing,
+          payment: [],
+          adjust_offline_payments: [],
+          total_amount: params.total_amount,
+          expect_amount: params.total_amount,
+          tax_fee: "0.00",
+          is_deposit: params.is_deposit || 0,
+          deposit_amount: params.deposit_amount || "0.00"
+        };
+        await this.dbManager.add("order", newOrder);
         this.core.effects.emit(`${this.name}:onOrderAdded`, newOrder);
-      }, 0);
-      return newOrder;
+        this.logInfo("createPaymentOrderAsync completed - new payment order created", {
+          orderUuid: newOrder.uuid,
+          orderId: newOrder.id
+        });
+        return newOrder;
+      }
     } catch (error) {
       console.error("[PaymentModule] 创建支付订单失败", error);
       this.logError("createPaymentOrderAsync failed", error, {
@@ -368,7 +381,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       const order = await this.dbManager.get("order", orderUuid);
       if (order) {
         await this.dbManager.delete("order", orderUuid);
-        await this.core.effects.emit(import_types.PaymentHooks.OnOrderDeleted, order);
+        await this.core.effects.emit(`${this.name}:onOrderDeleted`, order);
         console.log("[PaymentModule] 支付订单删除成功:", orderUuid);
       }
     } catch (error) {
@@ -386,8 +399,8 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         const updatedOrder = { ...order, ...params };
         this.recalculateOrderAmount(updatedOrder);
         await this.dbManager.update("order", updatedOrder);
-        await this.core.effects.emit(import_types.PaymentHooks.OnOrderUpdated, updatedOrder);
-        await this.core.effects.emit(import_types.PaymentHooks.OnOrderChanged, {
+        await this.core.effects.emit(`${this.name}:onOrderUpdated`, updatedOrder);
+        await this.core.effects.emit(`${this.name}:onOrderChanged`, {
           action: "update",
           order: updatedOrder,
           originalOrder: order
@@ -445,8 +458,8 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         }
       };
       await this.dbManager.update("order", updatedOrder);
-      await this.core.effects.emit(import_types.PaymentHooks.OnOrderUpdated, updatedOrder);
-      await this.core.effects.emit(import_types.PaymentHooks.OnOrderChanged, {
+      await this.core.effects.emit(`${this.name}:onOrderUpdated`, updatedOrder);
+      await this.core.effects.emit(`${this.name}:onOrderChanged`, {
         action: "order_id_replaced",
         order: updatedOrder,
         originalOrder: existingOrder,
@@ -563,7 +576,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       order.payment.push(newPaymentItem);
       this.recalculateOrderAmount(order);
       await this.dbManager.update("order", order);
-      await this.core.effects.emit(import_types.PaymentHooks.OnPaymentAdded, {
+      await this.core.effects.emit(`${this.name}:onPaymentAdded`, {
         orderUuid,
         payment: newPaymentItem
       });
@@ -619,11 +632,11 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       });
       this.recalculateOrderAmount(order);
       await this.dbManager.update("order", order);
-      await this.core.effects.emit(import_types.PaymentHooks.OnPaymentDeleted, {
+      await this.core.effects.emit(`${this.name}:onPaymentDeleted`, {
         order,
         paymentItem
       });
-      await this.core.effects.emit(import_types.PaymentHooks.OnOrderChanged, {
+      await this.core.effects.emit(`${this.name}:onOrderChanged`, {
         action: "payment_delete",
         order,
         paymentItem
@@ -700,7 +713,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         await this.addPaymentItemAsync(orderUuid, voucherItem);
       }
       const updatedOrder = await this.getPaymentOrderByUuidAsync(orderUuid);
-      await this.core.effects.emit(import_types.PaymentHooks.OnPaymentAdded, {
+      await this.core.effects.emit(`${this.name}:onPaymentAdded`, {
         orderUuid,
         order: updatedOrder,
         payment: null
@@ -741,11 +754,11 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         Object.assign(paymentItem, formattedParams);
         this.recalculateOrderAmount(order);
         await this.dbManager.update("order", order);
-        await this.core.effects.emit(import_types.PaymentHooks.OnPaymentUpdated, {
+        await this.core.effects.emit(`${this.name}:onPaymentUpdated`, {
           order,
           paymentItem
         });
-        await this.core.effects.emit(import_types.PaymentHooks.OnOrderChanged, {
+        await this.core.effects.emit(`${this.name}:onOrderChanged`, {
           action: "payment_update",
           order,
           paymentItem
@@ -833,8 +846,8 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         });
         return;
       }
-      await this.core.effects.emit(import_types.PaymentHooks.OnPaymentSubmitted, order);
-      await this.core.effects.emit(import_types.PaymentHooks.OnOrderChanged, {
+      await this.core.effects.emit(`${this.name}:onPaymentSubmitted`, order);
+      await this.core.effects.emit(`${this.name}:onOrderChanged`, {
         action: "submit",
         order
       });

package/lib/modules/Payment/walletpass.js

@@ -38,7 +38,9 @@ var WalletPassPaymentImpl = class {
    */
   emitEvent(hook, data) {
     try {
-      this.paymentModule.core.effects.emit(hook, data);
+      const eventName = hook.split(":")[1] || hook.replace(/^[A-Z][a-z]+/, "").replace(/^On/, "").toLowerCase();
+      const fullEventName = `${this.paymentModule.name}:${eventName}`;
+      this.paymentModule.core.effects.emit(fullEventName, data);
     } catch (error) {
       this.paymentModule.logError("[WalletPass] 发送事件失败", error, { hook });
     }

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

@@ -24,7 +24,6 @@ __export(ProductList_exports, {
 });
 module.exports = __toCommonJS(ProductList_exports);
 var import_BaseModule = require("../BaseModule");
-var import_types = require("./types");
 var import_lodash_es = require("lodash-es");
 __reExport(ProductList_exports, require("./types"), module.exports);
 var ProductList = class extends import_BaseModule.BaseModule {
@@ -96,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;
   }
@@ -134,14 +125,14 @@ var ProductList = class extends import_BaseModule.BaseModule {
   }
   async getProducts() {
     await this.core.effects.emit(
-      import_types.ProductListHooks.onGetProducts,
+      `${this.name}:onGetProducts`,
       this.store.list
     );
     return (0, import_lodash_es.cloneDeep)(this.store.list);
   }
   async getProduct(id) {
     await this.core.effects.emit(
-      import_types.ProductListHooks.onGetProduct,
+      `${this.name}:onGetProduct`,
       this.store.list
     );
     const product = this.store.list.find((product2) => product2.id === id);

package/lib/modules/Resource/index.js

@@ -42,7 +42,7 @@ var ResourceListModule = class extends import_BaseModule.BaseModule {
     if (!resource)
       return;
     this.store.selectedResource = resource;
-    await this.core.effects.emit(import_types.ResourceHooks.OnResourceSelect, resource);
+    await this.core.effects.emit(`${this.name}:onResourceSelect`, resource);
   }
   getSelectedResource() {
     return this.store.selectedResource;

package/lib/modules/Rules/index.js

@@ -33,7 +33,6 @@ __export(Rules_exports, {
 });
 module.exports = __toCommonJS(Rules_exports);
 var import_BaseModule = require("../BaseModule");
-var import_types = require("./types");
 var import_utils = require("../../solution/ShopDiscount/utils");
 var import_utils2 = require("../Cart/utils");
 var import_decimal = __toESM(require("decimal.js"));
@@ -52,7 +51,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
   }
   async setRulesList(rulesList) {
     this.store.rulesList = rulesList;
-    await this.core.effects.emit(import_types.RulesHooks.OnRulesListChange, rulesList);
+    await this.core.effects.emit(`${this.name}:onRulesListChange`, rulesList);
   }
   getRulesList() {
     return this.store.rulesList;
@@ -489,7 +488,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
   }
   async destroy() {
     this.core.effects.offByModuleDestroy(this.name);
-    await this.core.effects.emit(import_types.RulesHooks.OnDestroy, {});
+    await this.core.effects.emit(`${this.name}:onDestroy`, {});
     console.log("[Rules] 已销毁");
   }
   async clear() {

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

@@ -49,6 +49,7 @@ export interface RequestOptions {
     responseType?: 'json' | 'text' | 'arraybuffer' | 'blob';
     withCredentials?: boolean;
     useCache?: boolean;
+    osServer?: boolean;
 }
 /**
  * 响应接口

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';