@pisell/pisellos 1.0.65 → 1.0.67

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

@@ -2,42 +2,6 @@ import { Module } from '../../types';
 import { OrderModule } from '../../modules/Order';
 import { PaymentModuleAPI, PaymentOrder, PaymentMethod, PaymentStatus, PaymentItem, PaymentItemInput } from '../../modules/Payment';
 import { CartItem } from '../../modules/Cart/types';
-/**
- * 结账状态枚举
- */
-export declare enum CheckoutStatus {
-    /** 初始化中 */
-    Initializing = "initializing",
-    /** 准备就绪 */
-    Ready = "ready",
-    /** 创建订单中 */
-    CreatingOrder = "creating_order",
-    /** 订单已创建 */
-    OrderCreated = "order_created",
-    /** 处理支付中 */
-    ProcessingPayment = "processing_payment",
-    /** 支付完成 */
-    PaymentCompleted = "payment_completed",
-    /** 结账完成 */
-    Completed = "completed",
-    /** 已取消 */
-    Cancelled = "cancelled",
-    /** 错误状态 */
-    Error = "error"
-}
-/**
- * 结账步骤枚举
- */
-export declare enum CheckoutStep {
-    /** 订单确认 */
-    OrderConfirmation = "order_confirmation",
-    /** 支付方式选择 */
-    PaymentMethod = "payment_method",
-    /** 支付处理 */
-    PaymentProcessing = "payment_processing",
-    /** 完成 */
-    Complete = "complete"
-}
 /**
  * 结账错误类型
  */
@@ -127,15 +91,6 @@ export interface CreateLocalOrderParams {
     autoPayment?: boolean;
     totalInfo: any;
 }
-/**
- * 手动下单参数
- */
-export interface PlaceOrderParams {
-    /** 订单提交的 URL (可选，默认使用 /order/appointment) */
-    url?: string;
-    /** 是否自动替换虚拟订单ID为真实订单ID */
-    autoReplaceOrderId?: boolean;
-}
 /**
  * 本地订单数据结构 (基于 appointmentDemo.json)
  */
@@ -300,74 +255,12 @@ export interface LocalResourceItem {
     /** 资源类型 (可选) */
     resourceType?: string;
 }
