|
|
@@ -43,6 +43,8 @@ import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
+import java.time.LocalDate;
|
|
|
+import java.time.LocalDateTime;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
import java.util.stream.Stream;
|
|
|
@@ -4162,8 +4164,16 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
throw new BizException("课程组不存在");
|
|
|
}
|
|
|
if(practiceGroup.getCoursesStartDate().after(coursesExpireDate)){
|
|
|
- throw new BizException("课程有效时间不能小于开始时间");
|
|
|
+ throw new BizException("课程有效时间不能早于开始时间");
|
|
|
}
|
|
|
+
|
|
|
+ LocalDate courseStartDay = LocalDateTime.ofInstant(practiceGroup.getCoursesStartDate().toInstant(), DateUtil.zoneId).toLocalDate();
|
|
|
+ LocalDate currentExpiredDay = courseStartDay.plusMonths(practiceGroup.getBuyMonths());
|
|
|
+ Date courseExpiredDateTemp=Date.from(currentExpiredDay.atStartOfDay(DateUtil.zoneId).toInstant());
|
|
|
+ if(coursesExpireDate.before(courseExpiredDateTemp)){
|
|
|
+ throw new BizException("课程结束时间不得早于，{}", DateUtil.dateToString(coursesExpireDate, "yyyy年MM月dd日"));
|
|
|
+ }
|
|
|
+
|
|
|
practiceGroup.setCoursesExpireDate(coursesExpireDate);
|
|
|
practiceGroup.setUpdateTime(new Date());
|
|
|
practiceGroupDao.update(practiceGroup);
|
Joburgess