From d03a20125852c40f4a9d118c6ce64b0c94f3b32a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 11 十月 2024 18:52:53 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 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 03b29e2..ef304ed 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
@@ -625,8 +625,8 @@
 			}
 		}
 		
-		electrovalence = electrovalence.setScale(2, RoundingMode.HALF_EVEN);
-		discountAmount = discountAmount.setScale(2, RoundingMode.HALF_EVEN);
+		electrovalence = electrovalence.setScale(4, RoundingMode.HALF_EVEN);
+		discountAmount = discountAmount.setScale(4, RoundingMode.HALF_EVEN);
 		chargingOrder.setChargeAmount(electrovalence);
 		chargingOrder.setVipDiscountAmount(discountAmount);
 		this.updateById(chargingOrder);
@@ -674,7 +674,7 @@
 		if(null != securityDetection){
 			PreChargeCheck preChargeCheck1 =  redisService.getCacheObject("AQJC_" + chargingOrder.getChargingGunId());
 			if(null != preChargeCheck1){
-				preChargeCheck1.setElectronicLockLock(preChargeCheck1.getElectronicLockLock());
+				preChargeCheck1.setElectronicLockLock(true);
 				preChargeCheck1.setInsulationTesting(true);
 				preChargeCheck1.setSecureConnectionDetection(preChargeCheck1.getSecureConnectionDetection());
 				preChargeCheck1.setStartupSuccess(1);
@@ -768,7 +768,7 @@
 		TChargingGun chargingGun = chargingGunClient.getChargingGunByCode(code).getData();
 		PreChargeCheck preChargeCheck1 = redisService.getCacheObject("AQJC_" + chargingGun.getId());
 		if(null != preChargeCheck1){
-			preChargeCheck1.setElectronicLockLock(preChargeCheck1.getElectronicLockLock());
+			preChargeCheck1.setElectronicLockLock(true);
 			preChargeCheck1.setInsulationTesting(true);
 			preChargeCheck1.setSecureConnectionDetection(preChargeCheck1.getSecureConnectionDetection());
 			preChargeCheck1.setStartupSuccess(1);
@@ -777,7 +777,7 @@
 	}
 	
 	/**
-	 * 启动充电应发
+	 * 启动充电应答
 	 * @param message
 	 */
 	@Override
@@ -791,7 +791,7 @@
 		String code = order.getCode();
 		PreChargeCheck preChargeCheck1 =  redisService.getCacheObject("AQJC_" + order.getChargingGunId());
 		if(null != preChargeCheck1){
-			preChargeCheck1.setElectronicLockLock(preChargeCheck1.getElectronicLockLock());
+			preChargeCheck1.setElectronicLockLock(true);
 			preChargeCheck1.setInsulationTesting(true);
 			preChargeCheck1.setSecureConnectionDetection(preChargeCheck1.getSecureConnectionDetection());
 			preChargeCheck1.setStartupSuccess(1);
@@ -1043,8 +1043,8 @@
 				query.setEnd_time(chargingOrder.getEndTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
 				PlatformStopChargingReply reply = platformStopChargingReplyClient.getPlatformStopChargingReply(query).getData();
 				log.error(code1 + ":-------------------查询远程停止充电应答-------------------");
-				log.error(reply.toString());
 				if(null == reply){
+					log.error(code1 + ":-------------------远程停止充电应答无数据-------------------");
 					try {
 						Thread.sleep(1000);
 					} catch (InterruptedException e) {
@@ -1052,7 +1052,7 @@
 					}
 					continue;
 				}
-				
+				log.error(reply.toString());
 				TChargingOrder chargingOrder1 = this.getById(id);
 				if(chargingOrder1.getStatus() != 3){
 					break;

--
Gitblit v1.7.1