Browse Source

feat:网管课推送

Joburgess 4 years ago
parent
commit
c11d0a2bd4

+ 32 - 4
mec-biz/src/main/java/com/ym/mec/biz/service/impl/EduPracticeGroupServiceImpl.java

@@ -955,16 +955,30 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.PAY_PRACTICE_BUY_SUCCESS,
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.PAY_PRACTICE_BUY_SUCCESS,
                     userPhoneMap, null, 0, null, "STUDENT", groupStartTime, groupEndTime, teacherName, drillTimesOnWeek, firstCourseStartTime);
                     userPhoneMap, null, 0, null, "STUDENT", groupStartTime, groupEndTime, teacherName, drillTimesOnWeek, firstCourseStartTime);
 
 
+            String practiceType = "网管课";
+            switch (practiceGroup.getType()){
+                case FREE:
+                case CHARGE:
+                    break;
+                case TRIAL:
+                    practiceType = "试听课";
+                    break;
+                case COME_ON_PACKAGE:
+                case CARE_PACKAGE:
+                    practiceType = practiceGroup.getType().getMsg();
+                    break;
+            }
+
             Map<Integer, String> teacherMap = new HashMap<>();
             Map<Integer, String> teacherMap = new HashMap<>();
             teacherMap.put(practiceGroup.getUserId(), practiceGroup.getUserId().toString());
             teacherMap.put(practiceGroup.getUserId(), practiceGroup.getUserId().toString());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PRACTICE_CREATE_TEACHER_PUSH,
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PRACTICE_CREATE_TEACHER_PUSH,
                     teacherMap, null, 0, null, "TEACHER", teacher.getRealName(),
                     teacherMap, null, 0, null, "TEACHER", teacher.getRealName(),
-                    practiceGroup.getType().getMsg(), practiceGroup.getName());
+                    practiceType, practiceGroup.getName());
             Map<Integer, String> teacherPhoneMap = new HashMap<>();
             Map<Integer, String> teacherPhoneMap = new HashMap<>();
             teacherPhoneMap.put(practiceGroup.getUserId(), teacher.getPhone());
             teacherPhoneMap.put(practiceGroup.getUserId(), teacher.getPhone());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.PRACTICE_CREATE_TEACHER_PUSH,
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.PRACTICE_CREATE_TEACHER_PUSH,
                     teacherPhoneMap, null, 0, null, "TEACHER", teacher.getRealName(),
                     teacherPhoneMap, null, 0, null, "TEACHER", teacher.getRealName(),
-                    practiceGroup.getType().getMsg(), practiceGroup.getName());
+                    practiceType, practiceGroup.getName());
         }catch (Exception e){
         }catch (Exception e){
             e.printStackTrace();
             e.printStackTrace();
         }
         }
@@ -1494,16 +1508,30 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
 //                    userPhoneMap, null, 0, null, "STUDENT", student.getUsername(), teacher.getRealName(),
 //                    userPhoneMap, null, 0, null, "STUDENT", student.getUsername(), teacher.getRealName(),
 //                    oneCourseTimeStr, twoCourseTimeStr);
 //                    oneCourseTimeStr, twoCourseTimeStr);
 
 
+            String practiceType = "网管课";
+            switch (practiceGroupBuyParams.getType()){
+                case FREE:
+                case CHARGE:
+                    break;
+                case TRIAL:
+                    practiceType = "试听课";
+                    break;
+                case COME_ON_PACKAGE:
+                case CARE_PACKAGE:
+                    practiceType = practiceGroupBuyParams.getType().getMsg();
+                    break;
+            }
+
             Map<Integer, String> teacherMap = new HashMap<>();
             Map<Integer, String> teacherMap = new HashMap<>();
             teacherMap.put(practiceGroupBuyParams.getUserId(), practiceGroupBuyParams.getUserId().toString());
             teacherMap.put(practiceGroupBuyParams.getUserId(), practiceGroupBuyParams.getUserId().toString());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PRACTICE_CREATE_TEACHER_PUSH,
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PRACTICE_CREATE_TEACHER_PUSH,
                     teacherMap, null, 0, null, "TEACHER", teacher.getRealName(),
                     teacherMap, null, 0, null, "TEACHER", teacher.getRealName(),
-                    practiceGroupBuyParams.getType().getMsg(), practiceGroupBuyParams.getName());
+                    practiceType, practiceGroupBuyParams.getName());
             Map<Integer, String> teacherPhoneMap = new HashMap<>();
             Map<Integer, String> teacherPhoneMap = new HashMap<>();
             teacherPhoneMap.put(practiceGroupBuyParams.getUserId(), teacher.getPhone());
             teacherPhoneMap.put(practiceGroupBuyParams.getUserId(), teacher.getPhone());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.PRACTICE_CREATE_TEACHER_PUSH,
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.PRACTICE_CREATE_TEACHER_PUSH,
                     teacherPhoneMap, null, 0, null, "TEACHER", teacher.getRealName(),
                     teacherPhoneMap, null, 0, null, "TEACHER", teacher.getRealName(),
