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

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

@@ -312,20 +312,20 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
 
     @Override
     public Boolean pushNotice() {
-        Date endTime = DateUtil.addDays(DateUtil.getLastTimeWithDay(new Date()), -7);
+        Date endTime = DateUtil.addDays(DateUtil.getLastTimeWithDay(new Date()), -6);
         Date startTime = DateUtil.trunc(endTime);
         List<StudentInstrument> studentInstruments = studentInstrumentDao.getListByEndTime(startTime, endTime);
-        if(studentInstruments.size() <=0){
+        if (studentInstruments.size() <= 0) {
             return false;
         }
         String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
-        String pushUrl = baseApiUrl+"#/leBao";
-        Map<Integer, String> userMap = new HashMap<>();
+        String pushUrl = baseApiUrl + "#/leBao";
         for (StudentInstrument studentInstrument : studentInstruments) {
+            Map<Integer, String> userMap = new HashMap<>();
             userMap.put(studentInstrument.getStudentId(), studentInstrument.getStudentId().toString());
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.MAINTENANCE_NOTICE_PUSH,
+                    userMap, null, 0, "5?" + pushUrl, "STUDENT", studentInstrument.getGoodsName());
         }
-        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.MAINTENANCE_NOTICE_PUSH,
-                userMap, null, 0, "5?" + pushUrl, "STUDENT");
         return true;
     }
 }