From eee291d4c08cca7d5676845eb1c3b829915aaea9 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Tue, 28 May 2024 09:06:16 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=98=BE=E7=A4=BA=E5=B7=B2=E5=85=85?=
 =?UTF-8?q?=E7=94=B5=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jsowell/service/OrderService.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
index bfae60e7d..bd4f4c280 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
@@ -625,7 +625,11 @@ public class OrderService {
             BeanUtils.copyBeanProp(billingDetails, orderDetail);
             vo.setBillingDetails(billingDetails);
             if (StringUtils.equals(OrderStatusEnum.ORDER_COMPLETE.getValue(), orderStatus)) {
-                vo.setChargingDegree(String.valueOf(orderDetail.getTotalUsedElectricity()));
+                BigDecimal totalUsedElectricity = orderDetail.getTotalUsedElectricity();
+                if (totalUsedElectricity != null && StringUtils.isNotBlank(vo.getChargingAmount())
+                        && totalUsedElectricity.compareTo(new BigDecimal(vo.getChargingAmount())) > 0) {
+                    vo.setChargingDegree(String.valueOf(totalUsedElectricity));
+                }
             }
         }