@pisell/pisellos 0.0.230 → 0.0.232

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

@@ -1,6 +1,6 @@
 import { Module } from '../../types';
 import { OrderModule } from '../../modules/Order';
-import { PaymentModule, PaymentModuleAPI, PaymentOrder, PaymentMethod, PaymentStatus } from '../../modules/Payment';
+import { PaymentModuleAPI, PaymentOrder, PaymentMethod, PaymentStatus, PaymentItem, PaymentItemInput } from '../../modules/Payment';
 import { CartItem } from '../../modules/Cart/types';
 /**
  * 结账状态枚举
@@ -125,6 +125,7 @@ export interface CreateLocalOrderParams {
     cartSummary: CartSummaryItem[];
     /** 是否自动进入支付流程 */
     autoPayment?: boolean;
+    totalInfo: any;
 }
 /**
  * 手动下单参数
@@ -159,6 +160,16 @@ export interface LocalOrderData {
     relation_products: any[];
     /** 关联表单 */
     relation_forms: any[];
+    /** 客户ID */
+    customer_id?: string;
+    /** 客户姓名 */
+    customer_name?: string;
+    /** 创建时间 (YYYY-MM-DD hh:mm:ss) */
+    created_at?: string;
+    /** 附加费用 */
+    surcharge_fee?: number;
+    /** 商店折扣金额 */
+    shop_discount?: number;
 }
 /**
  * 本地预订项
@@ -368,16 +379,22 @@ export declare enum CheckoutHooks {
     /** 结账取消 */
     OnCheckoutCancelled = "checkout:onCancelled",
     /** 错误发生 */
