From 070d0169294696eb53423115ee1c66cad6bd382f Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 26 十月 2024 14:36:45 +0800
Subject: [PATCH] merge
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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..ebd6f4c 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.*;
@@ -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
--
Gitblit v1.7.1