|
@@ -103,7 +103,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
private CourseScheduleTeacherSalaryDao courseScheduleTeacherSalaryDao;
|
|
private CourseScheduleTeacherSalaryDao courseScheduleTeacherSalaryDao;
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
- private CourseScheduleStudentPaymentDao courseScheduleStudentPaymentDao;
|
|
|
|
|
|
+ private CourseScheduleStudentPaymentService courseScheduleStudentPaymentService;
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private CooperationOrganDao cooperationOrganDao;
|
|
private CooperationOrganDao cooperationOrganDao;
|
|
@@ -137,7 +137,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private StudentPaymentOrderDetailDao studentPaymentOrderDetailDao;
|
|
private StudentPaymentOrderDetailDao studentPaymentOrderDetailDao;
|
|
-
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private MusicGroupSubjectPlanService musicGroupSubjectPlanService;
|
|
private MusicGroupSubjectPlanService musicGroupSubjectPlanService;
|
|
@Autowired
|
|
@Autowired
|
|
@@ -152,7 +151,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
private ClassGroupStudentMapperService classGroupStudentMapperService;
|
|
private ClassGroupStudentMapperService classGroupStudentMapperService;
|
|
@Autowired
|
|
@Autowired
|
|
private MusicGroupPaymentCalenderDetailDao musicGroupPaymentCalenderDetailDao;
|
|
private MusicGroupPaymentCalenderDetailDao musicGroupPaymentCalenderDetailDao;
|
|
-
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private ImFeignService imFeignService;
|
|
private ImFeignService imFeignService;
|
|
@Autowired
|
|
@Autowired
|
|
@@ -1219,7 +1217,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
// 删除课表
|
|
// 删除课表
|
|
courseScheduleDao.deleteCourseSchedulesByMusicGroupID(musicGroupId, GroupType.MUSIC);
|
|
courseScheduleDao.deleteCourseSchedulesByMusicGroupID(musicGroupId, GroupType.MUSIC);
|
|
// 删除每节课的课酬
|
|
// 删除每节课的课酬
|
|
- courseScheduleStudentPaymentDao.deleteByMusicGroupId(musicGroupId, GroupType.MUSIC);
|
|
|
|
|
|
+ courseScheduleStudentPaymentService.deleteByMusicGroupId(musicGroupId, GroupType.MUSIC);
|
|
courseScheduleTeacherSalaryDao.deleteByMusicGroupId(musicGroupId, GroupType.MUSIC);
|
|
courseScheduleTeacherSalaryDao.deleteByMusicGroupId(musicGroupId, GroupType.MUSIC);
|
|
|
|
|
|
//删除考勤
|
|
//删除考勤
|
|
@@ -1788,6 +1786,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
push.put(userId, userId.toString());
|
|
push.put(userId, userId.toString());
|
|
yimei.put(userId, studentRegistration.getParentsPhone());
|
|
yimei.put(userId, studentRegistration.getParentsPhone());
|
|
if (studentPaymentOrder.getStatus() == SUCCESS) {
|
|
if (studentPaymentOrder.getStatus() == SUCCESS) {
|
|
|
|
+ courseScheduleStudentPaymentService.updateForMusicGroupWithPaymentCalender(studentPaymentOrder.getOrderNo());
|
|
//当前乐团报名是否赠送乐团网管课
|
|
//当前乐团报名是否赠送乐团网管课
|
|
MusicGroupPaymentCalenderDetail calenderDetail = musicGroupPaymentCalenderDetailDao.findByOrderId(studentPaymentOrder.getId());
|
|
MusicGroupPaymentCalenderDetail calenderDetail = musicGroupPaymentCalenderDetailDao.findByOrderId(studentPaymentOrder.getId());
|
|
MusicGroupStudentFee musicGroupStudentFee = musicGroupPaymentCalenderService.updateCalender(calenderDetail.getId(),studentRegistration.getUserId());
|
|
MusicGroupStudentFee musicGroupStudentFee = musicGroupPaymentCalenderService.updateCalender(calenderDetail.getId(),studentRegistration.getUserId());
|