From d08aab9abf24fd6319a2d54d9c252745f111f275 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 26 八月 2022 15:14:22 +0800
Subject: [PATCH] 充电桩FIX
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java
index 8f16fd1..c6976da 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java
@@ -37,6 +37,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.Date;
@@ -390,17 +391,17 @@
/**
- * 鍏呯數妗╂晠闅滄儏鍐典笅,缁撴灉鏁呴殰鍓嶆鍦ㄨ繘琛屼腑鐨勮鍗�
+ * 鍏呯數妗╂晠闅滄儏鍐典笅,缁撴潫鏁呴殰鍓嶆鍦ㄨ繘琛屼腑鐨勮鍗�
*
* @param dataPackage
*/
- public void stopCharingOrder(String c3Mac, A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage dataPackage) {
- if (c3Mac.isEmpty() || c3Mac == null || dataPackage == null) {
+ public void stopCharingOrder(A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage dataPackage) {
+ if (dataPackage == null) {
return;
}
//鑾峰彇姝ｅ湪杩涜涓殑璁㈠崟
C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class)
- .eq(C3mOrder::getC3Mac, c3Mac).eq(C3mOrder::getChargingStates, 0)
+ .eq(C3mOrder::getC3Mac, dataPackage.getC3Mac()).eq(C3mOrder::getChargingStates, 0)
.eq(C3mOrder::getOrderStatus, OrderStatus.PAYED.getStatus()).last("limit 1"));
//璁㈠崟鏈粨鏉�,浣嗘槸鍏呯數妗╀负绌洪棽鐘舵��(鍗冲厖鐢垫々鏂數/鏁呴殰鎯呭喌) 缁撴潫璇ヨ鍗�
if ("1".equals(dataPackage.getStatusBit()) && c3mOrder != null) {
@@ -422,4 +423,37 @@
}
}
+ /**
+ * 鍒锋柊鍏呯數涓鍗曚俊鎭�
+ *
+ * @param aPackage
+ */
+ public void orderProcess(A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage) {
+
+ String c3Mac = aPackage.getC3Mac();
+ //缁撴潫鍏呯數 鏇存敼璁㈠崟鐘舵��
+ C3mOrder lastOrderByC3Mac = SpringContextHolder.getBean(C3mOrderService.class).getLastOrderByC3Mac(c3Mac);
+ if (lastOrderByC3Mac != null) {
+ //璁剧疆璁㈠崟鐘舵�佷负宸插畬鎴�
+ lastOrderByC3Mac.setOrderStatus(OrderStatus.COMPLETE.getStatus());
+
+ BigDecimal actualChargingCapacity = BigDecimal.valueOf(lastOrderByC3Mac.getActualChargingCapacity());
+ BigDecimal actualChargingCapacityHide = BigDecimal.valueOf(lastOrderByC3Mac.getActualChargingCapacityHide());
+ //璁剧疆瀹為檯鍏呯數鐢甸噺
+ lastOrderByC3Mac.setActualChargingCapacity(actualChargingCapacity.add(actualChargingCapacityHide).doubleValue());
+ //璁剧疆璁㈠崟缁撴潫鏃堕棿
+ lastOrderByC3Mac.setStopChargingTimestamp(System.currentTimeMillis());
+ lastOrderByC3Mac.setActualChargingCapacity(0.00);
+ //璁剧疆璁㈠崟鐘舵�佷负鍏呯數缁撴潫
+ lastOrderByC3Mac.setChargingStates(1);
+ //璁剧疆鍓╀綑閲戦
+ lastOrderByC3Mac.setSurplusAmount(Double.parseDouble(aPackage.getRemainingAmount()));
+ //璁剧疆閫�娆鹃噾棰�
+ lastOrderByC3Mac.setRefundAmount(Double.parseDouble(aPackage.getRemainingAmount()));
+ //鍏呯數鏃堕暱
+ lastOrderByC3Mac.setAlreadyChargingTime(aPackage.getAlreadyChargingTime());
+ SpringContextHolder.getBean(C3mOrderService.class).updateById(lastOrderByC3Mac);
+ }
+ }
+
}
--
Gitblit v1.9.3