活动排课

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

@@ -3788,21 +3788,26 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         String groupStartTime = DateUtil.dateToString(practiceGroup.getCoursesStartDate(), "yyyy年MM月dd日");
         String groupEndTime = DateUtil.dateToString(practiceGroup.getCoursesExpireDate(), "yyyy年MM月dd日");
         String teacherName = teacher.getRealName();
-        String drillTimesOnWeek = practiceGroup.getDrillTimesOnWeek().toString();
+        String drillTimesOnWeek = null;
+        if(practiceGroup.getDrillTimesOnWeek() != null){
+            drillTimesOnWeek = practiceGroup.getDrillTimesOnWeek().toString();
+        }
         CourseSchedule firstCourseWithGroup = courseScheduleDao.findFirstCourseWithGroup(practiceGroup.getId().toString(), GroupType.PRACTICE);
         String firstCourseStartTime = DateUtil.dateToString(firstCourseWithGroup.getStartClassTime(), "yyyy年MM月dd日 HH时mm分");
 
         try {
-            Map<Integer, String> userMap = new HashMap<>();
-            userMap.put(practiceGroup.getStudentId(), practiceGroup.getStudentId().toString());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_SMS_PUSH_PAY_PRACTICE_BUY_SUCCESS,
-                    userMap, null, 0, null, "STUDENT", groupStartTime, groupEndTime, teacherName, drillTimesOnWeek, firstCourseStartTime);
+            if(drillTimesOnWeek != null){
+                Map<Integer, String> userMap = new HashMap<>();
+                userMap.put(practiceGroup.getStudentId(), practiceGroup.getStudentId().toString());
+                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_SMS_PUSH_PAY_PRACTICE_BUY_SUCCESS,
+                        userMap, null, 0, null, "STUDENT", groupStartTime, groupEndTime, teacherName, drillTimesOnWeek, firstCourseStartTime);
 //            SysUser student = sysUserFeignService.queryUserById(practiceGroup.getStudentId());
-            SysUser student = teacherDao.getUser(practiceGroup.getStudentId());
-            Map<Integer, String> userPhoneMap = new HashMap<>();
-            userPhoneMap.put(practiceGroup.getStudentId(), student.getPhone());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_PUSH_PAY_PRACTICE_BUY_SUCCESS,
-                    userPhoneMap, null, 0, null, "STUDENT", groupStartTime, groupEndTime, teacherName, drillTimesOnWeek, firstCourseStartTime);
+                SysUser student = teacherDao.getUser(practiceGroup.getStudentId());
+                Map<Integer, String> userPhoneMap = new HashMap<>();
+                userPhoneMap.put(practiceGroup.getStudentId(), student.getPhone());
+                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_PUSH_PAY_PRACTICE_BUY_SUCCESS,
+                        userPhoneMap, null, 0, null, "STUDENT", groupStartTime, groupEndTime, teacherName, drillTimesOnWeek, firstCourseStartTime);
+            }
 
             String practiceType = "网管课";
             switch (practiceGroup.getType()){