app去掉多余计算

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -4932,12 +4932,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 
 
 		long xsCount = saleDetailDtoList.stream().filter(e -> !OrderStatusEnum.COMPLETED.value.equals(e.getStatus()) && e.getBsType().equals("销售")).count();
-		appStatisticsVo.setIncome(subTotalMoneyActual.abs().add(subTotalMoneyCancel));
-		appStatisticsVo.setCost(costprieActual.abs().add(costprieCancel));
-		appStatisticsVo.setProfit(profitActual.abs().add(profitCancel));
-		appStatisticsVo.setIncome(appStatisticsVo.getIncome().subtract(subTotalMoneyCancel.add(subTotalMoneyReturns)));
-		appStatisticsVo.setCost(appStatisticsVo.getCost().subtract(costprieCancel.add(costprieReturns)));
-		appStatisticsVo.setProfit(appStatisticsVo.getProfit().subtract(profitCancel.add(profitReturns)));
+		appStatisticsVo.setIncome(subTotalMoneyActual.abs().subtract(subTotalMoneyReturns));
+		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.setExpenditure(expenditure == null ? BigDecimal.ZERO : expenditure.setScale(0, RoundingMode.DOWN));
 		return R.data(appStatisticsVo);