-    OnError = "checkout:onError"
+    OnError = "checkout:onError",
+    /** 自定义支付金额变更 */
+    OnStateAmountChanged = "checkout:onStateAmountChanged",
+    /** 订单支付完成（待付款金额 ≤ 0） */
+    OnOrderPaymentCompleted = "checkout:onOrderPaymentCompleted",
+    /** 订单同步到后端完成 */
+    OnOrderSynced = "checkout:onOrderSynced",
+    /** 订单备注变更 */
+    OnOrderNoteChanged = "checkout:onOrderNoteChanged",
+    /** 商店折扣变更 */
+    OnShopDiscountChanged = "checkout:onShopDiscountChanged"
 }
 /**
  * 结账状态数据
  */
 export interface CheckoutState {
-    /** 订单模块 */
-    order: OrderModule;
-    /** 支付模块 */
-    payment: PaymentModule;
     /** 当前状态 */
     status: CheckoutStatus;
     /** 当前步骤 */
@@ -388,10 +405,21 @@ export interface CheckoutState {
     cartItems: CartItem[];
     /** 本地订单数据 */
     localOrderData?: LocalOrderData;
+    /** 购物车小计数据 */
+    cartSummary?: CartSummaryItem[];
     /** 可用支付方式 */
     paymentMethods: PaymentMethod[];
     /** 错误信息 */
     lastError?: CheckoutError;
+    /** UI 自定义支付金额 */
+    stateAmount: string;
+    /** 订单是否已同步到后端 */
+    isOrderSynced: boolean;
+    /** 当前客户信息 */
+    currentCustomer?: {
+        customer_id?: string;
+        customer_name?: string;
+    };
 }
 /**
  * 当前订单基础信息
@@ -485,6 +513,10 @@ export interface CheckoutModuleAPI extends Module {
      * 获取当前订单基础信息
      */
     getCurrentOrderInfo(): CurrentOrderInfo | null;
+    /**
+     * 获取当前订单的支付项
+     */
+    getCurrentOrderPaymentItemsAsync(): Promise<PaymentItem[]>;
     /**
      * 验证结账前置条件
      */
@@ -512,6 +544,137 @@ export interface CheckoutModuleAPI extends Module {
      * 替换本地订单ID为真实订单ID
      */
     replaceLocalOrderIdAsync(newOrderId: string): Promise<PaymentOrder | null>;
+    /**
+     * 设置自定义支付金额
+     */
+    setStateAmountAsync(amount: string): Promise<void>;
+    /**
+     * 获取当前自定义支付金额
+     */
+    getStateAmount(): string;
+    /**
+     * 刷新 stateAmount 为当前剩余未支付金额
+     */
+    refreshStateAmountAsync(): Promise<void>;
+    /**
+     * 获取购物车小计数据
+     */
+    getCartSummary(): CartSummaryItem[] | null;
+    /**
+     * 获取提取的金额详细信息
+     */
+    getExtractedAmountInfo(): ExtractedAmountInfo | null;
+    /**
+     * 获取支付方式列表（直接调用 Payment 模块）
+     */
+    getPaymentMethodsAsync(): Promise<PaymentMethod[]>;
+    /**
+     * 为当前订单添加支付项
+     */
+    addPaymentItemAsync(paymentItem: PaymentItemInput): Promise<void>;
+    /**
+     * 删除当前订单的支付项
+     */
+    deletePaymentItemAsync(paymentUuid: string): Promise<void>;
+    /**
+     * 批量更新当前订单的代金券支付项（覆盖更新）
+     */
+    updateVoucherPaymentItemsAsync(voucherPaymentItems: PaymentItemInput[]): Promise<void>;
+    /**
+     * 修改当前订单的定金状态
+     */
+    updateOrderDepositStatusAsync(isDeposit: number): Promise<void>;
+    /**
+     * 更新当前订单的客户信息
+     */
+    updateOrderCustomerAsync(customer: {
+        customer_id?: string;
+        customer_name?: string;
+    }): Promise<void>;
+    /**
+     * 获取当前订单的客户信息
+     */
+    getCurrentCustomer(): {
+        customer_id?: string;
+        customer_name?: string;
+    } | null;
+    /**
+     * 手动同步订单到后端
+     *
+     * 用于强制同步订单到后端，特别适用于纯代金券支付完成的订单
+     */
+    manualSyncOrderAsync(): Promise<{
+        success: boolean;
+        message?: string;
+        orderId?: string;
+        orderUuid?: string;
+    }>;
+    /**
+     * 检查订单是否需要手动同步
+     *
+     * 返回订单是否为纯代金券支付且待付金额<=0但未同步的状态
+     */
+    needsManualSync(): boolean;
+    /**
+     * 更新订单备注
+     *
+     * @param note 订单备注内容
+     */
+    updateOrderNoteAsync(note: string): Promise<void>;
+    /**
+     * 获取当前订单备注
+     *
+     * @returns 当前订单的备注内容，如果没有则返回空字符串
+     */
+    getOrderNote(): string;
+    /**
+     * 获取当前订单ID
+     *
+     * @returns 当前订单的ID，如果没有订单则返回null
+     */
+    getCurrentOrderId(): string | null;
+    /**
+     * 更新订单商店折扣
+     *
+     * 同时更新cartSummary和localOrderData中的shop_discount值
+     *
+     * @param discountAmount 商店折扣金额
+     */
+    updateShopDiscountAsync(discountAmount: number): Promise<void>;
+    /**
+     * 获取当前商店折扣金额
+     *
+     * @returns 当前的商店折扣金额，如果没有则返回0
+     */
+    getShopDiscount(): number;
+    /**
+     * 保存订单并稍后支付
+     *
+     * 将当前订单保存到后端，但排除代金券类支付项(voucher_id)，
+     * 适用于用户想要保存订单但稍后完成支付的场景
+     *
+     * @returns 保存结果，包含订单ID和状态
+     */
+    saveForLaterPaymentAsync(): Promise<{
+        success: boolean;
+        message?: string;
+        orderId?: string;
+        orderUuid?: string;
+    }>;
+    /**
+     * 通过订单ID编辑订单备注
+     *
+     * 用于修改已同步到后端的订单备注，通常在支付成功后的弹窗中使用
+     *
+     * @param orderId 后端订单ID
+     * @param note 新的订单备注
+     * @returns 修改结果
+     */
+    editOrderNoteByOrderIdAsync(orderId: string | number, note: string): Promise<{
+        success: boolean;
+        message?: string;
+        orderId?: string | number;
+    }>;
 }
 /**
  * 结账事件数据类型
@@ -547,4 +710,42 @@ export interface CheckoutEventData {
         context?: any;
         timestamp: number;
     };
+    /** 自定义支付金额变更事件 */
+    stateAmountChanged: {
+        oldAmount: string;
+        newAmount: string;
+        timestamp: number;
+    };
+    /** 订单支付完成事件 */
+    orderPaymentCompleted: {
+        orderUuid: string;
+        orderId: string;
+        totalAmount: string;
+        paidAmount: string;
+        remainingAmount: string;
+        timestamp: number;
+    };
+    /** 订单同步到后端完成事件 */
+    orderSynced: {
+        orderUuid: string;
+        realOrderId: string;
+        virtualOrderId: string;
+        timestamp: number;
+        /** 是否为手动同步 */
+        isManual?: boolean;
+    };
+    /** 订单备注变更事件 */
+    orderNoteChanged: {
+        orderUuid?: string;
+        oldNote: string;
+        newNote: string;
+        timestamp: number;
+    };
+    /** 商店折扣变更事件 */
+    shopDiscountChanged: {
+        orderUuid?: string;
+        oldDiscount: number;
+        newDiscount: number;
+        timestamp: number;
+    };
 }

