From c749b25283db16afd994535d0a55c8d24647e282 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 11 三月 2025 16:30:37 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index 50c910b..0f67e72 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -522,8 +522,12 @@
}
-
-
+ public static void main(String[] args) {
+ ;
+ System.err.println(Integer.parseInt("01"));
+ System.err.println(Integer.valueOf("01"));
+ ;
+ }
@RequiresPermissions(value = {"/chargingPileOrder/monitoring_record"}, logical = Logical.OR)
@ResponseBody
@GetMapping(value = "/chargingOrderInfo")
@@ -558,13 +562,13 @@
System.err.println("订单详情时间结束"+tChargingOrderAccountingStrategy.getEndTime());
String temp1=list.get(0).getStartTime().split(" ")[1].split(":")[0];
String[] split = tChargingOrderAccountingStrategy.getStartTime().split(" ")[1].split(":");
- if (Integer.parseInt(split[0])>=Integer.valueOf(temp1)){
+ if (Integer.parseInt(split[0])>=Integer.parseInt(temp1)){
format = byId.getCreateTime().format(formatter);
}else {
format = byId.getEndTime().format(formatter);
}
String[] split1 = tChargingOrderAccountingStrategy.getEndTime().split(" ")[1].split(":");
- if (Integer.parseInt(split1[0])<Integer.valueOf(temp1)){
+ if (Integer.parseInt(split1[0])<Integer.parseInt(temp1)){
format1 = byId.getCreateTime().format(formatter);
}else {
format1 = byId.getEndTime().format(formatter);
@@ -1063,7 +1067,7 @@
if (chargingOrder.getOrderSource().equals(2)){
serviceCharge = serviceCharge.add(chargingOrder.getServiceCharge()!=null?chargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN):new BigDecimal("0"));
commissionAmount = commissionAmount.add(chargingOrder.getServiceCharge()!=null?chargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN):new BigDecimal("0"));
- }else{
+ }else if (chargingOrder.getServiceCharge()!=null){
serviceCharge = serviceCharge.add(chargingOrder.getServiceCharge());
}
@@ -1136,7 +1140,11 @@
if (chargingOrderVO != null) {
BeanUtils.copyProperties(chargingOrderVO, dataDto);
}
+
BeanUtils.copyProperties(uploadRealTimeMonitoringData, dataDto);
+ if (chargingOrderVO != null && chargingOrderVO.getOrderSource()==2){
+ dataDto.setPeriod_service_price(uploadRealTimeMonitoringData.getPeriod_service_price().multiply(new BigDecimal("0.2").setScale(2,BigDecimal.ROUND_DOWN)));
+ }
dataDto.setStartTime(uploadRealTimeMonitoringData.getStartTime());
dataDto.setEndTime(uploadRealTimeMonitoringData.getEndTime() == null ? null : uploadRealTimeMonitoringData.getEndTime());
dataDto.setStatus(uploadRealTimeMonitoringData.getStatus());
@@ -1254,14 +1262,14 @@
}
}
- List<TChargingOrder> list = chargingOrderService.lambdaQuery().ge(TChargingOrder::getCreateTime, start).le(TChargingOrder::getCreateTime, end).in(TChargingOrder::getSiteId, siteIds).list();
- List<Long> chargingOrderIds = list.stream().map(TChargingOrder::getId).collect(Collectors.toList());
- chargingOrderIds.add(-1L);
+// List<TChargingOrder> list = chargingOrderService.lambdaQuery().ge(TChargingOrder::getCreateTime, start).le(TChargingOrder::getCreateTime, end).in(TChargingOrder::getSiteId, siteIds).list();
+// List<Long> chargingOrderIds = list.stream().map(TChargingOrder::getId).collect(Collectors.toList());
+// chargingOrderIds.add(-1L);
//上方饼图
- List<Map<String,Object>> maps = chargingOrderService.getSumByType(chargingOrderIds);
+ List<Map<String,Object>> maps = chargingOrderService.getSumByType(start,end);
if (statisticsQueryDto.getDayType()==1){
- List<Map<String,Object>> maps1 = chargingOrderService.getDateData(chargingOrderIds);
+ List<Map<String,Object>> maps1 = chargingOrderService.getDateData(start,end);
List<Map<String, Object>> charMap = new ArrayList<>();
// 生成从 "00:00" 到 "23:00" 的时间数据
@@ -1288,7 +1296,7 @@
- List<Map<String,Object>> maps1 = chargingOrderService.getWeekData(chargingOrderIds);
+ List<Map<String,Object>> maps1 = chargingOrderService.getWeekData(start,end);
LocalDate startDate = statisticsQueryDto.getStartTime();
LocalDate endDate = statisticsQueryDto.getEndTime();
@@ -1318,7 +1326,7 @@
}
tCharingOrderMapVO.setMaps1(dateRangeStatistics);
}else if (statisticsQueryDto.getDayType()==3){
- List<Map<String,Object>> maps1 = chargingOrderService.getMonthData(chargingOrderIds);
+ List<Map<String,Object>> maps1 = chargingOrderService.getMonthData(start,end);
LocalDate startDate = statisticsQueryDto.getStartTime();
LocalDate endDate = statisticsQueryDto.getEndTime();
@@ -1348,7 +1356,7 @@
}
tCharingOrderMapVO.setMaps1(dateRangeStatistics);
}else if (statisticsQueryDto.getDayType()==4){
- List<Map<String,Object>> maps1 = chargingOrderService.getYearData(chargingOrderIds);
+ List<Map<String,Object>> maps1 = chargingOrderService.getYearData(start,end);
LocalDate startDate = statisticsQueryDto.getStartTime();
LocalDate endDate = statisticsQueryDto.getEndTime();
@@ -1379,7 +1387,7 @@
}
tCharingOrderMapVO.setMaps1(dateRangeStatistics);
}else if (statisticsQueryDto.getDayType()==5){
- List<Map<String,Object>> maps1 = chargingOrderService.getByDate(chargingOrderIds);
+ List<Map<String,Object>> maps1 = chargingOrderService.getByDate(start,end);
LocalDate startDate = statisticsQueryDto.getStartTime();
LocalDate endDate = statisticsQueryDto.getEndTime();
@@ -2258,4 +2266,6 @@
return chargingOrderService.getNotPaymentChargingOrder();
}
+
+
}
--
Gitblit v1.7.1