@pisell/pisellos 3.0.76 → 3.0.78

package/lib/modules/Account/index.js

@@ -24,6 +24,7 @@ __export(Account_exports, {
 });
 module.exports = __toCommonJS(Account_exports);
 var import_BaseModule = require("../BaseModule");
+var import_types = require("./types");
 __reExport(Account_exports, require("./types"), module.exports);
 var AccountModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
@@ -58,7 +59,7 @@ var AccountModule = class extends import_BaseModule.BaseModule {
     };
     this.store.accountInfo = account;
     this.store.isLoggedIn = true;
-    await this.core.effects.emit(`${this.name}:onLogin`, account);
+    await this.core.effects.emit(import_types.AccountHooks.OnLogin, account);
   }
   getCurrentAccount() {
     return this.store.accountInfo;
@@ -71,7 +72,7 @@ var AccountModule = class extends import_BaseModule.BaseModule {
       ...updates
     };
     await this.core.effects.emit(
-      `${this.name}:onProfileUpdate`,
+      import_types.AccountHooks.OnProfileUpdate,
       this.store.accountInfo
     );
   }

package/lib/modules/AccountList/index.d.ts

@@ -1,7 +1,7 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { AccountModule, Account } from '../Account';
 import { BaseModule } from '../BaseModule';
-import { IFetchHolderAccountsParams, IHolder, IGetCustomerListParams } from './types';
+import { IFetchHolderAccountsParams, IHolder } from './types';
 export declare class AccountListModule extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -37,12 +37,6 @@ export declare class AccountListModule extends BaseModule implements Module {
         customerId: number;
         type?: 'unshift' | 'push';
     }): Promise<AccountModule[]>;
-    /**
-     * 获取客户列表
-     * @param params 查询参数
-     * @returns 客户列表
-     */
-    getCustomerList(params?: IGetCustomerListParams): Promise<any>;
     /**
      * 获取holder类型账户列表
      * @param params

package/lib/modules/AccountList/index.js

@@ -288,33 +288,6 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
     );
     return accountModules;
   }
-  /**
-   * 获取客户列表
-   * @param params 查询参数
-   * @returns 客户列表
-   */
-  async getCustomerList(params = {}) {
-    const url = "/customer/es/data";
-    const { page = 1, pageSize = 20, keyword, ...otherParams } = params;
-    try {
-      this.store.isLoading = true;
-      this.store.error = null;
-      const queryParams = {
-        page,
-        pageSize,
-        ...keyword && { keyword },
-        ...otherParams
-      };
-      const res = await this.request.get(url, queryParams);
-      return (res == null ? void 0 : res.data) || [];
-    } catch (error) {
-      console.error("Failed to fetch customer list:", error);
-      this.store.error = error instanceof Error ? error.message : "Failed to fetch customer list";
-      throw error;
-    } finally {
-      this.store.isLoading = false;
-    }
-  }
   /**
    * 获取holder类型账户列表
    * @param params

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

@@ -67,31 +67,3 @@ export interface IHolder {
     main_field: string;
     customer_cover?: string;
 }
-/**
- * 获取客户列表参数
- */
-export interface IGetCustomerListParams {
-    /** 页码 */
-    page?: number;
-    /** 每页数量 */
-    pageSize?: number;
-    /** 搜索关键词 */
-    keyword?: string;
-    /** 其他筛选参数 */
-    [key: string]: any;
-}
-/**
- * 客户数据
- */
-export interface ICustomer {
-    /** 客户ID */
-    id: string | number;
-    /** 客户姓名 */
-    name: string;
-    /** 客户电话 */
-    phone?: string;
-    /** 客户邮箱 */
-    email?: string;
-    /** 其他客户信息 */
-    [key: string]: any;
-}

package/lib/modules/BaseModule.d.ts

@@ -14,7 +14,4 @@ export declare class BaseModule {
         store: any;
         cacheKey: string[];
     }): void;
-    effectsOn(eventType: string, callback: (payload: any) => void): () => void;
-    effectsOff(eventType: string, callback: (payload: any) => void): void;
-    effectsOnce(eventType: string, callback: (payload: any) => void): () => void;
 }

package/lib/modules/BaseModule.js

@@ -82,15 +82,6 @@ var BaseModule = class {
       }
     }
   }
