@pisell/pisellos 2.1.8 → 2.1.10

package/dist/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 模块）
      */
@@ -610,20 +438,6 @@ export interface CheckoutModuleAPI extends Module {
      * 修改当前订单的定金状态
      */
     updateOrderDepositStatusAsync(isDeposit: number): Promise<void>;
-    /**
-     * 更新当前订单的客户信息
-     */
-    updateOrderCustomerAsync(customer: {
-        customer_id?: string;
-        customer_name?: string;
-    }): Promise<void>;
-    /**
-     * 获取当前订单的客户信息
-     */
-    getCurrentCustomer(): {
-        customer_id?: string;
-        customer_name?: string;
-    } | null;
     /**
      * 手动同步订单到后端
      *
@@ -636,13 +450,6 @@ export interface CheckoutModuleAPI extends Module {
         orderUuid?: string;
         response?: any;
     }>;
-    /**
-     * 检查订单是否需要手动同步（异步版本）
-     *
-     * 返回订单是否为纯代金券支付且待付金额<=0但未同步的状态
-     * 从 Payment 模块获取最新的支付项数据
-     */
-    needsManualSyncAsync(): Promise<boolean>;
     /**
      * 更新订单备注
      *
@@ -680,20 +487,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 +557,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/dist/solution/Checkout/types.js

@@ -1,30 +1,3 @@
-/**
- * 结账状态枚举
- */
-export var CheckoutStatus = /*#__PURE__*/function (CheckoutStatus) {
-  CheckoutStatus["Initializing"] = "initializing";
-  CheckoutStatus["Ready"] = "ready";
-  CheckoutStatus["CreatingOrder"] = "creating_order";
-  CheckoutStatus["OrderCreated"] = "order_created";
-  CheckoutStatus["ProcessingPayment"] = "processing_payment";
-  CheckoutStatus["PaymentCompleted"] = "payment_completed";
-  CheckoutStatus["Completed"] = "completed";
-  CheckoutStatus["Cancelled"] = "cancelled";
-  CheckoutStatus["Error"] = "error";
-  return CheckoutStatus;
-}({});
-
-/**
- * 结账步骤枚举
- */
-export var CheckoutStep = /*#__PURE__*/function (CheckoutStep) {
-  CheckoutStep["OrderConfirmation"] = "order_confirmation";
-  CheckoutStep["PaymentMethod"] = "payment_method";
-  CheckoutStep["PaymentProcessing"] = "payment_processing";
-  CheckoutStep["Complete"] = "complete";
-  return CheckoutStep;
-}({});
-
 /**
  * 结账错误类型
  */
@@ -57,10 +30,6 @@ export var CheckoutErrorType = /*#__PURE__*/function (CheckoutErrorType) {
  * 本地订单创建参数
  */
 
-/**
- * 手动下单参数
- */
-
 /**
  * 本地订单数据结构 (基于 appointmentDemo.json)
  */
@@ -81,29 +50,11 @@ export var CheckoutErrorType = /*#__PURE__*/function (CheckoutErrorType) {
  * 本地资源项
  */
 
-/**
- * 订单创建参数
- */
-
-/**
- * 支付处理参数
- */
-
-/**
- * 结账状态信息
- */
-
-/**
- * 结账摘要信息
- */
-
 /**
  * 结账事件钩子
  */
 export var CheckoutHooks = /*#__PURE__*/function (CheckoutHooks) {
   CheckoutHooks["OnCheckoutInitialized"] = "checkout:onInitialized";
-  CheckoutHooks["OnStatusChanged"] = "checkout:onStatusChanged";
-  CheckoutHooks["OnStepChanged"] = "checkout:onStepChanged";
   CheckoutHooks["OnOrderCreated"] = "checkout:onOrderCreated";
   CheckoutHooks["OnOrderCreationFailed"] = "checkout:onOrderCreationFailed";
   CheckoutHooks["OnPaymentStarted"] = "checkout:onPaymentStarted";
@@ -124,6 +75,7 @@ export var CheckoutHooks = /*#__PURE__*/function (CheckoutHooks) {
   CheckoutHooks["OnOrderSubmitStart"] = "checkout:onOrderSubmitStart";
   CheckoutHooks["OnOrderSubmitEnd"] = "checkout:onOrderSubmitEnd";
   CheckoutHooks["OnWalletDataInitialized"] = "checkout:onWalletDataInitialized";
+  CheckoutHooks["OnPaymentItemAdded"] = "checkout:onPaymentItemAdded";
   return CheckoutHooks;
 }({});
 

package/dist/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/dist/solution/Checkout/utils/index.js

@@ -2,7 +2,6 @@ function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyri
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-import { CheckoutStatus, CheckoutStep } from "../types";
 import { PaymentMethodType } from "../../../modules/Payment/types";
 
 /**
@@ -58,61 +57,6 @@ export function createCheckoutError(type, message, details) {
   };
 }
 
-/**
- * 计算结账进度
- */
-export function calculateProgress(status, step) {
-  // 基于状态的基础进度
-  var baseProgress = 0;
-  switch (status) {
-    case CheckoutStatus.Initializing:
-      baseProgress = 5;
-      break;
-    case CheckoutStatus.Ready:
-      baseProgress = 10;
-      break;
-    case CheckoutStatus.CreatingOrder:
-      baseProgress = 25;
-      break;
-    case CheckoutStatus.OrderCreated:
-      baseProgress = 40;
-      break;
-    case CheckoutStatus.ProcessingPayment:
-      baseProgress = 65;
-      break;
-    case CheckoutStatus.PaymentCompleted:
-      baseProgress = 85;
-      break;
-    case CheckoutStatus.Completed:
-      baseProgress = 100;
-      break;
-    case CheckoutStatus.Cancelled:
-    case CheckoutStatus.Error:
-      baseProgress = 0;
-      break;
-    default:
-      baseProgress = 0;
-  }
-
-  // 基于步骤的额外进度
-  var stepProgress = 0;
-  switch (step) {
-    case CheckoutStep.OrderConfirmation:
-      stepProgress = 0;
-      break;
-    case CheckoutStep.PaymentMethod:
-      stepProgress = 10;
-      break;
-    case CheckoutStep.PaymentProcessing:
-      stepProgress = 15;
-      break;
-    case CheckoutStep.Complete:
-      stepProgress = 0; // 已经在状态中体现
-      break;
-  }
-  return Math.min(100, baseProgress + stepProgress);
-}
-
 /**
  * 格式化金额
  */
@@ -546,4 +490,22 @@ export function shouldSyncOrderForPayment(paymentCode, paymentType) {
 
   // 其他支付方式都需要同步
   return true;
+}
+
+/**
+ * 判断是否为现金支付
+ * 
+ * @param paymentCode 支付方式代码
+ * @param paymentType 支付方式类型
+ * @returns 是否为现金支付
+ */
+export function isCashPayment(paymentCode, paymentType) {
+  var codeUpper = (paymentCode === null || paymentCode === void 0 ? void 0 : paymentCode.toUpperCase()) || '';
+  var typeUpper = (paymentType === null || paymentType === void 0 ? void 0 : paymentType.toUpperCase()) || '';
+
+  // 现金支付识别规则
+  var cashIdentifiers = ['CASH', 'CASHMANUAL', 'MANUAL'];
+  return cashIdentifiers.some(function (identifier) {
+    return codeUpper.includes(identifier) || typeUpper.includes(identifier);
+  });
 }

package/lib/modules/Order/index.js

@@ -273,6 +273,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         smallTicketDataFlag: orderData.small_ticket_data_flag
       });
       const response = await this.request.post("/order/checkout", orderData);
+      this.logInfo("Order API called successfully", {
+        response
+      });
       console.log("[Order] 订单创建成功，后端响应:", {
         success: !!response,
         hasOrderId: !!(((_q = response == null ? void 0 : response.data) == null ? void 0 : _q.order_id) || (response == null ? void 0 : response.order_id))
@@ -280,6 +283,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return response;
     } catch (error) {
       console.error("[Order] createOrderByCheckout 创建订单失败:", error);
+      this.logInfo("Order API called failed", {
+        error: error instanceof Error ? error.message : String(error)
+      });
       throw error;
     }
   }

package/lib/modules/Payment/index.js

@@ -323,15 +323,11 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       totalAmount: params.total_amount
     });
     try {
-      const existingOrders = await this.dbManager.getAll("order");
-      const existingOrder = existingOrders.find(
-        (order) => String(order.id) === String(params.order_id)
-      );
+      const existingOrder = await this.dbManager.get("order", params.order_id);
       if (existingOrder) {
         console.log(
           `[PaymentModule] 发现重复订单 ID: ${params.order_id}，更新现有支付订单`
         );
-        const originalOrder = { ...existingOrder };
         existingOrder.order_info = params.order_info;
         existingOrder.total_amount = params.total_amount;
         existingOrder.is_deposit = params.is_deposit || 0;
@@ -359,7 +355,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
           deposit_amount: params.deposit_amount || "0.00"
         };
         await this.dbManager.add("order", newOrder);
-        await this.core.effects.emit(import_types.PaymentHooks.OnOrderAdded, newOrder);
+        this.core.effects.emit(import_types.PaymentHooks.OnOrderAdded, newOrder);
         this.logInfo("createPaymentOrderAsync completed - new payment order created", {
           orderUuid: newOrder.uuid,
           orderId: newOrder.id

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

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 客户状态