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/controller/OrderController.java | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 44 insertions(+), 3 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 fa009b9..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,14 @@
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;
+import java.util.stream.Collectors;
/**
* <p>
@@ -232,10 +238,10 @@
- @PutMapping("/confirmDelivery/{orderId}")
+ @PostMapping("/confirmDelivery")
@ApiOperation(value = "已发货操作", tags = {"管理后台-订单管理"})
- public R confirmDelivery(@PathVariable("orderId") String orderId, String code){
- return orderService.confirmDelivery(orderId, code);
+ public R confirmDelivery(@RequestBody ConfirmDelivery confirmDelivery){
+ return orderService.confirmDelivery(confirmDelivery.getOrderId(), confirmDelivery.getCode());
}
@@ -273,7 +279,42 @@
@ApiOperation(value = "订单统计", tags = {"管理后台-首页统计"})
public R<OrderStatistics> getOrderStatistics(@RequestParam("startTime") String startTime,
@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>> map = orderList.stream().collect(Collectors.groupingBy(item -> item.getCreateTime()
+ .format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))));
+
+ 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.setOrderStatisticsDetailList(orderStatisticsDetails);
return R.ok(orderStatistics);
}
--
Gitblit v1.7.1