修改

xuhy

2024-10-31 cb381536d1a18156078591f06558fe20872565c4

修改

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


 ruoyi-system/src/main/resources/mapper/system/TOrderStockMapper.xml

@@ -51,7 +51,6 @@
    </select>
    <select id="getDataGeneratorStockDetail" resultType="java.util.Map">
        SELECT
        IFNULL(SUM(tos.stockTotalPrice),0) AS stockAmountSum,
        IFNULL(SUM(tosg.stockCount),0) AS totalStock
        from t_order_stock tos
        left join t_order_stock_goods tosg on tos.id = tosg.orderId