From 4ec71930da15cc83b2fbf67fdeade89b8900b14c Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 31 三月 2026 17:32:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
index b0cc3bd..e59bd8d 100644
--- a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
@@ -2525,10 +2525,14 @@
Map<String, Long> map = new HashMap<>();
//鎬婚攢鍞噾棰�
List<SalesDelivery> salesDeliveries = salesDeliveryMapper.selectList(null);
- long sum = salesDeliveries.stream().mapToLong(value -> Long.parseLong(value.getPrice().toString())).sum();
- map.put("price",sum/1000);//鍗曚綅w
+ BigDecimal sum = salesDeliveries.stream()
+ .map(item -> item.getPrice() != null ? new BigDecimal(item.getPrice().toString()) : BigDecimal.ZERO)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ long finalPrice = sum.divide(new BigDecimal("1000"), 0, RoundingMode.HALF_UP).longValue();
+
+ map.put("price", finalPrice);//鍗曚綅w
//鎬诲彂璐у崟
- map.put("delivery",salesDeliveries.stream().count());
+ map.put("delivery", (long) salesDeliveries.size());
//鎬婚攢鍞柟鏁�
long volume = salesDeliveries.stream().mapToLong(value -> Long.parseLong(value.getVolume().toString())).sum();
map.put("volume",volume);
--
Gitblit v1.9.3