From 9868d192968a143d7aded8aad71e04c04aa92c10 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 01 十一月 2024 17:25:04 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 4a4feea..ab5661a 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
@@ -295,7 +295,7 @@
if(orders.size() > 0){
TChargingOrder chargingOrder = orders.get(0);
TChargingGun tChargingGun1 = new TChargingGun();
- if(Arrays.asList(1, 2).contains(chargingOrder.getStatus())){
+ if(Arrays.asList(1, 2, 5).contains(chargingOrder.getStatus())){
tChargingGun1.setStatus(3);
}
if(Arrays.asList(3).contains(chargingOrder.getStatus())){
@@ -306,6 +306,11 @@
}
tChargingGun1.setId(tChargingGun.getId());
chargingGunService.updateById(tChargingGun1);
+ }else{
+ TChargingGun tChargingGun1 = new TChargingGun();
+ tChargingGun1.setId(tChargingGun.getId());
+ tChargingGun1.setStatus(3);
+ chargingGunService.updateById(tChargingGun1);
}
}
}
--
Gitblit v1.7.1