|
|
@@ -2175,14 +2175,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
|
|
|
Map<String,BigDecimal> results=new HashMap<>(1);
|
|
|
|
|
|
- int normalStudentNum = 0;
|
|
|
- if(Objects.nonNull(courseId)){
|
|
|
- normalStudentNum = courseScheduleStudentPaymentDao.countStudentNum(courseId.intValue());
|
|
|
- }
|
|
|
- if(normalStudentNum <= 0 && Objects.nonNull(vipGroup.getId())){
|
|
|
- normalStudentNum = classGroupStudentMapperDao.countGroupNormalStudentNum(GroupType.VIP, vipGroup.getId().toString());
|
|
|
- }
|
|
|
-
|
|
|
VipGroupSalarySettlementTypeDto vipOnlineSalarySettlement = null;
|
|
|
VipGroupSalarySettlementTypeDto giveVipOnlineSalarySettlement = null;
|
|
|
VipGroupSalarySettlementTypeDto vipOfflineSalarySettlement = null;
|
|
|
@@ -2254,7 +2246,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
|
|
|
//教师线下单课酬计算
|
|
|
if(vipGroupCategory.getMusicTheory()){
|
|
|
- teacherOfflineSalary = teacherDefaultVipGroupSalary.getOfflineClassesSalary().multiply(new BigDecimal(normalStudentNum)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP);
|
|
|
+ teacherOfflineSalary = teacherDefaultVipGroupSalary.getOfflineClassesSalary().multiply(new BigDecimal(studentNum>5?5:studentNum)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP);
|
|
|
}else {
|
|
|
teacherOfflineSalary = teacherDefaultVipGroupSalary.getOfflineClassesSalary();
|
|
|
}
|
|
|
@@ -2267,7 +2259,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
|
|
|
//教师赠送线下单课酬计算
|
|
|
if(vipGroupCategory.getMusicTheory()){
|
|
|
- giveTeacherOfflineSalary = teacherDefaultVipGroupSalary.getOfflineClassesSalary().multiply(new BigDecimal(normalStudentNum)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP);
|
|
|
+ giveTeacherOfflineSalary = teacherDefaultVipGroupSalary.getOfflineClassesSalary().multiply(new BigDecimal(studentNum>5?5:studentNum)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP);
|
|
|
}else {
|
|
|
giveTeacherOfflineSalary = teacherDefaultVipGroupSalary.getOfflineClassesSalary();
|
|
|
}
|
zouxuan