金额统计

mec-biz/src/main/java/com/ym/mec/biz/service/impl/OperatingReportServiceImpl.java

@@ -224,6 +224,14 @@ public class OperatingReportServiceImpl extends BaseServiceImpl<Integer, Operati
         organOperating.forEach((organId, operatingReport) -> {
             operatingReport.setMonth(startTime);
             operatingReport.setCreateTime(nowDate);
+            //收入合计：销售收入+服务收入-业务退费
+            BigDecimal incomeTotal = operatingReport.getSellAmount().add(operatingReport.getServiceAmount()).subtract(operatingReport.getRefundAmount());
+            operatingReport.setIncomeTotal(incomeTotal);
+            //成本费用合计：销售成本+固定支出+变动支出+分摊费用
+            BigDecimal costAmount = operatingReport.getSellCost().add(operatingReport.getExpensesAmount()).add(operatingReport.getVariableCost()).add(operatingReport.getDistributionAmount());
+            operatingReport.setCostAmount(costAmount);
+            //利润：收入合计-成本费用合计
+            operatingReport.setProfit(incomeTotal.subtract(costAmount));
             params.put("organId", operatingReport.getOrganId());
             params.put("cooperationOrganId", operatingReport.getCooperationOrganId());
             if (operatingReportDao.getReport(params) == null) {