From 7983ce4db5c7bfcda3f5b28efe79ef82b83c53fa Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 24 八月 2022 15:35:33 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java
index 3d6c011..ca7976f 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java
@@ -12,7 +12,6 @@
import com.sandu.ximon.admin.service.*;
import com.sandu.ximon.admin.utils.LogUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
-import com.sandu.ximon.dao.domain.C3mCharging;
import com.sandu.ximon.dao.domain.C3mOrder;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.enums.OrderStatus;
@@ -73,11 +72,11 @@
if (codeRequestFrame.isValidate()) {
if (deviceName != null) {
- C3mCharging c3mCharging = SpringContextHolder.getBean(C3ChargingService.class).
- getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, codeRequestFrame.getDestinationAddress()).last("limit 1"));
- if (c3mCharging == null) {
- SpringContextHolder.getBean(C3ChargingService.class).saveReporEquipment(deviceName, codeRequestFrame.getMcuUdid(), codeRequestFrame.getDestinationAddress());
- }
+// C3mCharging c3mCharging = SpringContextHolder.getBean(C3ChargingService.class).
+// getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, codeRequestFrame.getDestinationAddress()).last("limit 1"));
+// if (c3mCharging == null) {
+// SpringContextHolder.getBean(C3ChargingService.class).saveReporEquipment(deviceName, codeRequestFrame.getMcuUdid(), codeRequestFrame.getDestinationAddress());
+// }
//璁剧疆浜岀淮鐮�
Pole pole = SpringContextHolder.getBean(PoleService.class).getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, deviceName));
@@ -174,6 +173,10 @@
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