|
|
@@ -2120,8 +2120,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
incomeDto.setCloudCoachIncome(incomeDto.getCloudCoachIncome().add(groupCloudAmount.getOrDefault(organId,BigDecimal.ZERO)));
|
|
|
incomeDto.setSaleCloudCoachIncome(incomeDto.getSaleCloudCoachIncome().add(personalCloudAmount.getOrDefault(organId,BigDecimal.ZERO)));
|
|
|
//服务收入
|
|
|
- incomeDto.setServiceIncome(incomeDto.getLargeInstruments()
|
|
|
- .add(incomeDto.getStudentGuidanceIncome())
|
|
|
+ incomeDto.setServiceIncome(incomeDto.getStudentGuidanceIncome()
|
|
|
.add(incomeDto.getCoursePurchaseIncome())
|
|
|
.add(incomeDto.getExamIncome())
|
|
|
.add(incomeDto.getMaintenanceCost())
|
