Merge branch 'adapay_new' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentCourseHomeworkServiceImpl.java

@@ -173,6 +173,17 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
                     null,courseDate,courseSchedule.getName());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_SUBMIT_PUSH,
                     userMap, null, 0, notifyUrl, "TEACHER", courseSchedule.getName(), courseDate, user.getUsername());
+
+            Date date = new Date();
+            if(date.before(courseHomework.getExpiryDate())){
+                ClassGroup classGroup = classGroupDao.findByCourseSchedule(existHomework.getCourseScheduleId().intValue(), 0);
+                if(classGroup != null){
+                    SysUser sysUser = sysUserFeignService.queryUserById(existHomework.getUserId());
+                    sysMessageService.batchSendImGroupMessage(MessageTypeEnum.IM_HOMEWORK_SUBMIT_PUSH_GROUP,existHomework.getUserId().toString(),null,
+                            new String[]{classGroup.getId().toString()},
+                            null, sysUser.getUsername());
+                }
+            }
         }
     }