-/**
- * 订单创建参数
- */
-export interface CreateOrderParams {
-    /** 购物车商品 */
-    cartItems: CartItem[];
-    /** 订单类型 */
-    type?: 'virtual' | 'appointment_booking';
-    /** 平台类型 */
-    platform?: 'pc' | 'h5';
-    /** 额外参数 */
-    extra?: Record<string, any>;
-}
-/**
- * 支付处理参数
- */
-export interface ProcessPaymentParams {
-    /** 订单UUID */
-    orderUuid: string;
-    /** 支付方式代码 */
-    paymentMethodCode: string;
-    /** 支付金额 */
-    amount: string | number;
-    /** 支付元数据 */
-    metadata?: Record<string, any>;
-}
-/**
- * 结账状态信息
- */
-export interface CheckoutStatusInfo {
-    /** 当前状态 */
-    status: CheckoutStatus;
-    /** 当前步骤 */
-    step: CheckoutStep;
-    /** 进度百分比 (0-100) */
-    progress: number;
-    /** 状态消息 */
-    message?: string;
-    /** 错误信息 */
-    error?: CheckoutError;
-}
-/**
- * 结账摘要信息
- */
-export interface CheckoutSummary {
-    /** 订单信息 */
-    order?: PaymentOrder;
-    /** 总金额 */
-    totalAmount: string;
-    /** 已支付金额 */
-    paidAmount: string;
-    /** 待支付金额 */
-    remainingAmount: string;
-    /** 支付状态 */
-    paymentStatus: PaymentStatus;
-    /** 可用支付方式 */
-    availablePaymentMethods: PaymentMethod[];
-}
 /**
  * 结账事件钩子
  */
 export declare enum CheckoutHooks {
     /** 结账初始化完成 */
     OnCheckoutInitialized = "checkout:onInitialized",
-    /** 状态变更 */
-    OnStatusChanged = "checkout:onStatusChanged",
-    /** 步骤变更 */
-    OnStepChanged = "checkout:onStepChanged",
     /** 订单创建成功 */
     OnOrderCreated = "checkout:onOrderCreated",
     /** 订单创建失败 */
@@ -407,16 +300,14 @@ export declare enum CheckoutHooks {
     /** 下单接口请求完成 */
     OnOrderSubmitEnd = "checkout:onOrderSubmitEnd",
     /** 钱包数据初始化完成 */
-    OnWalletDataInitialized = "checkout:onWalletDataInitialized"
+    OnWalletDataInitialized = "checkout:onWalletDataInitialized",
+    /** 支付项添加成功 */
+    OnPaymentItemAdded = "checkout:onPaymentItemAdded"
 }
 /**
  * 结账状态数据
  */
 export interface CheckoutState {
-    /** 当前状态 */
-    status: CheckoutStatus;
-    /** 当前步骤 */
-    step: CheckoutStep;
     /** 当前订单 */
     currentOrder?: PaymentOrder;
     /** 购物车商品 */
@@ -449,10 +340,6 @@ export interface CurrentOrderInfo {
     uuid?: string;
     /** 订单ID */
     orderId?: string;
-    /** 订单状态 */
-    status?: CheckoutStatus;
-    /** 当前步骤 */
-    step?: CheckoutStep;
     /** 订单总金额 */
     totalAmount?: string;
     /** 待付金额 */
@@ -486,22 +373,6 @@ export interface CheckoutModuleAPI extends Module {
      * 创建本地订单 (前端模拟下单流程)
      */
     createLocalOrderAsync(params: CreateLocalOrderParams): Promise<PaymentOrder>;
-    /**
-     * 手动下单 (根据虚拟订单生成实际订单)
-     */
-    placeOrderAsync(params?: PlaceOrderParams): Promise<{
-        success: boolean;
-        orderId?: string;
-        error?: string;
-    }>;
-    /**
-     * 创建订单
-     */
-    createOrderAsync(params: CreateOrderParams): Promise<PaymentOrder>;
-    /**
-     * 处理支付
-     */
-    processPaymentAsync(params: ProcessPaymentParams): Promise<void>;
     /**
      * 完成结账
      */
@@ -509,26 +380,6 @@ export interface CheckoutModuleAPI extends Module {
         success: boolean;
         orderId?: string;
     }>;
-    /**
-     * 取消结账
-     */
-    cancelCheckoutAsync(): Promise<void>;
-    /**
-     * 获取结账状态
-     */
-    getCheckoutStatus(): CheckoutStatusInfo;
-    /**
-     * 获取结账摘要
-     */
-    getCheckoutSummaryAsync(): Promise<CheckoutSummary>;
-    /**
-     * 获取可用支付方式
-     */
-    getAvailablePaymentMethodsAsync(): Promise<PaymentMethod[]>;
-    /**
-     * 刷新支付方式缓存
-     */
-    refreshPaymentMethodsAsync(): Promise<PaymentMethod[]>;
     /**
      * 获取当前订单基础信息
      */
@@ -537,21 +388,6 @@ export interface CheckoutModuleAPI extends Module {
      * 获取当前订单的支付项
      */
     getCurrentOrderPaymentItemsAsync(): Promise<PaymentItem[]>;
-    /**
-     * 验证结账前置条件
-     */
-    validateCheckoutAsync(): Promise<{
-        valid: boolean;
-        errors: string[];
-    }>;
-    /**
-     * 重试失败的操作
-     */
-    retryFailedOperationAsync(): Promise<void>;
-    /**
-     * 设置当前步骤
-     */
-    setCurrentStep(step: CheckoutStep): void;
     /**
      * 获取订单模块
      */
@@ -578,18 +414,10 @@ export interface CheckoutModuleAPI extends Module {
      * @returns 当前系统计算的待付金额
      */
     getBalanceDueAmount(): string;
-    /**
-     * 刷新 stateAmount 为当前剩余未支付金额
-     */
-    refreshStateAmountAsync(): Promise<void>;
     /**
      * 获取购物车小计数据
      */
     getCartSummary(): CartSummaryItem[] | null;
-    /**
-     * 获取提取的金额详细信息
-     */
-    getExtractedAmountInfo(): ExtractedAmountInfo | null;
     /**
      * 获取支付方式列表（直接调用 Payment 模块）
      */
@@ -611,19 +439,11 @@ export interface CheckoutModuleAPI extends Module {
      */
     updateOrderDepositStatusAsync(isDeposit: number): Promise<void>;
     /**
-     * 更新当前订单的客户信息
+     * 手动设置当前订单的定金金额
+     *
+     * @param depositAmount 定金金额，必须是有效的数字字符串，且不能超过订单总额
      */
-    updateOrderCustomerAsync(customer: {
-        customer_id?: string;
-        customer_name?: string;
-    }): Promise<void>;
-    /**
-     * 获取当前订单的客户信息
-     */
-    getCurrentCustomer(): {
-        customer_id?: string;
-        customer_name?: string;
-    } | null;
+    setDepositAmountAsync(depositAmount: string): Promise<void>;
     /**
      * 手动同步订单到后端
      *
@@ -636,13 +456,6 @@ export interface CheckoutModuleAPI extends Module {
         orderUuid?: string;
         response?: any;
     }>;
-    /**
-     * 检查订单是否需要手动同步（异步版本）
-     *
-     * 返回订单是否为纯代金券支付且待付金额<=0但未同步的状态
-     * 从 Payment 模块获取最新的支付项数据
-     */
-    needsManualSyncAsync(): Promise<boolean>;
     /**
      * 更新订单备注
      *
@@ -680,20 +493,6 @@ export interface CheckoutModuleAPI extends Module {
         message?: string;
         orderId?: string;
     }>;
-    /**
-     * 更新订单商店折扣
-     *
-     * 同时更新cartSummary和localOrderData中的shop_discount值
-     *
-     * @param discountAmount 商店折扣金额
-     */
-    updateShopDiscountAsync(discountAmount: number): Promise<void>;
-    /**
-     * 获取当前商店折扣金额
-     *
-     * @returns 当前的商店折扣金额，如果没有则返回0
-     */
-    getShopDiscount(): number;
     /**
      * 保存订单并稍后支付
      *
@@ -764,18 +563,6 @@ export interface SendCustomerPayLinkParams {
  * 结账事件数据类型
  */
 export interface CheckoutEventData {
-    /** 状态变更事件 */
-    statusChanged: {
-        oldStatus: CheckoutStatus;
-        newStatus: CheckoutStatus;
-        timestamp: number;
-    };
-    /** 步骤变更事件 */
-    stepChanged: {
-        oldStep: CheckoutStep;
-        newStep: CheckoutStep;
-        timestamp: number;
-    };
     /** 订单创建事件 */
     orderCreated: {
         order: PaymentOrder;

package/lib/solution/Checkout/types.js

@@ -20,30 +20,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var types_exports = {};
 __export(types_exports, {
   CheckoutErrorType: () => CheckoutErrorType,
-  CheckoutHooks: () => CheckoutHooks,
-  CheckoutStatus: () => CheckoutStatus,
-  CheckoutStep: () => CheckoutStep
+  CheckoutHooks: () => CheckoutHooks
 });
 module.exports = __toCommonJS(types_exports);
-var CheckoutStatus = /* @__PURE__ */ ((CheckoutStatus2) => {
-  CheckoutStatus2["Initializing"] = "initializing";
-  CheckoutStatus2["Ready"] = "ready";
-  CheckoutStatus2["CreatingOrder"] = "creating_order";
-  CheckoutStatus2["OrderCreated"] = "order_created";
-  CheckoutStatus2["ProcessingPayment"] = "processing_payment";
-  CheckoutStatus2["PaymentCompleted"] = "payment_completed";
-  CheckoutStatus2["Completed"] = "completed";
-  CheckoutStatus2["Cancelled"] = "cancelled";
-  CheckoutStatus2["Error"] = "error";
-  return CheckoutStatus2;
-})(CheckoutStatus || {});
-var CheckoutStep = /* @__PURE__ */ ((CheckoutStep2) => {
-  CheckoutStep2["OrderConfirmation"] = "order_confirmation";
-  CheckoutStep2["PaymentMethod"] = "payment_method";
-  CheckoutStep2["PaymentProcessing"] = "payment_processing";
-  CheckoutStep2["Complete"] = "complete";
-  return CheckoutStep2;
-})(CheckoutStep || {});
 var CheckoutErrorType = /* @__PURE__ */ ((CheckoutErrorType2) => {
   CheckoutErrorType2["OrderCreationFailed"] = "order_creation_failed";
   CheckoutErrorType2["PaymentFailed"] = "payment_failed";
@@ -54,8 +33,6 @@ var CheckoutErrorType = /* @__PURE__ */ ((CheckoutErrorType2) => {
 })(CheckoutErrorType || {});
 var CheckoutHooks = /* @__PURE__ */ ((CheckoutHooks2) => {
   CheckoutHooks2["OnCheckoutInitialized"] = "checkout:onInitialized";
-  CheckoutHooks2["OnStatusChanged"] = "checkout:onStatusChanged";
-  CheckoutHooks2["OnStepChanged"] = "checkout:onStepChanged";
   CheckoutHooks2["OnOrderCreated"] = "checkout:onOrderCreated";
   CheckoutHooks2["OnOrderCreationFailed"] = "checkout:onOrderCreationFailed";
   CheckoutHooks2["OnPaymentStarted"] = "checkout:onPaymentStarted";
@@ -76,12 +53,11 @@ var CheckoutHooks = /* @__PURE__ */ ((CheckoutHooks2) => {
   CheckoutHooks2["OnOrderSubmitStart"] = "checkout:onOrderSubmitStart";
   CheckoutHooks2["OnOrderSubmitEnd"] = "checkout:onOrderSubmitEnd";
   CheckoutHooks2["OnWalletDataInitialized"] = "checkout:onWalletDataInitialized";
+  CheckoutHooks2["OnPaymentItemAdded"] = "checkout:onPaymentItemAdded";
   return CheckoutHooks2;
 })(CheckoutHooks || {});
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CheckoutErrorType,
-  CheckoutHooks,
-  CheckoutStatus,
-  CheckoutStep
+  CheckoutHooks
 });

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

@@ -1,4 +1,4 @@
-import { CheckoutInitParams, CheckoutError, CheckoutErrorType, CheckoutStatus, CheckoutStep, LocalOrderData, CartSummaryItem, ExtractedAmountInfo } from '../types';
+import { CheckoutInitParams, CheckoutError, CheckoutErrorType, LocalOrderData, CartSummaryItem, ExtractedAmountInfo } from '../types';
 import { CartItem } from '../../../modules/Cart/types';
 /**
  * 验证结账数据
@@ -11,10 +11,6 @@ export declare function validateCheckoutData(params: CheckoutInitParams): {
  * 创建结账错误对象
  */
 export declare function createCheckoutError(type: CheckoutErrorType, message: string, details?: any): CheckoutError;
-/**
- * 计算结账进度
- */
-export declare function calculateProgress(status: CheckoutStatus, step: CheckoutStep): number;
 /**
  * 格式化金额
  */
@@ -115,3 +111,11 @@ export declare function isVirtualOrderId(orderId: string): boolean;
  * @returns 是否需要同步订单
  */
 export declare function shouldSyncOrderForPayment(paymentCode: string, paymentType: string): boolean;
+/**
+ * 判断是否为现金支付
+ *
+ * @param paymentCode 支付方式代码
+ * @param paymentType 支付方式类型
+ * @returns 是否为现金支付
+ */
+export declare function isCashPayment(paymentCode?: string, paymentType?: string): boolean;

package/lib/solution/Checkout/utils/index.js

@@ -19,7 +19,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/solution/Checkout/utils/index.ts
 var utils_exports = {};
 __export(utils_exports, {
-  calculateProgress: () => calculateProgress,
   calculateTotalAmount: () => calculateTotalAmount,
   createCheckoutError: () => createCheckoutError,
   debounce: () => debounce,
@@ -30,6 +29,7 @@ __export(utils_exports, {
   generateLocalOrderId: () => generateLocalOrderId,
   generateOrderId: () => generateOrderId,
   getErrorMessage: () => getErrorMessage,
+  isCashPayment: () => isCashPayment,
   isEmpty: () => isEmpty,
   isProduction: () => isProduction,
   isValidPaymentMethodCode: () => isValidPaymentMethodCode,
@@ -44,8 +44,7 @@ __export(utils_exports, {
   validateLocalOrderData: () => validateLocalOrderData
 });
 module.exports = __toCommonJS(utils_exports);
-var import_types = require("../types");
-var import_types2 = require("../../../modules/Payment/types");
+var import_types = require("../../../modules/Payment/types");
 function validateCheckoutData(params) {
   const errors = [];
   if (!params.cartItems || params.cartItems.length === 0) {
@@ -83,54 +82,6 @@ function createCheckoutError(type, message, details) {
     timestamp: Date.now()
   };
 }
-function calculateProgress(status, step) {
-  let baseProgress = 0;
-  switch (status) {
-    case import_types.CheckoutStatus.Initializing:
-      baseProgress = 5;
-      break;
-    case import_types.CheckoutStatus.Ready:
-      baseProgress = 10;
-      break;
-    case import_types.CheckoutStatus.CreatingOrder:
-      baseProgress = 25;
-      break;
-    case import_types.CheckoutStatus.OrderCreated:
-      baseProgress = 40;
-      break;
-    case import_types.CheckoutStatus.ProcessingPayment:
-      baseProgress = 65;
-      break;
-    case import_types.CheckoutStatus.PaymentCompleted:
-      baseProgress = 85;
-      break;
-    case import_types.CheckoutStatus.Completed:
-      baseProgress = 100;
-      break;
-    case import_types.CheckoutStatus.Cancelled:
-    case import_types.CheckoutStatus.Error:
-      baseProgress = 0;
-      break;
-    default:
-      baseProgress = 0;
-  }
-  let stepProgress = 0;
-  switch (step) {
-    case import_types.CheckoutStep.OrderConfirmation:
-      stepProgress = 0;
-      break;
-    case import_types.CheckoutStep.PaymentMethod:
-      stepProgress = 10;
-      break;
-    case import_types.CheckoutStep.PaymentProcessing:
-      stepProgress = 15;
-      break;
-    case import_types.CheckoutStep.Complete:
-      stepProgress = 0;
-      break;
-  }
-  return Math.min(100, baseProgress + stepProgress);
-}
 function formatAmount(amount) {
   const numAmount = typeof amount === "string" ? parseFloat(amount) : amount;
   if (isNaN(numAmount))
@@ -367,7 +318,7 @@ function shouldSyncOrderForPayment(paymentCode, paymentType) {
   )) {
     return false;
   }
-  if (paymentCode === import_types2.PaymentMethodType.Cash || paymentType === import_types2.PaymentMethodType.Cash) {
+  if (paymentCode === import_types.PaymentMethodType.Cash || paymentType === import_types.PaymentMethodType.Cash) {
     return false;
   }
   if (codeUpper.includes("CUSTOM") || typeUpper.includes("CUSTOM")) {
@@ -375,9 +326,16 @@ function shouldSyncOrderForPayment(paymentCode, paymentType) {
   }
   return true;
 }
+function isCashPayment(paymentCode, paymentType) {
+  const codeUpper = (paymentCode == null ? void 0 : paymentCode.toUpperCase()) || "";
+  const typeUpper = (paymentType == null ? void 0 : paymentType.toUpperCase()) || "";
+  const cashIdentifiers = ["CASH", "CASHMANUAL", "MANUAL"];
+  return cashIdentifiers.some(
+    (identifier) => codeUpper.includes(identifier) || typeUpper.includes(identifier)
+  );
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  calculateProgress,
   calculateTotalAmount,
   createCheckoutError,
   debounce,
@@ -388,6 +346,7 @@ function shouldSyncOrderForPayment(paymentCode, paymentType) {
   generateLocalOrderId,
   generateOrderId,
   getErrorMessage,
+  isCashPayment,
   isEmpty,
   isProduction,
   isValidPaymentMethodCode,

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "1.0.65",
+  "version": "1.0.67",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",