package/dist/solution/Checkout/types.js

@@ -112,6 +112,11 @@ export var CheckoutHooks = /*#__PURE__*/function (CheckoutHooks) {
   CheckoutHooks["OnCheckoutCompleted"] = "checkout:onCompleted";
   CheckoutHooks["OnCheckoutCancelled"] = "checkout:onCancelled";
   CheckoutHooks["OnError"] = "checkout:onError";
+  CheckoutHooks["OnStateAmountChanged"] = "checkout:onStateAmountChanged";
+  CheckoutHooks["OnOrderPaymentCompleted"] = "checkout:onOrderPaymentCompleted";
+  CheckoutHooks["OnOrderSynced"] = "checkout:onOrderSynced";
+  CheckoutHooks["OnOrderNoteChanged"] = "checkout:onOrderNoteChanged";
+  CheckoutHooks["OnShopDiscountChanged"] = "checkout:onShopDiscountChanged";
   return CheckoutHooks;
 }({});
 

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

@@ -1,6 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { OrderModuleAPI, CommitOrderParams } from './types';
+import { OrderModuleAPI, CommitOrderParams, CheckoutOrderParams } from './types';
 import { CartItem } from '../Cart/types';
 export declare class OrderModule extends BaseModule implements Module, OrderModuleAPI {
     protected defaultName: string;
@@ -11,7 +11,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     createOrder(params: CommitOrderParams['query']): {
         type: "virtual" | "appointment_booking";
-        platform: string;
+        platform: "pc" | "h5";
         sales_channel: string;
         order_sales_channel: string;
         bookings: any[];
@@ -26,4 +26,15 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         type: 'holder' | 'account';
     }): boolean;
     submitOrder(order: CommitOrderParams): Promise<void>;
+    /**
+     * Checkout 专用：创建订单到后端
+     *
+     * 专门为 Checkout 模块设计的订单创建方法，
+     * 直接调用 /order/checkout 接口创建订单
+     * 接收已经处理好的订单数据，无需再处理购物车
+     *
+     * @param params Checkout 订单参数（已处理的订单数据）
+     * @returns 后端返回的订单数据（包含订单ID等）
+     */
+    createOrderByCheckout(params: CheckoutOrderParams): Promise<any>;
 }

package/lib/modules/Order/index.js

