@pisell/pisellos 0.0.213 → 0.0.215

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 }
     );

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/Schedule/utils.js

@@ -139,7 +139,10 @@ var getDaysByRepeatWeek = (params, isGetRange) => {
   while (startTmp.isBefore(deadline, "day") || startTmp.isSame(deadline, "day")) {
     for (let i = 0; i < frequency_date.length; i++) {
       const item = frequency_date[i];
-      const _start = startTmp.day(item);
+      let _start = startTmp.day(item);
+      if (_start.isBefore(startTmp, "day")) {
+        _start = _start.add(1, "week");
+      }
       let _end = _start.add(scheduleDiff, "second");
       if (_end.isAfter(deadline, "day")) {
         _end = deadline;
@@ -160,7 +163,7 @@ var getDaysByRepeatWeek = (params, isGetRange) => {
         daysArr.push(...getDaysByStartEnd(_start, _end));
       }
     }
-    startTmp = startTmp.day(1).add(frequency, "week");
+    startTmp = startTmp.add(frequency, "week");
   }
   return Array.from(new Set(daysArr));
 };
@@ -585,7 +588,9 @@ function getAllSortedDateRanges(schedules) {
     return durationA - durationB;
   });
   const uniqueDateRanges = sortedDateRanges.filter(
-    (range, index, self) => index === self.findIndex((t) => (0, import_dayjs.default)(t.start).isSame((0, import_dayjs.default)(range.start)) && (0, import_dayjs.default)(t.end).isSame((0, import_dayjs.default)(range.end)))
+    (range, index, self) => index === self.findIndex(
+      (t) => (0, import_dayjs.default)(t.start).isSame((0, import_dayjs.default)(range.start)) && (0, import_dayjs.default)(t.end).isSame((0, import_dayjs.default)(range.end))
+    )
   );
   return uniqueDateRanges;
 }

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/BookingByStep/index.js

@@ -644,13 +644,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           this.store.cart.removeItem(n._id);
         });
       }
