活动排课课酬规则变更

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

@@ -618,7 +618,7 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 		//如果是1V1的课程，需要处理老师课酬
 		Map<Integer, String> settlementMap = new HashMap<>();
 		if (vipGroupCategory.getStudentNum() == 1){
-			List<Integer> activityUserMapperIds = courseScheduleStudentPayments.stream().map(e -> e.getActivityUserMapperId()).collect(Collectors.toList());
+			List<Integer> activityUserMapperIds = courseScheduleStudentPayments.stream().map(e -> e.getActivityUserMapperId()).distinct().collect(Collectors.toList());
 			if(CollectionUtils.isNotEmpty(activityUserMapperIds)){
 				List<ActivityUserMapperSettlementDto> activityUserMapperSettlementDtos = activityUserMapperDao.querySettlementByIds(activityUserMapperIds);
 				settlementMap = activityUserMapperSettlementDtos.stream().collect(Collectors.groupingBy(e -> e.getActivityId(),
@@ -686,7 +686,7 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 				Map<Long,CourseScheduleStudentPayment> courseActivityUserMap = courseScheduleStudentPayments.stream().collect(Collectors.groupingBy(CourseScheduleStudentPayment::getCourseScheduleId,
 						Collectors.collectingAndThen(Collectors.toList(),value->value.get(0))));
 				for (CourseScheduleTeacherSalary teacherSalary : courseScheduleTeacherSalaries) {
-					String s = settlementMap.get(courseActivityUserMap.get(teacherSalary.getCourseScheduleId()));
+					String s = settlementMap.get(teacherSalary.getCourseScheduleId());
 					if (StringUtils.isEmpty(s)) {
 						continue;
 					}