|
|
@@ -4941,7 +4941,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
|
|
|
appStatisticsVo.setCost(costprieActual.abs().subtract(costprieReturns));
|
|
|
appStatisticsVo.setProfit(profitActual.abs().subtract(profitReturns));
|
|
|
// appStatisticsVo.setAverageAmount(appStatisticsVo.getIncome().divide(new BigDecimal(xsCount), MathContext.DECIMAL32).setScale(2, RoundingMode.HALF_UP));
|
|
|
- appStatisticsVo.setAverageAmount( appStatisticsVo.getIncome().divide(new BigDecimal(customerCount), MathContext.DECIMAL32).setScale(2, RoundingMode.HALF_UP));
|
|
|
+ appStatisticsVo.setAverageAmount(BigDecimal.ZERO.compareTo(appStatisticsVo.getIncome()) == 0 ? BigDecimal.ZERO :appStatisticsVo.getIncome().divide(new BigDecimal(customerCount), MathContext.DECIMAL32).setScale(2, RoundingMode.HALF_UP));
|
|
|
appStatisticsVo.setExpenditure(expenditure == null ? BigDecimal.ZERO : expenditure.setScale(0, RoundingMode.DOWN));
|
|
|
return R.data(appStatisticsVo);
|
|
|
}
|