@pisell/pisellos 0.0.255 → 0.0.257

package/lib/modules/Payment/walletpass.js

@@ -40,7 +40,7 @@ var WalletPassPaymentImpl = class {
     try {
       this.paymentModule.core.effects.emit(hook, data);
     } catch (error) {
-      console.error("[WalletPass] 发送事件失败:", hook, error);
+      this.paymentModule.logError("[WalletPass] 发送事件失败", error, { hook });
     }
   }
   /**
@@ -48,6 +48,7 @@ var WalletPassPaymentImpl = class {
    * 根据业务数据生成标准的钱包API参数，并存储在模块中
    */
   generateWalletParams(businessData) {
+    var _a;
     const { customer_id, amountInfo, products, order_wait_pay_amount } = businessData;
     const totalAmount = Number(amountInfo.totalAmount);
     const subTotal = Number(amountInfo.subTotal);
@@ -65,7 +66,13 @@ var WalletPassPaymentImpl = class {
       prepare_payments: []
     };
     this.walletParams = walletParams;
-    console.log("[WalletPass] 钱包默认参数已生成并存储:", walletParams);
+    this.paymentModule.logInfo("[WalletPass] 钱包默认参数已生成并存储", {
+      customer_id: walletParams.customer_id,
+      order_expect_amount: walletParams.order_expect_amount,
+      order_product_amount: walletParams.order_product_amount,
+      order_wait_pay_amount: walletParams.order_wait_pay_amount,
+      products_count: ((_a = walletParams.products) == null ? void 0 : _a.length) || 0
+    });
     return walletParams;
   }
   /**
@@ -81,14 +88,14 @@ var WalletPassPaymentImpl = class {
    */
   clearStoredWalletParams() {
     this.walletParams = null;
-    console.log("[WalletPass] 已存储的钱包参数已清理");
+    this.paymentModule.logInfo("[WalletPass] 已存储的钱包参数已清理");
   }
   /**
    * 从业务数据初始化钱包数据
    * 内部生成参数，然后调用标准的初始化流程
    */
   async initializeWalletDataFromBusinessAsync(businessData) {
-    var _a, _b;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const startTime = Date.now();
     const walletParams = this.generateWalletParams(businessData);
     if (Number(((_a = businessData == null ? void 0 : businessData.amountInfo) == null ? void 0 : _a.totalAmount) || 0) < 0 || Number(((_b = businessData == null ? void 0 : businessData.amountInfo) == null ? void 0 : _b.subTotal) || 0) < 0) {
@@ -101,6 +108,13 @@ var WalletPassPaymentImpl = class {
       businessData,
       startTime
     });
+    this.paymentModule.logInfo("[WalletPass] 开始从业务数据初始化钱包数据", {
+      customer_id: businessData.customer_id,
+      totalAmount: (_c = businessData.amountInfo) == null ? void 0 : _c.totalAmount,
+      subTotal: (_d = businessData.amountInfo) == null ? void 0 : _d.subTotal,
+      order_wait_pay_amount: businessData.order_wait_pay_amount,
+      products_count: ((_e = businessData.products) == null ? void 0 : _e.length) || 0
+    });
     try {
       const result = await this.initializeWalletDataAsync(walletParams);
       const endTime = Date.now();
@@ -112,7 +126,11 @@ var WalletPassPaymentImpl = class {
         endTime,
         duration
       });
-      console.log(`[WalletPass] 从业务数据初始化钱包数据成功，耗时: ${duration}ms`);
+      this.paymentModule.logInfo(`[WalletPass] 从业务数据初始化钱包数据成功`, {
+        duration: `${duration}ms`,
+        walletRecommendList_count: ((_f = result.walletRecommendList) == null ? void 0 : _f.length) || 0,
+        userIdentificationCodes_count: ((_g = result.userIdentificationCodes) == null ? void 0 : _g.length) || 0
+      });
       return result;
     } catch (error) {
       const endTime = Date.now();
@@ -124,7 +142,11 @@ var WalletPassPaymentImpl = class {
         endTime,
         duration
       });
-      console.error(`[WalletPass] 从业务数据初始化钱包数据失败，耗时: ${duration}ms`, error);
+      this.paymentModule.logError(`[WalletPass] 从业务数据初始化钱包数据失败`, error, {
+        duration: `${duration}ms`,
+        customer_id: businessData.customer_id,
+        totalAmount: (_h = businessData.amountInfo) == null ? void 0 : _h.totalAmount
+      });
       throw error;
     }
   }
