@pisell/pisellos 0.0.229 → 0.0.231

package/lib/modules/Payment/walletpass.d.ts

@@ -0,0 +1,96 @@
+import { WalletPassPayment, WalletDeductionRecommendParams, WalletRecommendItem, UserIdentificationCodeParams, UserIdentificationCodeItem, SearchIdentificationCodeParams, SearchIdentificationCodeItem, WalletInitBusinessData } from './types';
+import type { PaymentModule } from './index';
+/**
+ * 钱包支付实现
+ */
+export declare class WalletPassPaymentImpl implements WalletPassPayment {
+    private paymentModule;
+    private walletRecommendList;
+    private userIdentificationCodes;
+    private searchResults;
+    private walletParams;
+    constructor(paymentModule: PaymentModule);
+    /**
+     * 发送事件的辅助方法
+     * 支持使用WalletPassHooks或PaymentHooks
+     */
+    private emitEvent;
+    /**
+     * 生成钱包API默认参数
+     * 根据业务数据生成标准的钱包API参数，并存储在模块中
+     */
+    generateWalletParams(businessData: WalletInitBusinessData): WalletDeductionRecommendParams;
+    /**
+     * 获取已存储的钱包参数
+     * 返回之前生成并存储的钱包参数
+     */
+    getStoredWalletParams(): WalletDeductionRecommendParams | null;
+    /**
+     * 清理已存储的钱包参数
+     * 清除之前存储的钱包参数
+     */
+    clearStoredWalletParams(): void;
+    /**
+     * 从业务数据初始化钱包数据
+     * 内部生成参数，然后调用标准的初始化流程
+     */
+    initializeWalletDataFromBusinessAsync(businessData: WalletInitBusinessData): Promise<{
+        walletRecommendList: WalletRecommendItem[];
+        userIdentificationCodes: UserIdentificationCodeItem[];
+    }>;
+    /**
+     * 初始化钱包数据
+     * 先获取推荐列表，再获取用户识别码列表（顺序执行）
+     */
+    initializeWalletDataAsync(baseParams: WalletDeductionRecommendParams): Promise<{
+        walletRecommendList: WalletRecommendItem[];
+        userIdentificationCodes: UserIdentificationCodeItem[];
+    }>;
+    getWalletPassRecommendListAsync(params: WalletDeductionRecommendParams): Promise<WalletRecommendItem[]>;
+    formatWalletPassList2PreparePayments(list: WalletRecommendItem[]): {
+        voucher_id: number;
+        amount: number;
+        tag: string;
+    }[];
+    getUserIdentificationCodeListAsync(params: UserIdentificationCodeParams): Promise<UserIdentificationCodeItem[]>;
+    /**
+     * 搜索识别码信息
+     * 通过识别码搜索相关的钱包通行证信息
+     * 基于 WalletDeductionRecommendParams 参数结构
+     */
+    searchIdentificationCodeAsync(params: SearchIdentificationCodeParams): Promise<SearchIdentificationCodeItem[]>;
+    processWalletPayment(amount: number, orderUuid: string, voucherId?: string): Promise<void>;
+    getWalletBalance(voucherId: string): Promise<number>;
+    /**
+     * 获取缓存的钱包推荐列表
+     */
+    getWalletRecommendList(): WalletRecommendItem[];
+    /**
+     * 获取缓存的用户识别码列表
+     */
+    getUserIdentificationCodes(): UserIdentificationCodeItem[];
+    /**
+     * 清除钱包推荐列表
+     */
+    clearWalletRecommendList(): void;
+    /**
+     * 清除用户识别码列表
+     */
+    clearUserIdentificationCodes(): void;
+    /**
+     * 获取缓存的搜索结果列表
+     */
+    getSearchResults(): SearchIdentificationCodeItem[];
+    /**
+     * 根据识别码查找搜索结果
+     */
+    findSearchResultByCode(code: string): SearchIdentificationCodeItem | undefined;
+    /**
+     * 清除搜索结果缓存
+     */
+    clearSearchResults(): void;
+    /**
+     * 清除所有缓存数据
+     */
+    clearAllCache(): void;
+}