@@ -41,7 +41,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const order = {
       type: (params == null ? void 0 : params.type) || "appointment_booking",
       // 要从外面拿，virtual
-      platform: (params == null ? void 0 : params.platform) === "pc" ? "PC" : "H5",
+      platform: (params == null ? void 0 : params.platform) || "pc",
       sales_channel: "my_pisel",
       order_sales_channel: "online_store",
       bookings: [],
@@ -101,6 +101,70 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const params = this.createOrder(query);
     return this.request.post(fetchUrl, params);
   }
+  /**
+   * Checkout 专用：创建订单到后端
+   * 
+   * 专门为 Checkout 模块设计的订单创建方法，
+   * 直接调用 /order/checkout 接口创建订单
+   * 接收已经处理好的订单数据，无需再处理购物车
+   * 
+   * @param params Checkout 订单参数（已处理的订单数据）
+   * @returns 后端返回的订单数据（包含订单ID等）
+   */
+  async createOrderByCheckout(params) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    console.log("[Order] createOrderByCheckout 开始创建订单:", {
+      type: params.type,
+      platform: params.platform,
+      is_deposit: params.is_deposit,
+      customer_id: params.customer_id,
+      bookingsCount: ((_a = params.bookings) == null ? void 0 : _a.length) || 0,
+      relationProductsCount: ((_b = params.relation_products) == null ? void 0 : _b.length) || 0,
+      paymentsCount: ((_c = params.payments) == null ? void 0 : _c.length) || 0
+    });
+    try {
+      const orderData = {
+        sales_channel: "my_pisel",
+        order_sales_channel: "online_store",
+        shop_note: "",
+        schedule_date: "",
+        is_deposit: 0,
+        bookings: [],
+        relation_products: [],
+        relation_forms: [],
+        payments: [],
+        ...params
+        // 使用传入的参数覆盖默认值
+      };
+      if ((_d = orderData.payments) == null ? void 0 : _d.length) {
+        orderData.small_ticket_data_flag = 1;
+      }
+      if (params.order_id) {
+        orderData.bookings = [];
+        orderData.relation_products = [];
+      }
+      console.log("[Order] 调用后端接口创建订单:", {
+        url: "/order/checkout",
+        orderType: orderData.type,
+        platform: orderData.platform,
+        isDeposit: orderData.is_deposit,
+        customerId: orderData.customer_id,
+        bookingsCount: ((_e = orderData.bookings) == null ? void 0 : _e.length) || 0,
+        relationProductsCount: ((_f = orderData.relation_products) == null ? void 0 : _f.length) || 0,
+        paymentsCount: ((_g = orderData.payments) == null ? void 0 : _g.length) || 0,
+        paymentsMethods: ((_h = orderData.payments) == null ? void 0 : _h.map((p) => p.code)) || []
+      });
+      const response = await this.request.post("/order/checkout", orderData);
+      console.log("[Order] 订单创建成功，后端响应:", {
+        success: !!response,
+        hasOrderId: !!(((_i = response == null ? void 0 : response.data) == null ? void 0 : _i.order_id) || (response == null ? void 0 : response.order_id))
+      });
+      return response;
+    } catch (error) {
+      console.error("[Order] createOrderByCheckout 创建订单失败:", error);
+      throw error;
+    }
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/modules/Order/types.d.ts

@@ -18,6 +18,45 @@ export interface CommitOrderParams {
         platform?: 'pc' | 'h5';
     };
 }
+/**
+ * 支付项数据
+ */
+export interface PaymentItemData {
+    /** 当前支付项的唯一 ID */
+    uuid: string;
+    /** 当前支付方式付出去多少钱 */
+    amount: string;
+    /** 支付类型代码 */
+    code: string;
+    /** 支付类型id */
+    id: number;
+    /** 支付类型名称 */
+    name: string;
+    /** 支付类型 */
+    type: string;
+    /** 是否已同步到后端 */
+    isSynced?: boolean;
+}
+/**
+ * Checkout 专用订单创建参数
+ */
+export interface CheckoutOrderParams {
+    type: 'virtual' | 'appointment_booking';
+    platform: 'PC' | 'H5';
+    sales_channel?: string;
+    order_sales_channel?: string;
+    bookings?: any[];
+    shop_note?: string;
+    schedule_date?: string;
+    is_deposit?: number;
+    relation_products?: any[];
+    relation_forms?: any[];
+    payments?: PaymentItemData[];
+    customer_id?: string;
+    /** 小票数据标记，当有支付项时设置为1 */
+    small_ticket_data_flag?: number;
+    [key: string]: any;
+}
 /**
  * 订单模块 API
  */
