活动排课

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

@@ -635,8 +635,12 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 			throw new BizException("课程单价设置错误");
 		}
 		//生成学生单课缴费信息
-		for (CourseSchedule courseSchedule : courseSchedules) {
-			for (CourseScheduleStudentPayment courseScheduleStudentPayment : courseScheduleStudentPayments) {
+		Map<Integer, List<CourseScheduleStudentPayment>> collect = courseScheduleStudentPayments.stream().collect(Collectors.groupingBy(CourseScheduleStudentPayment::getUserId));
+		for (Integer integer : collect.keySet()) {
+			List<CourseScheduleStudentPayment> studentPayments = collect.get(integer);
+			for (int i = 0; i < studentPayments.size(); i++) {
+				CourseScheduleStudentPayment courseScheduleStudentPayment = studentPayments.get(i);
+				CourseSchedule courseSchedule = courseSchedules.get(i);
 				courseScheduleStudentPayment.setGroupType(courseSchedule.getGroupType());
 				courseScheduleStudentPayment.setMusicGroupId(courseSchedule.getMusicGroupId());
 				courseScheduleStudentPayment.setCourseScheduleId(courseSchedule.getId());
@@ -813,7 +817,7 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 			}
 			activityUserMapper.setGiveVipFlag(2);
 		}else {
-			if(StringUtils.isEmpty(activityUserMapper.getPracticeGroupId())){
+			if(StringUtils.isEmpty(activityUserMapper.getGivePracticeGroupId())){
 				activityUserMapper.setGivePracticeGroupId(groupId.toString());
 			}else {
 				activityUserMapper.setGivePracticeGroupId(activityUserMapper.getGivePracticeGroupId()+","+groupId);
@@ -829,7 +833,7 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 		PracticeGroupApplyBaseInfoDto applyBaseInfo = practice.getPracticeGroupApplyBaseInfoDto();
 		List<CourseSchedule> courseSchedules = practice.getCourseSchedules();
 		Integer allCourseNum = applyBaseInfo.getAllCourseNum();
-		if (courseSchedules.size() != applyBaseInfo.getAllCourseNum()) {
+		if (courseSchedules.size() != allCourseNum) {
 			throw new BizException("建课失败，课程数量异常");
 		}
 		if (applyBaseInfo.getSubjectId() == null) {
@@ -980,12 +984,14 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 		if (courseScheduleTeacherSalaries.size() > 0) {
 			courseScheduleTeacherSalaryService.batchInsert(courseScheduleTeacherSalaries);
 		}
-
-		//生成学生单课缴费信息
 		PracticeGroupSellPrice practiceGroupSellPrice = practiceGroupSellPriceDao.get(applyBaseInfo.getOrganId());
 		BigDecimal singleClassMinutesPrice = practiceGroupSellPrice.getSingleClassMinutesPrice();
-		for (CourseSchedule courseSchedule : courseSchedules) {
-			for (CourseScheduleStudentPayment courseScheduleStudentPayment : courseScheduleStudentPayments) {
+		Map<Integer, List<CourseScheduleStudentPayment>> collect = courseScheduleStudentPayments.stream().collect(Collectors.groupingBy(CourseScheduleStudentPayment::getUserId));
+		for (Integer integer : collect.keySet()) {
+			List<CourseScheduleStudentPayment> studentPayments = collect.get(integer);
+			for (int i = 0; i < studentPayments.size(); i++) {
+				CourseScheduleStudentPayment courseScheduleStudentPayment = studentPayments.get(i);
+				CourseSchedule courseSchedule = courseSchedules.get(i);
 				courseScheduleStudentPayment.setGroupType(courseSchedule.getGroupType());
 				courseScheduleStudentPayment.setMusicGroupId(courseSchedule.getMusicGroupId());
 				courseScheduleStudentPayment.setCourseScheduleId(courseSchedule.getId());

mec-web/src/main/java/com/ym/mec/web/controller/education/EduActivityUserMapperController.java

@@ -1,6 +1,5 @@
 package com.ym.mec.web.controller.education;
 
-import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.dao.VipGroupDefaultClassesUnitPriceDao;
 import com.ym.mec.biz.dal.dto.*;
@@ -99,11 +98,6 @@ public class EduActivityUserMapperController extends BaseController {
         if(Objects.isNull(applyBaseInfo.getUserId())){
             throw new BizException("请选择指导老师");
         }
-        SysUser student = teacherDao.getUser(applyBaseInfo.getStudentId());
-        if(Objects.isNull(student)||Objects.isNull(student.getOrganId())){
-            return failed("学员信息异常");
-        }
-        applyBaseInfo.setOrganId(student.getOrganId());
         for (CourseSchedule courseSchedule : practiceGroupApplyDto.getCourseSchedules()) {
             courseSchedule.setEndClassTime(DateUtil.addMinutes(courseSchedule.getStartClassTime(), applyBaseInfo.getSingleClassMinutes()));
         }