package/lib/modules/Payment/walletpass.js

@@ -0,0 +1,304 @@
+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/Payment/walletpass.ts
+var walletpass_exports = {};
+__export(walletpass_exports, {
+  WalletPassPaymentImpl: () => WalletPassPaymentImpl
+});
+module.exports = __toCommonJS(walletpass_exports);
+var import_types = require("./types");
+var import_utils = require("./utils");
+var WalletPassPaymentImpl = class {
+  constructor(paymentModule) {
+    this.paymentModule = paymentModule;
+    this.walletRecommendList = [];
+    this.userIdentificationCodes = [];
+    this.searchResults = [];
+    this.walletParams = null;
+  }
+  /**
+   * 发送事件的辅助方法
+   * 支持使用WalletPassHooks或PaymentHooks
+   */
+  emitEvent(hook, data) {
+    try {
+      this.paymentModule.core.effects.emit(hook, data);
+    } catch (error) {
+      console.error("[WalletPass] 发送事件失败:", hook, error);
+    }
+  }
+  /**
+   * 生成钱包API默认参数
+   * 根据业务数据生成标准的钱包API参数，并存储在模块中
+   */
+  generateWalletParams(businessData) {
+    const { customer_id, amountInfo, products } = businessData;
+    const totalAmount = Number(amountInfo.subTotal) || Number(amountInfo.totalAmount);
+    const walletParams = {
+      sale_channel: "kiosk",
+      customer_id: 9752,
+      order_expect_amount: totalAmount,
+      order_product_amount: totalAmount,
+      order_wait_pay_amount: totalAmount,
+      order_behavior_count_customer_id: 1,
+      products,
+      prepare_payments: []
+    };
+    this.walletParams = walletParams;
+    console.log("[WalletPass] 钱包默认参数已生成并存储:", walletParams);
+    return walletParams;
+  }
+  /**
+   * 获取已存储的钱包参数
+   * 返回之前生成并存储的钱包参数
+   */
+  getStoredWalletParams() {
+    return this.walletParams;
+  }
+  /**
+   * 清理已存储的钱包参数
+   * 清除之前存储的钱包参数
+   */
+  clearStoredWalletParams() {
+    this.walletParams = null;
+    console.log("[WalletPass] 已存储的钱包参数已清理");
+  }
+  /**
+   * 从业务数据初始化钱包数据
+   * 内部生成参数，然后调用标准的初始化流程
+   */
+  async initializeWalletDataFromBusinessAsync(businessData) {
+    try {
+      const walletParams = this.generateWalletParams(businessData);
+      return await this.initializeWalletDataAsync(walletParams);
+    } catch (error) {
+      console.error("[WalletPass] 从业务数据初始化钱包数据失败:", error);
+      throw error;
+    }
+  }
+  /**
+   * 初始化钱包数据
+   * 先获取推荐列表，再获取用户识别码列表（顺序执行）
+   */
+  async initializeWalletDataAsync(baseParams) {
+    try {
+      const walletRecommendList = await this.getWalletPassRecommendListAsync(baseParams);
+      const identificationParams = {
+        ...baseParams,
+        available: 2,
+        prepare_payments: this.formatWalletPassList2PreparePayments(walletRecommendList),
+        other_exact_codes: [],
+        filter_prepare_wallet_pass: 1
+      };
+      const userIdentificationCodes = await this.getUserIdentificationCodeListAsync(identificationParams);
+      return {
+        walletRecommendList,
+        userIdentificationCodes
+      };
+    } catch (error) {
+      console.error("[WalletPass] 初始化钱包数据失败:", error);
+      throw error;
+    }
+  }
+  async getWalletPassRecommendListAsync(params) {
+    try {
+      const response = await this.paymentModule.request.post(
+        "/machinecode/prepare/deduction/recommend",
+        params
+        // 将 params 作为请求体数据
+      );
+      this.walletRecommendList = (response == null ? void 0 : response.data) || [];
+      this.emitEvent(import_types.WalletPassHooks.OnWalletRecommendListUpdated, {
+        walletRecommendList: this.walletRecommendList
+      });
+      console.log(
+        "[WalletPass] 钱包推荐列表已更新:",
+        this.walletRecommendList.length,
+        "项"
+      );
+      return this.walletRecommendList;
+    } catch (error) {
+      console.error("获取钱包推荐列表失败:", error);
+      throw error;
+    }
+  }
+  formatWalletPassList2PreparePayments(list) {
+    return (0, import_utils.formatWalletPassList2PreparePayments)(list);
+  }
+  async getUserIdentificationCodeListAsync(params) {
+    try {
+      const newParams = {
+        ...this.walletParams,
+        ...params
+      };
+      const response = await this.paymentModule.request.post(
+        "/machinecode/prepare/deduction",
+        newParams
+      );
+      const sortedData = (0, import_utils.sortUserIdentificationCodeList)((response == null ? void 0 : response.data) || []);
+      this.userIdentificationCodes = sortedData;
+      this.emitEvent(import_types.WalletPassHooks.OnUserIdentificationCodesUpdated, {
+        userIdentificationCodes: this.userIdentificationCodes
+      });
+      console.log(
+        "[WalletPass] 用户识别码列表已更新:",
+        this.userIdentificationCodes.length,
+        "项"
+      );
+      return this.userIdentificationCodes;
+    } catch (error) {
+      console.error("获取用户识别码列表失败:", error);
+      throw error;
+    }
+  }
+  /**
+   * 搜索识别码信息
+   * 通过识别码搜索相关的钱包通行证信息
+   * 基于 WalletDeductionRecommendParams 参数结构
+   */
+  async searchIdentificationCodeAsync(params) {
+    try {
+      const baseWalletParams = this.walletParams;
+      const searchParams = {
+        // 基础钱包参数
+        sale_channel: params.sale_channel || (baseWalletParams == null ? void 0 : baseWalletParams.sale_channel),
+        customer_id: params.customer_id || (baseWalletParams == null ? void 0 : baseWalletParams.customer_id),
+        order_expect_amount: params.order_expect_amount || (baseWalletParams == null ? void 0 : baseWalletParams.order_expect_amount),
+        order_product_amount: params.order_product_amount || (baseWalletParams == null ? void 0 : baseWalletParams.order_product_amount),
+        order_wait_pay_amount: params.order_wait_pay_amount || (baseWalletParams == null ? void 0 : baseWalletParams.order_wait_pay_amount),
+        order_behavior_count_customer_id: params.order_behavior_count_customer_id || (baseWalletParams == null ? void 0 : baseWalletParams.order_behavior_count_customer_id),
+        products: params.products || (baseWalletParams == null ? void 0 : baseWalletParams.products),
+        prepare_payments: params.prepare_payments || (baseWalletParams == null ? void 0 : baseWalletParams.prepare_payments),
+        multiple: 1,
+        // 搜索特有参数
+        code: params.code
+      };
+      const response = await this.paymentModule.request.post(
+        "/machinecode/prepare/deduction/search",
+        searchParams
+      );
+      const searchResults = (response == null ? void 0 : response.data) || [];
+      if (searchResults.length > 0) {
+        const existingCodes = new Set(
+          this.searchResults.map((item) => item.code)
+        );
+        const newResults = searchResults.filter(
+          (item) => !existingCodes.has(item.code)
+        );
+        this.searchResults.push(...newResults);
+      }
+      this.emitEvent(import_types.WalletPassHooks.OnSearchIdentificationCodeCompleted, {
+        searchCode: params.code,
+        currentSearchResults: searchResults,
+        cachedSearchResults: [...this.searchResults],
+        searchParams: params
+      });
+      return searchResults;
+    } catch (error) {
+      console.error("[WalletPass] 搜索识别码信息失败:", error);
+      throw error;
+    }
+  }
+  async processWalletPayment(amount, orderUuid, voucherId) {
+    const walletMethod = await this.paymentModule.getWalletPaymentMethod();
+    if (!walletMethod) {
+      throw new Error("钱包支付方式未找到");
+    }
+    const paymentItem = {
+      amount: amount.toString(),
+      code: walletMethod.code,
+      id: walletMethod.id,
+      name: walletMethod.name,
+      type: walletMethod.type,
+      voucher_id: voucherId || ""
+    };
+    await this.paymentModule.addPaymentItemAsync(orderUuid, paymentItem);
+  }
+  async getWalletBalance(voucherId) {
+    return 0;
+  }
+  /**
+   * 获取缓存的钱包推荐列表
+   */
+  getWalletRecommendList() {
+    return this.walletRecommendList;
+  }
+  /**
+   * 获取缓存的用户识别码列表
+   */
+  getUserIdentificationCodes() {
+    return this.userIdentificationCodes;
+  }
+  /**
+   * 清除钱包推荐列表
+   */
+  clearWalletRecommendList() {
+    this.walletRecommendList = [];
+    this.emitEvent(import_types.WalletPassHooks.OnWalletRecommendListCleared, {
+      clearedTypes: ["walletRecommendList"]
+    });
+    console.log("[WalletPass] 钱包推荐列表已清除");
+  }
+  /**
+   * 清除用户识别码列表
+   */
+  clearUserIdentificationCodes() {
+    this.userIdentificationCodes = [];
+    this.emitEvent(import_types.WalletPassHooks.OnUserIdentificationCodesCleared, {
+      clearedTypes: ["userIdentificationCodes"]
+    });
+    console.log("[WalletPass] 用户识别码列表已清除");
+  }
+  /**
+   * 获取缓存的搜索结果列表
+   */
+  getSearchResults() {
+    return this.searchResults;
+  }
+  /**
+   * 根据识别码查找搜索结果
+   */
+  findSearchResultByCode(code) {
+    return this.searchResults.find((item) => item.code === code);
+  }
+  /**
+   * 清除搜索结果缓存
+   */
+  clearSearchResults() {
+    this.searchResults = [];
+    console.log("[WalletPass] 搜索结果缓存已清除");
+  }
+  /**
+   * 清除所有缓存数据
+   */
+  clearAllCache() {
+    this.walletRecommendList = [];
+    this.userIdentificationCodes = [];
+    this.searchResults = [];
+    this.walletParams = null;
+    this.emitEvent(import_types.WalletPassHooks.OnWalletCacheCleared, {
+      clearedTypes: ["all"]
+    });
+    console.log("[WalletPass] 所有缓存数据已清除（包括钱包参数和搜索结果）");
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  WalletPassPaymentImpl
+});

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

