修改

xuhy

2024-10-31 cb381536d1a18156078591f06558fe20872565c4

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

@@ -131,7 +131,13 @@
                orderMeal.setMealType(1);
                orderMeal.setMealPerson(random);
                orderMeal.setMealTime(orderMealGeneratorCountDTO.getTime());
                orderMeal.setOrderNum(OrderNumConstants.MEAL + CodeGenerateUtils.generateVolumeSn());
                String num = OrderNumConstants.MEAL + CodeGenerateUtils.generateVolumeSn();
//                long count1 = orderMealService.count(Wrappers.lambdaQuery(TOrderMeal.class)
//                        .eq(TOrderMeal::getOrderNum, num));
//                if(count1>0){
//                    num = CodeGenerateUtils.generateVolumeSn();
//                }
                orderMeal.setOrderNum(num);
                orderMeal.setStatus(2);
                List<TOrderMealGoods> orderMealGoods = new ArrayList<>();
                // 获取当前桌的菜品
@@ -685,9 +691,15 @@
        // 统计支付金额
        Map<String, Object> map = orderStockService.getDataGeneratorStockDetail(query);
        Integer totalStock = Integer.parseInt(map.get("totalStock").toString());
        BigDecimal stockAmountSum = new BigDecimal(map.get("stockAmountSum").toString());
//        BigDecimal stockAmountSum = new BigDecimal(map.get("stockAmountSum").toString());
        data.setTotalStock(totalStock);
        data.setStockAmountSum(stockAmountSum);
        List<TOrderStock> list = orderStockService.list(Wrappers.lambdaQuery(TOrderStock.class)
                .eq(TOrderStock::getGeneratorId, query.getGeneratorId()));
        if(CollectionUtils.isEmpty(list)){
            data.setStockAmountSum(BigDecimal.ZERO);
        }else {
            data.setStockAmountSum(list.stream().map(TOrderStock::getStockTotalPrice).reduce(BigDecimal.ZERO, BigDecimal::add));
        }
        return data;
    }

@@ -696,6 +708,11 @@
        return null;
    }

    @Override
    public void deleteByShopId(Long shopId) {
        this.baseMapper.deleteByShopId(shopId);
    }

    private int getRandomPayType(Integer size,BigDecimal count) {
        BigDecimal bigDecimal = new BigDecimal(size).multiply(count.divide(new BigDecimal(100))).setScale(0, BigDecimal.ROUND_FLOOR);
        return Integer.parseInt(bigDecimal.toString());