Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.dto.ImGroupMemberDto;
+import com.ym.mec.biz.dal.dto.NameDto;
 import com.ym.mec.biz.dal.entity.ImGroup;
 import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
@@ -35,4 +36,6 @@ public interface ImGroupDao extends BaseDAO<String, ImGroup> {
 	int updateUserFriendNickname(@Param("userId") Integer userId, @Param("nickName") String nickName);
 
     void updateMemberNum();
+
+    List<NameDto> queryNameByIds(@Param("ids") String ids);
 }

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

@@ -1,7 +1,9 @@
 package com.ym.mec.biz.dal.dao;
 
+import java.util.Collection;
 import java.util.List;
 import com.ym.mec.biz.dal.dto.BasicUserDto;
+import com.ym.mec.biz.dal.dto.NameDto;
 import org.apache.ibatis.annotations.Param;
 import com.ym.mec.biz.dal.dto.ImUserFriendDto;
 import com.ym.mec.biz.dal.entity.ImUserFriend;
@@ -37,4 +39,6 @@ public interface ImUserFriendDao extends BaseDAO<Long, ImUserFriend> {
 	* @date 2022/1/20 11:56
 	*/
 	void updateNullNickName();
+
+    List<NameDto> queryNameByIds(@Param("ids") String ids, @Param("userId") Integer userId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/NameDto.java

@@ -0,0 +1,36 @@
+package com.ym.mec.biz.dal.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class NameDto {
+    private String id;
+
+    private String name;
+
+    @ApiModelProperty(value = "1 单人, 3 群组",required = false)
+    private Integer type;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/NamesDto.java

@@ -1,25 +0,0 @@
-package com.ym.mec.biz.dal.dto;
-
-import java.util.List;
-
-public class NamesDto {
-    private Integer id;
-
-    private List<String> names;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public List<String> getNames() {
-        return names;
-    }
-
-    public void setNames(List<String> names) {
-        this.names = names;
-    }
-}

mec-biz/src/main/java/com/ym/mec/biz/service/ImGroupService.java

@@ -2,6 +2,7 @@ package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.dto.ImGroupDto;
 import com.ym.mec.biz.dal.dto.ImGroupMemberDto;
+import com.ym.mec.biz.dal.dto.NameDto;
 import com.ym.mec.biz.dal.entity.ImGroup;
 import com.ym.mec.biz.dal.page.GroupMemberQueryInfo;
 import com.ym.mec.common.page.PageInfo;
@@ -83,4 +84,13 @@ public interface ImGroupService extends BaseService<String, ImGroup> {
 
 	//解散群组
 	void dismissGroup(String imGroupId);
+
+	/**
+	* @description: 获取群聊、用户详情
+	 * @param nameDto
+	* @return java.lang.Object
+	* @author zx
+	* @date 2022/8/8 10:10
+	*/
+	List<NameDto> queryDetail(List<NameDto> nameDto);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/SysUserService.java

@@ -8,4 +8,6 @@ public interface SysUserService {
     SysUser getUser();
 
     SysUser queryUserById(Integer userId);
+
+    Boolean updateSysUser(SysUser user);
 }

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

@@ -1133,16 +1133,25 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 for (ClassGroupTeacherMapper classGroupTeacher : classGroupTeachers) {
                     List<TeacherDefaultMusicGroupSalary> teacherSalaryList = teacherDefaultMusicGroupSalaryService.getTeacherSalaryByUserIdAndType(classGroupTeacher.getUserId(), null, null);
                     Map<CourseSchedule.CourseScheduleType, TeacherDefaultMusicGroupSalary> collect = teacherSalaryList.stream().collect(Collectors.toMap(TeacherDefaultMusicGroupSalary::getCourseScheduleType, teacherDefaultMusicGroupSalary -> teacherDefaultMusicGroupSalary));
-                    TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary = collect.get(CourseSchedule.CourseScheduleType.HIGH_ONLINE);
-                    if (classGroup.getType().equals(HIGH_ONLINE) && studentNum > 5) {
+
+                    if ((classGroup.getType().equals(HIGH_ONLINE) || classGroup.getType().equals(HIGH)) && studentNum > 5) {
                         studentNum = 5;
                     }
 
                     BigDecimal salary = null;
                     if (classGroup.getType().equals(HIGH_ONLINE)) {
+                        TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary = collect.get(CourseSchedule.CourseScheduleType.HIGH_ONLINE);
+                        if (Objects.isNull(teacherDefaultMusicGroupSalary)) {
+                            throw new BizException("请设置老师课酬");
+                        }
                         salary = JSON.parseObject(teacherDefaultMusicGroupSalary.getSalaryRuleJson()).getBigDecimal(studentNum + "");
                     } else if (classGroup.getType().equals(HIGH)) {
-                        MusicGroup musicGroup = musicGroupDao.get(classGroup.getMusicGroupId());
+                        TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalaryHigh = collect.get(CourseSchedule.CourseScheduleType.HIGH);
+                        if (Objects.isNull(teacherDefaultMusicGroupSalaryHigh)) {
+                            throw new BizException("请设置老师课酬");
+                        }
+                        salary = JSON.parseObject(teacherDefaultMusicGroupSalaryHigh.getSalaryRuleJson()).getBigDecimal(studentNum + "");
+                        /*MusicGroup musicGroup = musicGroupDao.get(classGroup.getMusicGroupId());
                         TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalaryHigh = collect.get(CourseSchedule.CourseScheduleType.HIGH);
                         if (Objects.isNull(teacherDefaultMusicGroupSalaryHigh)) {
                             throw new BizException("请设置老师课酬");
@@ -1154,7 +1163,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                         if (Objects.isNull(salary)) {
                             throw new BizException("请设置老师课酬");
                         }
-                        salary = salary.multiply(new BigDecimal(studentNum));
+                        salary = salary.multiply(new BigDecimal(studentNum));*/
                     }
                     if (Objects.isNull(salary)) {
                         throw new BizException("请设置老师课酬");
@@ -4558,16 +4567,24 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                                         throw new BizException("请设置老师线上网管课课酬");
                                     }
                                     Map<CourseSchedule.CourseScheduleType, TeacherDefaultMusicGroupSalary> collect = teacherSalaryList.stream().collect(Collectors.toMap(TeacherDefaultMusicGroupSalary::getCourseScheduleType, teacherDefaultMusicGroupSalary -> teacherDefaultMusicGroupSalary));
-                                    TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary = collect.get(CourseSchedule.CourseScheduleType.HIGH_ONLINE);
 
-                                    if (courseSchedule.getType() == CourseScheduleType.HIGH_ONLINE && aLong > 5l) {
+                                    if ((courseSchedule.getType() == CourseScheduleType.HIGH_ONLINE || courseSchedule.getType() == CourseScheduleType.HIGH) && aLong > 5l) {
                                         aLong = 5l;
                                     }
                                     BigDecimal salary = null;
                                     if (courseSchedule.getType() == CourseScheduleType.HIGH_ONLINE) {
+                                        TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary = collect.get(CourseSchedule.CourseScheduleType.HIGH_ONLINE);
+                                        if (Objects.isNull(teacherDefaultMusicGroupSalary)) {
+                                            throw new BizException("请设置老师课酬");
+                                        }
                                         salary = JSON.parseObject(teacherDefaultMusicGroupSalary.getSalaryRuleJson()).getBigDecimal(aLong + "");
                                     } else if (courseSchedule.getType() == CourseScheduleType.HIGH) {
-                                        MusicGroup musicGroup = musicGroupDao.get(classGroup.getMusicGroupId());
+                                        TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalaryHigh = collect.get(CourseSchedule.CourseScheduleType.HIGH);
+                                        if (Objects.isNull(teacherDefaultMusicGroupSalaryHigh)) {
+                                            throw new BizException("请设置老师课酬");
+                                        }
+                                        salary = JSON.parseObject(teacherDefaultMusicGroupSalaryHigh.getSalaryRuleJson()).getBigDecimal(aLong + "");
+                                        /*MusicGroup musicGroup = musicGroupDao.get(classGroup.getMusicGroupId());
                                         TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalaryHigh = collect.get(CourseSchedule.CourseScheduleType.HIGH);
                                         if (Objects.isNull(teacherDefaultMusicGroupSalaryHigh)) {
                                             throw new BizException("请设置老师课酬");
@@ -4579,7 +4596,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                                         if (Objects.isNull(salary)) {
                                             throw new BizException("请设置老师课酬");
                                         }
-                                        salary = salary.multiply(new BigDecimal(aLong));
+                                        salary = salary.multiply(new BigDecimal(aLong));*/
                                     }
                                     if (Objects.isNull(salary)) {
                                         throw new BizException("请设置老师课酬");

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

@@ -377,17 +377,17 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
                     }
                     Map<CourseSchedule.CourseScheduleType, TeacherDefaultMusicGroupSalary> collect = teacherSalaryList.stream().collect(Collectors.toMap(TeacherDefaultMusicGroupSalary::getCourseScheduleType, teacherDefaultMusicGroupSalary -> teacherDefaultMusicGroupSalary));
                     TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary = collect.get(courseSchedule.getType());
-                    if (classGroup.getType().equals(ClassGroupTypeEnum.HIGH_ONLINE) && studentNum > 5) {
+                    if ((classGroup.getType().equals(ClassGroupTypeEnum.HIGH_ONLINE) || classGroup.getType().equals(ClassGroupTypeEnum.HIGH)) && studentNum > 5) {
                         studentNum = 5;
                     }
                     BigDecimal salary = null;
-                    if(classGroup.getType().equals(ClassGroupTypeEnum.HIGH_ONLINE)){
+                    if(classGroup.getType().equals(ClassGroupTypeEnum.HIGH_ONLINE) || classGroup.getType().equals(ClassGroupTypeEnum.HIGH)){
                         if(studentNum>0){
                             salary = JSON.parseObject(teacherDefaultMusicGroupSalary.getSalaryRuleJson()).getBigDecimal(studentNum + "");
                         }else{
                             salary = new BigDecimal("0");
                         }
-                    }else if(classGroup.getType().equals(ClassGroupTypeEnum.HIGH)){
+                    }/*else if(classGroup.getType().equals(ClassGroupTypeEnum.HIGH)){
                         MusicGroup musicGroup = musicGroupDao.get(classGroup.getMusicGroupId());
                         TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalaryHigh = collect.get(CourseSchedule.CourseScheduleType.HIGH);
                         if(Objects.isNull(teacherDefaultMusicGroupSalaryHigh)){
@@ -401,7 +401,7 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
                             throw new BizException("请设置老师课酬");
                         }
                         salary = salary.multiply(new BigDecimal(studentNum));
-                    }
+                    }*/
                     if(Objects.isNull(salary)){
                         throw new BizException("请设置老师课酬");
                     }

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

@@ -745,7 +745,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 								courseScheduleTeacherSalary.setExpectSalary(salary);
 							}
 							//基础技能提高课
-							if (type == CourseScheduleType.HIGH) {
+							/*if (type == CourseScheduleType.HIGH) {
 								BigDecimal salary = courseScheduleTeacherSalary.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? tdms.getMainTeacher30MinSalary() : tdms.getAssistantTeacher30MinSalary();
 								if (StringUtils.equals(settlementType, "GRADIENT_SALARY")) {
 									salary = courseScheduleTeacherSalary.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? tdms.getMainTeacher90MinSalary() : tdms.getAssistantTeacher90MinSalary();
@@ -755,9 +755,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 									studentNum = classGroupStudentMapperDao.countClassGroupNormalStudentNum(courseSchedule.getClassGroupId());
 								}
 								courseScheduleTeacherSalary.setExpectSalary(salary.multiply(new BigDecimal(studentNum)));
-							}
+							}*/
 							//线上小班课
-							if(type == CourseScheduleType.HIGH_ONLINE){
+							if(type == CourseScheduleType.HIGH_ONLINE || type == CourseScheduleType.HIGH){
 								int studentNum = courseScheduleStudentPaymentDao.countCourseOnlyStudentNum(courseSchedule.getId());
 								if(studentNum<=0){
 									studentNum = classGroupStudentMapperDao.countClassGroupNormalStudentNum(courseSchedule.getClassGroupId());

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

@@ -1326,7 +1326,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             salary = baseSalary.multiply(classTimeDuty).setScale(2, BigDecimal.ROUND_HALF_UP);
 
             //基础技能提高课
-            if (courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.HIGH)) {
+            /*if (courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.HIGH)) {
                 salary = TeachTypeEnum.BISHOP.equals(courseScheduleTeacherSalary.getTeacherRole()) ? teacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary();
                 if (settlementType.equals(SalarySettlementTypeEnum.GRADIENT_SALARY)) {
                     salary = TeachTypeEnum.BISHOP.equals(courseScheduleTeacherSalary.getTeacherRole()) ? teacherDefaultMusicGroupSalary.getMainTeacher90MinSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacher90MinSalary();
@@ -1339,9 +1339,9 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                     studentNum = classGroupStudentMapperDao.countClassGroupNormalStudentNum(courseSchedule.getClassGroupId());
                 }
                 salary = salary.multiply(new BigDecimal(studentNum));
-            }
+            }*/
             //线上小班课
-            if (courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.HIGH_ONLINE)) {
+            if (courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.HIGH_ONLINE) || courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.HIGH)) {
                 int studentNum = courseScheduleStudentPaymentDao.countCourseOnlyStudentNum(courseSchedule.getId());
                 if(studentNum<=0){
                     studentNum = classGroupStudentMapperDao.countClassGroupNormalStudentNum(courseSchedule.getClassGroupId());

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

@@ -5,12 +5,15 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.ImGroupDao;
 import com.ym.mec.biz.dal.dao.ImGroupMemberDao;
 import com.ym.mec.biz.dal.dao.ImGroupNoticeDao;
+import com.ym.mec.biz.dal.dao.ImUserFriendDao;
 import com.ym.mec.biz.dal.dto.ImGroupDto;
 import com.ym.mec.biz.dal.dto.ImGroupMemberDto;
+import com.ym.mec.biz.dal.dto.NameDto;
 import com.ym.mec.biz.dal.entity.ImGroup;
 import com.ym.mec.biz.dal.entity.ImGroupMember;
 import com.ym.mec.biz.service.ImGroupMemberService;
 import com.ym.mec.biz.service.ImGroupService;
+import com.ym.mec.biz.service.SysUserService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.ImUserModel;
 import com.ym.mec.common.exception.BizException;
@@ -48,7 +51,10 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
 	private ImFeignService imFeignService;
 
 	@Autowired
-	private SysUserFeignService sysUserFeignService;
+	private SysUserService sysUserService;
+
+	@Autowired
+	private ImUserFriendDao imUserFriendDao;
 
 	@Override
 	public BaseDAO<String, ImGroup> getDAO() {
@@ -106,8 +112,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
 		List<String> userIdList = imGroupDto.getUserIdList();
 		Integer currentUserId = null;
 		if (CollectionUtils.isEmpty(userIdList)){
-			currentUserId = sysUserFeignService.queryUserInfo().getId();
-			userIdList.add(currentUserId.toString());
+			userIdList.add(sysUserService.getUserId().toString());
 		}
 		String groupName = imGroupDto.getGroupName();
 		String type = imGroupDto.getType();
@@ -192,13 +197,13 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
 		imGroupDao.updateNickname(userId, nickName);
 		imGroupDao.updateUserFriendNickname(userId, nickName);
 		//修改sysUser名称，如果包含学员的角色，那么修改userName。否则修改realName
-		SysUser sysUser = sysUserFeignService.queryUserById(userId);
+		SysUser sysUser = sysUserService.queryUserById(userId);
 		if(sysUser.getUserType().contains("STUDENT")){
 			sysUser.setUsername(nickName);
 		}else {
 			sysUser.setRealName(nickName);
 		}
-		sysUserFeignService.updateSysUser(sysUser);
+		sysUserService.updateSysUser(sysUser);
 		//同步融云基本信息
 		imFeignService.update(new ImUserModel(sysUser.getId().toString(),nickName,sysUser.getAvatar()));
 	}
@@ -219,4 +224,25 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
 		imGroupMemberDao.deleteByImGroupId(imGroupId);
 		imGroupNoticeDao.deleteByImGroupId(imGroupId);
 	}
+
+    @Override
+    public List<NameDto> queryDetail(List<NameDto> nameDto) {
+		List<NameDto> dtos = new ArrayList<>();
+		if(CollectionUtils.isNotEmpty(nameDto)){
+			Map<Integer, List<NameDto>> collect = nameDto.stream().collect(Collectors.groupingBy(NameDto::getType));
+			for (Integer integer : collect.keySet()) {
+				List<NameDto> nameDtos = collect.get(integer);
+				if(CollectionUtils.isNotEmpty(nameDtos)){
+					String idList = nameDtos.stream().map(e -> e.getId()).collect(Collectors.joining(","));
+					if(integer.equals(3)){
+						dtos.addAll(imGroupDao.queryNameByIds(idList));
+					}else if (integer.equals(1)){
+						Integer userId = sysUserService.getUserId();
+						dtos.addAll(imUserFriendDao.queryNameByIds(idList,userId));
+					}
+				}
+			}
+		}
+        return dtos;
+    }
 }

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

@@ -39,4 +39,9 @@ public class SysUserServiceImpl implements SysUserService {
                 .orElseThrow(() -> new BizException("用户信息获取失败"));
         return user;
     }
+
+    @Override
+    public Boolean updateSysUser(SysUser user) {
+        return sysUserFeignService.updateSysUser(user);
+    }
 }

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

@@ -93,7 +93,7 @@ public class TeacherDefaultMusicGroupSalaryServiceImpl extends BaseServiceImpl<L
 				salaryMap.put(ms.getCourseScheduleType(), ms);
 			}
 			
-			Map<Integer,Integer> classGroupStudentNumMap = new HashMap<Integer, Integer>();
+//			Map<Integer,Integer> classGroupStudentNumMap = new HashMap<Integer, Integer>();
 
 			if (salaryMap.size() > 0) {
 
@@ -129,7 +129,7 @@ public class TeacherDefaultMusicGroupSalaryServiceImpl extends BaseServiceImpl<L
 								BigDecimal duration = new BigDecimal(DateUtil.minutesBetween(ts.getCourseSchedule().getStartClassTime(), ts.getCourseSchedule()
 										.getEndClassTime()));
 								int mins = 0;
-								if(tdms.getCourseScheduleType() == CourseScheduleType.HIGH_ONLINE || tdms.getCourseScheduleType() == CourseScheduleType.MUSIC_NETWORK) {
+								if(tdms.getCourseScheduleType() == CourseScheduleType.HIGH_ONLINE || tdms.getCourseScheduleType() == CourseScheduleType.HIGH || tdms.getCourseScheduleType() == CourseScheduleType.MUSIC_NETWORK) {
 									int studentNum = courseScheduleStudentPaymentDao.countCourseOnlyStudentNum(ts.getCourseScheduleId());
 
 									String salaryRuleJson = tdms.getSalaryRuleJson();
@@ -154,22 +154,22 @@ public class TeacherDefaultMusicGroupSalaryServiceImpl extends BaseServiceImpl<L
 									mins = 90;
 									// 判断是助教、主教
 									if (ts.getTeacherRole() == TeachTypeEnum.BISHOP) {
-										if (tdms.getCourseScheduleType() == CourseScheduleType.CLASSROOM || tdms.getCourseScheduleType() == CourseScheduleType.HIGH) {
+										if (tdms.getCourseScheduleType() == CourseScheduleType.CLASSROOM) {
 											ts.setExpectSalary(tdms.getMainTeacher90MinSalary());
 										}else{
 											ts.setExpectSalary(duration.divide(new BigDecimal(mins), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN).multiply(tdms.getMainTeacher90MinSalary()));
 										}
 									} else {
-										if (tdms.getCourseScheduleType() == CourseScheduleType.CLASSROOM || tdms.getCourseScheduleType() == CourseScheduleType.HIGH) {
+										if (tdms.getCourseScheduleType() == CourseScheduleType.CLASSROOM) {
 											ts.setExpectSalary(tdms.getAssistantTeacher90MinSalary());
 										}else{
 											ts.setExpectSalary(duration.divide(new BigDecimal(mins), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN).multiply(tdms.getAssistantTeacher90MinSalary()));
 										}
 									}
-									if(CourseScheduleType.HIGH.equals(tdms.getCourseScheduleType())){
+									/*if(CourseScheduleType.HIGH.equals(tdms.getCourseScheduleType())){
 										int studentNum = courseScheduleStudentPaymentDao.countCourseOnlyStudentNum(ts.getCourseScheduleId());
 										ts.setExpectSalary(ts.getExpectSalary().multiply(new BigDecimal(studentNum)));
-									}
+									}*/
 									//课堂课课酬改为按分钟数计算，并且时长占比向下取整
 									if (CourseSchedule.CourseScheduleType.CLASSROOM.equals(tdms.getCourseScheduleType())){
 										ts.setExpectSalary(TeachTypeEnum.BISHOP.equals(ts.getTeacherRole()) ? tdms.getMainTeacher90MinSalary() : tdms.getAssistantTeacher90MinSalary());
@@ -181,22 +181,22 @@ public class TeacherDefaultMusicGroupSalaryServiceImpl extends BaseServiceImpl<L
 									BigDecimal minsDecimal = new BigDecimal(mins);
 									// 判断是助教、主教
 									if (ts.getTeacherRole() == TeachTypeEnum.BISHOP) {
-										if (tdms.getCourseScheduleType() == CourseScheduleType.CLASSROOM || tdms.getCourseScheduleType() == CourseScheduleType.HIGH) {
+										if (tdms.getCourseScheduleType() == CourseScheduleType.CLASSROOM) {
 											ts.setExpectSalary(tdms.getMainTeacher30MinSalary());
 										}else{
 											ts.setExpectSalary(duration.divide(minsDecimal, CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN).multiply(tdms.getMainTeacher30MinSalary()));
 										}
 									} else {
-										if (tdms.getCourseScheduleType() == CourseScheduleType.CLASSROOM || tdms.getCourseScheduleType() == CourseScheduleType.HIGH) {
+										if (tdms.getCourseScheduleType() == CourseScheduleType.CLASSROOM) {
 											ts.setExpectSalary(tdms.getAssistantTeacher30MinSalary());
 										}else{
 											ts.setExpectSalary(duration.divide(minsDecimal, CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN).multiply(tdms.getAssistantTeacher30MinSalary()));
 										}
 									}
-									if(CourseScheduleType.HIGH.equals(tdms.getCourseScheduleType())){
+									/*if(CourseScheduleType.HIGH.equals(tdms.getCourseScheduleType())){
 										int studentNum = courseScheduleStudentPaymentDao.countCourseOnlyStudentNum(ts.getCourseScheduleId());
 										ts.setExpectSalary(ts.getExpectSalary().multiply(new BigDecimal(studentNum)));
-									}
+									}*/
 									//课堂课课酬改为按分钟数计算，并且时长占比向下取整
 									if (CourseSchedule.CourseScheduleType.CLASSROOM.equals(tdms.getCourseScheduleType())){
 										ts.setExpectSalary(TeachTypeEnum.BISHOP.equals(ts.getTeacherRole()) ? tdms.getMainTeacher90MinSalary() : tdms.getAssistantTeacher90MinSalary());

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

@@ -180,4 +180,12 @@
 			LIMIT 1
 		</if>
 	</select>
+	<resultMap id="NameDto" type="com.ym.mec.biz.dal.dto.NameDto">
+		<result property="id" column="id_" />
+		<result property="name" column="name_" />
+		<result property="type" column="type_"/>
+	</resultMap>
+    <select id="queryNameByIds" resultMap="NameDto">
+		select id_,name_,3 type_ from im_group where FIND_IN_SET(id_,#{ids})
+	</select>
 </mapper>

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

@@ -119,4 +119,12 @@
 		LEFT JOIN subject sb ON s.subject_id_list_ = sb.id_
 		WHERE iuf.user_id_ = #{userId} AND iuf.friend_id_ = #{friendUserId}
 	</select>
+	<resultMap id="NameDto" type="com.ym.mec.biz.dal.dto.NameDto">
+		<result property="id" column="id_" />
+		<result property="name" column="name_" />
+		<result property="type" column="type_"/>
+	</resultMap>
+    <select id="queryNameByIds" resultMap="NameDto">
+		select friend_id_ id_,friend_nickname_ name_,1 type_ from im_user_friend where user_id_ = #{userId} and find_in_set(friend_id_,#{ids})
+	</select>
 </mapper>

mec-web/src/main/java/com/ym/mec/web/controller/ImGroupController.java

@@ -4,6 +4,7 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.ImGroupDto;
 import com.ym.mec.biz.dal.dto.ImGroupMemberDto;
 import com.ym.mec.biz.dal.dto.ImUserFriendDto;
+import com.ym.mec.biz.dal.dto.NameDto;
 import com.ym.mec.biz.dal.entity.ImGroup;
 import com.ym.mec.biz.dal.page.ImGroupNoticeQueryInfo;
 import com.ym.mec.biz.dal.page.ImGroupQueryInfo;
@@ -176,4 +177,10 @@ public class ImGroupController extends BaseController {
 	public Object updateRoleType(String imGroupId, Integer userId, String roleType) {
 		return succeed(imGroupMemberService.updateRoleType(imGroupId,userId,roleType));
 	}
+
+	@ApiOperation("获取群聊、用户详情")
+	@PostMapping(value = "/queryDetail")
+	public HttpResponseResult<List<NameDto>> queryDetail(@RequestBody List<NameDto> nameDto) {
+		return succeed(imGroupService.queryDetail(nameDto));
+	}
 }