From 91df8c9b3dac121493b03c9ce1890953c1879603 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期日, 16 三月 2025 13:00:37 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
index 9fc876b..8ae8366 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
@@ -321,16 +321,19 @@
TChargingGun tChargingGun1 = new TChargingGun();
if(Arrays.asList(1, 2, 5).contains(chargingOrder.getStatus())){
tChargingGun1.setStatus(3);
+ tChargingGun1.setId(tChargingGun.getId());
+ chargingGunService.updateById(tChargingGun1);
}
if(Arrays.asList(3).contains(chargingOrder.getStatus())){
tChargingGun1.setStatus(4);
+ tChargingGun1.setId(tChargingGun.getId());
+ chargingGunService.updateById(tChargingGun1);
}
if(Arrays.asList(4).contains(chargingOrder.getStatus()) && chargingOrder.getEndMode() == 2){
tChargingGun1.setStatus(5);
+ tChargingGun1.setId(tChargingGun.getId());
+ chargingGunService.updateById(tChargingGun1);
}
- tChargingGun1.setId(tChargingGun.getId());
- chargingGunService.updateById(tChargingGun1);
-
//推送状态给三方平台
tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), tChargingGun1.getStatus());
}else{
--
Gitblit v1.7.1