xuhy
4 天以前 1364b791aeb7877c6f48b24cab88367a87e53460
修改
1个文件已修改
6 ■■■■ 已修改文件
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java
@@ -336,7 +336,11 @@
            if(i==stockDataSets.size()-1){
                // 最后一次
                LocalDate endTime = LocalDate.now();
                List<TOrderSale> collect = orderSales.stream().filter(e -> e.getOrderTime().compareTo(startTime) >= 0 && e.getOrderTime().compareTo(endTime) <= 0).collect(Collectors.toList());
                if(endTime.isBefore(startTime)){
                    endTime = dto.getEndTime();
                }
                LocalDate finalEndTime = endTime;
                List<TOrderSale> collect = orderSales.stream().filter(e -> e.getOrderTime().compareTo(startTime) >= 0 && e.getOrderTime().compareTo(finalEndTime) <= 0).collect(Collectors.toList());
                List<TOrderSaleGoods> orderSaleGoodsList = new ArrayList<>();
                collect.forEach(e->orderSaleGoodsList.addAll(e.getOrderSaleGoods()));
                // 根据商品新生成一条数据