xuhy
2025-04-24 12dc412a07b9d4b2280cddd9131db73d3dc4ebd2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java
@@ -378,10 +378,15 @@
                    // 查询上一次开始之后的订单数据
                    List<TOrderSale> orderSales1 = orderSaleService.list(new LambdaQueryWrapper<TOrderSale>().gt(TOrderSale::getOrderTime, startTime1));
                    List<Long> saleIds1 = orderSales1.stream().map(TOrderSale::getId).collect(Collectors.toList());
                    // 查询上一次的商品
                    List<TOrderSaleGoods> list = orderSaleGoodsService.list(new LambdaQueryWrapper<TOrderSaleGoods>().in(TOrderSaleGoods::getOrderId, saleIds1));
                    // 结合上次最后一次的数据
                    list.addAll(orderSaleGoodsList);
                    List<TOrderSaleGoods> list;
                    if(CollectionUtils.isEmpty(saleIds1)){
                        // 查询上一次的商品
                        list = orderSaleGoodsService.list(new LambdaQueryWrapper<TOrderSaleGoods>().in(TOrderSaleGoods::getOrderId, saleIds1));
                        // 结合上次最后一次的数据
                        list.addAll(orderSaleGoodsList);
                    }else {
                        list = orderSaleGoodsList;
                    }
                    // 删除上一次的数据生成   新生成一条数据
                    TOrderStock orderStock = new TOrderStock();
                    orderStock.setStockNum(OrderNumConstants.STOCK + CodeGenerateUtils.generateVolumeSn());