From cc1964c31d9f5c218bc76e91bf63fd3c7cb75a97 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 08 一月 2026 11:12:47 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java | 2 +-
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java | 1 +
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/chengdujianguan/ChengDuJianGuanController.java | 3 +++
3 files changed, 5 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 03d76d8..9deb0d2 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
@@ -139,7 +139,7 @@
@PostMapping(value = "/getChargingPileBySiteIds")
public R<List<TChargingPile>> getChargingPileBySiteIds(@RequestParam("siteIds") List<Integer> siteIds) {
return R.ok(chargingPileService.list(Wrappers.lambdaQuery(TChargingPile.class)
- .in(!siteIds.isEmpty(),TChargingPile::getSiteId,siteIds)));
+ .in(!siteIds.isEmpty(),TChargingPile::getSiteId,siteIds).eq(TChargingPile::getDelFlag, 0)));
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
index f462eb1..9936370 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
@@ -734,6 +734,7 @@
List<TChargingPile> list1 = chargingPileService.lambdaQuery().eq(TChargingPile::getSiteId, id).eq(TChargingPile::getDelFlag, 0).list();
for (TChargingPile tChargingPile : list1) {
integrationClient.setupBillingModel1(tChargingPile.getCode(), JSON.toJSONString(accountingStrategyDetails));
+ chengDuJianGuanClient.notificationStationFee(tChargingPile.getId());
}
if(1 == site.getIsOpenSynchronization()){
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/chengdujianguan/ChengDuJianGuanController.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/chengdujianguan/ChengDuJianGuanController.java
index 5afccfb..4b7df75 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/chengdujianguan/ChengDuJianGuanController.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/chengdujianguan/ChengDuJianGuanController.java
@@ -320,6 +320,9 @@
ChargeFeeDetail chargeFeeDetail1 = new ChargeFeeDetail();
chargeFeeDetail1.setEquipmentType(chargingPile.getType());
chargeFeeDetail1.setStartTime(accountingStrategyDetail.getStartTime());
+ if("00:00".equals(accountingStrategyDetail.getEndTime())){
+ accountingStrategyDetail.setEndTime("24:00");
+ }
chargeFeeDetail1.setEndTime(accountingStrategyDetail.getEndTime());
chargeFeeDetail1.setElectricityFee(accountingStrategyDetail.getElectrovalence());
chargeFeeDetail1.setServiceFee(accountingStrategyDetail.getServiceCharge());
--
Gitblit v1.7.1