统计销售增加经营利润显示

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/vo/StatisticsVo.java

@@ -98,6 +98,11 @@ public class StatisticsVo {
 	 */
 	private BigDecimal surplusAmount;
 
+	/**
+	 * 经营利润 = 毛利 - 已取消毛利
+	 */
+	private BigDecimal earnedProfit;
+
 
 
 	public void valueIsZero() {
@@ -117,6 +122,7 @@ public class StatisticsVo {
 		this.primaryGoodsTotalMoney = BigDecimal.ZERO;
 		this.surplusNum = BigDecimal.ZERO;
 		this.surplusAmount = BigDecimal.ZERO;
+		this.earnedProfit = BigDecimal.ZERO;
 	}
 
 }

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

@@ -1146,6 +1146,7 @@ public class StatisticsServiceImpl implements IStatisticsService {
 		statisticsVo.setPrimaryGoodsTotalMoney(primaryGoodsTotalMoney);
 		statisticsVo.setSurplusNum(surplusNum);
 		statisticsVo.setSurplusAmount(surplusAmount);
+		statisticsVo.setEarnedProfit(statisticsVo.getProfit().subtract(statisticsVo.getProfitCancellation()));
 		return R.data(statisticsVo);
 	}