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

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupDao.java

@@ -126,4 +126,11 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      * @return
      */
     Integer queryCurrentMonthCoursesNum(@Param("organId") Integer organId);
+
+    /**
+     * 获取乐团下的教师map
+     * @param musicGroupId
+     * @return
+     */
+    List<Map<Integer,String>> queryTeacherMap(String musicGroupId);
 }

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

@@ -315,6 +315,11 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId,"确认开团(筹备中 -> 进行中)",sysUser.getId(),""));
         musicGroup.setStatus(MusicGroupStatusEnum.PROGRESS);
         musicGroupDao.update(musicGroup);
+        //给老师发送乐团成立通知
+        //获取所有和乐团相关的老师列表
+        Map<Integer,String> map = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(musicGroupDao.queryTeacherMap(musicGroupId))),HashMap.class);
+        sysMessageService.batchSendMessage(MessageSender.YIMEI,MessageTypeEnum.TEACHER_PUSH_MUSIC_GROUP_COURSE_ADD_PLAN,
+                map,null,0,musicGroup.getName());
     }
 
     private MusicGroup saveLog(String musicGroupId,MusicGroupStatusEnum statusEnum) throws Exception {

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

@@ -94,6 +94,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 	private SysMessageService sysMessageService;
 	@Autowired
 	private VipGroupDefaultClassesCycleDao vipGroupDefaultClassesCycleDao;
+	@Autowired
+	private TeacherDao teacherDao;
 
 	@Override
 	public BaseDAO<Long, VipGroup> getDAO() {
@@ -219,11 +221,19 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		vipGroupClassGroupMapper.setClassGroupId(classGroup.getId());
 		vipGroupClassGroupMapperDao.insert(vipGroupClassGroupMapper);
 
-		//创建融云班级群
-		// 指导老师加入群组
-		ImGroupMember[] imGroupMembers = { new ImGroupMember(vipGroup.getVipGroupApplyBaseInfo().getUserId().toString())};
-		// 创建群组
-		imFeignService.groupCreate(new ImGroupModel(classGroup.getId().toString(), imGroupMembers, classGroup.getName()));
+		//不需要审核
+		if(vipGroupApplyBaseInfoDto.getAuditStatus() == AuditStatusEnum.PASS){
+			//创建融云班级群
+			ImGroupMember[] imGroupMembers = { new ImGroupMember(vipGroup.getVipGroupApplyBaseInfo().getUserId().toString())};
+			// 创建群组
+			imFeignService.groupCreate(new ImGroupModel(classGroup.getId().toString(), imGroupMembers, classGroup.getName()));
+
+			//发送推送短信
+			Map<Integer,String> map = new HashMap<>(1);
+			map.put(sysUser.getId(),sysUser.getPhone());
+			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI,MessageTypeEnum.TEACHER_SMS_VIP_COURSE_ADD,
+					map,null,0,"",vipGroupApplyBaseInfoDto.getName());
+		}
 
 		//创建班级老师关联记录
 		ClassGroupTeacherMapper classGroupTeacherMapper=new ClassGroupTeacherMapper();
@@ -261,6 +271,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				vipGroup.getCourseSchedules(),
 				vipGroupApplyBaseInfoDto.getOnlineTeacherSalary(),
 				vipGroupApplyBaseInfoDto.getOfflineTeacherSalary());
+		//
 	}
 
 	@Override
@@ -350,6 +361,14 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		vipGroup.setAuditStatus(auditStatus);
 		vipGroup.setStopReason(reason);
 		vipGroupDao.update(vipGroup);
+		//给老师推送审批短信
+		Teacher teacher = teacherDao.get(vipGroup.getUserId());
+		if(teacher != null){
+			Map<Integer,String> map = new HashMap<>(1);
+			map.put(vipGroup.getUserId(),teacher.getPhone());
+			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI,MessageTypeEnum.TEACHER_SMS_VIP_COURSE_APPLY_RESULT,
+					map,null,0,"",vipGroup.getName(),vipGroup.getAuditStatus().getCode());
+		}
 	}
 
 	@Override
@@ -1094,6 +1113,12 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		courseScheduleDao.batchDeleteCourseSchedules(courseScheduleIds);
 		courseScheduleTeacherSalaryDao.batchDeleteByCourseScheduleIds(courseScheduleIds);
 		courseScheduleStudentPaymentDao.deleteByCourseSchedule(courseScheduleIds);
+		//vip课停止通知
+		Teacher teacher = teacherDao.get(vipGroup.getUserId());
+		Map<Integer,String> map = new HashMap<>(1);
+		map.put(vipGroup.getUserId(),teacher.getPhone());
+		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI,MessageTypeEnum.TEACHER_PUSH_VIP_COURSE_STOP,
+				map,null,0,"",vipGroup.getName());
 	}
 
 	@Override

mec-biz/src/main/resources/config/mybatis/MusicGroupMapper.xml

@@ -329,4 +329,10 @@
    			and mg.organ_id_ = #{organId}
    		</if>
   	</select>
+	<select id="queryTeacherMap" resultType="java.util.Map">
+		SELECT su.id_ 'key',su.phone_ 'value' FROM class_group_teacher_mapper cgtm
+		LEFT JOIN sys_user su ON cgtm.user_id_ = su.id_
+		WHERE cgtm.music_group_id_ = #{musicGroupId} AND su.phone_ IS NOT NULL
+		GROUP BY su.id_
+	</select>
 </mapper>

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherVipGroupController.java

@@ -29,8 +29,6 @@ public class TeacherVipGroupController extends BaseController {
 
 	@Autowired
 	private SysUserFeignService sysUserFeignService;
-	@Autowired
-	private SchoolService schoolService;
 
 	@ApiOperation("vip课申请")
 	@PostMapping("/vipGroupApply")