修改

xuhy

2024-12-02 8ae8190ed6bb9fef783387ffd3f4ad95ef5c222d

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

@@ -691,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().filter(e->Objects.nonNull(e.getStockTotalPrice())).map(TOrderStock::getStockTotalPrice).reduce(BigDecimal.ZERO, BigDecimal::add));
        }
        return data;
    }