@pisell/pisellos 1.0.49 → 1.0.50

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

@@ -0,0 +1,146 @@
+import { ICustomer } from "../AccountList/types";
+export declare enum CustomerHooks {
+    OnCustomerListUpdate = "customer:onUpdate",
+    OnCustomerListError = "customer:onError",
+    OnCustomerSelected = "customer:onSelected",
+    OnPaginationChange = "customer:onPaginationChange",
+    OnScrollLoadMore = "customer:onScrollLoadMore",
+    OnScrollLoadComplete = "customer:onScrollLoadComplete"
+}
+/**
+ * 客户数据
+ */
+export interface ShopCustomer extends ICustomer {
+    /** 客户ID */
+    id: string | number;
+    /** 客户姓名 */
+    name: string;
+    /** 客户电话 */
+    phone?: string;
+    /** 客户邮箱 */
+    email?: string;
+    /** 客户创建时间 */
+    created_at?: string;
+    /** 客户更新时间 */
+    updated_at?: string;
+    /** 其他客户信息 */
+    [key: string]: any;
+}
+/**
+ * 客户列表关联查询参数
+ *
+ * formRecord: 用户表单记录
+ * walletDetails.wallet: 用户所有wallet
+ * latestWalletDetail.wallet: 用户最新wallet
+ */
+type CustomerWith = 'formRecord' | 'walletDetails.wallet' | 'latestWalletDetail.wallet';
+/**
+ * 获取客户列表参数
+ */
+export interface ShopGetCustomerListParams {
+    /** 页码 */
+    skip?: number;
+    /** 每页数量 */
+    num?: number;
+    /** 搜索关键词 */
+    search?: string;
+    /** 关联查询参数 */
+    with?: CustomerWith[];
+    /** wallet搜索标识 */
+    search_wallet_flag?: 0 | 1;
+    /** wallet pass搜索标识 */
+    search_wallet_pass_flag?: 0 | 1;
+    /** 其他筛选参数 */
+    [key: string]: any;
+}
+/**
+ * 分页信息
+ */
+export interface IPaginationInfo {
+    /** 当前页码 */
+    page: number;
+    /** 每页数量 */
+    pageSize: number;
+    /** 总数 */
+    total: number;
+    /** 总页数 */
+    totalPages: number;
+}
+/**
+ * 客户列表响应
+ */
+export interface ICustomerListResponse {
+    /** 客户列表 */
+    list: ShopCustomer[];
+    /** 总数 */
+    total: number;
+    /** 当前页 */
+    page?: number;
+    /** 每页数量 */
+    pageSize?: number;
+}
+/**
+ * 客户列表状态
+ */
+export interface CustomerState {
+    /** 客户列表 */
+    customerList: ShopCustomer[];
+    /** 当前选择的客户 */
+    selectedCustomer: ShopCustomer | null;
+    /** 列表总数 */
+    total: number;
+    /** 当前页码 */
+    currentPage: number;
+    /** 每页数量 */
+    pageSize: number;
+    /** 加载状态 */
+    loading: boolean;
+    /** 错误信息 */
+    error: string | null;
+    /** 是否支持滚动加载更多 */
+    hasMore: boolean;
+    /** 滚动加载状态 */
+    loadingMore: boolean;
+    /** 当前搜索条件 */
+    searchParams: Omit<ShopGetCustomerListParams, 'skip' | 'num'>;
+}
+/**
+ * 客户模块 API
+ */
+export interface CustomerModuleAPI {
+    /** 获取客户列表 */
+    getCustomerList: (params?: ShopGetCustomerListParams) => Promise<ICustomerListResponse>;
+    /** 设置客户列表 */
+    setCustomerList: (customers: ShopCustomer[], total?: number) => void;
+    /** 设置当前选择的客户 */
+    setSelectedCustomer: (customer: ShopCustomer | null) => void;
+    /** 获取当前选择的客户 */
+    getSelectedCustomer: () => ShopCustomer | null;
+    /** 获取客户列表 */
+    getCustomers: () => ShopCustomer[];
+    /** 根据ID查找客户 */
+    getCustomerById: (id: string | number) => ShopCustomer | null;
+    /** 清空客户列表 */
+    clearCustomers: () => void;
+    /** 添加客户到列表第一位 */
+    addCustomerToFirst: (customer: ShopCustomer) => void;
+    /** 获取当前状态 */
+    getState: () => CustomerState;
+    /** 获取分页信息 */
+    getPaginationInfo: () => IPaginationInfo;
+    /** 触发分页变化事件 */
+    triggerPaginationChange: (pagination: IPaginationInfo) => void;
+    /** 设置分页信息 */
+    setPaginationInfo: (page: number, pageSize: number) => void;
+    /** 便捷方法：切换分页并自动获取数据 */
+    changeCustomerPage: (page: number, pageSize?: number) => Promise<ICustomerListResponse>;
+    /** 滚动加载更多客户数据 */
+    loadMoreCustomers: () => Promise<ICustomerListResponse>;
+    /** 重置并重新开始滚动加载 */
+    resetAndLoadCustomers: (params?: ShopGetCustomerListParams) => Promise<ICustomerListResponse>;
+    /** 检查是否还有更多数据可以加载 */
+    hasMoreCustomers: () => boolean;
+    /** 获取当前的搜索条件 */
+    getCurrentSearchParams: () => Omit<ShopGetCustomerListParams, 'skip' | 'num'>;
+}
+export {};

