update

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

@@ -904,10 +904,11 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
         if (Objects.isNull(practiceGroupBuyParams.getSubjectId())) {
             return BaseController.failed(HttpStatus.EXPECTATION_FAILED, "请选择声部");
         }
-        if(Objects.isNull(practiceGroupBuyParams.getFirstCourseTime())||Objects.isNull(practiceGroupBuyParams.getSecondCourseTime())){
+        if(Objects.isNull(practiceGroupBuyParams.getFirstCourseTime())&&Objects.isNull(practiceGroupBuyParams.getSecondCourseTime())){
             return BaseController.failed(HttpStatus.EXPECTATION_FAILED, "请确定上课时间");
         }
-        if(DateUtil.daysBetween(practiceGroupBuyParams.getFirstCourseTime(),practiceGroupBuyParams.getSecondCourseTime())>7){
+        if(Objects.nonNull(practiceGroupBuyParams.getSecondCourseTime())
+                ||DateUtil.daysBetween(practiceGroupBuyParams.getFirstCourseTime(),practiceGroupBuyParams.getSecondCourseTime())>7){
             return BaseController.failed(HttpStatus.EXPECTATION_FAILED, "两次课程的时间需安排在七天内");
         }
 
@@ -945,7 +946,9 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
 
         List<Date> courseDates=new ArrayList<>();
         courseDates.add(practiceGroupBuyParams.getFirstCourseTime());
-        courseDates.add(practiceGroupBuyParams.getSecondCourseTime());
+        if(Objects.nonNull(practiceGroupBuyParams.getSecondCourseTime())){
+            courseDates.add(practiceGroupBuyParams.getSecondCourseTime());
+        }
         courseDates.sort(Comparator.comparing(Date::getTime));
 
         Date now=new Date();
@@ -961,7 +964,7 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
         }
 
         practiceGroupBuyParams.setCoursesStartDate(courseDates.get(0));
-        practiceGroupBuyParams.setCoursesExpireDate(DateUtil.addMinutes(courseDates.get(1),practiceCourseMinutes));
+        practiceGroupBuyParams.setCoursesExpireDate(DateUtil.addMinutes(courseDates.get(courseDates.size()-1),practiceCourseMinutes));
         practiceGroupBuyParams.setOrganId(student.getOrganId());
         practiceGroupBuyParams.setSingleClassMinutes(practiceCourseMinutes);
         practiceGroupBuyParams.setGroupStatus(GroupStatusEnum.NORMAL);
@@ -974,7 +977,7 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
         classGroup.setExpectStudentNum(1);
         classGroup.setStudentNum(1);
         classGroup.setName(practiceGroupBuyParams.getName());
-        classGroup.setTotalClassTimes(2);
+        classGroup.setTotalClassTimes(courseDates.size());
         classGroup.setType(ClassGroupTypeEnum.PRACTICE);
         classGroup.setDelFlag(0);
         classGroup.setGroupType(GroupType.PRACTICE);