From d0b83b31dba32844fc6fe8ff84afa0d960e18de7 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 12 二月 2025 16:09:01 +0800
Subject: [PATCH] bug修改

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 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 88a7fa5..098dd01 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
@@ -396,7 +396,7 @@
 				if(null != data){
 					//支付失败,删除无效的订单
 					String tradeStatus = data.getTradeStatus();
-					if(tradeStatus.equals("TRADE_CLOSED")){
+					if(null != tradeStatus && tradeStatus.equals("TRADE_CLOSED")){
 						this.removeById(tChargingOrder.getId());
 					}
 				}
@@ -1212,7 +1212,7 @@
 			endTime2 = split[1];
 		}
 		PageInfo<ChargingOrderVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
-		PageInfo<ChargingOrderVO> pageInfo1 = new PageInfo<>(1,9999999);
+		PageInfo<ChargingOrderVO> pageInfo1 = new PageInfo<>(1,999999999);
 
 		if (StringUtils.hasLength(dto.getPhone())){
 			List<Long> data = appUserClient.getUserIdsByPhone(dto.getPhone()).getData();
@@ -2194,7 +2194,7 @@
 			Integer soc = uploadRealTimeMonitoringData.getSoc();
 			if(soc > 98){
 				order.setEndMode(2);
-			}else if(order.getResidualAmount().compareTo(new BigDecimal(1)) <= 0){
+			}else if(chargingOrder.getResidualAmount().compareTo(new BigDecimal(1)) <= 0){
 				order.setEndMode(3);
 			}else{
 				order.setEndMode(0);

--
Gitblit v1.7.1