-  effectsOn(eventType, callback) {
-    return this.core.effects.on(`${this.name}:${eventType}`, callback);
-  }
-  effectsOff(eventType, callback) {
-    return this.core.effects.off(`${this.name}:${eventType}`, callback);
-  }
-  effectsOnce(eventType, callback) {
-    return this.core.effects.once(`${this.name}:${eventType}`, callback);
-  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/modules/Cart/index.d.ts

@@ -3,7 +3,6 @@ import { BaseModule } from '../BaseModule';
 import { CartItem, CartModuleAPI, ECartItemCheckType, ECartItemInfoType, IAddItemParams, IUpdateItemParams } from './types';
 import { Account } from '../Account';
 export * from './types';
-export { getProductDeposit } from './utils';
 /**
  * 购物车模块实现
  */

package/lib/modules/Cart/index.js

@@ -20,8 +20,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/modules/Cart/index.ts
 var Cart_exports = {};
 __export(Cart_exports, {
-  CartModule: () => CartModule,
-  getProductDeposit: () => import_utils3.getProductDeposit
+  CartModule: () => CartModule
 });
 module.exports = __toCommonJS(Cart_exports);
 var import_BaseModule = require("../BaseModule");
@@ -30,10 +29,9 @@ var import_utils = require("./utils");
 var import_lodash_es = require("lodash-es");
 var import_utils2 = require("../Product/utils");
 __reExport(Cart_exports, require("./types"), module.exports);
-var import_utils3 = require("./utils");
 var CartModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
-    super(name || "cart", version || "1.0.0");
+    super(name, version);
     // 提供给 baseModule 用的默认名称 和 默认版本
     this.defaultName = "cart";
     this.defaultVersion = "1.0.0";
@@ -363,6 +361,5 @@ var CartModule = class extends import_BaseModule.BaseModule {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CartModule,
-  getProductDeposit,
   ...require("./types")
 });

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

@@ -20,7 +20,9 @@ export interface ITime {
     date: string;
     week: string;
     weekNum: number;
-    status: 'unavailable' | 'available';
+    status: 'unavailable' | 'available' | 'lots_of_space' | 'filling_up_fast' | 'sold_out';
+    summaryCount?: number;
+    availableCount?: number;
     resource?: any[];
     color?: string[];
 }

package/lib/modules/Discount/index.d.ts

@@ -33,4 +33,3 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     clear(): Promise<void>;
     storeChange(): void;
 }
-export type { Discount } from './types';

package/lib/modules/Discount/index.js

