|
@@ -97,6 +97,8 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
@Autowired
|
|
|
private ImFeignService imFeignService;
|
|
|
@Autowired
|
|
|
+ private ImUserFriendService imUserFriendService;
|
|
|
+ @Autowired
|
|
|
private TeacherFreeTimeDao teacherFreeTimeDao;
|
|
|
@Autowired
|
|
|
private CourseScheduleService courseScheduleService;
|
|
@@ -2075,6 +2077,10 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
}
|
|
|
courseScheduleStudentPaymentDao.batchInsert(courseScheduleStudentPayments);
|
|
|
|
|
|
+ imUserFriendService.groupChangeEducation(practiceGroup.getId().toString(), practiceGroup.getEducationalTeacherId(), GroupType.PRACTICE);
|
|
|
+ imUserFriendService.classGroupChangeTeacher(classGroup.getId(), practiceGroup.getUserId());
|
|
|
+ imUserFriendService.classGroupAddStudent(classGroup.getId(), Arrays.asList(practiceGroup.getStudentId()));
|
|
|
+
|
|
|
//推送
|
|
|
List<CourseSchedule> courseSchedules1 = courseScheduleDao.findTeacherCoursesWithIncludeDateRange(practiceGroup.getUserId(), allCourseDates.get(0), DateUtil.addMinutes(allCourseDates.get(0), practiceCourseMinutes));
|
|
|
List<CourseSchedule> courseSchedules2 = courseScheduleDao.findTeacherCoursesWithIncludeDateRange(practiceGroup.getUserId(), allCourseDates.get(1), DateUtil.addMinutes(allCourseDates.get(1), practiceCourseMinutes));
|
|
@@ -3266,6 +3272,10 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
practiceGroup.setGroupStatus(GroupStatusEnum.NORMAL);
|
|
|
practiceGroupDao.update(practiceGroup);
|
|
|
|
|
|
+ imUserFriendService.groupChangeEducation(practiceGroup.getId().toString(), practiceGroup.getEducationalTeacherId(), GroupType.PRACTICE);
|
|
|
+ imUserFriendService.classGroupChangeTeacher(classGroup.getId(), practiceGroup.getUserId());
|
|
|
+ imUserFriendService.classGroupAddStudent(classGroup.getId(), Arrays.asList(practiceGroup.getStudentId()));
|
|
|
+
|
|
|
try {
|
|
|
contractService.transferPracticeCoursesContract(order.getUserId(), classGroup.getTotalClassTimes(), practiceGroup.getCoursesStartDate(), practiceGroup.getCoursesExpireDate(), order.getExpectAmount());
|
|
|
} catch (Exception e) {
|