@pisell/pisellos 2.1.27 → 2.1.29

package/lib/modules/Payment/index.js

@@ -913,7 +913,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
           }
           const paymentAmount = new import_decimal.Decimal(payment.amount || 0);
           const roundingAmount = new import_decimal.Decimal(payment.rounding_amount || 0);
-          const effectiveAmount = paymentAmount.plus(roundingAmount.abs());
+          const effectiveAmount = paymentAmount.plus(roundingAmount.isNegative() ? roundingAmount.abs() : 0);
           return sum.plus(effectiveAmount);
         } catch (error) {
           console.warn(`[PaymentModule] 无效的支付金额: amount=${payment.amount}, rounding_amount=${payment.rounding_amount}，跳过计算`);
@@ -935,7 +935,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         code: p.code,
         amount: p.amount,
         rounding_amount: p.rounding_amount || "0.00",
-        effective_amount: new import_decimal.Decimal(p.amount || 0).plus(new import_decimal.Decimal(p.rounding_amount || 0).abs()).toFixed(2)
+        effective_amount: new import_decimal.Decimal(p.amount || 0).plus(new import_decimal.Decimal(Number(p.rounding_amount) > 0 ? 0 : p.rounding_amount || 0).abs()).toFixed(2)
       })),
       说明: "有效支付金额包含抹零计算（amount + |rounding_amount|）"
     });

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

@@ -310,6 +310,10 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * 计算剩余未支付金额（从 Payment 模块获取最新数据）
      */
     private calculateRemainingAmountAsync;
+    /**
+     * 计算剩余未支付金额（排除定金计算，始终使用订单总金额）
+     */
+    private calculateRemainingTotalAmountAsync;
     /**
      * 更新 balanceDueAmount 为当前剩余未支付金额（系统内部计算）
      */

package/lib/solution/Checkout/index.js

@@ -475,7 +475,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       );
       const paidAmount = activePayments.reduce((sum, p) => {
         const amt = new import_decimal.default(p.amount || "0");
-        const rounding = new import_decimal.default(p.rounding_amount || "0").abs();
+        const rounding = new import_decimal.default(Number(p.rounding_amount) > 0 ? 0 : p.rounding_amount || "0").abs();
         return sum.plus(amt).plus(rounding);
       }, new import_decimal.default(0));
       const remaining = import_decimal.default.max(0, totalAmount.minus(paidAmount)).toFixed(
@@ -524,14 +524,18 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       });
       const syncedAmount = activePayments.reduce((sum, p) => {
         const amt = new import_decimal.default(p.amount || "0");
-        const rounding = new import_decimal.default(p.rounding_amount || "0").abs();
+        const rounding = new import_decimal.default(Number(p.rounding_amount) > 0 ? 0 : p.rounding_amount || "0").abs();
         return sum.plus(amt).plus(rounding);
       }, new import_decimal.default(0));
       const remainingExpectAmount = import_decimal.default.max(0, totalAmount.minus(syncedAmount)).toFixed(
         2
       );
+      let depositDiffAmount = new import_decimal.default(0).toFixed(2);
+      if (updated.is_deposit === 1) {
+        depositDiffAmount = new import_decimal.default(updated.deposit_amount).minus(syncedAmount).toFixed(2);
+      }
       this.initWalletData({
-        order_wait_pay_amount: Number(remainingExpectAmount)
+        order_wait_pay_amount: Number(depositDiffAmount) > 0 ? Number(depositDiffAmount) : Number(remainingExpectAmount)
       });
       return updated;
     }
@@ -1094,7 +1098,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         console.log("[Checkout] 定金状态无变化，跳过更新");
         return;
       }
-      let deposit_amount = newDepositValue === 1 ? this.store.currentOrder.deposit_amount : "0.00";
+      let deposit_amount = this.store.currentOrder.deposit_amount || "0.00";
       if (!deposit_amount || Number(deposit_amount) === 0) {
         deposit_amount = this.store.currentOrder.expect_amount;
       }