@@ -185,7 +185,7 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
   async destroy() {
     this.store.discountList = [];
     this.core.effects.offByModuleDestroy(this.name);
-    await this.core.effects.emit(`${this.name}:onDestroy`, {});
+    await this.core.effects.emit(import_types.DiscountHooks.OnDestroy, {});
     console.log("[Discount] 已销毁");
   }
   async clear() {

package/lib/modules/Guests/index.js

@@ -41,8 +41,8 @@ var GuestListModule = class extends import_BaseModule.BaseModule {
   }
   async addGuest(guest) {
     this.state.list.push(guest);
-    await this.core.effects.emit(`${this.name}:onGuestAdd`, guest);
-    await this.core.effects.emit(`${this.name}:onGuestChange`, this.state.list);
+    await this.core.effects.emit(import_types.GuestHooks.OnGuestAdd, guest);
+    await this.core.effects.emit(import_types.GuestHooks.OnGuestChange, this.state.list);
   }
   async updateGuest(id, updates) {
     const index = this.state.list.findIndex((g) => g.id === id);
@@ -56,15 +56,15 @@ var GuestListModule = class extends import_BaseModule.BaseModule {
       import_types.GuestHooks.OnGuestUpdate,
       this.state.list[index]
     );
-    await this.core.effects.emit(`${this.name}:onGuestChange`, this.state.list);
+    await this.core.effects.emit(import_types.GuestHooks.OnGuestChange, this.state.list);
   }
   async removeGuest(id) {
     const index = this.state.list.findIndex((g) => g.id === id);
     if (index === -1)
       return;
     const [removed] = this.state.list.splice(index, 1);
-    await this.core.effects.emit(`${this.name}:onGuestRemove`, removed);
-    await this.core.effects.emit(`${this.name}:onGuestChange`, this.state.list);
+    await this.core.effects.emit(import_types.GuestHooks.OnGuestRemove, removed);
+    await this.core.effects.emit(import_types.GuestHooks.OnGuestChange, this.state.list);
   }
   async getGuests() {
     return this.state.list;
@@ -77,8 +77,8 @@ var GuestListModule = class extends import_BaseModule.BaseModule {
     if (!guest)
       return;
     guest.items.push(item);
-    await this.core.effects.emit(`${this.name}:onGuestUpdate`, guest);
-    await this.core.effects.emit(`${this.name}:onGuestChange`, this.state.list);
+    await this.core.effects.emit(import_types.GuestHooks.OnGuestUpdate, guest);
+    await this.core.effects.emit(import_types.GuestHooks.OnGuestChange, this.state.list);
   }
   async removeItemFromGuest(guestId, itemId) {
     const guest = this.state.list.find((g) => g.id === guestId);
@@ -88,8 +88,8 @@ var GuestListModule = class extends import_BaseModule.BaseModule {
     if (index === -1)
       return;
     guest.items.splice(index, 1);
-    await this.core.effects.emit(`${this.name}:onGuestUpdate`, guest);
-    await this.core.effects.emit(`${this.name}:onGuestChange`, this.state.list);
+    await this.core.effects.emit(import_types.GuestHooks.OnGuestUpdate, guest);
+    await this.core.effects.emit(import_types.GuestHooks.OnGuestChange, this.state.list);
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -1,27 +1,14 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { OrderModuleAPI, CommitOrderParams, CheckoutOrderParams } from './types';
+import { OrderModuleAPI, CommitOrderParams } from './types';
 import { CartItem } from '../Cart/types';
 export declare class OrderModule extends BaseModule implements Module, OrderModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
     private store;
     private request;
-    private logger;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
-    /**
-     * 记录信息日志
-     */
-    private logInfo;
-    /**
-     * 记录警告日志
-     */
-    private logWarning;
-    /**
-     * 记录错误日志
-     */
-    private logError;
     createOrder(params: CommitOrderParams['query']): {
         type: "virtual" | "appointment_booking";
         platform: string;
@@ -39,15 +26,4 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         type: 'holder' | 'account';
     }): boolean;
     submitOrder(order: CommitOrderParams): Promise<void>;
-    /**
-     * Checkout 专用：创建订单到后端
-     *
-     * 专门为 Checkout 模块设计的订单创建方法，
-     * 直接调用 /order/checkout 接口创建订单
-     * 接收已经处理好的订单数据，无需再处理购物车
-     *
-     * @param params Checkout 订单参数（已处理的订单数据）
-     * @returns 后端返回的订单数据（包含订单ID等）
-     */
-    createOrderByCheckout(params: CheckoutOrderParams): Promise<any>;
 }

package/lib/modules/Order/index.js

@@ -1,8 +1,6 @@
-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)
@@ -16,14 +14,6 @@ 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/modules/Order/index.ts
@@ -35,11 +25,9 @@ module.exports = __toCommonJS(Order_exports);
 var import_BaseModule = require("../BaseModule");
 var import_utils = require("./utils");
 var import_utils2 = require("../Product/utils");
-var import_dayjs = __toESM(require("dayjs"));
 var OrderModule = class extends import_BaseModule.BaseModule {
-  // LoggerManager 实例
   constructor(name, version) {
-    super(name || "order", version);
+    super(name, version);
     this.defaultName = "order";
     this.defaultVersion = "1.0.0";
   }
@@ -47,49 +35,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.core = core;
     this.store = options.store;
     this.request = this.core.getPlugin("request");
-    const appPlugin = this.core.getPlugin("app");
-    if (!appPlugin) {
-      throw new Error("Order 模块需要 app 插件支持");
-    }
-    const app = appPlugin.getApp();
-    this.logger = app.logger;
-    this.logInfo("OrderModule initialized successfully");
-  }
-  /**
-   * 记录信息日志
-   */
-  logInfo(title, metadata) {
-    if (this.logger) {
-      this.logger.addLog({
-        type: "info",
-        title: `[OrderModule] ${title}`,
-        metadata: metadata || {}
-      });
-    }
-  }
-  /**
-   * 记录警告日志
-   */
-  logWarning(title, metadata) {
-    if (this.logger) {
-      this.logger.addLog({
-        type: "warning",
-        title: `[OrderModule] ${title}`,
-        metadata: metadata || {}
-      });
-    }
-  }
-  /**
-   * 记录错误日志
-   */
-  logError(title, metadata) {
-    if (this.logger) {
-      this.logger.addLog({
-        type: "error",
-        title: `[OrderModule] ${title}`,
-        metadata: metadata || {}
-      });
-    }
   }
   createOrder(params) {
     var _a;
@@ -146,11 +91,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     return order;
   }
   checkBeforeSubmitOrder(params) {
-    var _a;
-    this.logInfo("checkBeforeSubmitOrder called", {
-      cartItemsCount: ((_a = params.cartItems) == null ? void 0 : _a.length) || 0,
-      type: params.type
-    });
     const { cartItems, type } = params;
     if (type === "holder") {
       const hasNoHolderId = cartItems.some((item) => !item.holder_id);
@@ -161,136 +101,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     return true;
   }
   async submitOrder(order) {
-    var _a, _b, _c;
-    this.logInfo("submitOrder called", {
-      url: order.url,
-      orderType: order.query.type,
-      platform: order.query.platform,
-      cartItemsCount: ((_a = order.query.cartItems) == null ? void 0 : _a.length) || 0
-    });
     const { url, query } = order;
     const fetchUrl = url || "/order/appointment";
     const params = this.createOrder(query);
-    this.logInfo("Calling backend order API", {
-      url: fetchUrl,
-      orderType: params.type,
-      platform: params.platform,
-      isDeposit: params.is_deposit,
-      bookingsCount: ((_b = params.bookings) == null ? void 0 : _b.length) || 0,
-      relationProductsCount: ((_c = params.relation_products) == null ? void 0 : _c.length) || 0,
-      scheduleDate: params.schedule_date
-    });
     return this.request.post(fetchUrl, params);
   }
-  /**
-   * Checkout 专用：创建订单到后端
-   * 
-   * 专门为 Checkout 模块设计的订单创建方法，
-   * 直接调用 /order/checkout 接口创建订单
-   * 接收已经处理好的订单数据，无需再处理购物车
-   * 
-   * @param params Checkout 订单参数（已处理的订单数据）
-   * @returns 后端返回的订单数据（包含订单ID等）
-   */
-  async createOrderByCheckout(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
-    this.logInfo("createOrderByCheckout called", {
-      type: params.type,
-      platform: params.platform,
-      is_deposit: params.is_deposit,
-      customer_id: params.customer_id,
-      bookingsCount: ((_a = params.bookings) == null ? void 0 : _a.length) || 0,
-      relationProductsCount: ((_b = params.relation_products) == null ? void 0 : _b.length) || 0,
-      paymentsCount: ((_c = params.payments) == null ? void 0 : _c.length) || 0,
-      depositAmount: params.deposit_amount,
-      productTaxFee: params.product_tax_fee,
-      note: params.note,
-      scheduleDate: params.schedule_date,
-      hasOrderId: !!params.order_id,
-      orderIdIncluded: params.order_id,
-      paymentMethods: ((_d = params.payments) == null ? void 0 : _d.map((p) => p.code)) || []
-    });
-    console.log("[Order] createOrderByCheckout 开始创建订单:", {
-      type: params.type,
-      platform: params.platform,
-      is_deposit: params.is_deposit,
-      customer_id: params.customer_id,
-      bookingsCount: ((_e = params.bookings) == null ? void 0 : _e.length) || 0,
-      relationProductsCount: ((_f = params.relation_products) == null ? void 0 : _f.length) || 0,
-      paymentsCount: ((_g = params.payments) == null ? void 0 : _g.length) || 0
-    });
-    try {
-      const orderData = {
-        sales_channel: "my_pisel",
-        order_sales_channel: "online_store",
-        shop_note: "",
-        schedule_date: "",
-        is_deposit: 0,
-        bookings: [],
-        relation_products: [],
-        relation_forms: [],
-        payments: [],
-        is_full_overwrite_flag: 1,
-        ...params
-        // 使用传入的参数覆盖默认值
-      };
-      if ((_h = orderData.payments) == null ? void 0 : _h.length) {
-        orderData.small_ticket_data_flag = 1;
-      }
-      if (!params.order_id && !orderData.schedule_date) {
-        orderData.schedule_date = (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
-      }
-      console.log("[Order] 调用后端接口创建订单:", {
-        url: "/order/checkout",
-        orderType: orderData.type,
-        platform: orderData.platform,
-        isDeposit: orderData.is_deposit,
-        customerId: orderData.customer_id,
-        bookingsCount: ((_i = orderData.bookings) == null ? void 0 : _i.length) || 0,
-        relationProductsCount: ((_j = orderData.relation_products) == null ? void 0 : _j.length) || 0,
-        paymentsCount: ((_k = orderData.payments) == null ? void 0 : _k.length) || 0,
-        paymentsMethods: ((_l = orderData.payments) == null ? void 0 : _l.map((p) => p.code)) || []
-      });
-      this.logInfo("Calling backend checkout API", {
-        url: "/order/checkout",
-        orderType: orderData.type,
-        platform: orderData.platform,
-        isDeposit: orderData.is_deposit,
-        customerId: orderData.customer_id,
-        depositAmount: orderData.deposit_amount,
-        bookingsCount: ((_m = orderData.bookings) == null ? void 0 : _m.length) || 0,
-        relationProductsCount: ((_n = orderData.relation_products) == null ? void 0 : _n.length) || 0,
-        paymentsCount: ((_o = orderData.payments) == null ? void 0 : _o.length) || 0,
-        paymentMethods: ((_p = orderData.payments) == null ? void 0 : _p.map((p) => ({
-          code: p.code,
-          amount: p.amount,
-          type: p.type,
-          hasVoucherId: !!p.voucher_id,
-          orderPaymentType: p.order_payment_type
-        }))) || [],
-        productTaxFee: orderData.product_tax_fee,
-        note: orderData.note,
-        scheduleDate: orderData.schedule_date,
-        hasOrderId: !!orderData.order_id,
-        smallTicketDataFlag: orderData.small_ticket_data_flag
-      });
-      const response = await this.request.post("/order/checkout", orderData);
-      this.logInfo("Order API called successfully", {
-        response
-      });
-      console.log("[Order] 订单创建成功，后端响应:", {
-        success: !!response,
-        hasOrderId: !!(((_q = response == null ? void 0 : response.data) == null ? void 0 : _q.order_id) || (response == null ? void 0 : response.order_id))
-      });
-      return response;
-    } catch (error) {
-      console.error("[Order] createOrderByCheckout 创建订单失败:", error);
-      this.logInfo("Order API called failed", {
-        error: error instanceof Error ? error.message : String(error)
-      });
-      throw error;
-    }
-  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -19,45 +19,6 @@ export interface CommitOrderParams {
         extraData?: Record<string, any>;
     };
 }
-/**
- * 支付项数据
- */
-export interface PaymentItemData {
-    /** 当前支付项的唯一 ID */
-    uuid: string;
-    /** 当前支付方式付出去多少钱 */
-    amount: string;
-    /** 支付类型代码 */
-    code: string;
-    /** 支付类型id */
-    id: number;
-    /** 支付类型名称 */
-    name: string;
-    /** 支付类型 */
-    type: string;
-    /** 是否已同步到后端 */
-    isSynced?: boolean;
-}
-/**
- * Checkout 专用订单创建参数
- */
-export interface CheckoutOrderParams {
-    type: 'virtual' | 'appointment_booking';
-    platform: 'PC' | 'H5';
-    sales_channel?: string;
-    order_sales_channel?: string;
-    bookings?: any[];
-    shop_note?: string;
-    schedule_date?: string;
-    is_deposit?: number;
-    relation_products?: any[];
-    relation_forms?: any[];
-    payments?: PaymentItemData[];
-    customer_id?: string;
-    /** 小票数据标记，当有支付项时设置为1 */
-    small_ticket_data_flag?: number;
-    [key: string]: any;
-}
 /**
  * 订单模块 API
  */
@@ -80,10 +41,4 @@ export interface OrderModuleAPI {
      * @param params 订单信息
      */
     submitOrder: (params: CommitOrderParams) => Promise<void>;
-    /**
-     * Checkout 专用：创建订单到后端
-     * @param params 订单参数
-     * @returns 后端返回的订单数据
-     */
-    createOrderByCheckout: (params: CheckoutOrderParams) => Promise<any>;
 }

package/lib/modules/Order/utils.js

@@ -60,7 +60,7 @@ var getAllDiscountList = (cartItem) => {
   var _a, _b, _c, _d;
   let discountList = ((_b = (_a = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _a.product) == null ? void 0 : _b.discount_list) || [];
   (((_d = (_c = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _c.product) == null ? void 0 : _d.product_bundle) || []).forEach((item) => {
-    discountList = [...discountList, ...(item == null ? void 0 : item.discount_list) || []];
+    discountList = [...discountList, ...item.discount_list || []];
     item.discount_list = void 0;
   });
   return discountList;