-                    practiceGroupBuyParams.getType().getMsg(), practiceGroupBuyParams.getName());
+                    practiceType, practiceGroupBuyParams.getName());
         }catch (Exception e){
         }catch (Exception e){
             e.printStackTrace();
             e.printStackTrace();
         }
         }

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

@@ -2125,16 +2125,30 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             }
             }
         }
         }
 
 
+        String practiceType = "网管课";
+        switch (practiceGroup.getType()){
+            case FREE:
+            case CHARGE:
+                break;
+            case TRIAL:
+                practiceType = "试听课";
+                break;
+            case COME_ON_PACKAGE:
+            case CARE_PACKAGE:
+                practiceType = practiceGroup.getType().getMsg();
+                break;
+        }
+
         Map<Integer, String> teacherMap = new HashMap<>();
         Map<Integer, String> teacherMap = new HashMap<>();
         teacherMap.put(practiceGroup.getUserId(), practiceGroup.getUserId().toString());
         teacherMap.put(practiceGroup.getUserId(), practiceGroup.getUserId().toString());
         sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PRACTICE_CREATE_TEACHER_PUSH,
         sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PRACTICE_CREATE_TEACHER_PUSH,
                 teacherMap, null, 0, null, "TEACHER",
                 teacherMap, null, 0, null, "TEACHER",
-                teacher.getRealName(), practiceGroup.getType().getMsg(), practiceGroup.getName());
+                teacher.getRealName(),practiceType, practiceGroup.getName());
         Map<Integer, String> teacherPhoneMap = new HashMap<>();
         Map<Integer, String> teacherPhoneMap = new HashMap<>();
         teacherPhoneMap.put(practiceGroup.getUserId(), teacher.getPhone());
         teacherPhoneMap.put(practiceGroup.getUserId(), teacher.getPhone());
         sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.PRACTICE_CREATE_TEACHER_PUSH,
         sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.PRACTICE_CREATE_TEACHER_PUSH,
                 teacherPhoneMap, null, 0, null, "TEACHER",
                 teacherPhoneMap, null, 0, null, "TEACHER",
-                teacher.getRealName(), practiceGroup.getType().getMsg(), practiceGroup.getName());
+                teacher.getRealName(), practiceType, practiceGroup.getName());
 
 
         studentDao.updateStudentServiceTag(practiceGroup.getStudentId(), null, YesOrNoEnum.YES.getCode());
         studentDao.updateStudentServiceTag(practiceGroup.getStudentId(), null, YesOrNoEnum.YES.getCode());
 
 
@@ -3317,18 +3331,30 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.PAY_PRACTICE_BUY_SUCCESS,
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.PAY_PRACTICE_BUY_SUCCESS,
                     userPhoneMap, null, 0, null, "STUDENT", groupStartTime, groupEndTime, teacherName, drillTimesOnWeek, firstCourseStartTime);
                     userPhoneMap, null, 0, null, "STUDENT", groupStartTime, groupEndTime, teacherName, drillTimesOnWeek, firstCourseStartTime);
 
 
-
+            String practiceType = "网管课";
+            switch (practiceGroup.getType()){
+                case FREE:
+                case CHARGE:
+                    break;
+                case TRIAL:
+                    practiceType = "试听课";
+                    break;
+                case COME_ON_PACKAGE:
+                case CARE_PACKAGE:
+                    practiceType = practiceGroup.getType().getMsg();
+                    break;
+            }
 
 
             Map<Integer, String> teacherMap = new HashMap<>();
             Map<Integer, String> teacherMap = new HashMap<>();
             teacherMap.put(practiceGroup.getUserId(), practiceGroup.getUserId().toString());
             teacherMap.put(practiceGroup.getUserId(), practiceGroup.getUserId().toString());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PRACTICE_CREATE_TEACHER_PUSH,
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PRACTICE_CREATE_TEACHER_PUSH,
                     teacherMap, null, 0, null, "TEACHER",
                     teacherMap, null, 0, null, "TEACHER",
-                    teacher.getRealName(), practiceGroup.getType().getMsg(), practiceGroup.getName());
+                    teacher.getRealName(), practiceType, practiceGroup.getName());
             Map<Integer, String> teacherPhoneMap = new HashMap<>();
             Map<Integer, String> teacherPhoneMap = new HashMap<>();
             teacherPhoneMap.put(practiceGroup.getUserId(), teacher.getPhone());
             teacherPhoneMap.put(practiceGroup.getUserId(), teacher.getPhone());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.PRACTICE_CREATE_TEACHER_PUSH,
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.PRACTICE_CREATE_TEACHER_PUSH,
                     teacherPhoneMap, null, 0, null, "TEACHER",
                     teacherPhoneMap, null, 0, null, "TEACHER",
-                    teacher.getRealName(), practiceGroup.getType().getMsg(), practiceGroup.getName());
+                    teacher.getRealName(), practiceType, practiceGroup.getName());
         } catch (Exception e) {
         } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();
         }
         }