|
@@ -555,21 +555,23 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public boolean sendBuyMessage(Long teacherId, Long studentId, Long musicSheetId, ClientEnum orderClient) {
|
|
|
- SysUser teacher = sysUserFeignService.queryUserById(teacherId);
|
|
|
- SysUser student = sysUserFeignService.queryUserById(studentId);
|
|
|
- if (StringUtil.isEmpty(teacher.getPhone())) {
|
|
|
- log.warn("teacher id {} name {} 手机号不存在,消息推送失败", teacher.getId(), teacher.getUsername());
|
|
|
- }
|
|
|
|
|
|
MusicSheet musicSheet = this.getById(musicSheetId);
|
|
|
- // 推送老师
|
|
|
- Map<Long, String> teacherReceivers = new HashMap<>();
|
|
|
- teacherReceivers.put(teacherId, teacher.getPhone());
|
|
|
+ SysUser student = sysUserFeignService.queryUserById(studentId);
|
|
|
+ if (musicSheet.getSourceType().equals(SourceTypeEnum.TEACHER)) {
|
|
|
+ SysUser teacher = sysUserFeignService.queryUserById(teacherId);
|
|
|
+ if (StringUtil.isEmpty(teacher.getPhone())) {
|
|
|
+ log.warn("teacher id {} name {} 手机号不存在,消息推送失败", teacher.getId(), teacher.getUsername());
|
|
|
+ }
|
|
|
|
|
|
- sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,
|
|
|
- MessageTypeEnum.STUDENT_BUY_TEACHER_MUSIC_SHEET, teacherReceivers, null,
|
|
|
- 0, null, ClientEnum.TEACHER.getCode(), student.getUsername(), musicSheet.getMusicSheetName());
|
|
|
+ // 推送老师
|
|
|
+ Map<Long, String> teacherReceivers = new HashMap<>();
|
|
|
+ teacherReceivers.put(teacherId, teacher.getPhone());
|
|
|
+
|
|
|
+ sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_BUY_TEACHER_MUSIC_SHEET, teacherReceivers, null,
|
|
|
+ 0, null, ClientEnum.TEACHER.getCode(), student.getUsername(), musicSheet.getMusicSheetName());
|
|
|
|
|
|
+ }
|
|
|
// 推送学生
|
|
|
Map<Long, String> studentReceivers = new HashMap<>();
|
|
|
studentReceivers.put(studentId, student.getPhone());
|