From 1c5825ad257362eb61a6c11b62a158011214d105 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 25 八月 2022 18:31:15 +0800
Subject: [PATCH] changes
---
dao/src/main/java/com/sandu/ximon/dao/domain/C3mOrder.java | 2 ++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java | 17 ++++++++++++++---
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/C3mOrder.java b/dao/src/main/java/com/sandu/ximon/dao/domain/C3mOrder.java
index f0e1469..e6bbe72 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/C3mOrder.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/C3mOrder.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import java.io.Serializable;
@@ -96,6 +97,7 @@
/**
* 瀹炲厖鐢甸噺 鍚庣璁＄畻鐢� 涓昏鐢ㄤ簬寮傚父鎯呭喌涓嬬殑鍏呯數鐢甸噺璁板綍
*/
+ @JsonIgnore
private Double actualChargingCapacityHide;
/**
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..8ce4eab 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
@@ -390,17 +390,28 @@
*
* @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());
updateById(c3mOrder);
}
}
--
Gitblit v1.9.3