@@ -148,12 +170,20 @@ var WalletPassPaymentImpl = class {
         userIdentificationCodes
       };
     } catch (error) {
-      console.error("[WalletPass] 初始化钱包数据失败:", error);
+      this.paymentModule.logError("[WalletPass] 初始化钱包数据失败", error, {
+        customer_id: baseParams.customer_id,
+        order_expect_amount: baseParams.order_expect_amount
+      });
       throw error;
     }
   }
   async getWalletPassRecommendListAsync(params) {
     try {
+      this.paymentModule.logInfo("[WalletPass] 开始获取钱包推荐列表", {
+        customer_id: params.customer_id,
+        order_expect_amount: params.order_expect_amount,
+        sale_channel: params.sale_channel
+      });
       const response = await this.paymentModule.request.post(
         "/machinecode/prepare/deduction/recommend",
         params
@@ -163,14 +193,22 @@ var WalletPassPaymentImpl = class {
       this.emitEvent(import_types.WalletPassHooks.OnWalletRecommendListUpdated, {
         walletRecommendList: this.walletRecommendList
       });
-      console.log(
-        "[WalletPass] 钱包推荐列表已更新:",
-        this.walletRecommendList.length,
-        "项"
-      );
+      this.paymentModule.logInfo("[WalletPass] 钱包推荐列表已更新", {
+        count: this.walletRecommendList.length,
+        items: this.walletRecommendList.map((item) => ({
+          voucher_id: item.voucher_id,
+          name: item.name,
+          amount: item.amount,
+          tag: item.tag
+        }))
+      });
       return this.walletRecommendList;
     } catch (error) {
-      console.error("获取钱包推荐列表失败:", error);
+      this.paymentModule.logError("[WalletPass] 获取钱包推荐列表失败", error, {
+        customer_id: params.customer_id,
+        order_expect_amount: params.order_expect_amount,
+        sale_channel: params.sale_channel
+      });
       return [];
     }
   }
@@ -178,11 +216,18 @@ var WalletPassPaymentImpl = class {
     return (0, import_utils.formatWalletPassList2PreparePayments)(list);
   }
   async getUserIdentificationCodeListAsync(params) {
+    var _a;
     try {
       const newParams = {
         ...this.walletParams,
         ...params
       };
+      this.paymentModule.logInfo("[WalletPass] 开始获取用户识别码列表", {
+        customer_id: newParams.customer_id,
+        available: newParams.available,
+        prepare_payments_count: ((_a = newParams.prepare_payments) == null ? void 0 : _a.length) || 0,
+        filter_prepare_wallet_pass: newParams.filter_prepare_wallet_pass
+      });
       const response = await this.paymentModule.request.post(
         "/machinecode/prepare/deduction",
         newParams
@@ -192,14 +237,20 @@ var WalletPassPaymentImpl = class {
       this.emitEvent(import_types.WalletPassHooks.OnUserIdentificationCodesUpdated, {
         userIdentificationCodes: this.userIdentificationCodes
       });
-      console.log(
-        "[WalletPass] 用户识别码列表已更新:",
-        this.userIdentificationCodes.length,
-        "项"
-      );
+      this.paymentModule.logInfo("[WalletPass] 用户识别码列表已更新", {
+        count: this.userIdentificationCodes.length,
+        sorted_items: this.userIdentificationCodes.slice(0, 5).map((item) => ({
+          code: item.code,
+          error_code: item.error_code,
+          error_msg: item.error_msg
+        }))
+      });
       return this.userIdentificationCodes;
     } catch (error) {
-      console.error("获取用户识别码列表失败:", error);
+      this.paymentModule.logError("[WalletPass] 获取用户识别码列表失败", error, {
+        customer_id: params.customer_id,
+        available: params.available
+      });
       return [];
     }
   }
@@ -212,6 +263,11 @@ var WalletPassPaymentImpl = class {
   async searchIdentificationCodeAsync(params, config = {}) {
     try {
       const { code } = params;
+      this.paymentModule.logInfo("[WalletPass] 开始搜索识别码", {
+        code,
+        code_length: code.length,
+        noCache: config.noCache || false
+      });
       const isWalletCode = code.startsWith("WL");
       if (isWalletCode) {
         const walletDetailParams = {
@@ -219,11 +275,21 @@ var WalletPassPaymentImpl = class {
           with_customer: 1,
           with: ["wallet"]
         };
+        this.paymentModule.logInfo("[WalletPass] 搜索钱包识别码", {
+          code,
+          with_customer: walletDetailParams.with_customer,
+          with: walletDetailParams.with
+        });
         const response2 = await this.paymentModule.request.post(
           "/wallet/detail/search",
           walletDetailParams
         );
         const searchResults2 = (response2 == null ? void 0 : response2.data) || [];
+        this.paymentModule.logInfo("[WalletPass] 钱包识别码搜索完成", {
+          code,
+          results_count: searchResults2.length,
+          type: "walletCode"
+        });
         return {
           type: "walletCode",
           data: searchResults2
@@ -232,7 +298,7 @@ var WalletPassPaymentImpl = class {
       const baseWalletParams = this.walletParams;
       const searchParams = {
         // 基础钱包参数
-        sale_channel: params.sale_channel || (baseWalletParams == null ? void 0 : baseWalletParams.sale_channel),
+        sale_channel: params.sale_channel || (baseWalletParams == null ? void 0 : baseWalletParams.sale_channel) || "pos",
         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),
@@ -244,6 +310,12 @@ var WalletPassPaymentImpl = class {
         // 搜索特有参数
         code: params.code
       };
+      this.paymentModule.logInfo("[WalletPass] 搜索普通识别码", {
+        code: searchParams.code,
+        customer_id: searchParams.customer_id,
+        order_expect_amount: searchParams.order_expect_amount,
+        multiple: searchParams.multiple
+      });
       const response = await this.paymentModule.request.post(
         "/machinecode/prepare/deduction/search",
         searchParams
@@ -270,18 +342,38 @@ var WalletPassPaymentImpl = class {
         cachedSearchResults: [...this.searchResults],
         searchParams: params
       });
+      this.paymentModule.logInfo("[WalletPass] 普通识别码搜索完成", {
+        code: params.code,
+        results_count: searchResults.length,
+        cached_results_count: this.searchResults.length,
+        type: "normalCode"
+      });
       return {
         type: "normalCode",
         data: searchResults
       };
     } catch (error) {
-      console.error("[WalletPass] 搜索识别码信息失败:", error);
+      this.paymentModule.logError("[WalletPass] 搜索识别码信息失败", error, {
+        code: params.code,
+        customer_id: params.customer_id,
+        order_expect_amount: params.order_expect_amount
+      });
       throw error;
     }
   }
   async processWalletPayment(amount, orderUuid, voucherId) {
+    this.paymentModule.logInfo("[WalletPass] 开始处理钱包支付", {
+      amount,
+      orderUuid,
+      voucherId: voucherId || "none"
+    });
     const walletMethod = await this.paymentModule.getWalletPaymentMethod();
     if (!walletMethod) {
+      this.paymentModule.logError("[WalletPass] 钱包支付方式未找到", null, {
+        amount,
+        orderUuid,
+        voucherId
+      });
       throw new Error("钱包支付方式未找到");
     }
     const paymentItem = {
@@ -293,6 +385,12 @@ var WalletPassPaymentImpl = class {
       voucher_id: voucherId || ""
     };
     await this.paymentModule.addPaymentItemAsync(orderUuid, paymentItem);
+    this.paymentModule.logInfo("[WalletPass] 钱包支付处理完成", {
+      amount,
+      orderUuid,
+      voucherId: voucherId || "none",
+      payment_method: walletMethod.name
+    });
   }
   async getWalletBalance(voucherId) {
     return 0;
@@ -317,7 +415,7 @@ var WalletPassPaymentImpl = class {
     this.emitEvent(import_types.WalletPassHooks.OnWalletRecommendListCleared, {
       clearedTypes: ["walletRecommendList"]
     });
-    console.log("[WalletPass] 钱包推荐列表已清除");
+    this.paymentModule.logInfo("[WalletPass] 钱包推荐列表已清除");
   }
   /**
    * 清除用户识别码列表
@@ -327,7 +425,7 @@ var WalletPassPaymentImpl = class {
     this.emitEvent(import_types.WalletPassHooks.OnUserIdentificationCodesCleared, {
       clearedTypes: ["userIdentificationCodes"]
     });
-    console.log("[WalletPass] 用户识别码列表已清除");
+    this.paymentModule.logInfo("[WalletPass] 用户识别码列表已清除");
   }
   /**
    * 获取缓存的搜索结果列表
@@ -346,7 +444,7 @@ var WalletPassPaymentImpl = class {
    */
   clearSearchResults() {
     this.searchResults = [];
-    console.log("[WalletPass] 搜索结果缓存已清除");
+    this.paymentModule.logInfo("[WalletPass] 搜索结果缓存已清除");
   }
   /**
    * 清除所有缓存数据
@@ -359,7 +457,9 @@ var WalletPassPaymentImpl = class {
     this.emitEvent(import_types.WalletPassHooks.OnWalletCacheCleared, {
       clearedTypes: ["all"]
     });
-    console.log("[WalletPass] 所有缓存数据已清除（包括钱包参数和搜索结果）");
+    this.paymentModule.logInfo("[WalletPass] 所有缓存数据已清除", {
+      cleared_types: ["walletRecommendList", "userIdentificationCodes", "searchResults", "walletParams"]
+    });
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -33,5 +33,5 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
     static isInScheduleByDate({ date, schedule, }: {
         date: string;
         schedule: any;
-    }): true | undefined;
+    }): boolean | undefined;
 }

package/lib/modules/Schedule/index.js

@@ -169,6 +169,15 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
     schedule
   }) {
     var _a, _b, _c, _d;
+    if (schedule.start_time && schedule.end_time) {
+      const isBeforeStartTime = (0, import_dayjs.default)(date).isBefore(
+        (0, import_dayjs.default)(schedule.start_time)
+      );
+      const isAfterEndTime = (0, import_dayjs.default)(date).isAfter((0, import_dayjs.default)(schedule.end_time));
+      if (isBeforeStartTime || isAfterEndTime) {
+        return false;
+      }
+    }
     let _schedule = {
       ...schedule,
       // 开始时间向前推一天

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

@@ -314,7 +314,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     }[];
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

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

@@ -2,7 +2,7 @@ import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import { OrderModule } from '../../modules/Order';
 import { PaymentModule } from '../../modules/Payment';
-import { CheckoutModuleAPI, CheckoutStep, CheckoutInitParams, CreateLocalOrderParams, PlaceOrderParams, CreateOrderParams, ProcessPaymentParams, CheckoutStatusInfo, CheckoutSummary, CurrentOrderInfo, CartSummaryItem, ExtractedAmountInfo, SendCustomerPayLinkParams } from './types';
+import { CheckoutModuleAPI, CheckoutInitParams, CreateLocalOrderParams, CurrentOrderInfo, CartSummaryItem, SendCustomerPayLinkParams } from './types';
 import { PaymentOrder, PaymentMethod, PaymentItem, PaymentItemInput } from '../../modules/Payment/types';
 export * from './types';
 /**
@@ -64,24 +64,6 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * 方法会记录参数并创建本地虚拟订单，然后用 Payment 模块管理支付流程。
      */
     createLocalOrderAsync(params: CreateLocalOrderParams): Promise<PaymentOrder>;
-    /**
-     * 手动下单 (根据虚拟订单生成实际订单)
-     *
-     * 使用当前存储的本地订单数据调用 Order 模块创建真实订单
-     */
-    placeOrderAsync(params?: PlaceOrderParams): Promise<{
-        success: boolean;
-        orderId?: string;
-        error?: string;
-    }>;
-    /**
-     * 创建订单
-     */
-    createOrderAsync(params: CreateOrderParams): Promise<PaymentOrder>;
-    /**
-     * 处理支付
-     */
-    processPaymentAsync(params: ProcessPaymentParams): Promise<void>;
     /**
      * 完成结账
      */
@@ -89,28 +71,6 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
         success: boolean;
         orderId?: string;
     }>;
-    /**
-     * 取消结账
-     */
-    cancelCheckoutAsync(): Promise<void>;
-    /**
-     * 获取结账状态
-     */
-    getCheckoutStatus(): CheckoutStatusInfo;
-    /**
-     * 获取结账摘要
-     */
-    getCheckoutSummaryAsync(): Promise<CheckoutSummary>;
-    /**
-     * 获取可用支付方式
-     */
-    getAvailablePaymentMethodsAsync(): Promise<PaymentMethod[]>;
-    /**
-     * 刷新支付方式缓存
-     *
-     * 强制重新从服务器获取支付方式列表，更新本地缓存
-     */
-    refreshPaymentMethodsAsync(): Promise<PaymentMethod[]>;
     /**
      * 获取订单原始数据
      */
@@ -127,21 +87,6 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * 返回当前订单的所有支付项，包括活跃和已撤销的支付项
      */
     getCurrentOrderPaymentItemsAsync(): Promise<PaymentItem[]>;
-    /**
-     * 验证结账前置条件
-     */
-    validateCheckoutAsync(): Promise<{
-        valid: boolean;
-        errors: string[];
-    }>;
-    /**
-     * 重试失败的操作
-     */
-    retryFailedOperationAsync(): Promise<void>;
-    /**
-     * 设置当前步骤
-     */
-    setCurrentStep(step: CheckoutStep): void;
     /**
      * 获取订单模块
      */
@@ -181,12 +126,6 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * @returns 当前系统计算的待付金额
      */
     getBalanceDueAmount(): string;
-    /**
-     * 刷新 stateAmount 为当前剩余未支付金额
-     *
-     * UI 可以调用此方法来主动刷新支付金额状态
-     */
-    refreshStateAmountAsync(): Promise<void>;
     /**
      * 获取购物车小计数据
      *
@@ -195,14 +134,6 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * @returns 购物车小计数据数组，如果没有则返回 null
      */
     getCartSummary(): CartSummaryItem[] | null;
-    /**
-     * 获取提取的金额详细信息
-     *
-     * 从当前的购物车小计数据中提取结构化的金额信息
-     *
-     * @returns 提取的金额信息对象，如果没有小计数据则返回 null
-     */
-    getExtractedAmountInfo(): ExtractedAmountInfo | null;
     /**
      * 获取支付方式列表
      *
@@ -251,34 +182,6 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * @throws 当前没有活跃订单时抛出错误
      */
     updateOrderDepositStatusAsync(isDeposit: number): Promise<void>;
-    /**
-     * 更新当前订单的客户信息
-     *
-     * 更新当前订单关联的客户信息，用于标识订单的所属客户
-     *
-     * @param customer 客户信息 (customer_id 和/或 customer_name)
-     * @throws 当前没有活跃订单时抛出错误
-     */
-    updateOrderCustomerAsync(customer: {
-        customer_id?: string;
-        customer_name?: string;
-    }): Promise<void>;
-    /**
-     * 获取当前订单的客户信息
-     *
-     * @returns 当前客户信息，如果没有则返回 null
-     */
-    getCurrentCustomer(): {
-        customer_id?: string;
-        customer_name?: string;
-    } | null;
-    /**
-     * 检查订单是否需要手动同步（异步版本）
-     *
-     * 返回订单是否为纯代金券支付且待付金额<=0但未同步的状态
-     * 从 Payment 模块获取最新的支付项数据
-     */
-    needsManualSyncAsync(): Promise<boolean>;
     /**
      * 手动同步订单到后端
      *
@@ -335,34 +238,12 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
         orderUuid?: string;
         response?: any;
     }>;
-    /**
-     * 获取当前商店折扣金额
-     *
-     * @returns 当前的商店折扣金额，如果没有则返回0
-     */
-    getShopDiscount(): number;
-    /**
-     * 更新订单商店折扣
-     *
-     * 同时更新cartSummary和localOrderData中的shop_discount值
-     *
-     * @param discountAmount 商店折扣金额
-     */
-    updateShopDiscountAsync(discountAmount: number): Promise<void>;
     /**
      * 更新订单备注
      *
      * @param note 订单备注内容
      */
     updateOrderNoteAsync(note: string): Promise<void>;
-    /**
-     * 设置状态
-     */
-    private setStatus;
-    /**
-     * 设置步骤
-     */
-    private setStep;
     /**
      * 处理错误
      */
@@ -386,14 +267,6 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * @returns 处理后的支付项（包含找零信息）
      */
     private processCashPaymentItem;
-    /**
-     * 判断是否为现金支付
-     *
-     * @param paymentCode 支付代码
-     * @param paymentType 支付类型
-     * @returns 是否为现金支付
-     */
-    private isCashPayment;
     /**
      * 预加载支付方式（在初始化时调用）
      */
@@ -426,11 +299,6 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * 当剩余待付款金额 <= 0 时，触发订单支付完成事件
      */
     private checkOrderPaymentCompletion;
-    /**
-     * 同步订单到后端
-     *
-     * 调用后端 /order/checkout 接口创建真实订单
-     */
     /**
      * 同步订单到后端并返回真实订单ID
      *
@@ -439,11 +307,6 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * @returns 包含订单ID、UUID和完整后端响应的对象
      */
     private syncOrderToBackendWithReturn;
-    private syncOrderToBackend;
-    /**
-     * 获取状态消息
-     */
-    private getStatusMessage;
     setOtherParams(params: Record<string, any>, { cover }?: {
         cover?: boolean;
     }): Promise<void>;
@@ -491,19 +354,4 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * 在创建新订单前调用，确保状态完全干净
      */
     private resetStoreStateAsync;
-    /**
-     * 手动清理已完成的订单状态（公开方法）
-     *
-     * 供UI层调用的公开方法，用于手动清理订单状态
-     *
-     * @returns 清理结果
-     */
-    clearCompletedOrderAsync(): Promise<{
-        success: boolean;
-        message?: string;
-        clearedOrder?: {
-            uuid: string;
-            orderId: string;
-        } | null;
-    }>;
 }