修改bug

无关风月

2025-01-11 ec73339e08669dc5a0d4ff93e6640f51473c08cd

 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);
    }