-      const dateRange = this.store.date.getDateRange();
-      if ((dateRange == null ? void 0 : dateRange[0]) && !(0, import_dayjs.default)(dateRange[0].date).isSame((0, import_dayjs.default)(date.startTime), "day")) {
-        this.setDateRange([
-          { date: (0, import_dayjs.default)(date.startTime).format("YYYY-MM-DD"), status: "available", week: "", weekNum: 0 },
-          { date: (0, import_dayjs.default)(date.endTime).format("YYYY-MM-DD"), status: "available", week: "", weekNum: 0 }
-        ]);
-      }
     }
   }
   beforeUpdateCart(params, targetCartItem) {

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

@@ -0,0 +1,127 @@
+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>;
+    /**
+     * 全局扫描监听
+     * @param callback 回调
+     */
+    scanGlobalListener(callback: (data: IScanResult) => void): {
+        remove: () => void;
+    };
+    /**
+     * 客户扫描监听
+     * @param callback 回调
+     */
+    scanCustomerListener(callback: (data: IScanResult) => void): {
+        remove: () => 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 };

package/lib/solution/BookingTicket/index.js

@@ -0,0 +1,291 @@
+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 __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/solution/BookingTicket/index.ts
+var BookingTicket_exports = {};
+__export(BookingTicket_exports, {
+  BookingTicket: () => BookingTicketImpl,
+  BookingTicketImpl: () => BookingTicketImpl
+});
+module.exports = __toCommonJS(BookingTicket_exports);
+var import_BaseModule = require("../../modules/BaseModule");
+var import_types = require("./types");
+var import_scan = require("./utils/scan/index");
+var import_handleScan = require("./utils/scan/handleScan");
+__reExport(BookingTicket_exports, require("./types"), module.exports);
+var BookingTicketImpl = class extends import_BaseModule.BaseModule {
+  constructor() {
+    super(...arguments);
+    this.defaultName = "bookingTicket";
+    this.defaultVersion = "1.0.0";
+    this.isSolution = true;
+    this.otherParams = {};
+  }
+  async initialize(core, options) {
+    var _a, _b, _c;
+    this.core = core;
+    this.store = options.store || {};
+    this.otherParams = options.otherParams || {};
+    console.log("[BookingTicket] 初始化完成");
+    this.request = core.getPlugin("request");
+    this.window = core.getPlugin("window");
+    this.shopStore = core.getPlugin("shopStore");
+    if (!this.request) {
+      throw new Error("bookingTicket解决方案需要 request 插件支持");
+    }
+    if (!this.shopStore) {
+      throw new Error("bookingTicket解决方案需要 shopStore 插件支持");
+    }
+    let targetCacheData = {};
+    this.cacheId = (_a = this.otherParams) == null ? void 0 : _a.cacheId;
+    this.platform = (_b = this.otherParams) == null ? void 0 : _b.platform;
+    this.scan = new import_scan.Scan(this, "BOOKING_TICKET_SCAN");
+    if ((_c = this.otherParams) == null ? void 0 : _c.cacheId) {
+      const sessionData = this.window.sessionStorage.getItem(this.name);
+      if (sessionData) {
+        const data = JSON.parse(sessionData);
+        targetCacheData = data[this.otherParams.cacheId];
+      }
+    }
+    const moduleArr = [
+      "cart",
+      "products",
+      "accountList",
+      "customer",
+      "order"
+    ];
+    moduleArr.forEach((step) => {
+      var _a2, _b2;
+      const targetModule = (0, import_types.createModule)(step, this.name);
+      if (targetModule) {
+        this.store[step] = targetModule;
+        this.core.registerModule(targetModule, {
+          initialState: targetCacheData == null ? void 0 : targetCacheData[targetModule.name],
+          otherParams: {
+            ...this.otherParams,
+            fatherModule: this.name,
+            openCache: ((_a2 = this.otherParams) == null ? void 0 : _a2.cacheId) ? true : false,
+            cacheId: (_b2 = this.otherParams) == null ? void 0 : _b2.cacheId
+          }
+        });
+      } else {
+        throw new Error(`模块 ${step} 不存在`);
+      }
+    });
+    this.core.effects.emit(import_types.BookingTicketHooks.onInited, {});
+  }
+  /**
+   * 获取商品列表
+   * @param params 包含 schedule_date 的参数
+   * @returns 商品列表
+   */
+  async loadProducts(params = {}) {
+    const { schedule_date, customer_id, menu_list_ids, schedule_datetime } = params;
+    try {
+      const result = await this.store.products.loadProducts({
+        with_count: ["bundleGroup", "optionGroup"],
+        with_schedule: 1,
+        ...params,
+        cacheId: this.cacheId
+      });
+      this.core.effects.emit(import_types.BookingTicketHooks.onProductsLoaded, result);
+      return result;
+    } catch (error) {
+      console.error("Failed to load products:", error);
+      throw error;
+    }
+  }
+  /**
+   * 获取商品列表（不加载到模块中）
+   * @returns 商品列表
+   */
+  async getProducts() {
+    return this.store.products.getProducts();
+  }
+  /**
+   * 获取客户列表
+   * @param params 查询参数
+   * @returns 客户列表响应
+   */
+  async getCustomerList(params = {}) {
+    try {
+      const result = await this.store.customer.getCustomerList(params);
+      return result;
+    } catch (error) {
+      console.error("Failed to get customer list:", error);
+      throw error;
+    }
+  }
+  /**
+   * 设置活跃客户
+   * @param customer 客户信息
+   */
+  setActiveCustomer(customer) {
+    this.store.customer.setSelectedCustomer(customer);
+    this.core.effects.emit(import_types.BookingTicketHooks.onCustomerSelected, {
+      customer
+    });
+  }
+  /**
+   * 获取当前活跃客户
+   * @returns 当前活跃客户
+   */
+  getActiveCustomer() {
+    return this.store.customer.getSelectedCustomer();
+  }
+  /**
+   * 根据ID设置选中的客户
+   * @param customerId 客户ID
+   */
+  setSelectedCustomerById(customerId) {
+    const customer = this.store.customer.getCustomerById(customerId);
+    if (customer) {
+      this.store.customer.setSelectedCustomer(customer);
+      this.core.effects.emit(import_types.BookingTicketHooks.onCustomerSelected, {
+        customer
+      });
+    }
+  }
+  /**
+   * 获取所有客户
+   * @returns 客户列表
+   */
+  getCustomers() {
+    return this.store.customer.getCustomers();
+  }
+  /**
+   * 根据ID获取客户
+   * @param customerId 客户ID
+   * @returns 客户信息
+   */
+  getCustomerById(customerId) {
+    return this.store.customer.getCustomerById(customerId);
+  }
+  /**
+   * 清空客户列表
+   */
+  clearCustomers() {
+    this.store.customer.clearCustomers();
+  }
+  /**
+   * 添加客户到列表第一位
+   * @param customer 要添加的客户信息
+   */
+  addCustomerToFirst(customer) {
+    this.store.customer.addCustomerToFirst(customer);
+  }
+  /**
+   * 获取客户分页信息
+   * @returns 分页信息
+   */
+  getCustomerPaginationInfo() {
+    return this.store.customer.getPaginationInfo();
+  }
+  /**
+   * 获取客户列表总数
+   * @returns 总数
+   */
+  getCustomerTotal() {
+    return this.store.customer.getState().total;
+  }
+  /**
+   * 设置客户分页信息
+   * @param page 页码
+   * @param pageSize 每页数量
+   */
+  setCustomerPaginationInfo(page, pageSize) {
+    this.store.customer.setPaginationInfo(page, pageSize);
+  }
+  /**
+   * 便捷方法：切换客户分页并自动获取数据
+   * @param page 页码
+   * @param pageSize 每页数量（可选）
+   * @returns 客户列表响应
+   */
+  async changeCustomerPage(page, pageSize) {
+    try {
+      const result = await this.store.customer.changeCustomerPage(
+        page,
+        pageSize
+      );
+      return result;
+    } catch (error) {
+      console.error("Failed to change customer page:", error);
+      throw error;
+    }
+  }
+  /**
+   * 全局扫描监听
+   * @param callback 回调
+   */
+  scanGlobalListener(callback) {
+    const listenerCallback = (0, import_handleScan.handleGlobalScan)(this.request);
+    const listener = { key: "global", callback };
+    const removeListener = this.scan.addListener(listener, listenerCallback);
+    return removeListener;
+  }
+  /**
+   * 客户扫描监听
+   * @param callback 回调
+   */
+  scanCustomerListener(callback) {
+    const listenerCallback = (0, import_handleScan.handleCustomerScan)(this.request);
+    const listener = { key: "customer", callback };
+    const removeListener = this.scan.addListener(listener, listenerCallback);
+    return removeListener;
+  }
+  /**
+   * 设置其他参数
+   * @param params 参数
+   * @param options 选项
+   */
+  async setOtherParams(params, { cover = false } = {}) {
+    if (cover) {
+      this.otherParams = params;
+    } else {
+      this.otherParams = { ...this.otherParams, ...params };
+    }
+  }
+  /**
+   * 获取其他参数
+   * @returns 其他参数
+   */
+  async getOtherParams() {
+    return this.otherParams;
+  }
+  /**
+   * 销毁模块
+   */
+  destroy() {
+    var _a, _b, _c, _d, _e;
+    (_a = this.store.cart) == null ? void 0 : _a.destroy();
+    (_b = this.store.products) == null ? void 0 : _b.destroy();
+    (_c = this.store.accountList) == null ? void 0 : _c.destroy();
+    (_d = this.store.customer) == null ? void 0 : _d.destroy();
+    (_e = this.store.order) == null ? void 0 : _e.destroy();
+    this.core.effects.offByModuleDestroy(this.name);
+    this.core.unregisterModule(this);
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BookingTicket,
+  BookingTicketImpl,
+  ...require("./types")
+});

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

@@ -0,0 +1,66 @@
+import { ProductList, CartModule, AccountListModule, OrderModule } from '../../modules';
+import { CustomerModule } from '../../modules/Customer';
+export interface BookingTicketState {
+    cart: CartModule;
+    products: ProductList;
+    accountList: AccountListModule;
+    customer: CustomerModule;
+    order: OrderModule;
+}
+export declare function createModule<T extends keyof BookingTicketState>(moduleName: T, solutionName: string, name?: string, version?: string): BookingTicketState[T];
+export declare enum BookingTicketHooks {
+    onInited = "bookingTicket:onInited",
+    onDestroy = "bookingTicket:onDestroy",
+    onProductsLoaded = "bookingTicket:onProductsLoaded",
+    onCustomerSelected = "bookingTicket:onCustomerSelected"
+}
+/**
+ * 获取客户列表的参数
+ */
+export interface IGetCustomerListParams {
+    /** 页码 */
+    skip?: number;
+    /** 每页数量 */
+    num?: number;
+    /** 搜索关键词 */
+    search?: string;
+    /** 其他筛选参数 */
+    [key: string]: any;
+}
+/**
+ * 客户信息
+ */
+export interface ICustomer {
+    /** 客户ID */
+    id: string | number;
+    /** 客户姓名 */
+    name: string;
+    /** 客户电话 */
+    phone?: string;
+    /** 客户邮箱 */
+    email?: string;
+    /** 其他客户信息 */
+    [key: string]: any;
+}
+/**
+ * 加载商品列表的参数
+ */
+export interface ILoadProductsParams {
+    /** 日期 格式：YYYY-MM-DD */
+    schedule_date?: string;
+    /** 客户ID */
+    customer_id?: number;
+    /** 餐牌列表ID */
+    menu_list_ids?: number[];
+    /** 时间 格式：YYYY-MM-DD HH:mm:ss*/
+    schedule_datetime?: string;
+}
+/**
+ * 扫描结果
+ */
+export interface IScanResult {
+    status: 'success' | 'fail';
+    scanType: string;
+    scanCode: string;
+    result: any;
+}