Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -1945,22 +1945,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 imFeignService.groupJoin(new ImGroupModel(classGroupId.toString(), imGroupMembers, classGroup.getName()));
             });
         }
-
-        if (classGroup4MixDtos.get(0).getCourseAddType().equals("onlyUpdateTeacher")) {
-            List<Integer> classGroupIds = new ArrayList<Integer>();
-            classGroupIds.add(classGroupId);
-            // 删除历史记录
-            classGroupTeacherMapperDao.delClassGroupTeacherMapper(classGroupIds);
-            for (ClassGroupTeacherMapper tm : newTeacherMapperList) {
-                tm.setClassGroupId(classGroupId);
-                tm.setCreateTime(date);
-                tm.setGroupType(GroupType.MUSIC);
-                tm.setMusicGroupId(musicGroupId);
-                tm.setUpdateTime(date);
-                classGroupTeacherMapperDao.insert(tm);
-            }
-            return classGroup;
-        }
         if (classGroup4MixDtos.get(0).getCourseTimes().compareTo(0) <= 0) {
             throw new BizException("排课次数必须大于0");
         }
@@ -1968,18 +1952,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
         Date entryDate = DateUtil.stringToDate(sysConfigDao.findByParamName(SysConfigService.TEACHER_ENTRY_DATE).getParanValue(), "yyyy-MM-dd");
 
-        if (classGroup4MixDtos.get(0).getCourseAddType().equals("renew")) {
-            List<CourseSchedule> noStartCourses = courseScheduleService.findNoStartCoursesByClassGroupId(classGroup.getId());
-            if (noStartCourses.size() > 0) {
-                courseTimes -= noStartCourses.size();
-                List<Long> courseScheduleIds = noStartCourses.stream().map(courseSchedule -> courseSchedule.getId()).collect(Collectors.toList());
-                courseScheduleDao.batchDeleteCourseSchedules(courseScheduleIds);
-                courseScheduleTeacherSalaryDao.batchDeleteByCourseScheduleIds(courseScheduleIds);
-                teacherAttendanceDao.batchDeleteByCourseSchedules(courseScheduleIds);
-                courseScheduleStudentPaymentDao.deleteByCourseSchedule(courseScheduleIds);
-            }
-        }
-
         classGroupService.updateTotalClassTimes(classGroup.getId(), courseTimes);
 
         MusicGroup musicGroup = musicGroupDao.get(classGroup.getMusicGroupId());

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

@@ -393,7 +393,7 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 			List<MusicGroupPaymentCalenderDetail> musicGroupPaymentCalenderDetails = studentCalenderDetailMap.get(studentStudentPaymentMapEntry.getKey());
 
 			//学员总缴费金额
-			BigDecimal totalActualAmount = musicGroupPaymentCalenderDetails.stream().map(MusicGroupPaymentCalenderDetail::getActualAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+			BigDecimal totalActualAmount = musicGroupPaymentCalenderDetails.stream().map(e -> Objects.isNull(e.getActualAmount())?BigDecimal.ZERO:e.getActualAmount()).reduce(BigDecimal.ZERO, BigDecimal::add);
 
 			for (CourseScheduleStudentPayment courseScheduleStudentPayment : studentStudentPaymentMapEntry.getValue()) {
 				if(totalActualAmount.compareTo(courseScheduleStudentPayment.getExpectPrice())>=0){

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

@@ -109,7 +109,7 @@
 		SELECT * FROM music_group_payment_student_course_detail
 		WHERE user_id_=#{studentId}
 		AND course_type_=#{courseType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-		AND total_course_minutes_ > #{courseMinutes}
+		AND total_course_minutes_ >= #{courseMinutes}
 		AND used_course_minutes_ <= 0
 		ORDER BY id_ DESC LIMIT 1;
 	</select>