|
@@ -278,7 +278,7 @@ public class OperatingReportServiceImpl extends BaseServiceImpl<Integer, Operati
|
|
|
|
|
|
private void updateReport(OperatingReport operatingReport, Map<String, Object> params) {
|
|
|
//收入合计:销售收入+服务收入-业务退费
|
|
|
- BigDecimal incomeTotal = operatingReport.getSellAmount().add(operatingReport.getServiceAmount()).subtract(operatingReport.getRefundAmount());
|
|
|
+ BigDecimal incomeTotal = operatingReport.getSellAmount().add(operatingReport.getServiceAmount()).add(operatingReport.getOtherIncome()).subtract(operatingReport.getRefundAmount());
|
|
|
operatingReport.setIncomeTotal(incomeTotal);
|
|
|
//成本费用合计:销售成本+固定支出+变动支出+分摊费用
|
|
|
BigDecimal costAmount = operatingReport.getSellCost().add(operatingReport.getExpensesAmount()).add(operatingReport.getVariableCost()).add(operatingReport.getDistributionAmount());
|