From d5ccf57765e2b7ac1f6d547ef0895e234902065b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 25 十二月 2024 10:09:27 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 53 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 34 insertions(+), 19 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index 0d1c3de..8c668ec 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -26,8 +26,10 @@
import javax.annotation.Resource;
import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -279,29 +281,42 @@
@RequestParam("endTime") String endTime){
List<Order> orderList = orderService.list(new LambdaQueryWrapper<Order>()
- .between(Order::getCreateTime, LocalDateTime.parse(startTime), LocalDateTime.parse(endTime)));
- Map<String, List<Order>> orderMap = orderList.stream()
- .collect(Collectors.groupingBy(o -> o.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))));
+ .between(Order::getCreateTime, LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
- Map<String, Integer> serviceOrderMap = new HashMap<>();
- Map<String, Integer> singleOrderMap = new HashMap<>();
- Map<String, Integer> totalOrderMap = new HashMap<>();
- orderMap.forEach((date, orders) -> {
- long serviceCount = orders.stream().filter(o -> o.getOrderType() == 1).count();
- long singleCount = orders.stream().filter(o -> o.getOrderType() == 2).count();
- long totalCount = orders.size();
+ Map<String, List<Order>> map = orderList.stream().collect(Collectors.groupingBy(item -> item.getCreateTime()
+ .format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))));
- serviceOrderMap.put(date, (int) serviceCount);
- singleOrderMap.put(date, (int) singleCount);
- totalOrderMap.put(date, (int) totalCount);
+ List<OrderStatisticsDetail> orderStatisticsDetails = new ArrayList<>();
+ map.forEach((key, value) -> {
+ int serviceTotal = 0;
+ int singleTotal = 0;
+ int total = 0;
+ BigDecimal totalMoney = BigDecimal.ZERO;
+ BigDecimal serviceTotalMoney = BigDecimal.ZERO;
+ BigDecimal singleTotalMoney = BigDecimal.ZERO;
+ OrderStatisticsDetail orderStatisticsDetail = new OrderStatisticsDetail();
+ for (Order order : value) {
+ if (order.getOrderType().equals(1)) {
+ serviceTotal++;
+ serviceTotalMoney = serviceTotalMoney.add(order.getPaymentAmount());
+ }else if (order.getOrderType().equals(2)){
+ singleTotal++;
+ singleTotalMoney = singleTotalMoney.add(order.getPaymentAmount());
+ }
+ total++;
+ totalMoney = totalMoney.add(order.getPaymentAmount());
+ }
+ orderStatisticsDetail.setDate(key);
+ orderStatisticsDetail.setServiceTotal(serviceTotal);
+ orderStatisticsDetail.setSingleTotal(singleTotal);
+ orderStatisticsDetail.setTotal(total);
+ orderStatisticsDetails.add(orderStatisticsDetail);
});
-
- OrderStatistics orderStatistics = orderMapper.getOrderStatistics(LocalDateTime.parse(startTime), LocalDateTime.parse(endTime));
- orderStatistics.setServiceOrderMap(serviceOrderMap);
- orderStatistics.setSingleOrderMap(singleOrderMap);
- orderStatistics.setTotalOrderMap(totalOrderMap);
-
+ OrderStatistics orderStatistics = orderMapper.getOrderStatistics(startTime, endTime);
+ if(null != orderStatistics){
+ orderStatistics.setOrderStatisticsDetailList(orderStatisticsDetails);
+ }
return R.ok(orderStatistics);
}
--
Gitblit v1.7.1