Merge remote-tracking branch 'origin/master'

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

@@ -2958,17 +2958,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     @Override
     public Boolean addImGroup(ClassGroup classGroup, List<Integer> userIds) {
         MusicGroup musicGroup = musicGroupDao.get(classGroup.getMusicGroupId());
-        List<Integer> userIdList = new ArrayList<>();
-        userIdList.add(musicGroup.getEducationalTeacherId());
-        userIdList.add(musicGroup.getTeamTeacherId());
-        userIdList.add(musicGroup.getOperatorUserId());
-        userIdList.add(musicGroup.getDirectorUserId());
-        if (userIds != null) {
-            userIdList.addAll(userIds);
-        }
 
         Map<Integer,String> userRoleMap = new HashMap<Integer, String>();
-        for (Integer userId : userIdList) {
+        userRoleMap.put(musicGroup.getEducationalTeacherId(), "乐团主管");
+        userRoleMap.put(musicGroup.getTeamTeacherId(), "运营主管");
+        userRoleMap.put(musicGroup.getDirectorUserId(), "乐队指导");
+        for (Integer userId : userIds) {
             if (userId == null) continue;
             
             userRoleMap.put(userId, "");

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

@@ -93,7 +93,7 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
             if (userIdList.size() > 0) {
             	Map<Integer, String> userRoleMap = new HashMap<Integer, String>();
             	for(Integer userId : userIdList){
-            		userRoleMap.put(userId, "");
+            		userRoleMap.put(userId, "指导老师");
             	}
                 imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);
             }
@@ -138,7 +138,7 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
             if (userIdList.size() > 0) {
             	Map<Integer, String> userRoleMap = new HashMap<Integer, String>();
             	for(Integer userId : userIdList){
-            		userRoleMap.put(userId, "");
+            		userRoleMap.put(userId, "指导老师");
             	}
                 imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);
             }

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

@@ -1,5 +1,18 @@
 package com.ym.mec.biz.service.impl;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.auth.api.enums.YesOrNoEnum;
@@ -10,7 +23,6 @@ import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.dto.EmployeeDto;
 import com.ym.mec.biz.dal.dto.EmployeeLevelDto;
 import com.ym.mec.biz.dal.dto.SimpleUserDto;
-import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.entity.SysUserCashAccount;
 import com.ym.mec.biz.dal.enums.EmployeeOperateEnum;
@@ -29,15 +41,6 @@ import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.im.ImFeignService;
 import com.ym.mec.util.collection.MapUtil;
 
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
 @Service
 public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  implements EmployeeService {
 	
@@ -224,7 +227,9 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 	@Transactional(rollbackFor = Exception.class)
 	public void level(List<EmployeeLevelDto> employeeLevelDtos) {
 		Integer levelUserId = employeeLevelDtos.get(0).getLevelUserId();
-		List<ImGroupModel> imGroupModels = new ArrayList<>();
+		List<ImGroupModel> educationGroupModels = new ArrayList<>();
+		List<ImGroupModel> teamGroupModels = new ArrayList<>();
+		List<ImGroupModel> directorGroupModels = new ArrayList<>();
 		//获取用户需要加入的群组列表
 		Map<String, List<EmployeeLevelDto>> collect = employeeLevelDtos.stream().collect(Collectors.groupingBy(e -> e.getRoleName()));
 		Set<String> roleNames = collect.keySet();
@@ -241,28 +246,52 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 					switch (roleName){
 						case "education":
 							//教务老师所需加入的群组
-							imGroupModels.addAll(classGroupDao.queryEducationGroups(employeeLevelDto.getTransferUserId(),levelUserId,organId));
+							educationGroupModels.addAll(classGroupDao.queryEducationGroups(employeeLevelDto.getTransferUserId(),levelUserId,organId));
 							break;
 						case "teamTeacher":
 							//运营主管所需加入的群组
-							imGroupModels.addAll(classGroupDao.queryTeamTeacherGroups(employeeLevelDto.getTransferUserId(),levelUserId,organId));
+							teamGroupModels.addAll(classGroupDao.queryTeamTeacherGroups(employeeLevelDto.getTransferUserId(),levelUserId,organId));
 							break;
 						case "director":
 							//乐队指导所需加入的群组
-							imGroupModels.addAll(classGroupDao.queryDirectorGroups(employeeLevelDto.getTransferUserId(),levelUserId,organId));
+							directorGroupModels.addAll(classGroupDao.queryDirectorGroups(employeeLevelDto.getTransferUserId(),levelUserId,organId));
 							break;
 					}
 				}
 			}
 		}
