From d51a8cfa10c34d9c1e7d6b4726d31e75ecee5dc6 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期五, 20 十二月 2024 18:32:03 +0800
Subject: [PATCH] 1
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderStatistics.java | 13 +-----
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 47 +++++++++++++++--------
aa.json | 14 +++---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderStatisticsDetail.java | 39 +++++++++++++++++++
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Banner.java | 3 +
5 files changed, 81 insertions(+), 35 deletions(-)
diff --git a/aa.json b/aa.json
index cd2e2d8..f8fb1b9 100644
--- a/aa.json
+++ b/aa.json
@@ -1,7 +1,7 @@
-
-{
- "province": "",
- "city":"",
- "area": "",
- "vip": []
-}
\ No newline at end of file
+[
+ {
+ "date": "2.1",
+ "num1": 100,
+ "num2": 200
+ }
+]
\ No newline at end of file
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Banner.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Banner.java
index 1a47a93..480fde1 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Banner.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Banner.java
@@ -45,6 +45,9 @@
@TableField("jump_type")
private Integer jumpType;
+ @TableField("content_type")
+ private Integer contentType;
+
@ApiModelProperty(value = "跳转内容")
@TableField("content")
private String content;
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..dd4d036 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;
@@ -280,28 +282,39 @@
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"))));
- 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.setOrderStatisticsDetailList(orderStatisticsDetails);
return R.ok(orderStatistics);
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderStatistics.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderStatistics.java
index 9e51514..f2a9aae 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderStatistics.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderStatistics.java
@@ -5,6 +5,7 @@
import lombok.Data;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
@Data
@@ -46,15 +47,5 @@
@ApiModelProperty(value = "单品类型订单总金额")
private Double singleTotalMoney;
- /**
- * 服务类型订单数量map(key:日期，value:数量)
- */
- @ApiModelProperty(value = "服务类型订单数量map(key:日期，value:数量)")
- private Map<String, Integer> serviceOrderMap;
-
- @ApiModelProperty(value = "单品类型订单数量map(key:日期，value:数量)")
- private Map<String, Integer> singleOrderMap;
-
- @ApiModelProperty(value = "订单总数map(key:日期，value:数量)")
- private Map<String, Integer> totalOrderMap;
+ private List<OrderStatisticsDetail> orderStatisticsDetailList;
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderStatisticsDetail.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderStatisticsDetail.java
new file mode 100644
index 0000000..46b6a90
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderStatisticsDetail.java
@@ -0,0 +1,39 @@
+package com.ruoyi.order.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class OrderStatisticsDetail {
+ private String date;
+ /**
+ * 服务订单数量
+ */
+ private Integer serviceTotal;
+
+ /**
+ * 单品订单数量
+ */
+ private Integer singleTotal;
+
+ /**
+ * 订单总数量
+ */
+ private Integer total;
+
+ /**
+ * 订单总金额
+ */
+ private BigDecimal totalMoney;
+
+ /**
+ * 服务订单金额
+ */
+ private BigDecimal serviceTotalMoney;
+
+ /**
+ * 单品订单金额
+ */
+ private BigDecimal singleTotalMoney;
+}
--
Gitblit v1.7.1