@@ -25,4 +25,13 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
     setOtherProductsIds(ids: number[]): void;
     getOtherProductsIds(): number[];
     storeChange(): void;
+    /**
+     * 传入一个时间, 判断改时间是否在schedule 内
+     * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
+     * @returns
+     */
+    static isInScheduleByDate({ date, schedule }: {
+        date: string;
+        schedule: any;
+    }): true | undefined;
 }

package/lib/modules/Schedule/index.js

@@ -38,6 +38,7 @@ var import_dayjs = __toESM(require("dayjs"));
 var import_isSameOrBefore = __toESM(require("dayjs/plugin/isSameOrBefore"));
 var import_isSameOrAfter = __toESM(require("dayjs/plugin/isSameOrAfter"));
 var import_utils = require("../Date/utils");
+var import_utils2 = require("./utils");
 import_dayjs.default.extend(import_isSameOrBefore.default);
 import_dayjs.default.extend(import_isSameOrAfter.default);
 var ScheduleModule = class extends import_BaseModule.BaseModule {
@@ -158,6 +159,41 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
       });
     }
   }
+  /**
+   * 传入一个时间, 判断改时间是否在schedule 内
+   * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
+   * @returns 
+   */
+  static isInScheduleByDate({ date, schedule }) {
+    var _a, _b, _c, _d;
+    let _schedule = {
+      ...schedule,
+      // 开始时间向前推一天
+      start_time: (0, import_dayjs.default)(date).subtract(1, "day").format("YYYY-MM-DD HH:mm:ss"),
+      end_time: (0, import_dayjs.default)(date).add(1, "day").format("YYYY-MM-DD HH:mm:ss")
+    };
+    if (((_b = (_a = _schedule.repeat_rule) == null ? void 0 : _a.end) == null ? void 0 : _b.type) === "never") {
+      _schedule.repeat_rule.end = {
+        type: "date",
+        end_date: _schedule.end_time,
+        occurrence: null
+      };
+    }
+    if (((_d = (_c = _schedule.repeat_rule) == null ? void 0 : _c.end) == null ? void 0 : _d.type) === "date") {
+      _schedule.repeat_rule.end = {
+        ..._schedule.repeat_rule.end,
+        end_date: _schedule.end_time
+      };
+    }
+    const dateRanges = (0, import_utils2.calcScheduleDateRange)({ ..._schedule });
+    for (const range of dateRanges) {
+      const startTime = (0, import_dayjs.default)(range.start);
+      const endTime = (0, import_dayjs.default)(range.end);
+      if ((0, import_dayjs.default)(date).isSameOrAfter(startTime) && (0, import_dayjs.default)(date).isSameOrBefore(endTime)) {
+        return true;
+      }
+    }
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -111,7 +111,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/solution/Checkout/appointmentDemo.json

@@ -0,0 +1 @@
+{"type":"appointment_booking","platform":"PC","sales_channel":"my_pisel","order_sales_channel":"online_store","bookings":[{"id":0,"number":1,"registration_type":"all","relation_products":[],"is_all":false,"product":{"num":1,"product_id":61170,"product_variant_id":0,"product_bundle":[],"product_option_item":[],"discount_list":[{"amount":100,"type":"good_pass","discount":{"resource_id":64523,"title":{"auto":"玄-商品券","original":"玄-商品券","en":null,"zh-CN":null,"zh-HK":null},"original_amount":100,"product_id":61170,"percent":"1.00"}}]},"sub_type":"minutes","duration":480,"like_status":"common","resources":[{"relation_type":"form","like_status":"common","form_id":35,"relation_id":40357,"capacity":1,"metadata":{"combined_resource":{"status":1,"resource_ids":[40262,40263]},"form_name":"桌台","resource_name":"组合资源测试table-0422-01"},"children":[{"relation_type":"form","like_status":"common","id":40262,"main_field":"A01（组合资源-小桌-4 人）","resourceType":"single","form_id":35,"relation_id":40262,"capacity":1,"metadata":{"combined_resource":null,"form_name":"桌台","resource_name":"A01（组合资源-小桌-4 人）"}},{"relation_type":"form","like_status":"common","id":40263,"main_field":"A02（组合资源-小桌-4 人）","resourceType":"single","form_id":35,"relation_id":40263,"capacity":0,"metadata":{"combined_resource":null,"form_name":"桌台","resource_name":"A02（组合资源-小桌-4 人）"}}]},{"relation_type":"form","like_status":"common","form_id":214,"relation_id":38350,"capacity":1,"metadata":{"combined_resource":null,"form_name":"校区2","resource_name":"West Campus"}}],"schedule_id":0,"start_date":"2025-08-22","start_time":"09:00","select_date":"2025-08-22","end_time":"17:00","end_date":"2025-08-22","metadata":{"account":{"id":13433,"username":"a a"},"capacity":[{"id":0,"value":1,"name":""}]},"holder":null,"relation_forms":[]}],"shop_note":"","schedule_date":"2025-08-22 09:00:00","is_deposit":0,"relation_products":[],"relation_forms":[]}