zouxuan 4 年之前
父节点
当前提交
c9d5111581

+ 2 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/CourseScheduleStudentPaymentService.java

@@ -2,6 +2,7 @@ package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.biz.dal.entity.CourseScheduleStudentPayment;
+import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.common.service.BaseService;
 
 import java.util.List;
@@ -81,4 +82,5 @@ public interface CourseScheduleStudentPaymentService extends BaseService<Long, C
 	 */
 	List<CourseScheduleStudentPayment> getClassGroupNoStartCourse(List<Integer> classGroupIds);
 
+	int deleteByMusicGroupId(String musicGroupId, GroupType music);
 }

+ 5 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleStudentPaymentServiceImpl.java

@@ -419,4 +419,9 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 		return needCourses;
 	}
 
+	@Override
+	public int deleteByMusicGroupId(String musicGroupId, GroupType music) {
+		return courseScheduleStudentPaymentDao.deleteByMusicGroupId(musicGroupId,music);
+	}
+
 }

+ 3 - 4
mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

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