From a9de601f87f633f71b6e531da0b61da8665d6383 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 10 十月 2024 09:04:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 89 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 80 insertions(+), 9 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index a4206d6..f479f12 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -38,7 +38,7 @@
import com.ruoyi.order.api.query.SettlementListQuery;
import com.ruoyi.order.api.query.UploadRealTimeMonitoringDataQuery;
import com.ruoyi.order.api.vo.*;
-import com.ruoyi.order.api.vo.SecurityDetection;
+import com.ruoyi.order.api.vo.PlatformStopChargingReplyVO;
import com.ruoyi.order.dto.*;
import com.ruoyi.order.mapper.TChargingOrderMapper;
import com.ruoyi.order.mapper.TSettlementConfirmMapper;
@@ -627,6 +627,9 @@
}
}
}
+
+ electrovalence = electrovalence.setScale(2, RoundingMode.HALF_EVEN);
+ discountAmount = discountAmount.setScale(2, RoundingMode.HALF_EVEN);
chargingOrder.setChargeAmount(electrovalence);
chargingOrder.setVipDiscountAmount(discountAmount);
this.updateById(chargingOrder);
@@ -762,7 +765,7 @@
* @param securityDetection
*/
@Override
- public void securityDetection(SecurityDetection securityDetection){
+ public void securityDetection(SecurityDetectionVO securityDetection){
GetChargingGunByCode code = new GetChargingGunByCode();
code.setCharging_pile_code(securityDetection.getCharging_pile_code());
code.setCharging_gun_code(securityDetection.getCharging_gun_code());
@@ -782,7 +785,7 @@
* @param message
*/
@Override
- public void startChargeSuccessfully(PlatformStartChargingReplyMessage message) {
+ public void startChargeSuccessfully(PlatformStartChargingReplyMessageVO message) {
Integer startup_result = message.getStartup_result();
Integer failure_cause = message.getFailure_cause();
TChargingOrder order = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getCode, message.getTransaction_serial_number()));
@@ -955,9 +958,13 @@
public AjaxResult stopCharging(String id) {
TChargingOrder chargingOrder = this.getById(id);
Integer status = chargingOrder.getStatus();
+ if(status != 3){
+ return AjaxResult.error("还未开始充电");
+ }
if(status == 4 || status == 5){
return AjaxResult.error("不能重复操作");
}
+ chargingOrder.setEndTime(LocalDateTime.now());
chargingOrder.setStatus(4);
chargingOrder.setEndMode(1);
this.updateById(chargingOrder);
@@ -1018,7 +1025,7 @@
}
}
}
-
+ String code1 = chargingOrder.getCode();
//异步线程处理停机
ExecutorService cachedThreadPool = Executors.newFixedThreadPool(1);
@@ -1030,12 +1037,17 @@
platformStopCharging.setCharging_pile_code(chargingPile.getCode());
platformStopCharging.setCharging_gun_code(chargingGun.getCode());
sendMessageClient.platformStopCharging(platformStopCharging);
+ log.error(code1 + "：-------------------远程停止充电请求-------------------");
+ log.error(platformStopCharging.toString());
//开始查询停机应答，成功后开始计费费用
for (int i = 0; i < 60; i++) {
GetPlatformStopChargingReply query = new GetPlatformStopChargingReply();
query.setCharging_gun_code(chargingGun.getCode());
query.setCharging_pile_code(chargingPile.getCode());
+ query.setEnd_time(chargingOrder.getEndTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
PlatformStopChargingReply reply = platformStopChargingReplyClient.getPlatformStopChargingReply(query).getData();
+ log.error(code1 + "：-------------------查询远程停止充电应答-------------------");
+ log.error(reply.toString());
if(null == reply){
try {
Thread.sleep(1000);
@@ -1044,7 +1056,12 @@
}
continue;
}
-
+
+ TChargingOrder chargingOrder1 = this.getById(id);
+ if(chargingOrder1.getStatus() != 3){
+ break;
+ }
+
if(0 == reply.getStop_result()){
String failure_cause = "";
switch (reply.getFailure_cause()){
@@ -1061,8 +1078,13 @@
failure_cause = "其他";
break;
}
- log.error("停机失败：订单号：{}，失败原因：{}", chargingOrder.getCode(), failure_cause);
- throw new RuntimeException(failure_cause);
+ log.error(code1 + "：停机失败：订单号：{}，失败原因：{}", chargingOrder.getCode(), failure_cause);
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ continue;
}
// 将枪状态重置为空闲
@@ -1070,6 +1092,7 @@
chargingGunClient.updateChargingGunById(chargingGun);
//计算费用，处理退款
endCharge(chargingOrder);
+ log.error(code1 + "：-------------------远程停止充电请求成功-------------------");
break;
}
});
@@ -1126,8 +1149,56 @@
return AjaxResult.success();
}
-
-
+
+
+
+ /**
+ * 停止充电应答结果处理
+ * @param platformStopChargingReply
+ */
+ @Override
+ public void terminateSuccessfulResponse(PlatformStopChargingReplyVO platformStopChargingReply){
+ GetChargingGunByCode code = new GetChargingGunByCode();
+ code.setCharging_gun_code(platformStopChargingReply.getCharging_gun_code());
+ code.setCharging_pile_code(platformStopChargingReply.getCharging_pile_code());
+ TChargingGun chargingGun = chargingGunClient.getChargingGunByCode(code).getData();
+ TChargingOrder order = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getChargingGunId, chargingGun.getId())
+ .orderByDesc(TChargingOrder::getEndTime).eq(TChargingOrder::getRechargePaymentStatus, 2).last(" limit 0, 1"));
+ if(null != order && order.getStatus() != 3){
+ return;
+ }
+ String code1 = order.getCode();
+ if(0 == platformStopChargingReply.getStop_result()){
+ String failure_cause = "";
+ switch (platformStopChargingReply.getFailure_cause()){
+ case 0:
+ failure_cause = "无";
+ break;
+ case 1:
+ failure_cause = "设备编号不匹配";
+ break;
+ case 2:
+ failure_cause = "枪未处于充电状态";
+ break;
+ case 3:
+ failure_cause = "其他";
+ break;
+ }
+ log.error(code1 + "：停机失败：订单号：{}，失败原因：{}", order.getCode(), failure_cause);
+ return;
+ }
+
+ // 将枪状态重置为空闲
+ chargingGun.setStatus(2);
+ chargingGunClient.updateChargingGunById(chargingGun);
+ //计算费用，处理退款
+ endCharge(order);
+ }
+
+
+
+
+
/**
* 手动结束后的费用计算和退款逻辑
*/
--
Gitblit v1.7.1