|
|
@@ -312,7 +312,7 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
|
|
|
Map<CourseSchedule.CourseScheduleType, List<CourseSchedule>> typeCourseMap = courseSchedules.stream().collect(Collectors.groupingBy(CourseSchedule::getType));
|
|
|
for (Map.Entry<CourseSchedule.CourseScheduleType, List<CourseSchedule>> typeCoursesEntry : typeCourseMap.entrySet()) {
|
|
|
MusicGroupPaymentCalenderCourseSettings musicGroupPaymentCalenderCourseSettings = courseTypeCourseSettingMap.get(typeCoursesEntry.getKey());
|
|
|
- if(musicGroupPaymentCalenderCourseSettings.isIsStudentOptional()){
|
|
|
+ if(musicGroupPaymentCalenderCourseSettings.getIsStudentOptional()){
|
|
|
//如果可选，则必须缴费才能排课
|
|
|
long paymentStudentNum = allStudentPaymentOrderDetails.stream().filter(spd -> musicGroupPaymentCalenderCourseSettings.getCourseType().getCode().equals(spd.getType().getCode())).count();
|
|
|
if(paymentStudentNum<studentIds.size()){
|
zouxuan