From 88f8a06039ddb14cb1c8ac0c012b6d1ee8bd933a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 18 七月 2025 16:55:03 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java | 49 +++++++++++++++++++++++++++++++------------------
1 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java
index 725396e..8db8d05 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java
@@ -8,9 +8,11 @@
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.integration.api.feignClient.ChargingMessageClient;
import com.ruoyi.integration.api.feignClient.UploadRealTimeMonitoringDataClient;
import com.ruoyi.integration.api.model.TransactionRecord;
import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
+import com.ruoyi.integration.api.vo.ChargingOrderVo;
import com.ruoyi.order.api.model.TChargingBill;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.model.TChargingOrderRefund;
@@ -65,6 +67,9 @@
@Resource
private TransactionRecordService transactionRecordService;
+ @Resource
+ private ChargingMessageClient chargingMessageClient;
+
private Integer port = null;
@@ -75,30 +80,36 @@
List<TChargingOrder> failedStartupOrder = chargingOrderService.findFailedStartupOrder();
log.info("定时任务执行，查询到启动失败的订单数量：{}", failedStartupOrder.size());
for (TChargingOrder order : failedStartupOrder) {
+ log.info("定时任务执行，查询到启动失败的订单：{}", order.getCode());
//查询是否有充电信息
List<UploadRealTimeMonitoringData> dataByOrderCode = uploadRealTimeMonitoringDataService.getDataByOrderCode(order.getCode());
- log.info("充电实时数据：{}", JSON.toJSONString(dataByOrderCode));
+ log.info("充电实时数据：{}", dataByOrderCode.size());
//没有充电数据，则执行退款
if(null == dataByOrderCode || dataByOrderCode.isEmpty()){
log.info("定时任务执行，查询到启动失败的订单，执行退款：{}", order.getCode());
- chargingOrderService.refund(order.getCode());
- int num = 0;
- while (true){
- TChargingOrderRefund one = chargingOrderRefundService.getOne(new LambdaQueryWrapper<TChargingOrderRefund>().eq(TChargingOrderRefund::getChargingOrderId, order.getId()));
- if(null != one && 2 == one.getRefundStatus()){
- order.setStatus(-1);
- chargingOrderService.updateById(order);
- break;
+ if(1 == order.getOrderSource()){
+ chargingOrderService.refund(order.getCode());
+ int num = 0;
+ while (true){
+ TChargingOrderRefund one = chargingOrderRefundService.getOne(new LambdaQueryWrapper<TChargingOrderRefund>().eq(TChargingOrderRefund::getChargingOrderId, order.getId()));
+ if(null != one && 2 == one.getRefundStatus()){
+ order.setStatus(-1);
+ chargingOrderService.updateById(order);
+ break;
+ }
+ try {
+ Thread.sleep(5000);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ num++;
+ if(num > 10){
+ break;
+ }
}
- try {
- Thread.sleep(5000);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
- num++;
- if(num > 10){
- break;
- }
+ }else{
+ order.setStatus(-1);
+ chargingOrderService.updateById(order);
}
}
}
@@ -106,6 +117,7 @@
List<TChargingOrder> stoppedOrder = chargingOrderService.findStoppedOrder();
log.info("定时任务执行，查询到停止中的订单数量：{}", stoppedOrder.size());
for (TChargingOrder order : stoppedOrder) {
+ log.info("定时任务执行，查询到停止中的订单：{}", order.getCode());
TransactionRecord one = transactionRecordService.findOne(order.getCode());
if(null != one){
log.info("定时任务执行，查询到停止中的订单账单数据：{}", JSON.toJSONString(one));
@@ -119,6 +131,7 @@
List<TChargingOrder> chargingOrder = chargingOrderService.findChargingOrder();
log.info("定时任务执行，查询到充电中的订单数量：{}", chargingOrder.size());
for (TChargingOrder order : chargingOrder) {
+ log.info("定时任务执行，查询到充电中的订单：{}", order.getCode());
TransactionRecord one = transactionRecordService.findOne(order.getCode());
if(null != one && StringUtils.isNotEmpty(one.getResult())){
log.info("定时任务执行，查询到充电中的订单账单数据：{}", JSON.toJSONString(one));
--
Gitblit v1.7.1