From 74dbde1f3b2f42c42a67ccd1df82f4d89c729559 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 11 十月 2025 17:40:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 4529c75..eb84ab1 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
@@ -191,7 +191,7 @@
R r = chargingOrderService.endChargeBillingCharge(vo);
log.info("定时任务执行，停止中的订单处理结果：{}", JSON.toJSONString(r));
}else{
-// endOrder(order);
+ endOrder(order);
}
}
//处理状态为充电中，但硬件已完成的订单
@@ -579,9 +579,9 @@
chargingOrderService.updateById(order);
order = chargingOrderService.getById(order.getId());
-
+ Site site = siteClient.getSiteByIds(Arrays.asList(order.getSiteId())).getData().get(0);
//推送三方平台
- if (2 == order.getOrderSource()) {
+ if (2 == order.getOrderSource() && 1 == site.getIsOpenSynchronization()) {
TChargingOrder finalChargingOrder = order;
new Thread(new Runnable() {
@Override
@@ -617,7 +617,7 @@
chargingGunClient.updateChargingGunById(chargingGun);
chargingGun = chargingGunClient.getChargingGunById(order.getChargingGunId()).getData();
//推送状态给三方平台
- if (2 == order.getOrderSource()) {
+ if (2 == order.getOrderSource() && 1 == site.getIsOpenSynchronization()) {
tcecClient.pushChargingGunStatus(chargingGun.getFullNumber(), 2);
}
--
Gitblit v1.7.1