update

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

@@ -844,51 +844,31 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 	}
 
     private void sendSuccessMsg(StudentPaymentOrder studentPaymentOrder,ActivityUserMapper activityUserMapper){
-		Integer userId = studentPaymentOrder.getUserId();
-		String[] split = studentPaymentOrder.getActivityId().split(",");
-		for (String activityId : split) {
-			VipGroupActivity vipGroupActivity = vipGroupActivityDao.get(Integer.parseInt(activityId));
-			String activityName = vipGroupActivity.getName();
-			SysUser user = teacherDao.getUser(userId);
-			String username = StringUtils.isEmpty(user.getUsername()) ? user.getRealName() : user.getUsername();
-			mark:if(vipGroupActivity.getActivityType().equals(0)) {
-				Map<Integer, String> map = new HashMap<>(1);
-				map.put(userId, userId.toString());
-				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PUSH_STUDENT_BUY_ACTIVITY, map, null, 0, null, "STUDENT",
-						activityName);
-				if(studentPaymentOrder.getType() == OrderTypeEnum.SMALL_CLASS_TO_BUY
-						|| studentPaymentOrder.getType() == OrderTypeEnum.PRACTICE_GROUP_BUY
-						|| studentPaymentOrder.getType() == OrderTypeEnum.PRACTICE_GROUP_RENEW){
-					List<Integer> teacherIds = studentTeacherMapperDao.queryTeacherIds(userId, studentPaymentOrder.getType() == OrderTypeEnum.SMALL_CLASS_TO_BUY ? "VIP" : "PRACTICE");
-					if(!CollectionUtils.isEmpty(teacherIds)){
-						Map<Integer, String> teacherMap = new HashMap<>(teacherIds.size());
-						teacherIds.stream().forEach(e->teacherMap.put(e,e.toString()));
-						sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PUSH_TEACHER_ACTIVITY_COURSE,
-								teacherMap, null, 0, null, "TEACHER", username, activityName);
-						break mark;
-					}
-				}
-				//获取乐团主管
-				Map<Integer, String> eduMap = MapUtil.convertMybatisMap(studentRegistrationDao.queryStudentEduMap(userId));
-				if (CollectionUtils.isEmpty(eduMap)) {
-					Set<Integer> integers = employeePositionService.queryUserIdByRoleId(new SysUserRoleEnum[]{ORGAN_MANAGER}, studentPaymentOrder.getOrganId());
-					eduMap = new HashMap<>(integers.size());
-					if (!CollectionUtils.isEmpty(integers)) {
-						for (Integer integer : integers) {
-							eduMap.put(integer, integer.toString());
+		try {
+			Integer userId = studentPaymentOrder.getUserId();
+			String[] split = studentPaymentOrder.getActivityId().split(",");
+			for (String activityId : split) {
+				VipGroupActivity vipGroupActivity = vipGroupActivityDao.get(Integer.parseInt(activityId));
+				String activityName = vipGroupActivity.getName();
+				SysUser user = teacherDao.getUser(userId);
+				String username = StringUtils.isEmpty(user.getUsername()) ? user.getRealName() : user.getUsername();
+				mark:if(vipGroupActivity.getActivityType().equals(0)) {
+					Map<Integer, String> map = new HashMap<>(1);
+					map.put(userId, userId.toString());
+					sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PUSH_STUDENT_BUY_ACTIVITY, map, null, 0, null, "STUDENT",
+							activityName);
+					if(studentPaymentOrder.getType() == OrderTypeEnum.SMALL_CLASS_TO_BUY
+							|| studentPaymentOrder.getType() == OrderTypeEnum.PRACTICE_GROUP_BUY
+							|| studentPaymentOrder.getType() == OrderTypeEnum.PRACTICE_GROUP_RENEW){
+						List<Integer> teacherIds = studentTeacherMapperDao.queryTeacherIds(userId, studentPaymentOrder.getType() == OrderTypeEnum.SMALL_CLASS_TO_BUY ? "VIP" : "PRACTICE");
+						if(!CollectionUtils.isEmpty(teacherIds)){
+							Map<Integer, String> teacherMap = new HashMap<>(teacherIds.size());
+							teacherIds.stream().forEach(e->teacherMap.put(e,e.toString()));
+							sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PUSH_TEACHER_ACTIVITY_COURSE,
+									teacherMap, null, 0, null, "TEACHER", username, activityName);
+							break mark;
 						}
 					}
-				}
-				if (!CollectionUtils.isEmpty(eduMap)) {
-					sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PUSH_SYSTEM_ACTIVITY_COURSE,
-							eduMap, null, 0, null, "SYSTEM", username, activityName);
-				}
-			}else {
-				Map<Integer, String> map = new HashMap<>(1);
-				map.put(userId, userId.toString());
-				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PUSH_STUDENT_BUY_MEMBER_ACTIVITY, map, null, 0, null, "STUDENT",
-						activityName);
-				if(!tenantConfigService.autoActivationFlag(user.getTenantId())){
 					//获取乐团主管
 					Map<Integer, String> eduMap = MapUtil.convertMybatisMap(studentRegistrationDao.queryStudentEduMap(userId));
 					if (CollectionUtils.isEmpty(eduMap)) {
@@ -901,52 +881,76 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 						}
 					}
 					if (!CollectionUtils.isEmpty(eduMap)) {
-						sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PUSH_SYSTEM_ACTIVITY_MEMBER,
+						sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PUSH_SYSTEM_ACTIVITY_COURSE,
 								eduMap, null, 0, null, "SYSTEM", username, activityName);
 					}
-				}
-			}
-			mark:if(activityUserMapper != null){
-				String teacherType = null;
-				Integer giveVipFlag = activityUserMapper.getGiveVipFlag();
-				if(giveVipFlag == 1){
-					teacherType = "VIP";
-				}
-				Integer givePracticeFlag = activityUserMapper.getGivePracticeFlag();
-				if(givePracticeFlag == 1){
-					teacherType = "PRACTICE";
-				}
-				if(teacherType == null){
-					continue;
-				}
-				if(studentPaymentOrder.getType() == OrderTypeEnum.SMALL_CLASS_TO_BUY
-						|| studentPaymentOrder.getType() == OrderTypeEnum.PRACTICE_GROUP_BUY
-						|| studentPaymentOrder.getType() == OrderTypeEnum.PRACTICE_GROUP_RENEW){
-					List<Integer> teacherIds = studentTeacherMapperDao.queryTeacherIds(userId,teacherType);
-					if(!CollectionUtils.isEmpty(teacherIds)){
-						Map<Integer, String> teacherMap = new HashMap<>(teacherIds.size());
-						teacherIds.stream().forEach(e->teacherMap.put(e,e.toString()));
-						sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PUSH_TEACHER_ACTIVITY_COURSE,
-								teacherMap, null, 0, null, "TEACHER", username, activityName);
-						break mark;
+				}else {
+					Map<Integer, String> map = new HashMap<>(1);
+					map.put(userId, userId.toString());
+					sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PUSH_STUDENT_BUY_MEMBER_ACTIVITY, map, null, 0, null, "STUDENT",
+							activityName);
+					if(!tenantConfigService.autoActivationFlag(user.getTenantId())){
+						//获取乐团主管
+						Map<Integer, String> eduMap = MapUtil.convertMybatisMap(studentRegistrationDao.queryStudentEduMap(userId));
+						if (CollectionUtils.isEmpty(eduMap)) {
+							Set<Integer> integers = employeePositionService.queryUserIdByRoleId(new SysUserRoleEnum[]{ORGAN_MANAGER}, studentPaymentOrder.getOrganId());
+							eduMap = new HashMap<>(integers.size());
+							if (!CollectionUtils.isEmpty(integers)) {
+								for (Integer integer : integers) {
+									eduMap.put(integer, integer.toString());
+								}
+							}
+						}
+						if (!CollectionUtils.isEmpty(eduMap)) {
+							sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PUSH_SYSTEM_ACTIVITY_MEMBER,
+									eduMap, null, 0, null, "SYSTEM", username, activityName);
+						}
 					}
 				}
