From ec9ce06bba427c7b9d680217af6065a82e2af075 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 13 三月 2025 17:54:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 46 +++++++++++++++++++++++++++-------------------
1 files changed, 27 insertions(+), 19 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..46f6c7d 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,6 @@
}
-
-
@RequiresPermissions(value = {"/chargingPileOrder/monitoring_record"}, logical = Logical.OR)
@ResponseBody
@GetMapping(value = "/chargingOrderInfo")
@@ -552,19 +550,19 @@
for (TChargingOrderAccountingStrategy tChargingOrderAccountingStrategy : list) {
String format = "";
String format1 = "";
-// String temp1=list.get(0).getStartTime().split(":")[0];
+ String temp1=list.get(0).getStartTime().split(":")[0];
System.err.println("订单详情时间第一条"+list.get(0).getStartTime());
System.err.println("订单详情时间开始"+tChargingOrderAccountingStrategy.getStartTime());
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)){
+// String temp1=list.get(0).getStartTime().split(":")[0];
+ String[] split = tChargingOrderAccountingStrategy.getStartTime().split(":");
+ 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)){
+ String[] split1 = tChargingOrderAccountingStrategy.getEndTime().split(":");
+ if (Integer.parseInt(split1[0])<Integer.parseInt(temp1)){
format1 = byId.getCreateTime().format(formatter);
}else {
format1 = byId.getEndTime().format(formatter);
@@ -1027,6 +1025,10 @@
}
+
+
+
+
@RequiresPermissions(value = {"/platformRevenueAnalysis"}, logical = Logical.OR)
@ResponseBody
@GetMapping(value = "/six/total")
@@ -1046,7 +1048,7 @@
siteIds.add(-1);
}
Map<String,Object> map = chargingOrderService.countAll(sixBefore,siteIds);
- BigDecimal data = parkingLotClient.getRecordAmount(sixBefore).getData();
+ BigDecimal data = parkingLotClient.getRecordAmount(sixBefore.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))).getData();
if (map ==null){
map = new HashMap<String,Object>();
}
@@ -1063,7 +1065,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 +1138,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 +1260,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 +1294,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 +1324,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 +1354,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 +1385,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 +2264,6 @@
return chargingOrderService.getNotPaymentChargingOrder();
}
+
+
}
--
Gitblit v1.7.1