|
@@ -1266,29 +1266,30 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
|
|
|
baseMapper.courseAdjust(adjustVo);
|
|
|
|
|
|
// 课程调整后给学生发消息
|
|
|
- sendCourseAdjustMessage(teacherId, adjustVo.getCourseId(), adjustVo.getStartTime());
|
|
|
+ sendCourseAdjustMessage(teacherId,studentPayment.getUserId(),adjustVo.getCourseId(),adjustVo.getStartTime());
|
|
|
}
|
|
|
|
|
|
//{老师昵称}已将{课程类型陪练课、琴房课}{课程名称}课调整到{上课时间yyyy-MM-dd HH:mm:ss},请注意查看
|
|
|
- private void sendCourseAdjustMessage(Long userId, Integer courseScheduleId, Date date) {
|
|
|
+ private void sendCourseAdjustMessage(Long teacherId,Long studentId,Integer courseScheduleId,Date date) {
|
|
|
// 陪练课调整模板
|
|
|
try {
|
|
|
// 发送消息
|
|
|
- SysUser user = sysUserFeignService.queryUserById(userId);
|
|
|
+ SysUser teacher = sysUserFeignService.queryUserById(teacherId);
|
|
|
+ SysUser student = sysUserFeignService.queryUserById(studentId);
|
|
|
|
|
|
CourseSchedule courseSchedule = this.getById(courseScheduleId);
|
|
|
CourseGroup courseGroup = courseGroupService.getById(courseSchedule.getCourseGroupId());
|
|
|
|
|
|
- String coureName = courseGroup.getName() + "-第" + courseSchedule.getClassNum() + "课";
|
|
|
+ String courseName = courseGroup.getName() + "-第" + courseSchedule.getClassNum() + "课";
|
|
|
|
|
|
String dateString = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().format(
|
|
|
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
|
|
|
|
|
|
Map<Long, String> receivers = new HashMap<>();
|
|
|
- receivers.put(userId, user.getPhone());
|
|
|
+ receivers.put(studentId, student.getPhone());
|
|
|
|
|
|
sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PRACTICE_ADJUST, receivers, null,
|
|
|
- 0, null, ClientEnum.STUDENT.getCode(), user.getUsername(), "陪练课", coureName, dateString);
|
|
|
+ 0, null, ClientEnum.STUDENT.getCode(), teacher.getUsername(),"陪练课",courseName,dateString);
|
|
|
|
|
|
} catch (Exception e) {
|
|
|
log.error("陪练课调整发送消息失败--> {}", e.fillInStackTrace());
|
|
@@ -2257,36 +2258,6 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
|
|
|
.set(CourseSchedule::getClassDate, DateUtil.trunc(startTime))
|
|
|
.set(CourseSchedule::getStartTime, startTime)
|
|
|
.set(CourseSchedule::getEndTime, endTime));
|
|
|
-
|
|
|
- if (CollectionUtils.isNotEmpty(studentPayments)) {
|
|
|
- SysUser teacher = sysUserFeignService.queryUserById(teacherId);
|
|
|
-
|
|
|
- CourseGroup courseGroup = courseGroupService.getById(courseSchedule.getCourseGroupId());
|
|
|
-
|
|
|
- String coureName = courseGroup.getName() + "-第" + courseSchedule.getClassNum() + "课";
|
|
|
-
|
|
|
- String dateString = startTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().format(
|
|
|
- DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
|
|
|
-
|
|
|
- for (CourseScheduleStudentPayment payment : studentPayments) {
|
|
|
- sendPianoRoomAdjustMessage(payment.getUserId(), teacher.getUsername(), coureName, dateString);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- //{老师昵称}已将{课程类型陪练课、琴房课}{课程名称}课调整到{上课时间yyyy-MM-dd HH:mm:ss},请注意查看
|
|
|
- private void sendPianoRoomAdjustMessage(Long userId, String teacherName, String coureName, String dateString) {
|
|
|
- try {
|
|
|
- // 发送消息
|
|
|
- SysUser user = sysUserFeignService.queryUserById(userId);
|
|
|
- Map<Long, String> receivers = new HashMap<>();
|
|
|
- receivers.put(userId, user.getPhone());
|
|
|
-
|
|
|
- sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PIANO_ROOM_ADJUST, receivers, null,
|
|
|
- 0, null, ClientEnum.STUDENT.getCode(), teacherName, "琴房课", coureName, dateString);
|
|
|
- } catch (Exception e) {
|
|
|
- log.error("琴房课调整发送消息失败--> {}", e.fillInStackTrace());
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
/**
|