|
@@ -2537,7 +2537,10 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
Date now=new Date();
|
|
|
LocalDate courseStartDay=LocalDate.now();
|
|
|
if(practiceGroupBuyParams.isRenew()){
|
|
|
- PracticeGroup userLatestPracticeGroup = practiceGroupDao.findUserPracticeGroup(practiceGroupBuyParams.getUserId(),practiceGroupBuyParams.getGroupId());
|
|
|
+ if(Objects.isNull(practiceGroupBuyParams.getGroupId())){
|
|
|
+ return BaseController.failed(HttpStatus.EXPECTATION_FAILED, "请选择续费的课程");
|
|
|
+ }
|
|
|
+ PracticeGroup userLatestPracticeGroup = practiceGroupDao.findUserPracticeGroup(practiceGroupBuyParams.getStudentId(),practiceGroupBuyParams.getGroupId());
|
|
|
if(Objects.nonNull(userLatestPracticeGroup)){
|
|
|
LocalDate lastExpiredDay=LocalDateTime.ofInstant(userLatestPracticeGroup.getCoursesExpireDate().toInstant(),DateUtil.zoneId).toLocalDate();
|
|
|
if(Objects.nonNull(lastExpiredDay)&&lastExpiredDay.compareTo(courseStartDay)>=0){
|