@pisell/pisellos 0.0.261 → 0.0.263

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

@@ -438,6 +438,12 @@ export interface CheckoutModuleAPI extends Module {
      * 修改当前订单的定金状态
      */
     updateOrderDepositStatusAsync(isDeposit: number): Promise<void>;
+    /**
+     * 手动设置当前订单的定金金额
+     *
+     * @param depositAmount 定金金额，必须是有效的数字字符串，且不能超过订单总额
+     */
+    setDepositAmountAsync(depositAmount: string): Promise<void>;
     /**
      * 手动同步订单到后端
      *

package/lib/modules/Payment/index.js

@@ -324,9 +324,12 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     });
     try {
       const existingOrder = await this.dbManager.get("order", params.order_id);
+      this.logInfo("createPaymentOrderAsync existingOrder", {
+        existingOrder
+      });
       if (existingOrder) {
-        console.log(
-          `[PaymentModule] 发现重复订单 ID: ${params.order_id}，更新现有支付订单`
+        this.logInfo(
+          `createPaymentOrderAsync found duplicate order ID: ${params.order_id}, updating existing payment order`
         );
         existingOrder.order_info = params.order_info;
         existingOrder.total_amount = params.total_amount;

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

@@ -182,6 +182,16 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * @throws 当前没有活跃订单时抛出错误
      */
     updateOrderDepositStatusAsync(isDeposit: number): Promise<void>;
+    /**
+     * 手动设置当前订单的定金金额
+     *
+     * 允许手动设置订单的定金金额，通常用于用户自定义定金支付场景
+     *
+     * @param depositAmount 定金金额，必须是有效的数字字符串，且不能超过订单总额
+     * @throws 当前没有活跃订单时抛出错误
+     * @throws 定金金额格式无效或超过订单总额时抛出错误
+     */
+    setDepositAmountAsync(depositAmount: string): Promise<void>;
     /**
      * 手动同步订单到后端
      *

package/lib/solution/Checkout/index.js

@@ -222,8 +222,14 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
   }
   async initWalletData(params) {
     var _a, _b, _c, _d;
+    this.logInfo("initWalletData called", {
+      params
+    });
     const amountInfo = (_b = (_a = this.store.currentOrder) == null ? void 0 : _a.order_info) == null ? void 0 : _b.amount_breakdown;
     if (!amountInfo) {
+      this.logInfo("initWalletData amountInfo not found", {
+        params
+      });
       return;
     }
     const walletBusinessData = {
@@ -235,12 +241,21 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       products: this.getProductListByOrder(),
       ...params
     };
+    this.logInfo("开始拉取:initializeWalletDataFromBusinessAsync", {
+      walletBusinessData
+    });
     await this.payment.wallet.initializeWalletDataFromBusinessAsync(
       walletBusinessData
     );
+    this.logInfo("调用结束:initializeWalletDataFromBusinessAsync", {
+      walletBusinessData
+    });
     if (!this.store.currentOrder) {
       return;
     }
+    this.logInfo("initWalletData currentOrder found", {
+      currentOrder: this.store.currentOrder
+    });
     await this.core.effects.emit(import_types.CheckoutHooks.OnWalletDataInitialized, {
       orderUuid: (_d = this.store.currentOrder) == null ? void 0 : _d.uuid,
       customerId: walletBusinessData.customer_id,
@@ -318,7 +333,6 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         }
       });
       this.store.currentOrder = paymentOrder;
-      this.initWalletData();
       if (params.autoPayment) {
       }
       this.core.effects.emit(import_types.CheckoutHooks.OnOrderCreated, {
@@ -334,12 +348,14 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         taxAmount: amountInfo.taxAmount,
         stateAmount: this.store.stateAmount
       });
+      this.initWalletData();
       return paymentOrder;
     } catch (error) {
       await this.handleError(
         error,
         import_types.CheckoutErrorType.OrderCreationFailed
       );
+      this.logError("本地订单创建失败:", error);
       this.core.effects.emit(import_types.CheckoutHooks.OnOrderCreationFailed, {
         error: this.store.lastError,
         timestamp: Date.now()
@@ -897,6 +913,107 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
+  /**
+   * 手动设置当前订单的定金金额
+   *
+   * 允许手动设置订单的定金金额，通常用于用户自定义定金支付场景
+   *
+   * @param depositAmount 定金金额，必须是有效的数字字符串，且不能超过订单总额
+   * @throws 当前没有活跃订单时抛出错误
+   * @throws 定金金额格式无效或超过订单总额时抛出错误
+   */
+  async setDepositAmountAsync(depositAmount) {
+    var _a, _b;
+    this.logInfo("setDepositAmountAsync called", {
+      depositAmount,
+      hasCurrentOrder: !!this.store.currentOrder,
+      currentOrderId: (_a = this.store.currentOrder) == null ? void 0 : _a.order_id,
+      currentTotalAmount: (_b = this.store.currentOrder) == null ? void 0 : _b.total_amount
+    });
+    try {
+      const depositValue = new import_decimal.default(depositAmount);
+      if (depositValue.isNaN() || depositValue.lt(0)) {
+        throw (0, import_utils.createCheckoutError)(
+          import_types.CheckoutErrorType.ValidationFailed,
+          `无效的定金金额格式: ${depositAmount}`
+        );
+      }
+      if (!this.store.currentOrder) {
+        throw (0, import_utils.createCheckoutError)(
+          import_types.CheckoutErrorType.ValidationFailed,
+          "未找到当前订单，无法设置定金金额"
+        );
+      }
+      const totalAmount = new import_decimal.default(this.store.currentOrder.total_amount || "0");
+      if (depositValue.gt(totalAmount)) {
+        throw (0, import_utils.createCheckoutError)(
+          import_types.CheckoutErrorType.ValidationFailed,
+          `定金金额 ${depositAmount} 不能超过订单总额 ${totalAmount.toFixed(2)}`
+        );
+      }
+      const formattedDepositAmount = depositValue.toFixed(2);
+      const oldDepositAmount = this.store.currentOrder.deposit_amount || "0.00";
+      if (formattedDepositAmount === oldDepositAmount) {
+        this.logInfo("定金金额无变化，跳过更新:", {
+          currentAmount: oldDepositAmount,
+          newAmount: formattedDepositAmount
+        });
+        return;
+      }
+      this.logInfo("开始设置订单定金金额:", {
+        orderUuid: this.store.currentOrder.uuid,
+        orderId: this.store.currentOrder.order_id,
+        oldDepositAmount,
+        newDepositAmount: formattedDepositAmount,
+        totalAmount: totalAmount.toFixed(2)
+      });
+      const updateParams = {
+        deposit_amount: formattedDepositAmount
+      };
+      if (depositValue.gt(0) && this.store.currentOrder.is_deposit !== 1) {
+        updateParams.is_deposit = 1;
+        this.logInfo("定金金额大于0，自动设置为定金订单");
+      } else if (depositValue.eq(0) && this.store.currentOrder.is_deposit === 1) {
+        updateParams.is_deposit = 0;
+        this.logInfo("定金金额为0，自动设置为全款订单");
+      }
+      await this.payment.updateOrderAsync(
+        this.store.currentOrder.uuid,
+        updateParams
+      );
+      this.store.currentOrder = {
+        ...this.store.currentOrder,
+        ...updateParams
+      };
+      if (this.store.localOrderData) {
+        if ("deposit_amount" in this.store.localOrderData) {
+          this.store.localOrderData.deposit_amount = formattedDepositAmount;
+        }
+        if (updateParams.is_deposit !== void 0) {
+          this.store.localOrderData.is_deposit = updateParams.is_deposit;
+        }
+      }
+      await this.core.effects.emit(import_types.CheckoutHooks.OnOrderCreated, {
+        order: this.store.currentOrder,
+        timestamp: Date.now()
+      });
+      this.logInfo("订单定金金额设置成功:", {
+        orderUuid: this.store.currentOrder.uuid,
+        orderId: this.store.currentOrder.order_id,
+        oldDepositAmount,
+        newDepositAmount: formattedDepositAmount,
+        isDeposit: this.store.currentOrder.is_deposit,
+        totalAmount: this.store.currentOrder.total_amount
+      });
+    } catch (error) {
+      this.logError("设置订单定金金额失败:", error);
+      await this.handleError(
+        error,
+        import_types.CheckoutErrorType.ValidationFailed
+      );
+      throw error;
+    }
+  }
   /**
    * 手动同步订单到后端
    *
@@ -1615,7 +1732,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
    * @returns 包含订单ID、UUID和完整后端响应的对象
    */
   async syncOrderToBackendWithReturn(isManual = false, customPaymentItems) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     if (!this.store.localOrderData || !this.store.currentOrder) {
       throw new Error("缺少必要的订单数据，无法同步到后端");
     }
@@ -1641,6 +1758,8 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         }
       };
     });
