|
@@ -1998,9 +1998,11 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
if (hasPaid && musicGroupSubjectPlan != null) {
|
|
|
musicGroupSubjectPlan.setPaidStudentNum(musicGroupSubjectPlan.getPaidStudentNum() - 1);
|
|
|
musicGroupSubjectPlan.setUpdateTime(date);
|
|
|
- List<String> orderDetailTypes = studentPaymentOrderDetailDao.getOrderDetailType(studentPaymentOrder.getId());
|
|
|
- if (musicGroup.getCourseViewType().equals(CourseViewTypeEnum.CLOUD_TEACHER) && !orderDetailTypes.contains("CLOUD_TEACHER")) {
|
|
|
- musicGroupSubjectPlan.setPaidZeroNum(musicGroupSubjectPlan.getPaidZeroNum() - 1);
|
|
|
+ if (studentPaymentOrder != null) {
|
|
|
+ List<String> orderDetailTypes = studentPaymentOrderDetailDao.getOrderDetailType(studentPaymentOrder.getId());
|
|
|
+ if (musicGroup.getCourseViewType().equals(CourseViewTypeEnum.CLOUD_TEACHER) && !orderDetailTypes.contains("CLOUD_TEACHER")) {
|
|
|
+ musicGroupSubjectPlan.setPaidZeroNum(musicGroupSubjectPlan.getPaidZeroNum() - 1);
|
|
|
+ }
|
|
|
}
|
|
|
musicGroupSubjectPlanDao.update(musicGroupSubjectPlan);
|
|
|
}
|
|
@@ -2393,14 +2395,14 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
if (courseScheduleTeacherSalary.getSettlementTime() != null) {
|
|
|
throw new BizException("课程已结算");
|
|
|
}
|
|
|
- if(Objects.nonNull(salary)){
|
|
|
+ if (Objects.nonNull(salary)) {
|
|
|
courseScheduleTeacherSalary.setExpectSalary(salary);
|
|
|
}
|
|
|
courseScheduleTeacherSalary.setSubsidy(subsidy);
|
|
|
courseScheduleTeacherSalary.setUpdateTime(new Date());
|
|
|
- if(TeachTypeEnum.BISHOP.equals(courseScheduleTeacherSalary.getTeacherRole())){
|
|
|
+ if (TeachTypeEnum.BISHOP.equals(courseScheduleTeacherSalary.getTeacherRole())) {
|
|
|
courseScheduleTeacherSalary.setEnableChangeSalary(false);
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
courseScheduleTeacherSalary.setEnableChangeSalary(true);
|
|
|
}
|
|
|
courseScheduleTeacherSalaryDao.update(courseScheduleTeacherSalary);
|