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