From c1023206d3207bf9520e99c2f0f4549d8eb61ddc Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 26 十月 2024 16:28:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 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 c74c027..522954c 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
@@ -3,6 +3,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.text.DecimalFormat;
import java.time.*;
@@ -822,7 +823,7 @@
BeanUtils.copyProperties(uploadRealTimeMonitoringData,dataDto);
dataDto.setStartTime(uploadRealTimeMonitoringData.getStartTime());
dataDto.setEndTime(uploadRealTimeMonitoringData.getEndTime()==null?null:uploadRealTimeMonitoringData.getEndTime());
- dataDto.setStatus(chargingOrderVO.getStatus());
+ dataDto.setStatus(uploadRealTimeMonitoringData.getStatus());
dtos.add(dataDto);
}else {
continue;
@@ -942,8 +943,16 @@
tCharingOrderMapVO.setMaps(maps);
+ BigDecimal allMoney = new BigDecimal(0);
+ for (Map<String, Object> map : maps) {
+ BigDecimal periodElectricPrice = (BigDecimal) map.get("period_electric_price");
+ allMoney = allMoney.add(periodElectricPrice);
+ BigDecimal total_amount = (BigDecimal) map.get("total_amount");
+ allMoney = allMoney.add(total_amount);
+ }
+ allMoney = allMoney.multiply(new BigDecimal("0.006"));
-
+ tCharingOrderMapVO.setAllMoney(allMoney);
return R.ok(tCharingOrderMapVO);
}
@@ -1231,8 +1240,8 @@
return R.ok(tCharingUserEquimentVO);
}
-
- private static double calculateAveragePercent(List<Map<String, Object>> mapList1, List<Map<String, Object>> mapList2) {
+ private static final DecimalFormat DF = new DecimalFormat("#.00");
+ public static double calculateAveragePercent(List<Map<String, Object>> mapList1, List<Map<String, Object>> mapList2) {
int totalElements = mapList1.size() + mapList2.size();
double sum = 0.0;
@@ -1254,7 +1263,10 @@
}
// 计算平均值
- return sum / totalElements;
+ double average = sum / totalElements;
+
+ // 格式化为两位小数
+ return Double.parseDouble(DF.format(average));
}
@ResponseBody
@@ -1284,7 +1296,7 @@
//当日的订单总数
int size = list.size();
//计算list中paymentAmount的总和
- BigDecimal totalPaymentAmount = list.stream().map(TChargingOrder::getOrderAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal totalPaymentAmount = list.stream().map(TChargingOrder::getPaymentAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
//计算list中electrovalence的总和
BigDecimal totalElectrovalence = list.stream().map(TChargingOrder::getElectrovalence).reduce(BigDecimal.ZERO, BigDecimal::add);
//计算list中serviceCharge的总和
--
Gitblit v1.7.1