回滚pc端与app端计算公式

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

@@ -4931,9 +4931,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 
 		// long xsCount = saleDetailDtoList.stream().filter(e -> !OrderStatusEnum.COMPLETED.value.equals(e.getStatus()) && !OrderStatusEnum.CANCELLED.value.equals(e.getStatus()) && e.getBsType().equals("销售")).count();
 		long customerCount = saleDetailDtoList.stream().filter(e -> !OrderStatusEnum.COMPLETED.value.equals(e.getStatus()) && !OrderStatusEnum.CANCELLED.value.equals(e.getStatus()) && e.getBsType().equals("销售")).map(SaleDetailDto::getCustomerId).distinct().count();
-		appStatisticsVo.setIncome(subTotalMoneyActual.abs().subtract(subTotalMoneyReturns).subtract(subTotalMoneyCancel));
-		appStatisticsVo.setCost(costprieActual.abs().subtract(costprieReturns).subtract(costprieCancel));
-		appStatisticsVo.setProfit(profitActual.abs().subtract(profitReturns).subtract(profitCancel));
+//		appStatisticsVo.setIncome(subTotalMoneyActual.abs().subtract(subTotalMoneyReturns).subtract(subTotalMoneyCancel));
+//		appStatisticsVo.setCost(costprieActual.abs().subtract(costprieReturns).subtract(costprieCancel));
+//		appStatisticsVo.setProfit(profitActual.abs().subtract(profitReturns).subtract(profitCancel));
+		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.setAverageAmount( appStatisticsVo.getIncome().divide(new BigDecimal(customerCount), MathContext.DECIMAL32).setScale(2, RoundingMode.HALF_UP));
 		appStatisticsVo.setExpenditure(expenditure == null ? BigDecimal.ZERO : expenditure.setScale(0, RoundingMode.DOWN));

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/statistics/service/impl/StatisticsServiceImpl.java

@@ -1128,9 +1128,12 @@ public class StatisticsServiceImpl implements IStatisticsService {
 			return R.data(statisticsVo);
 		}
 		statisticsVo.setGoodsSum(goodsNumActual.abs().add(goodsNumCancel));
-		statisticsVo.setAmount(subTotalMoneyActual.abs());
-		statisticsVo.setCostPrice(costprieActual.abs());
-		statisticsVo.setProfit(profitActual.abs());
+		statisticsVo.setAmount(subTotalMoneyActual.abs().add(subTotalMoneyCancel));
+		statisticsVo.setCostPrice(costprieActual.abs().add(costprieCancel));
+		statisticsVo.setProfit(profitActual.abs().add(profitCancel));
+//		statisticsVo.setAmount(subTotalMoneyActual.abs());
+//		statisticsVo.setCostPrice(costprieActual.abs());
+//		statisticsVo.setProfit(profitActual.abs());
 		statisticsVo.setFreight(freight.abs().add(freightCancel));
 		statisticsVo.setFreightCancellation(freightCancel.add(freightReturns));
 		statisticsVo.setGoodsSumCancellation(goodsNumCancel.add(goodsNumReturns));