From e5b0ae1c197110d47c6a5ba4321c62a6a0a8c68e Mon Sep 17 00:00:00 2001
From: 18631081161 <2088094923@qq.com>
Date: Wed, 24 Dec 2025 00:23:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=A3=E9=87=91.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/services/commissionService.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/backend/src/services/commissionService.js b/backend/src/services/commissionService.js
index f48c3d3..e8e5442 100644
--- a/backend/src/services/commissionService.js
+++ b/backend/src/services/commissionService.js
@@ -37,8 +37,11 @@ const calculateCommission = async (paymentOrderId) => {
   // Get current commission rate
   const commissionRate = await commissionConfigService.getCommissionRate();
 
-  // Calculate commission amount
-  const paymentAmount = parseFloat(paymentOrder.amount);
+  // Calculate commission amount - use amountRmb if available, otherwise use amount
+  const paymentAmount = parseFloat(paymentOrder.amountRmb || paymentOrder.amount || 0);
+  if (paymentAmount <= 0) {
+    return null; // No valid payment amount
+  }
   const commissionAmount = paymentAmount * commissionRate;
 
   // Start transaction