@pisell/pisellos 0.0.229 → 0.0.230

package/dist/modules/Payment/types.d.ts

@@ -106,17 +106,15 @@ export interface OrderInfo {
     deposit_amount: string;
 }
 /**
- * 支付订单
+ * 支付订单（简化版，仅保留支付相关信息）
  */
 export interface PaymentOrder {
     /** 当前订单的唯一 ID */
     uuid: string;
-    /** 订单ID */
-    id: number;
-    /** 订单信息 */
-    order_info: OrderInfo;
-    /** 支付状态 */
-    payment_status: PaymentStatus;
+    /** 订单ID（字符串类型，支持本地虚拟ID） */
+    id: string;
+    /** 订单ID（数字类型，兼容旧版本） */
+    order_id: string;
     /** 支付项列表 */
     payment: PaymentItem[];
     /** 修改的支付项列表 */
@@ -125,8 +123,16 @@ export interface PaymentOrder {
     total_amount: string;
     /** 待付金额 */
     expect_amount: string;
+    /** 支付状态 */
+    payment_status: PaymentStatus;
+    /** 是否是定金订单 */
+    is_deposit: number;
+    /** 定金金额 */
+    deposit_amount: string;
     /** 总税费 */
     tax_fee: string;
+    /** 原始订单数据（由 Checkout 模块传入） */
+    order_info?: any;
 }
 /**
  * 支付状态
@@ -134,11 +140,19 @@ export interface PaymentOrder {
 export interface PaymentState {
 }
 /**
- * 推送订单参数
+ * 推送订单参数（简化版）
  */
 export interface PushOrderParams {
-    /** 订单信息 */
-    order_info: OrderInfo;
+    /** 订单ID */
+    order_id: string;
+    /** 总金额 */
+    total_amount: string;
+    /** 是否是定金订单 */
+    is_deposit?: number;
+    /** 定金金额 */
+    deposit_amount?: string;
+    /** 原始订单数据（可选，由 Checkout 模块传入） */
+    order_info?: any;
 }
 /**
  * 更新订单参数
@@ -262,32 +276,30 @@ export interface PaymentModuleAPI {
     wallet: WalletPayment;
     /** 获取支付方式列表 */
     getPayMethodListAsync: () => Promise<PaymentMethod[]>;
-    /** 获取订单列表 */
-    getOrderListAsync: () => Promise<PaymentOrder[]>;
-    /** 根据uuid获取指定订单 */
-    getOrderByUuidAsync: (orderUuid: string) => Promise<PaymentOrder | null>;
-    /** 往交易组中添加订单 */
-    pushOrderAsync: (params: PushOrderParams) => Promise<PaymentOrder>;
-    /** 删除订单 */
-    deleteOrderAsync: (orderUuid: string) => Promise<void>;
-    /** 更新订单 */
-    updateOrderAsync: (orderUuid: string, params: Partial<PaymentOrder>) => Promise<void>;
+    /** 创建支付订单（仅保存支付相关信息） */
+    createPaymentOrderAsync: (params: PushOrderParams) => Promise<PaymentOrder>;
+    /** 根据订单UUID获取支付订单 */
+    getPaymentOrderByUuidAsync: (orderUuid: string) => Promise<PaymentOrder | null>;
+    /** 基于UUID替换订单ID */
+    replaceOrderIdByUuidAsync: (orderUuid: string, newOrderId: string) => Promise<PaymentOrder | null>;
+    /** 删除支付订单 */
+    deletePaymentOrderAsync: (orderUuid: string) => Promise<void>;
     /** 获取支付项 */
-    getPaymentAsync: (orderUuid: string) => Promise<PaymentItem[]>;
-    /** 为某个订单设置一个支付项 */
-    pushPaymentAsync: (orderUuid: string, paymentItem: PaymentItemInput) => Promise<void>;
-    /** 删除一个支付项 */
-    deletePaymentAsync: (orderUuid: string, paymentUuid: string) => Promise<void>;
-    /** 更新一个支付项 */
-    updatePaymentAsync: (orderUuid: string, paymentUuid: string, params: PaymentUpdateFields) => Promise<void>;
+    getPaymentItemsAsync: (orderUuid: string) => Promise<PaymentItem[]>;
+    /** 为某个订单添加支付项 */
+    addPaymentItemAsync: (orderUuid: string, paymentItem: PaymentItemInput) => Promise<void>;
+    /** 删除支付项 */
+    deletePaymentItemAsync: (orderUuid: string, paymentUuid: string) => Promise<void>;
+    /** 更新支付项 */
+    updatePaymentItemAsync: (orderUuid: string, paymentUuid: string, params: PaymentUpdateFields) => Promise<void>;
+    /** 获取订单剩余待付金额 */
+    getRemainingAmountAsync: (orderUuid: string) => Promise<number>;
+    /** 获取订单剩余待付金额（基于用户输入的金额） */
+    getRemainingAmountWithInputAsync: (inputAmount: string | number, orderUuid: string) => Promise<number>;
     /** 提交支付 */
-    submitPayAsync: (orderUuid?: string) => Promise<{
+    submitPaymentAsync: (orderUuid: string) => Promise<{
         status: 'success' | 'failed';
     }>;
-    /** 获取订单剩余待付金额 */
-    getRemainingOrderAmountAsync: (orderUuid: string) => Promise<number>;
-    /** 获取订单剩余待付金额（基于用户输入的金额） */
-    getRemainingOrderAmountWithInputAsync: (inputAmount: string | number, orderUuid: string) => Promise<number>;
     /** 获取部分支付的订单 */
     getPartiallyPaidOrdersAsync: () => Promise<PaymentOrder[]>;
     /** 获取未同步到服务器的订单 */
@@ -296,6 +308,24 @@ export interface PaymentModuleAPI {
     recheckAndRequeueUnsyncedOrders: () => Promise<number>;
     /** 手动执行支付同步队列 */
     runPaymentSyncQueue: () => Promise<void>;
+    /** @deprecated 使用 createPaymentOrderAsync 替代 */
+    pushOrderAsync: (params: PushOrderParams) => Promise<PaymentOrder>;
+    /** @deprecated 使用 getPaymentItemsAsync 替代 */
+    getPaymentAsync: (orderUuid: string) => Promise<PaymentItem[]>;
+    /** @deprecated 使用 addPaymentItemAsync 替代 */
+    pushPaymentAsync: (orderUuid: string, paymentItem: PaymentItemInput) => Promise<void>;
+    /** @deprecated 使用 deletePaymentItemAsync 替代 */
+    deletePaymentAsync: (orderUuid: string, paymentUuid: string) => Promise<void>;
+    /** @deprecated 使用 updatePaymentItemAsync 替代 */
+    updatePaymentAsync: (orderUuid: string, paymentUuid: string, params: PaymentUpdateFields) => Promise<void>;
+    /** @deprecated 使用 submitPaymentAsync 替代 */
+    submitPayAsync: (orderUuid?: string) => Promise<{
+        status: 'success' | 'failed';
+    }>;
+    /** @deprecated 使用 getRemainingAmountAsync 替代 */
+    getRemainingOrderAmountAsync: (orderUuid: string) => Promise<number>;
+    /** @deprecated 使用 getRemainingAmountWithInputAsync 替代 */
+    getRemainingOrderAmountWithInputAsync: (inputAmount: string | number, orderUuid: string) => Promise<number>;
 }
 /**
  * 订单变化事件数据

package/dist/modules/Payment/types.js

@@ -47,7 +47,7 @@ export var TaskRunStatus = /*#__PURE__*/function (TaskRunStatus) {
  */
 
 /**
- * 支付订单
+ * 支付订单（简化版，仅保留支付相关信息）
  */
 
 /**
@@ -55,7 +55,7 @@ export var TaskRunStatus = /*#__PURE__*/function (TaskRunStatus) {
  */
 
 /**
- * 推送订单参数
+ * 推送订单参数（简化版）
  */
 
 /**

package/dist/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/dist/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":[]}

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

@@ -0,0 +1,181 @@
+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 } from './types';
+import { PaymentOrder, PaymentMethod } from '../../modules/Payment/types';
+export * from './types';
+/**
+ * 结账解决方案实现
+ *
+ * 整合订单处理和支付功能，提供完整的结账流程管理。
+ * 支持多种支付方式，提供实时状态跟踪和错误处理。
+ */
+export declare class CheckoutImpl extends BaseModule implements Module, CheckoutModuleAPI {
+    protected defaultName: string;
+    protected defaultVersion: string;
+    isSolution: boolean;
+    private request;
+    private store;
+    private otherParams;
+    constructor(name?: string, version?: string);
+    initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
+    /**
+     * 初始化子模块
+     */
+    private initializeSubModules;
+    /**
+     * 设置支付模块事件监听
+     */
+    private setupPaymentEventListeners;
+    /**
+     * 初始化结账流程
+     */
+    initializeCheckoutAsync(params: CheckoutInitParams): Promise<void>;
+    /**
+     * 创建本地订单 (前端模拟下单流程)
+     *
+     * 此方法用于在前端模拟整个下单流程，创建一个本地的虚拟订单。
+     * 用户在购物车点击下单时，会把购物车参数传递给此方法，
+     * 方法会记录参数并创建本地虚拟订单，然后用 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>;
+    /**
+     * 完成结账
+     */
+    completeCheckoutAsync(): Promise<{
+        success: boolean;
+        orderId?: string;
+    }>;
+    /**
+     * 取消结账
+     */
+    cancelCheckoutAsync(): Promise<void>;
+    /**
+     * 获取结账状态
+     */
+    getCheckoutStatus(): CheckoutStatusInfo;
+    /**
+     * 获取结账摘要
+     */
+    getCheckoutSummaryAsync(): Promise<CheckoutSummary>;
+    /**
+     * 获取可用支付方式
+     */
+    getAvailablePaymentMethodsAsync(): Promise<PaymentMethod[]>;
+    /**
+     * 刷新支付方式缓存
+     *
+     * 强制重新从服务器获取支付方式列表，更新本地缓存
+     */
+    refreshPaymentMethodsAsync(): Promise<PaymentMethod[]>;
+    /**
+     * 获取当前订单基础信息
+     *
+     * 返回当前订单的基础信息，包括订单状态、金额、支付状态等
+     */
+    getCurrentOrderInfo(): CurrentOrderInfo | null;
+    /**
+     * 验证结账前置条件
+     */
+    validateCheckoutAsync(): Promise<{
+        valid: boolean;
+        errors: string[];
+    }>;
+    /**
+     * 重试失败的操作
+     */
+    retryFailedOperationAsync(): Promise<void>;
+    /**
+     * 设置当前步骤
+     */
+    setCurrentStep(step: CheckoutStep): void;
+    /**
+     * 获取订单模块
+     */
+    getOrderModule(): OrderModule;
+    /**
+     * 获取支付模块
+     */
+    getPaymentModule(): PaymentModule;
+    /**
+     * 替换本地订单ID为真实订单ID
+     *
+     * 当后端订单创建完成后，调用此方法将本地虚拟订单ID替换为真实订单ID
+     *
+     * @param newOrderId 后端返回的真实订单ID
+     * @returns 更新后的订单对象，如果当前没有订单则返回null
+     */
+    replaceLocalOrderIdAsync(newOrderId: string): Promise<PaymentOrder | null>;
+    /**
+     * 设置状态
+     */
+    private setStatus;
+    /**
+     * 设置步骤
+     */
+    private setStep;
+    /**
+     * 处理错误
+     */
+    private handleError;
+    /**
+     * 处理支付成功
+     */
+    private handlePaymentSuccess;
+    /**
+     * 处理支付错误
+     */
+    private handlePaymentError;
+    /**
+     * 验证结账参数
+     */
+    private validateCheckoutParams;
+    /**
+     * 验证本地订单数据
+     */
+    private validateLocalOrderData;
+    /**
+     * 生成本地订单ID
+     */
+    private generateLocalOrderId;
+    /**
+     * 从购物车小计数据中提取金额信息
+     */
+    private extractAmountFromCartSummary;
+    /**
+     * 预加载支付方式（在初始化时调用）
+     */
+    private preloadPaymentMethods;
+    /**
+     * 计算总金额
+     */
+    private calculateTotalAmount;
+    /**
+     * 计算已支付金额
+     */
+    private calculatePaidAmount;
+    /**
+     * 获取状态消息
+     */
+    private getStatusMessage;
+    destroy(): Promise<void>;
+}