From 70c66f5e065b6d467812f8e702f87c2262bce67e Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 24 八月 2022 11:39:13 +0800
Subject: [PATCH] changes
---
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 403cd41..125a5e3 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
@@ -73,11 +73,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));
@@ -134,8 +134,10 @@
/**
* 淇濆瓨C3鍏呯數妗╂晠闅滄暟鎹�
*/
- if (errorCodeRequestFrame.isValidate() && (errorCodeRequestFrame.getErrorCode() != 0)) {
+ if (errorCodeRequestFrame.isValidate() && errorCodeRequestFrame.getErrorMessage() != null) {
SpringContextHolder.getBean(C3mReportErrorService.class).saveReportError(errorCodeRequestFrame);
+ } else {
+ System.out.println("鏁版嵁鏍￠獙寮傚父锛�");
}
} else if (C3ChargingEnum.StartCharging.getCode().equals(functionCode)) {
@@ -172,6 +174,7 @@
lastOrderByC3Mac.setChargingStates(1);
//璁剧疆鍓╀綑閲戦
lastOrderByC3Mac.setSurplusAmount(Double.parseDouble(aPackage.getRemainingAmount()));
+ lastOrderByC3Mac.setRefundAmount(Double.parseDouble(aPackage.getRemainingAmount()));
SpringContextHolder.getBean(C3mOrderService.class).updateById(lastOrderByC3Mac);
}
}
--
Gitblit v1.9.3