From 1d5c4e55dcfb032948296e2508e8c04960d02b1f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 19 七月 2025 23:05:24 +0800
Subject: [PATCH] 添加微服务监控

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index 01740da..83734ad 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -2542,10 +2542,10 @@
 				Integer soc = uploadRealTimeMonitoringData.getSoc();
 				if (soc >= 98) {
 					chargingOrder.setEndMode(2);
-				} else if (chargingOrder.getResidualAmount().compareTo(new BigDecimal(1)) <= 0) {
+				} else if (null != chargingOrder.getResidualAmount() && chargingOrder.getResidualAmount().compareTo(new BigDecimal(1)) <= 0) {
 					chargingOrder.setEndMode(3);
 				} else {
-					chargingOrder.setEndMode(0);
+					chargingOrder.setEndMode(1);
 				}
 			}
 			chargingOrder.setResidualAmount(rechargeAmount.subtract(total).setScale(2, RoundingMode.HALF_EVEN));

--
Gitblit v1.7.1