修改

xuhy

2024-10-28 f765a447c75772c7202dbbb2ff7595f1e1472d8a

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

@@ -115,9 +115,12 @@
        for (OrderMealGeneratorCountDTO orderMealGeneratorCountDTO : orderMealGeneratorCountDTOS) {
            TBoard board = boards.stream().filter(e -> e.getId().equals(orderMealGeneratorCountDTO.getBoardId())).findFirst().orElse(null);
            if(Objects.isNull(board)){
                throw new ServiceException("桌台用餐人数配置不存在");
                throw new ServiceException("该桌台信息不存在");
            }
            Integer orderCount = orderMealGeneratorCountDTO.getOrderCount();
            if(orderCount == 0){
                continue;
            }
            // 查询当前桌的用餐人数
            for (int i = 1; i <= orderCount; i++) {
                int random = getRandom(board.getMinPerson(), board.getMaxPerson());
@@ -131,18 +134,25 @@
                List<TOrderMealGoods> orderMealGoods = new ArrayList<>();
                // 获取当前桌的菜品
                List<TFoundationConfigVO> foundationConfigVOS = foundationConfigs.stream().filter(e -> e.getMealCount().equals(random)).collect(Collectors.toList());
                if(CollectionUtils.isEmpty(foundationConfigVOS)){
                    throw new ServiceException("桌台"+random+"人餐，人数配置不存在");
                }
                // 每种菜品分类需要几个菜的生成
                foundationConfigVOS.forEach(e -> {
                    int random1 = getRandom(e.getMinCount(), e.getMaxCount());
                    List<TGoods> typeGoods = goods.stream().filter(m -> e.getTypeId().equals(m.getTypeId())).collect(Collectors.toList());
                    typeGoods = randomSelection(typeGoods, random1);
                    List<TGoods> typeGoodsList = goods.stream().filter(m -> e.getTypeId().equals(m.getTypeId())).collect(Collectors.toList());
                    List<TGoods> typeGoods = randomSelection(typeGoodsList, random1);
                    if(typeGoods.size() != random1){
                        List<TGoods> goods1 = randomSelection(typeGoodsList, random1 - typeGoods.size());
                        typeGoods.addAll(goods1);
                    }
                    for (TGoods typeGood : typeGoods) {
                        int count = 0;
                        for (TOrderMealGoods good : orderMealGoods) {
                            if (good.getGoodsNum().equals(typeGood.getGoodsNum())) {
                                count+=1;
                                good.setGoodsCount(good.getGoodsCount() + 1);
                                good.setGoodsSalePrice(good.getGoodsSalePrice().add(typeGood.getSalePrice()));
//                                good.setGoodsSalePrice(good.getGoodsSalePrice().add(typeGood.getSalePrice()));
                                break; // 找到后直接跳出循环
                            }
                        }
@@ -471,7 +481,7 @@
            return;
        }
        // 删除上一次的数据生成
        if(Objects.nonNull(orderStockLast)){
        if(Objects.nonNull(orderStockLast) && Objects.nonNull(stockDataSet) && stockDataSets.size() > 1){
            orderStockService.removeById(orderStockLast);
        }
        orderSaleService.saveBatch(orderSales);
@@ -529,7 +539,11 @@
//                BigDecimal money = orderSaleGoods.stream().filter(e -> collect.contains(e.getOrderId()))
//                        .reduce(BigDecimal.ZERO, (x, y) -> x.add(y.getGoodsCostPrice().multiply(new BigDecimal(y.getGoodsCount()))), BigDecimal::add);
                if(!CollectionUtils.isEmpty(orderSales)){
                    BigDecimal money = orderSales.stream().filter(e -> e.getGeneratorId().equals(tDataGeneratorVO.getId())).map(TOrderSale::getPayMoney).reduce(BigDecimal::add).get();
                    List<TOrderSale> collect = orderSales.stream().filter(e -> e.getGeneratorId().equals(tDataGeneratorVO.getId())).collect(Collectors.toList());
                    BigDecimal money = BigDecimal.ZERO;
                    if(!CollectionUtils.isEmpty(collect)){
                        money = collect.stream().map(TOrderSale::getPayMoney).reduce(BigDecimal::add).get();
                    }
                    tDataGeneratorVO.setTotalRevenue(money);
                }
            }