-		if(imGroupModels.size() > 0){
+		if(educationGroupModels.size() > 0){
+			//❤️用户加群
+			for (ImGroupModel imGroupModel : educationGroupModels) {
+				Map<Integer,String> userRoleMap = new HashMap<Integer, String>();
+				
+				List<ImGroupMember> memberList = imGroupModel.getMemberList();
+				for(ImGroupMember member : memberList){
+					userRoleMap.put(Integer.parseInt(member.getId()), "乐团主管");
+				}
+				imGroupMemberService.join(Long.parseLong(imGroupModel.getId()), userRoleMap);
+			}
+		}
+		if(teamGroupModels.size() > 0){
+			//❤️用户加群
+			for (ImGroupModel imGroupModel : teamGroupModels) {
+				Map<Integer,String> userRoleMap = new HashMap<Integer, String>();
+				
+				List<ImGroupMember> memberList = imGroupModel.getMemberList();
+				for(ImGroupMember member : memberList){
+					userRoleMap.put(Integer.parseInt(member.getId()), "运营主管");
+				}
+				imGroupMemberService.join(Long.parseLong(imGroupModel.getId()), userRoleMap);
+			}
+		}
+		if(directorGroupModels.size() > 0){
 			//❤️用户加群
-			for (ImGroupModel imGroupModel : imGroupModels) {
+			for (ImGroupModel imGroupModel : directorGroupModels) {
 				Map<Integer,String> userRoleMap = new HashMap<Integer, String>();
 				
 				List<ImGroupMember> memberList = imGroupModel.getMemberList();
 				for(ImGroupMember member : memberList){
-					userRoleMap.put(Integer.parseInt(member.getId()), "");
+					userRoleMap.put(Integer.parseInt(member.getId()), "乐队指导");
 				}
 				imGroupMemberService.join(Long.parseLong(imGroupModel.getId()), userRoleMap);
 			}

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

@@ -1511,7 +1511,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         //删除考勤
         teacherAttendanceDao.deleteByMusicGroupId(musicGroupId, GroupType.MUSIC);
 
-        // 查询已缴费信息
+        /*// 查询已缴费信息
         studentPaymentOrders = studentPaymentOrderDao.queryByDealStatus(musicGroupId, OrderTypeEnum.APPLY, SUCCESS);
 
         // 退费
@@ -1519,7 +1519,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             // 增加交易流水
             sysUserCashAccountDetailService.addCashAccountDetail(order.getUserId(), order.getActualAmount().add(order.getBalancePaymentAmount()), SysUserCashAccountDetailService.MUSIC_GROUP
                     + musicGroupId, "", PlatformCashAccountDetailTypeEnum.REFUNDS, null, SUCCESS, "取消乐团", null);
-        }
+        }*/
         //获取当前乐团所有已报名学员
         if (musicGroup.getOwnershipType() != null && musicGroup.getOwnershipType() == CooperationOrgan.OwnershipType.OWN) {
             List<StudentRegistration> registrations = studentRegistrationDao.findClassGroupStu(musicGroupId, null);

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

@@ -291,7 +291,7 @@ public class OnlineMusicGroupServiceImpl implements OnlineMusicGroupService {
 
         Map<Integer,String> userRoleMap = new HashMap<Integer, String>();
         userRoleMap.put(onlineMusicGroupCourseInfo.getStudentId(), null);
-        userRoleMap.put(onlineMusicGroupCourseInfo.getTeacherId(), null);
+        userRoleMap.put(onlineMusicGroupCourseInfo.getTeacherId(), "指导老师");
         
         // 创建群组
         imGroupService.create(classGroup.getId().longValue(), musicGroup.getEducationalTeacherId(), classGroup.getName(), classGroup.getName(), classGroup.getName(), classGroup.getName(), null, "MUSIC");

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

@@ -1564,7 +1564,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         List<StudentRegistration> registrations = studentRegistrationDao.findStudentListByUserIdList(musicGroupId, userIds);
         for (StudentRegistration registration : registrations) {
             if(registration.getPaymentStatus().equals(PaymentStatusEnum.OPEN)||registration.getPaymentStatus().equals(PaymentStatusEnum.YES)){
-                throw new BizException("开启缴费/已缴费的学员不能删除");
+                throw new BizException(registration.getName()+"（"+registration.getPaymentStatus().getDesc()+"），不能删除");
             }
         }
         if (registrations.size() <= 0) {

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

@@ -1407,9 +1407,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 		Map<Integer,String> userRoleMap = new HashMap<Integer, String>();
 		if(Objects.nonNull(vipGroupApplyBaseInfoDto.getEducationalTeacherId())){
-            userRoleMap.put(vipGroupApplyBaseInfoDto.getEducationalTeacherId(),null);
+            userRoleMap.put(vipGroupApplyBaseInfoDto.getEducationalTeacherId(),"乐团主管");
         }
-		userRoleMap.put(vipGroupApplyBaseInfoDto.getUserId(),null);
+		userRoleMap.put(vipGroupApplyBaseInfoDto.getUserId(),"指导老师");
 		//生成学生单课缴费信息
 		for (ClassGroupStudentMapper classGroupStudent : classGroupStudents) {
 			courseScheduleStudentPaymentService.createCourseScheduleStudentPaymentForVipGroup(vipGroupId,classGroupStudent.getUserId());