@pisell/pisellos 1.0.49 → 1.0.50

package/dist/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/dist/modules/Customer/types.js

@@ -0,0 +1,41 @@
+export var CustomerHooks = /*#__PURE__*/function (CustomerHooks) {
+  CustomerHooks["OnCustomerListUpdate"] = "customer:onUpdate";
+  CustomerHooks["OnCustomerListError"] = "customer:onError";
+  CustomerHooks["OnCustomerSelected"] = "customer:onSelected";
+  CustomerHooks["OnPaginationChange"] = "customer:onPaginationChange";
+  CustomerHooks["OnScrollLoadMore"] = "customer:onScrollLoadMore";
+  CustomerHooks["OnScrollLoadComplete"] = "customer:onScrollLoadComplete";
+  return CustomerHooks;
+}({});
+
+/**
+ * 客户数据
+ */
+
+/**
+ * 客户列表关联查询参数
+ * 
+ * formRecord: 用户表单记录
+ * walletDetails.wallet: 用户所有wallet
+ * latestWalletDetail.wallet: 用户最新wallet
+ */
+
+/**
+ * 获取客户列表参数
+ */
+
+/**
+ * 分页信息
+ */
+
+/**
+ * 客户列表响应
+ */
+
+/**
+ * 客户列表状态
+ */
+
+/**
+ * 客户模块 API
+ */

package/dist/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/dist/modules/ProductList/index.js

@@ -100,11 +100,11 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
     key: "loadProducts",
     value: function () {
       var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref) {
-        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, schedule_date, cacheId, userPlugin, customer_id, _userPlugin$get, productsData;
+        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, _ref$menu_list_ids, menu_list_ids, paramsCustomerId, _ref$with_count, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, userPlugin, customer_id, _userPlugin$get, productsData;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, schedule_date = _ref.schedule_date, cacheId = _ref.cacheId;
+              _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, _ref$menu_list_ids = _ref.menu_list_ids, menu_list_ids = _ref$menu_list_ids === void 0 ? [] : _ref$menu_list_ids, paramsCustomerId = _ref.customer_id, _ref$with_count = _ref.with_count, with_count = _ref$with_count === void 0 ? [] : _ref$with_count, schedule_datetime = _ref.schedule_datetime, schedule_date = _ref.schedule_date, cacheId = _ref.cacheId, with_schedule = _ref.with_schedule;
               // // 如果 schedule_ids 为空，则需要尝试从 schedule 模块里获取
               // if (!schedule_ids?.length) {
               //   const schedule_ids_data = this.store.schedule
@@ -120,7 +120,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               userPlugin = this.core.getPlugin('user');
               customer_id = undefined;
               try {
-                customer_id = userPlugin === null || userPlugin === void 0 || (_userPlugin$get = userPlugin.get()) === null || _userPlugin$get === void 0 ? void 0 : _userPlugin$get.id;
+                customer_id = paramsCustomerId || (userPlugin === null || userPlugin === void 0 || (_userPlugin$get = userPlugin.get()) === null || _userPlugin$get === void 0 ? void 0 : _userPlugin$get.id);
               } catch (error) {
                 console.error(error);
               }
@@ -139,8 +139,12 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 ids: product_ids,
                 collection: collection,
                 front_end_cache_id: cacheId,
+                menu_list_ids: menu_list_ids,
+                with_count: with_count,
                 // client_schedule_ids: schedule_ids,
-                schedule_date: schedule_date
+                schedule_date: schedule_date,
+                with_schedule: with_schedule,
+                schedule_datetime: schedule_datetime
               }, {
                 useCache: true
               });
@@ -297,6 +301,26 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
       }
       return selectProducts;
     }()
+    /**
+     * 根据商品编码或条码搜索商品
+     * @param code 商品编码或条码
+     * @returns 匹配的商品列表，如果没有匹配则返回空数组
+     */
+  }, {
+    key: "findProductsByCodeOrBarcode",
+    value: function findProductsByCodeOrBarcode(code) {
+      if (!code || typeof code !== 'string') {
+        return [];
+      }
+      var trimmedCode = code.trim();
+      if (!trimmedCode) {
+        return [];
+      }
+      var matchingProducts = this.store.list.filter(function (product) {
+        return product.code && product.code.trim() === trimmedCode || product.barcode && product.barcode.trim() === trimmedCode;
+      });
+      return cloneDeep(matchingProducts);
+    }
   }]);
   return ProductList;
 }(BaseModule);

package/dist/modules/Rules/index.js

@@ -28,6 +28,7 @@ import { RulesHooks } from "./types";
 import { uniqueById } from "../../solution/ShopDiscount/utils";
 import { getProductOriginTotalPrice, getProductTotalPrice } from "../Cart/utils";
 import Decimal from 'decimal.js';
+import { isBoolean } from 'lodash-es';
 export var RulesModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(RulesModule, _BaseModule);
   var _super = _createSuper(RulesModule);
@@ -330,10 +331,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var applicableDiscounts = sortedDiscountList.filter(function (discount) {
           var _product$discount_lis6;
           // 如果商品价格为 0，其实不需要使用任何优惠券，直接 return true
-          // 商品券时主商品价格为0不可用
-          if ((Number(product.price) === 0 || !product.price) && (discount.tag || discount.type) === 'good_pass') return false;
-          // 折扣卡时总价为0时不可用
-          if ((Number(product.total) === 0 || !product.total) && !((_product$discount_lis6 = product.discount_list) !== null && _product$discount_lis6 !== void 0 && _product$discount_lis6.find(function (n) {
+          // 商品券时主商品价格小于等于0不可用
+          if ((Number(product.price) <= 0 || !product.price) && (discount.tag || discount.type) === 'good_pass') return false;
+          // 折扣卡时总价小于等于0时不可用
+          if ((Number(product.total) <= 0 || !product.total) && !((_product$discount_lis6 = product.discount_list) !== null && _product$discount_lis6 !== void 0 && _product$discount_lis6.find(function (n) {
             var _n$discount;
             return ((_n$discount = n.discount) === null || _n$discount === void 0 ? void 0 : _n$discount.resource_id) === discount.id;
           })) && (discount.tag || discount.type) !== 'good_pass') return false;
@@ -373,7 +374,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         }
 
         // 如果没有适用的优惠券，或者手动折扣，则不适用优惠券
-        if (applicableDiscounts.length === 0 || isManualDiscount) {
+        // 自定义商品：如果未开启适用折扣卡（product.vouchersApplicable），则不适用优惠券
+        if (applicableDiscounts.length === 0 || isManualDiscount || isBoolean(product.vouchersApplicable) && !product.vouchersApplicable) {
           if (product.isClient) {
             processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
               origin_total: getProductOriginTotalPrice({

package/dist/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/dist/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/dist/modules/index.js

@@ -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/dist/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/dist/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 };