|
@@ -54,6 +54,8 @@ import java.text.SimpleDateFormat;
|
|
|
import java.time.Instant;
|
|
|
import java.time.LocalDate;
|
|
|
import java.time.LocalDateTime;
|
|
|
+import java.time.ZoneId;
|
|
|
+import java.time.format.DateTimeFormatter;
|
|
|
import java.time.temporal.ChronoUnit;
|
|
|
import java.time.temporal.TemporalAdjusters;
|
|
|
import java.util.*;
|
|
@@ -1264,20 +1266,29 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
|
|
|
baseMapper.courseAdjust(adjustVo);
|
|
|
|
|
|
// 课程调整后给学生发消息
|
|
|
- sendCourseAdjustMessage(studentPayment.getUserId());
|
|
|
+ sendCourseAdjustMessage(teacherId,adjustVo.getCourseId(),adjustVo.getStartTime());
|
|
|
}
|
|
|
|
|
|
- private void sendCourseAdjustMessage(Long userId) {
|
|
|
- // TODO 陪练课调整模板
|
|
|
+ //{老师昵称}已将{课程类型陪练课、琴房课}{课程名称}课调整到{上课时间yyyy-MM-dd HH:mm:ss},请注意查看
|
|
|
+ private void sendCourseAdjustMessage(Long userId,Integer courseScheduleId,Date date) {
|
|
|
+ // 陪练课调整模板
|
|
|
try {
|
|
|
// 发送消息
|
|
|
SysUser user = sysUserFeignService.queryUserById(userId);
|
|
|
|
|
|
+ CourseSchedule courseSchedule = this.getById(courseScheduleId);
|
|
|
+ CourseGroup courseGroup = courseGroupService.getById(courseSchedule.getCourseGroupId());
|
|
|
+
|
|
|
+ String coureName = 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());
|
|
|
|
|
|
sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PRACTICE_ADJUST, receivers, null,
|
|
|
- 0, null, ClientEnum.STUDENT.getCode(), user.getUsername());
|
|
|
+ 0, null, ClientEnum.STUDENT.getCode(), user.getUsername(),"陪练课",coureName,dateString);
|
|
|
|
|
|
} catch (Exception e) {
|
|
|
log.error("陪练课调整发送消息失败--> {}", e.fillInStackTrace());
|