package/lib/modules/Customer/types.js

@@ -0,0 +1,37 @@
+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);
+
+// src/modules/Customer/types.ts
+var types_exports = {};
+__export(types_exports, {
+  CustomerHooks: () => CustomerHooks
+});
+module.exports = __toCommonJS(types_exports);
+var CustomerHooks = /* @__PURE__ */ ((CustomerHooks2) => {
+  CustomerHooks2["OnCustomerListUpdate"] = "customer:onUpdate";
+  CustomerHooks2["OnCustomerListError"] = "customer:onError";
+  CustomerHooks2["OnCustomerSelected"] = "customer:onSelected";
+  CustomerHooks2["OnPaginationChange"] = "customer:onPaginationChange";
+  CustomerHooks2["OnScrollLoadMore"] = "customer:onScrollLoadMore";
+  CustomerHooks2["OnScrollLoadComplete"] = "customer:onScrollLoadComplete";
+  return CustomerHooks2;
+})(CustomerHooks || {});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  CustomerHooks
+});

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

@@ -11,12 +11,17 @@ export declare class ProductList extends BaseModule implements Module {
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: any): Promise<void>;
     storeChange(path?: string, value?: any): Promise<void>;
-    loadProducts({ category_ids, product_ids, collection, schedule_date, cacheId }: {
+    loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, }: {
         category_ids?: number[];
         product_ids?: number[];
         collection?: number | string[];
         schedule_date?: string;
         cacheId?: string;
+        customer_id?: number;
+        menu_list_ids?: number[];
+        schedule_datetime?: string;
+        with_count?: string[];
+        with_schedule?: number;
     }): Promise<any>;
     loadProductsPrice({ ids, customer_id, schedule_date, channel, }: {
         ids?: number[];
@@ -28,4 +33,10 @@ export declare class ProductList extends BaseModule implements Module {
     getProduct(id: number): Promise<Product | undefined>;
     addProduct(products: ProductData[]): Promise<void>;
     selectProducts(products: ProductData[]): Promise<void>;
+    /**
+     * 根据商品编码或条码搜索商品
+     * @param code 商品编码或条码
+     * @returns 匹配的商品列表，如果没有匹配则返回空数组
+     */
+    findProductsByCodeOrBarcode(code: string): ProductData[];
 }

package/lib/modules/ProductList/index.js

@@ -68,14 +68,19 @@ var ProductList = class extends import_BaseModule.BaseModule {
     category_ids = [],
     product_ids = [],
     collection = [],
+    menu_list_ids = [],
+    customer_id: paramsCustomerId,
+    with_count = [],
+    schedule_datetime,
     schedule_date,
-    cacheId
+    cacheId,
+    with_schedule
   }) {
     var _a;
     let userPlugin = this.core.getPlugin("user");
     let customer_id = void 0;
     try {
-      customer_id = (_a = userPlugin == null ? void 0 : userPlugin.get()) == null ? void 0 : _a.id;
+      customer_id = paramsCustomerId || ((_a = userPlugin == null ? void 0 : userPlugin.get()) == null ? void 0 : _a.id);
     } catch (error) {
       console.error(error);
     }
@@ -101,8 +106,12 @@ var ProductList = class extends import_BaseModule.BaseModule {
         ids: product_ids,
         collection,
         front_end_cache_id: cacheId,
+        menu_list_ids,
+        with_count,
         // client_schedule_ids: schedule_ids,
-        schedule_date
+        schedule_date,
+        with_schedule,
+        schedule_datetime
       },
       { useCache: true }
     );
@@ -161,6 +170,24 @@ var ProductList = class extends import_BaseModule.BaseModule {
   async selectProducts(products) {
     this.store.selectProducts = products;
   }
+  /**
+   * 根据商品编码或条码搜索商品
+   * @param code 商品编码或条码
+   * @returns 匹配的商品列表，如果没有匹配则返回空数组
+   */
+  findProductsByCodeOrBarcode(code) {
+    if (!code || typeof code !== "string") {
+      return [];
+    }
+    const trimmedCode = code.trim();
+    if (!trimmedCode) {
+      return [];
+    }
+    const matchingProducts = this.store.list.filter((product) => {
+      return product.code && product.code.trim() === trimmedCode || product.barcode && product.barcode.trim() === trimmedCode;
+    });
+    return (0, import_lodash_es.cloneDeep)(matchingProducts);
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/modules/Rules/index.js

@@ -37,6 +37,7 @@ 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"));
+var import_lodash_es = require("lodash-es");
 var RulesModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -215,9 +216,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }
       const applicableDiscounts = sortedDiscountList.filter((discount) => {
         var _a2;
-        if ((Number(product.price) === 0 || !product.price) && (discount.tag || discount.type) === "good_pass")
+        if ((Number(product.price) <= 0 || !product.price) && (discount.tag || discount.type) === "good_pass")
           return false;
-        if ((Number(product.total) === 0 || !product.total) && !((_a2 = product.discount_list) == null ? void 0 : _a2.find((n) => {
+        if ((Number(product.total) <= 0 || !product.total) && !((_a2 = product.discount_list) == null ? void 0 : _a2.find((n) => {
           var _a3;
           return ((_a3 = n.discount) == null ? void 0 : _a3.resource_id) === discount.id;
         })) && (discount.tag || discount.type) !== "good_pass")
@@ -242,7 +243,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }))) {
         isManualDiscount = false;
       }
-      if (applicableDiscounts.length === 0 || isManualDiscount) {
+      if (applicableDiscounts.length === 0 || isManualDiscount || (0, import_lodash_es.isBoolean)(product.vouchersApplicable) && !product.vouchersApplicable) {
         if (product.isClient) {
           processedProductsMap.set(
             product._id,

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

@@ -39,6 +39,7 @@ type ProductDetail = {
     original_price?: number | string;
     num?: number;
     quantity: number;
+    vouchersApplicable?: boolean;
 };
 export interface RulesParamsHooks {
     getProduct: (product: Record<string, any>) => ProductDetail;

package/lib/modules/index.d.ts

@@ -3,6 +3,7 @@ export * from './ProductList';
 export * from './Cart';
 export * from './Account';
 export * from './AccountList';
+export * from './Customer';
 export * from './Date';
 export * from './Guests';
 export * from './Order';

package/lib/modules/index.js

@@ -21,6 +21,7 @@ __reExport(modules_exports, require("./ProductList"), module.exports);
 __reExport(modules_exports, require("./Cart"), module.exports);
 __reExport(modules_exports, require("./Account"), module.exports);
 __reExport(modules_exports, require("./AccountList"), module.exports);
+__reExport(modules_exports, require("./Customer"), module.exports);
 __reExport(modules_exports, require("./Date"), module.exports);
 __reExport(modules_exports, require("./Guests"), module.exports);
 __reExport(modules_exports, require("./Order"), module.exports);
@@ -36,6 +37,7 @@ __reExport(modules_exports, require("./Schedule"), module.exports);
   ...require("./Cart"),
   ...require("./Account"),
   ...require("./AccountList"),
+  ...require("./Customer"),
   ...require("./Date"),
   ...require("./Guests"),
   ...require("./Order"),

package/lib/plugins/window.d.ts

@@ -13,6 +13,7 @@ export interface WindowPlugin extends Plugin {
     navigator: Partial<Navigator>;
     document: Partial<Document>;
     history: History;
+    interaction?: any;
 }
 /**
  * 简单的 Storage 接口实现

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

@@ -0,0 +1,160 @@
+import { Module, PisellCore } from '../../types';
+import { BaseModule } from '../../modules/BaseModule';
+import { RequestPlugin, WindowPlugin } from '../../plugins';
+import { IGetCustomerListParams, ICustomer, ILoadProductsParams, IScanResult } from './types';
+import { ProductData } from '../../modules';
+export declare class BookingTicketImpl extends BaseModule implements Module {
+    protected defaultName: string;
+    protected defaultVersion: string;
+    isSolution: boolean;
+    request: RequestPlugin;
+    window: WindowPlugin;
+    private shopStore;
+    private store;
+    private otherParams;
+    private cacheId;
+    private platform;
+    private scan;
+    initialize(core: PisellCore, options: any): Promise<void>;
+    /**
+     * 获取商品列表
+     * @param params 包含 schedule_date 的参数
+     * @returns 商品列表
+     */
+    loadProducts(params?: ILoadProductsParams): Promise<any>;
+    /**
+     * 获取商品列表（不加载到模块中）
+     * @returns 商品列表
+     */
+    getProducts(): Promise<ProductData[]>;
+    /**
+     * 获取客户列表
+     * @param params 查询参数
+     * @returns 客户列表响应
+     */
+    getCustomerList(params?: IGetCustomerListParams): Promise<import("../../modules").ICustomerListResponse>;
+    /**
+     * 设置活跃客户
+     * @param customer 客户信息
+     */
+    setActiveCustomer(customer: ICustomer): void;
+    /**
+     * 获取当前活跃客户
+     * @returns 当前活跃客户
+     */
+    getActiveCustomer(): ICustomer | null;
+    /**
+     * 根据ID设置选中的客户
+     * @param customerId 客户ID
+     */
+    setSelectedCustomerById(customerId: string | number): void;
+    /**
+     * 获取所有客户
+     * @returns 客户列表
+     */
+    getCustomers(): ICustomer[];
+    /**
+     * 根据ID获取客户
+     * @param customerId 客户ID
+     * @returns 客户信息
+     */
+    getCustomerById(customerId: string | number): ICustomer | null;
+    /**
+     * 清空客户列表
+     */
+    clearCustomers(): void;
+    /**
+     * 添加客户到列表第一位
+     * @param customer 要添加的客户信息
+     */
+    addCustomerToFirst(customer: ICustomer): void;
+    /**
+     * 获取客户分页信息
+     * @returns 分页信息
+     */
+    getCustomerPaginationInfo(): import("../../modules").IPaginationInfo;
+    /**
+     * 获取客户列表总数
+     * @returns 总数
+     */
+    getCustomerTotal(): number;
+    /**
+     * 设置客户分页信息
+     * @param page 页码
+     * @param pageSize 每页数量
+     */
+    setCustomerPaginationInfo(page: number, pageSize: number): void;
+    /**
+     * 便捷方法：切换客户分页并自动获取数据
+     * @param page 页码
+     * @param pageSize 每页数量（可选）
+     * @returns 客户列表响应
+     */
+    changeCustomerPage(page: number, pageSize?: number): Promise<import("../../modules").ICustomerListResponse>;
+    /**
+     * 滚动加载更多客户数据 - 数据会追加到现有列表中
+     * @returns 客户列表响应
+     */
+    loadMoreCustomers(): Promise<import("../../modules").ICustomerListResponse>;
+    /**
+     * 重置并重新开始滚动加载客户数据
+     * @param params 查询参数
+     * @returns 客户列表响应
+     */
+    resetAndLoadCustomers(params?: IGetCustomerListParams): Promise<import("../../modules").ICustomerListResponse>;
+    /**
+     * 检查是否还有更多客户数据可以加载
+     * @returns 是否还有更多数据
+     */
+    hasMoreCustomers(): boolean;
+    /**
+     * 获取当前的客户搜索条件
+     * @returns 当前搜索条件
+     */
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    /**
+     * 获取客户列表状态（包含滚动加载相关状态）
+     * @returns 客户状态
+     */
+    getCustomerState(): import("../../modules").CustomerState;
+    /**
+     * 全局扫描监听
+     * @param callback 回调
+     */
+    scanGlobalListener(callback: (data: IScanResult) => void): {
+        remove: () => void;
+    };
+    /**
+     * 客户扫描监听
+     * @param callback 回调
+     */
+    scanCustomerListener(callback: (data: IScanResult) => void): {
+        remove: () => void;
+    };
+    /**
+     * 调用摄像头
+     * @param data 用户自定义数据
+     */
+    activateCamera(data?: {
+        [key: string]: any;
+    }): void;
+    /**
+     * 设置其他参数
+     * @param params 参数
+     * @param options 选项
+     */
+    setOtherParams(params: Record<string, any>, { cover }?: {
+        cover?: boolean;
+    }): Promise<void>;
+    /**
+     * 获取其他参数
+     * @returns 其他参数
+     */
+    getOtherParams(): Promise<Record<string, any>>;
+    /**
+     * 销毁模块
+     */
+    destroy(): void;
+}
+export * from './types';
+export { BookingTicketImpl as BookingTicket };