From 7d6e1271ecd1b386c409c910df866aa8cccb46c2 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 26 八月 2022 14:08:13 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java | 42 +++++++++++++++++-------------------------
1 files changed, 17 insertions(+), 25 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 06cf5df..801027f 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
@@ -149,7 +149,7 @@
Integer subscribeChargingCapacity, String wxCode) {
//鏌ヨ鍏呯數妗╂槸鍚﹀瓨鍦ㄦ鍦ㄨ繘琛屼腑鐨勮鍗�
C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class)
- .eq(C3mOrder::getC3Udid, c3m.getMcuUdid()).last("limit 1"));
+ .eq(C3mOrder::getC3Udid, c3m.getMcuUdid()).eq(C3mOrder::getC3Mac, c3m.getC3Mac()).last("limit 1"));
//鍏呯數妗╂鍦ㄥ厖鐢典腑
if (c3mOrder != null && c3mOrder.getChargingStates() != null && c3mOrder.getChargingStates() == 0) {
@@ -362,27 +362,6 @@
remove(Wrappers.lambdaQuery(C3mOrder.class).lt(C3mOrder::getCreateTimestamp, timeMinus10).eq(C3mOrder::getOrderStatus, 0));
}
- /**
- * 鎭㈠缁х画鍏呯數
- *
- * @param c3Mac
- * @param mcuUdid
- */
- public void recoverContinueCharing(String c3Mac, String mcuUdid) {
- C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class).
- eq(C3mOrder::getC3Mac, c3Mac).eq(C3mOrder::getC3Udid, mcuUdid).eq(C3mOrder::getChargingStates, 0).last("limit 1"));
- if (c3mOrder != null) {
- c3mOrder.setActualChargingCapacity(c3mOrder.getActualChargingCapacityHide());
- c3mOrder.setActualChargingCapacityHide(0.00);
-
- //鍐嶆鍏呯數鐢甸噺
- double electricity = c3mOrder.getSubscribeChargingCapacity() - c3mOrder.getActualChargingCapacity();
- Integer chargingCapacity = Integer.valueOf(String.valueOf(Math.floor(electricity)));
- //鍐嶆鍏呯數閲戦
- double chargeAmount = c3mOrder.getSurplusAmount();
- SpringContextHolder.getBean(C3ChargingService.class).startCharging(c3Mac, chargingCapacity, chargeAmount);
- }
- }
/**
@@ -390,17 +369,30 @@
*
* @param dataPackage
*/
- public void stopCharingOrder(A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage dataPackage) {
+ public void stopCharingOrder(String c3Mac, A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage dataPackage) {
+ if (c3Mac.isEmpty() || c3Mac == null || dataPackage == null) {
+ return;
+ }
//鑾峰彇姝ｅ湪杩涜涓殑璁㈠崟
C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class)
- .eq(C3mOrder::getC3Mac, dataPackage.getC3Mac()).eq(C3mOrder::getChargingStates, 0)
+ .eq(C3mOrder::getC3Mac, c3Mac).eq(C3mOrder::getChargingStates, 0)
.eq(C3mOrder::getOrderStatus, OrderStatus.PAYED.getStatus()).last("limit 1"));
+ //璁㈠崟鏈粨鏉�,浣嗘槸鍏呯數妗╀负绌洪棽鐘舵��(鍗冲厖鐢垫々鏂數/鏁呴殰鎯呭喌) 缁撴潫璇ヨ鍗�
if ("1".equals(dataPackage.getStatusBit()) && c3mOrder != null) {
- //璁㈠崟鏈粨鏉�,浣嗘槸鍏呯數妗╀负绌洪棽鐘舵��(鍗冲厖鐢垫々鏂數/鏁呴殰鎯呭喌) 缁撴潫璇ヨ鍗�
//璁剧疆璁㈠崟涓哄凡瀹屾垚
c3mOrder.setOrderStatus(OrderStatus.COMPLETE.getStatus());
//璁剧疆鍏呯數鐘舵�佷负宸茬粨鏉�
c3mOrder.setChargingStates(1);
+ //璁剧疆鍏呯數鐢甸噺
+ c3mOrder.setActualChargingCapacity(Double.parseDouble(dataPackage.getChargedCapacity()));
+ //璁剧疆閫�娆鹃噾棰�
+ c3mOrder.setRefundAmount(Double.parseDouble(dataPackage.getRemainingAmount()));
+ //璁剧疆鍓╀綑閲戦
+ c3mOrder.setSurplusAmount(Double.parseDouble(dataPackage.getRemainingAmount()));
+ //缁撴潫鍏呯數(璁㈠崟)鏃堕棿
+ c3mOrder.setStopChargingTimestamp(System.currentTimeMillis());
+ //鍏呯數鏃堕暱
+ c3mOrder.setAlreadyChargingTime(dataPackage.getAlreadyChargingTime());
updateById(c3mOrder);
}
}
--
Gitblit v1.9.3