@@ -1769,7 +1773,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       const paidAmount = payments.filter((payment) => payment.status !== "voided").reduce((sum, payment) => {
         const amount = new import_decimal.default(payment.amount || "0");
         const roundingAmount = new import_decimal.default(payment.rounding_amount || "0");
-        const effectiveAmount = amount.add(roundingAmount.abs());
+        const effectiveAmount = amount.add(roundingAmount.isNegative() ? roundingAmount.abs() : 0);
         console.log(`[Checkout] 计算支付项: ${payment.code}`, {
           originalAmount: amount.toFixed(2),
           roundingAmount: roundingAmount.toFixed(2),
@@ -1814,19 +1818,37 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     this.logInfo("calculateRemainingAmountAsync: 计算=", result);
     return result;
   }
+  /**
+   * 计算剩余未支付金额（排除定金计算，始终使用订单总金额）
+   */
+  async calculateRemainingTotalAmountAsync() {
+    if (!this.store.currentOrder) {
+      this.logWarning("calculateRemainingTotalAmountAsync: 没有当前订单");
+      return "0.00";
+    }
+    const totalAmount = new import_decimal.default(this.store.currentOrder.total_amount || "0");
+    const paidAmountStr = await this.calculatePaidAmountAsync();
+    const paidAmount = new import_decimal.default(paidAmountStr);
+    const remainingAmount = totalAmount.sub(paidAmount);
+    const result = import_decimal.default.max(0, remainingAmount).toFixed(2);
+    this.logInfo("calculateRemainingTotalAmountAsync: 计算=", result);
+    return result;
+  }
   /**
    * 更新 balanceDueAmount 为当前剩余未支付金额（系统内部计算）
    */
   async updateBalanceDueAmount() {
     try {
       const remainingAmount = await this.calculateRemainingAmountAsync();
+      const remainingTotalAmount = await this.calculateRemainingTotalAmountAsync();
       const currentBalanceDueAmount = this.store.balanceDueAmount;
       if (remainingAmount !== currentBalanceDueAmount) {
         this.store.balanceDueAmount = remainingAmount;
         await this.core.effects.emit(import_types.CheckoutHooks.OnBalanceDueAmountChanged, {
           oldAmount: currentBalanceDueAmount,
           newAmount: remainingAmount,
-          timestamp: Date.now()
+          timestamp: Date.now(),
+          totalAmount: remainingTotalAmount
         });
         this.logInfo("balanceDueAmount 已自动更新:", {
           oldAmount: currentBalanceDueAmount,
@@ -1860,7 +1882,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           }
           const amount = new import_decimal.default(item.amount || "0");
           const roundingAmount = new import_decimal.default(item.rounding_amount || "0");
-          return sum.add(amount.add(roundingAmount.abs()));
+          return sum.add(amount.add(roundingAmount.isNegative() ? roundingAmount.abs() : 0));
         }, new import_decimal.default(0));
         if (depositPaidAmount.gte((_c = this.store.currentOrder) == null ? void 0 : _c.deposit_amount)) {
           this.store.currentOrder = {
@@ -1873,13 +1895,15 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         }
       }
       const remainingAmount = await this.calculateRemainingAmountAsync();
+      const remainingTotalAmount = await this.calculateRemainingTotalAmountAsync();
       const currentStateAmount = this.store.stateAmount;
       if (remainingAmount !== currentStateAmount) {
         this.store.stateAmount = remainingAmount;
         this.core.effects.emit(import_types.CheckoutHooks.OnStateAmountChanged, {
           oldAmount: currentStateAmount,
           newAmount: remainingAmount,
-          timestamp: Date.now()
+          timestamp: Date.now(),
+          totalAmount: remainingTotalAmount
         });
         this.logInfo("stateAmount 已自动更新为剩余金额:", {
           oldAmount: currentStateAmount,
@@ -1946,7 +1970,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
             code: p.code,
             amount: p.amount,
             rounding_amount: p.rounding_amount,
-            effective_amount: (parseFloat(p.amount || "0") + Math.abs(parseFloat(p.rounding_amount || "0"))).toFixed(2),
+            effective_amount: (parseFloat(p.amount || "0") + Math.abs(parseFloat(Number(p.rounding_amount) > 0 ? "0" : p.rounding_amount || "0"))).toFixed(2),
             voucher_id: p.voucher_id,
             status: p.status
           }))
@@ -2024,6 +2048,24 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         reason: "手动设置和计算值均为0"
       });
     }
+    if (this.store.currentOrder.is_deposit === 0 && processedPaymentItems.every((item) => item.order_payment_type !== "deposit")) {
+      finalDepositAmount = "0.00";
+      this.store.currentOrder.is_deposit = 0;
+    }
+    if (this.store.currentOrder.is_deposit === 0 && processedPaymentItems.some((item) => item.order_payment_type === "deposit")) {
+      finalDepositAmount = processedPaymentItems.filter((item) => item.status !== "voided" && item.order_payment_type === "deposit").reduce((sum, item) => {
+        const amt = new import_decimal.default(item.amount || "0");
+        const rounding = new import_decimal.default(item.rounding_amount || "0");
+        return sum.plus(amt).sub(rounding);
+      }, new import_decimal.default(0)).toFixed(2);
+    }
+    if (this.store.currentOrder.is_deposit === 1 && new import_decimal.default(finalDepositAmount).gte(new import_decimal.default(this.store.currentOrder.total_amount))) {
+      finalDepositAmount = processedPaymentItems.filter((item) => item.status !== "voided" && item.order_payment_type === "deposit").reduce((sum, item) => {
+        const amt = new import_decimal.default(item.amount || "0");
+        const rounding = new import_decimal.default(item.rounding_amount || "0");
+        return sum.plus(amt).sub(rounding);
+      }, new import_decimal.default(0)).toFixed(2);
+    }
     this.logInfo("定金金额确定结果", {
       depositPaymentItemsCount: processedPaymentItems.length,
       depositPaymentItems: processedPaymentItems.map((item) => ({
@@ -2411,11 +2453,19 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
    * @returns 舍入结果详情，包含原始金额、舍入后金额和舍入差额
    */
   async roundAmountAsync(amount) {
-    var _a, _b;
+    var _a, _b, _c;
+    const cashManualPayment = this.store.paymentMethods.find((p) => p.code === "CASHMANUAL");
+    if (!((_a = cashManualPayment == null ? void 0 : cashManualPayment.metadata) == null ? void 0 : _a.order_rounding_switch)) {
+      return {
+        originalAmount: amount.toString(),
+        roundedAmount: amount.toString(),
+        roundingDifference: "0.00"
+      };
+    }
     const result = await this.payment.roundAmountAsync(
       amount,
-      (_a = this.otherParams.order_rounding_setting) == null ? void 0 : _a.interval,
-      (_b = this.otherParams.order_rounding_setting) == null ? void 0 : _b.type
+      (_b = this.otherParams.order_rounding_setting) == null ? void 0 : _b.interval,
+      (_c = this.otherParams.order_rounding_setting) == null ? void 0 : _c.type
     );
     return result;
   }

package/package.json

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