修改

xuhy

5 天以前 e11c9afa78c98ee4fd4888126cd66b64d0468117

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java

@@ -170,6 +170,7 @@
                            tOrderMealGoods.setGoodsName(typeGood.getGoodsName());
                            tOrderMealGoods.setGoodsPicture(typeGood.getGoodsPicture());
                            tOrderMealGoods.setGoodsSalePrice(typeGood.getSalePrice());
                            tOrderMealGoods.setCostPrice(typeGood.getCostPrice());
                            tOrderMealGoods.setGoodsCount(1);
                            tOrderMealGoods.setTypeId(typeGood.getTypeId());
                            tOrderMealGoods.setGoodsId(typeGood.getId());
@@ -335,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()));
                // 根据商品新生成一条数据
@@ -379,7 +384,7 @@
                    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;
                    if(CollectionUtils.isEmpty(saleIds1)){
                    if(!CollectionUtils.isEmpty(saleIds1)){
                        // 查询上一次的商品
                        list = orderSaleGoodsService.list(new LambdaQueryWrapper<TOrderSaleGoods>().in(TOrderSaleGoods::getOrderId, saleIds1));
                        // 结合上次最后一次的数据
@@ -501,7 +506,10 @@
        for (TOrderSale orderSale : orderSales) {
            orderSale.getOrderSaleGoods().forEach(e->e.setOrderId(orderSale.getId()));
        }
        List<TGoodsType> list = goodsTypeService.list();
        // 查询店铺下的商品
        List<TGoods> goodsList = goodsService.list(Wrappers.lambdaQuery(TGoods.class)
                .in(TGoods::getShopId,dto.getShopId()));
//        List<TGoodsType> list = goodsTypeService.list();
//        orderSaleGoods.forEach(e->e.setTypeName(list.stream().filter(m->m.getId().equals(e.getTypeId())).findFirst().get().getTypeName()));
        orderSaleGoods.forEach(e->{
            e.setId(null);
@@ -514,6 +522,12 @@
            stock.getOrderStockGoods().forEach(e->e.setOrderId(stock.getId()));
        }
        List<TOrderStockGoods> orderStockGoods = stockList.stream().map(TOrderStock::getOrderStockGoods).flatMap(Collection::stream).collect(Collectors.toList());
        if(!CollectionUtils.isEmpty(orderStockGoods)){
            for (TOrderStockGoods orderStockGood : orderStockGoods) {
                goodsList.stream().filter(e->e.getId().equals(orderStockGood.getGoodsId()))
                        .findFirst().ifPresent(e->orderStockGood.setThisCostPrice(e.getCostPrice()));
            }
        }
        orderStockGoodsService.saveBatch(orderStockGoods);
    }

@@ -574,6 +588,7 @@
            orderMealService.remove(Wrappers.lambdaQuery(TOrderMeal.class)
                    .ge(TOrderMeal::getMealTime, dataGenerator.getStartTime())
                    .le(TOrderMeal::getMealTime, dataGenerator.getEndTime())
                    .eq(TOrderMeal::getShopId, dataGenerator.getShopId())
                    .eq(TOrderMeal::getIsCover,1));
            // 修改覆盖类型为已覆盖
            orderMealService.update(Wrappers.lambdaUpdate(TOrderMeal.class).set(TOrderMeal::getIsCover, 1).eq(TOrderMeal::getGeneratorId, id));
@@ -595,6 +610,7 @@
            orderSaleService.remove(Wrappers.lambdaQuery(TOrderSale.class)
                    .ge(TOrderSale::getOrderTime, dataGenerator.getStartTime())
                    .le(TOrderSale::getOrderTime, dataGenerator.getEndTime())
                    .eq(TOrderSale::getShopId, dataGenerator.getShopId())
                    .eq(TOrderSale::getIsCover,1));
            // 修改覆盖类型为已覆盖
            orderSaleService.update(Wrappers.lambdaUpdate(TOrderSale.class).set(TOrderSale::getIsCover, 1).eq(TOrderSale::getGeneratorId, id));
@@ -602,6 +618,7 @@
            orderStockService.remove(Wrappers.lambdaQuery(TOrderStock.class)
                    .ge(TOrderStock::getStockTime, dataGenerator.getStartTime())
                    .le(TOrderStock::getStockTime, dataGenerator.getEndTime())
                    .eq(TOrderStock::getShopId, dataGenerator.getShopId())
                    .eq(TOrderStock::getIsCover,1));
            // 修改覆盖类型为已覆盖
            orderStockService.update(Wrappers.lambdaUpdate(TOrderStock.class).set(TOrderStock::getIsCover, 1).eq(TOrderStock::getGeneratorId, id));