@@ -40,4 +79,10 @@ export interface OrderModuleAPI {
      * @param params 订单信息
      */
     submitOrder: (params: CommitOrderParams) => Promise<void>;
+    /**
+     * Checkout 专用：创建订单到后端
+     * @param params 订单参数
+     * @returns 后端返回的订单数据
+     */
+    createOrderByCheckout: (params: CheckoutOrderParams) => Promise<any>;
 }

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

@@ -8,4 +8,12 @@ export declare class CashPaymentImpl implements CashPayment {
     constructor(paymentModule: PaymentModule);
     processCashPayment(amount: number, orderUuid: string): Promise<void>;
     getCashBalance(): Promise<number>;
+    /**
+     * 获取推荐支付金额
+     * 基于目标金额和货币类型，返回最优支付金额建议
+     * @param money 目标支付金额
+     * @param currency 货币代码 (如: 'CNY', 'USD', 'EUR' 等)
+     * @returns 推荐支付金额数组
+     */
+    getRecommendedAmount(money: number, currency: string): number[];
 }

package/lib/modules/Payment/cash.js

@@ -22,6 +22,7 @@ __export(cash_exports, {
   CashPaymentImpl: () => CashPaymentImpl
 });
 module.exports = __toCommonJS(cash_exports);
+var import_cashRecommendationAlgorithm = require("./cashRecommendationAlgorithm");
 var CashPaymentImpl = class {
   constructor(paymentModule) {
     this.paymentModule = paymentModule;
@@ -39,11 +40,23 @@ var CashPaymentImpl = class {
       type: cashMethod.type,
       voucher_id: ""
     };
-    await this.paymentModule.pushPaymentAsync(orderUuid, paymentItem);
+    await this.paymentModule.addPaymentItemAsync(orderUuid, paymentItem);
   }
   async getCashBalance() {
     return 0;
   }
+  /**
+   * 获取推荐支付金额
+   * 基于目标金额和货币类型，返回最优支付金额建议
+   * @param money 目标支付金额
+   * @param currency 货币代码 (如: 'CNY', 'USD', 'EUR' 等)
+   * @returns 推荐支付金额数组
+   */
+  getRecommendedAmount(money, currency) {
+    const upperCurrency = currency.toUpperCase();
+    const denominations = import_cashRecommendationAlgorithm.CURRENCY_DENOMINATIONS[upperCurrency] || import_cashRecommendationAlgorithm.CURRENCY_DENOMINATIONS["DEFAULT"];
+    return (0, import_cashRecommendationAlgorithm.recommendOptimalPayments)(money, denominations);
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -0,0 +1,22 @@
+/**
+ * 现金支付推荐算法
+ *
+ * 核心原理：
+ * 1. 每个推荐金额都应该是独立的最优组合
+ * 2. 不推荐在已有最优解基础上添加额外面额的组合
+ * 3. 优先推荐使用不同数量币种的组合
+ * 4. 根据组合判断去重，避免扩展组合
+ */
+/**
+ * 常见国家货币面额配置
+ */
+export declare const CURRENCY_DENOMINATIONS: Record<string, number[]>;
+/**
+ * 最优支付金额推荐算法
+ * 推荐通过不同数量面额组合刚好足够支付的最小金额
+ *
+ * @param targetAmount 目标金额
+ * @param denominations 币种面值数组
+ * @returns 推荐支付金额数组
+ */
+export declare function recommendOptimalPayments(targetAmount: number, denominations: number[]): number[];