+    let finalDepositAmount;
+    const manualDepositAmount = ((_a = this.store.currentOrder) == null ? void 0 : _a.deposit_amount) || "0.00";
     const depositPaymentItems = processedPaymentItems.filter(
       (item) => item.order_payment_type === "deposit" && item.status !== "voided"
     );
@@ -1650,7 +1769,31 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       const effectiveAmount = amount.add(roundingAmount.abs());
       return sum.add(effectiveAmount);
     }, new import_decimal.default(0)).toFixed(2);
-    this.logInfo("计算定金支付项总金额", {
+    const manualDepositValue = new import_decimal.default(manualDepositAmount);
+    const calculatedDepositValue = new import_decimal.default(calculatedDepositAmount);
+    if (manualDepositValue.gt(0)) {
+      finalDepositAmount = manualDepositAmount;
+      this.logInfo("使用手动设置的定金金额", {
+        manualDepositAmount,
+        calculatedDepositAmount,
+        reason: "用户通过setDepositAmountAsync手动设置了定金金额"
+      });
+    } else if (calculatedDepositValue.gt(0)) {
+      finalDepositAmount = calculatedDepositAmount;
+      this.logInfo("使用从支付项计算的定金金额", {
+        manualDepositAmount,
+        calculatedDepositAmount,
+        reason: "未手动设置定金金额，从定金类型支付项计算得出"
+      });
+    } else {
+      finalDepositAmount = "0.00";
+      this.logInfo("定金金额为0", {
+        manualDepositAmount,
+        calculatedDepositAmount,
+        reason: "手动设置和计算值均为0"
+      });
+    }
+    this.logInfo("定金金额确定结果", {
       depositPaymentItemsCount: depositPaymentItems.length,
       depositPaymentItems: depositPaymentItems.map((item) => ({
         uuid: item.uuid,
@@ -1660,8 +1803,10 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         order_payment_type: item.order_payment_type,
         status: item.status
       })),
+      manualDepositAmount,
       calculatedDepositAmount,
-      originalDepositAmount: ((_a = this.store.currentOrder) == null ? void 0 : _a.deposit_amount) || "0.00"
+      finalDepositAmount,
+      isDeposit: ((_b = this.store.currentOrder) == null ? void 0 : _b.is_deposit) || 0
     });
     const orderParams = {
       ...this.store.localOrderData,
@@ -1669,7 +1814,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       platform: this.store.localOrderData.platform,
       payments: processedPaymentItems,
       // 使用处理过的支付项数据
-      customer_id: (_b = this.store.currentCustomer) == null ? void 0 : _b.customer_id,
+      customer_id: (_c = this.store.currentCustomer) == null ? void 0 : _c.customer_id,
       // 添加客户ID
       is_price_include_tax: this.otherParams.is_price_include_tax,
       // core 有
@@ -1682,9 +1827,9 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       currency_code: this.otherParams.currency_code,
       currency_symbol: this.otherParams.currency_symbol,
       currency_format: this.otherParams.currency_format,
-      is_deposit: ((_c = this.store.currentOrder) == null ? void 0 : _c.is_deposit) || 0,
-      deposit_amount: calculatedDepositAmount,
-      // 使用从支付项中计算出的定金金额
+      is_deposit: ((_d = this.store.currentOrder) == null ? void 0 : _d.is_deposit) || 0,
+      deposit_amount: finalDepositAmount,
+      // 使用最终确定的定金金额（手动设置优先）
       product_tax_fee: this.store.localOrderData.tax_fee,
       note: this.store.localOrderData.shop_note
     };
@@ -1737,7 +1882,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         orderUuid: this.store.currentOrder.uuid,
         operation: isUpdateOperation ? "update" : "create",
         isManual,
-        orderId: submitSuccess ? ((_d = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _d.order_id) || (checkoutResponse == null ? void 0 : checkoutResponse.order_id) : void 0,
+        orderId: submitSuccess ? ((_e = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _e.order_id) || (checkoutResponse == null ? void 0 : checkoutResponse.order_id) : void 0,
         error: submitError,
         duration: Date.now() - startTime,
         timestamp: Date.now()
@@ -1763,7 +1908,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     if (isUpdateOperation) {
       realOrderId = currentOrderId;
     } else {
-      let extractedOrderId = (_e = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _e.order_id;
+      let extractedOrderId = (_f = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _f.order_id;
       if (!extractedOrderId) {
         extractedOrderId = checkoutResponse == null ? void 0 : checkoutResponse.order_id;
       }

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

@@ -438,6 +438,12 @@ export interface CheckoutModuleAPI extends Module {
      * 修改当前订单的定金状态
      */
     updateOrderDepositStatusAsync(isDeposit: number): Promise<void>;
+    /**
+     * 手动设置当前订单的定金金额
+     *
+     * @param depositAmount 定金金额，必须是有效的数字字符串，且不能超过订单总额
+     */
+    setDepositAmountAsync(depositAmount: string): Promise<void>;
     /**
      * 手动同步订单到后端
      *

package/package.json

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