-				//获取乐团主管
-				Map<Integer, String> eduMap = MapUtil.convertMybatisMap(studentRegistrationDao.queryStudentEduMap(userId));
-				if (CollectionUtils.isEmpty(eduMap)) {
-					Set<Integer> integers = employeePositionService.queryUserIdByRoleId(new SysUserRoleEnum[]{ORGAN_MANAGER}, studentPaymentOrder.getOrganId());
-					eduMap = new HashMap<>(integers.size());
-					if (!CollectionUtils.isEmpty(integers)) {
-						for (Integer integer : integers) {
-							eduMap.put(integer, integer.toString());
+				mark:if(activityUserMapper != null){
+					String teacherType = null;
+					Integer giveVipFlag = activityUserMapper.getGiveVipFlag();
+					if(giveVipFlag == 1){
+						teacherType = "VIP";
+					}
+					Integer givePracticeFlag = activityUserMapper.getGivePracticeFlag();
+					if(givePracticeFlag == 1){
+						teacherType = "PRACTICE";
+					}
+					if(teacherType == null){
+						continue;
+					}
+					if(studentPaymentOrder.getType() == OrderTypeEnum.SMALL_CLASS_TO_BUY
+							|| studentPaymentOrder.getType() == OrderTypeEnum.PRACTICE_GROUP_BUY
+							|| studentPaymentOrder.getType() == OrderTypeEnum.PRACTICE_GROUP_RENEW){
+						List<Integer> teacherIds = studentTeacherMapperDao.queryTeacherIds(userId,teacherType);
+						if(!CollectionUtils.isEmpty(teacherIds)){
+							Map<Integer, String> teacherMap = new HashMap<>(teacherIds.size());
+							teacherIds.stream().forEach(e->teacherMap.put(e,e.toString()));
+							sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PUSH_TEACHER_ACTIVITY_COURSE,
+									teacherMap, null, 0, null, "TEACHER", username, activityName);
+							break mark;
 						}
 					}
-				}
-				if (!CollectionUtils.isEmpty(eduMap)) {
-					sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PUSH_SYSTEM_ACTIVITY_COURSE,
-							eduMap, null, 0, null, "SYSTEM", username, activityName);
+					//获取乐团主管
+					Map<Integer, String> eduMap = MapUtil.convertMybatisMap(studentRegistrationDao.queryStudentEduMap(userId));
+					if (CollectionUtils.isEmpty(eduMap)) {
+						Set<Integer> integers = employeePositionService.queryUserIdByRoleId(new SysUserRoleEnum[]{ORGAN_MANAGER}, studentPaymentOrder.getOrganId());
+						eduMap = new HashMap<>(integers.size());
+						if (!CollectionUtils.isEmpty(integers)) {
+							for (Integer integer : integers) {
+								eduMap.put(integer, integer.toString());
+							}
+						}
+					}
+					if (!CollectionUtils.isEmpty(eduMap)) {
+						sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PUSH_SYSTEM_ACTIVITY_COURSE,
+								eduMap, null, 0, null, "SYSTEM", username, activityName);
+					}
 				}
 			}
+		}catch (Exception e){
+			e.printStackTrace();
 		}
 	}
 }