From 3de79cb08809a47a91d354331ab166ab7cc87dc6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 11:02:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 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 bd94f8a..bc929ba 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
@@ -33,6 +33,8 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
@@ -312,6 +314,10 @@
orderStatisticsDetail.setServiceTotal(serviceTotal);
orderStatisticsDetail.setSingleTotal(singleTotal);
orderStatisticsDetail.setTotal(total);
+
+ orderStatisticsDetail.setServiceTotalMoney(serviceTotalMoney);
+ orderStatisticsDetail.setSingleTotalMoney(singleTotalMoney);
+ orderStatisticsDetail.setTotalMoney(totalMoney);
orderStatisticsDetails.add(orderStatisticsDetail);
});
Integer shopId = null;
@@ -320,7 +326,17 @@
}
OrderStatistics orderStatistics = orderMapper.getOrderStatistics(startTime, endTime, shopId);
if(null != orderStatistics){
- orderStatistics.setOrderStatisticsDetailList(orderStatisticsDetails);
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ List<OrderStatisticsDetail> sortedDetails = orderStatisticsDetails.stream()
+ .sorted(Comparator.comparing((OrderStatisticsDetail detail) -> {
+ try {
+ return dateFormat.parse(detail.getDate());
+ } catch (ParseException e) {
+ throw new RuntimeException(e);
+ }
+ }).reversed())
+ .collect(Collectors.toList());
+ orderStatistics.setOrderStatisticsDetailList(sortedDetails);
}
return R.ok(orderStatistics);
}
@@ -408,7 +424,8 @@
*/
@PostMapping("/getAppUserByShoppingShop")
public R<Set<Long>> getAppUserByShoppingShop(@RequestParam("shopId") Integer shopId){
- List<Order> list = orderService.list(new LambdaQueryWrapper<Order>().eq(Order::getShopId, shopId).eq(Order::getDelFlag, 0).eq(Order::getPayStatus, 2).in(Order::getOrderStatus, Arrays.asList(1, 2, 3, 4, 7, 8)));
+ List<Order> list = orderService.list(new LambdaQueryWrapper<Order>().eq(Order::getShopId, shopId).eq(Order::getDelFlag, 0)
+ .eq(Order::getPayStatus, 2).in(Order::getOrderStatus, Arrays.asList(1, 2, 3, 4, 7, 8)));
Set<Long> collect = list.stream().map(Order::getAppUserId).collect(Collectors.toSet());
return R.ok(collect);
}
--
Gitblit v1.7.1