From d6c8f09fd628bd0111de4ee7071844465df9adb1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 28 十月 2024 18:57:35 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index 494f449..dba79d4 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -1821,7 +1821,7 @@
BeanUtils.copyProperties(strategyDetail, vo1);
vo1.setStart(sdfs.parse(vo.getStart_time().split(" ")[0] + " " + strategyDetail.getStartTime() + ":00").getTime());
vo1.setEnd(sdfs.parse(vo.getStart_time().split(" ")[0] + " " + strategyDetail.getEndTime() + ":00").getTime());
- vo1.setServiceCharge(sharp_peak_charge);
+ vo1.setChargingCapacity(sharp_peak_charge);
lists.add(vo1);
} catch (IllegalAccessException e) {
throw new RuntimeException(e);
@@ -1864,10 +1864,10 @@
} catch (ParseException e) {
throw new RuntimeException(e);
}
+ System.err.println(start.getTime() + "\n" + end.getTime() + "\n" + lists.get(0).getStart() + "\n" + lists.get(0).getEnd());
+
+
for (AccountingStrategyDetailOrderVo strategyDetail : lists) {
- if(strategyDetail.getStart() < start.getTime() || strategyDetail.getEnd() > end.getTime()){
- continue;
- }
BigDecimal sharp_peak_charge = strategyDetail.getChargingCapacity();
TChargingOrderAccountingStrategy chargingOrderAccountingStrategy = new TChargingOrderAccountingStrategy();
chargingOrderAccountingStrategy.setChargingOrderId(chargingOrder.getId());
@@ -1883,9 +1883,9 @@
chargingOrderAccountingStrategy.setStartTime(strategyDetail.getStartTime());
}
if(end.getTime() >= strategyDetail.getEnd()){
- chargingOrderAccountingStrategy.setStartTime(strategyDetail.getEndTime());
+ chargingOrderAccountingStrategy.setEndTime(strategyDetail.getEndTime());
}else{
- chargingOrderAccountingStrategy.setStartTime(sdf2.format(end));
+ chargingOrderAccountingStrategy.setEndTime(sdf2.format(end));
}
//已充电总度数
--
Gitblit v1.7.1