Merge remote-tracking branch 'origin/dev' into dev

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

@@ -192,10 +192,10 @@ public class StatisticsServiceImpl implements IStatisticsService {
 			BigDecimal profitCancel = saleDetailDtoList.stream().filter(e -> OrderStatusEnum.CANCELLED.value.equals(e.getStatus()))
 				.map(SaleDetailDto::getProfit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add)
 				.setScale(0, RoundingMode.HALF_UP).abs();
-			map.put("dealAmountM", subTotalMoneyActual.subtract(subTotalMoneyReturns).subtract(subTotalMoneyCancel));
-			map.put("salesNumM", goodsNumActual.subtract(goodsNumReturns).subtract(goodsNumCancel));
+			map.put("dealAmountM", subTotalMoneyActual.subtract(subTotalMoneyReturns));
+			map.put("salesNumM", goodsNumActual.subtract(goodsNumReturns));
 			map.put("stlAmountM", stlAmountActual.subtract(stlAmountReturns));
-			map.put("profitM", profitActual.subtract(profitReturns).subtract(profitCancel));
+			map.put("profitM", profitActual.subtract(profitReturns));
 			String formattedDay = today.format(formatter);
 			List<SaleDetailDto> saleDetailDayList = saleDetailDtoList.stream().filter(e -> e.getBusinesDate().equals(formattedDay))
 				.collect(Collectors.toList());
@@ -768,7 +768,7 @@ public class StatisticsServiceImpl implements IStatisticsService {
 		long customerCount = saleDetailDtoList.stream().filter(e -> !OrderStatusEnum.COMPLETED.value.equals(e.getStatus()) && !OrderStatusEnum.CANCELLED.value.equals(e.getStatus()) && e.getBsType().equals("销售")).map(SaleDetailDto::getCustomerId).filter(Objects::nonNull).distinct().count();
 		BigDecimal realAmount = subTotalMoneyActual.subtract(subTotalMoneyReturns).subtract(subTotalMoneyCancel);
 		Map<String, Object> map = new HashMap<>(3);
-		map.put("income", goodsNumActual.subtract(goodsNumReturns).subtract(goodsNumCancel));
+		map.put("income", goodsNumActual.subtract(goodsNumReturns));
 		map.put("averageAmount", realAmount.divide(new BigDecimal(customerCount), 2, RoundingMode.HALF_UP));
 		map.put("corpsNumber", customerCount);