|
@@ -1733,18 +1733,18 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
if (practiceGroup.getFirstCourseTime().before(activityStartDate)
|
|
if (practiceGroup.getFirstCourseTime().before(activityStartDate)
|
|
|| practiceGroup.getFirstCourseTime().after(activityEndDate)) {
|
|
|| practiceGroup.getFirstCourseTime().after(activityEndDate)) {
|
|
result.put("status", "APPLY_DATE_OVERFLOW");
|
|
result.put("status", "APPLY_DATE_OVERFLOW");
|
|
- result.put("info", "预约失败,陪练课的时间超出活动范围,请重试。");
|
|
|
|
|
|
+ result.put("info", "预约失败,陪练课的时间超出活动时间范围(2020-3-31之前),请重试。");
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
if (practiceGroup.getSecondCourseTime().before(activityStartDate)
|
|
if (practiceGroup.getSecondCourseTime().before(activityStartDate)
|
|
|| practiceGroup.getSecondCourseTime().after(activityEndDate)) {
|
|
|| practiceGroup.getSecondCourseTime().after(activityEndDate)) {
|
|
result.put("status", "APPLY_DATE_OVERFLOW");
|
|
result.put("status", "APPLY_DATE_OVERFLOW");
|
|
- result.put("info", "预约失败,陪练课的时间超出活动范围,请重试。");
|
|
|
|
|
|
+ result.put("info", "预约失败,陪练课的时间超出活动时间范围(2020-3-31之前),请重试。");
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
if (DateUtil.isSameDay(practiceGroup.getFirstCourseTime(), practiceGroup.getSecondCourseTime())) {
|
|
if (DateUtil.isSameDay(practiceGroup.getFirstCourseTime(), practiceGroup.getSecondCourseTime())) {
|
|
result.put("status", "TWO_DATE_ON_ONE_DAY");
|
|
result.put("status", "TWO_DATE_ON_ONE_DAY");
|
|
- result.put("info", "预约失败,陪练课选择时间错误,请重试。");
|
|
|
|
|
|
+ result.put("info", "预约失败,陪练课选择时间重复,请重试。");
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1766,13 +1766,13 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
if (allCourseDates.get(2).before(activityStartDate)
|
|
if (allCourseDates.get(2).before(activityStartDate)
|
|
|| allCourseDates.get(2).after(courseExpireDate)) {
|
|
|| allCourseDates.get(2).after(courseExpireDate)) {
|
|
result.put("status", "APPLY_DATE_OVERFLOW");
|
|
result.put("status", "APPLY_DATE_OVERFLOW");
|
|
- result.put("info", "预约失败,陪练课的时间超出活动范围,请重试。");
|
|
|
|
|
|
+ result.put("info", "预约失败,陪练课的时间超出活动时间范围(2020-3-31之前),请重试。");
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
if (allCourseDates.get(3).before(activityStartDate)
|
|
if (allCourseDates.get(3).before(activityStartDate)
|
|
|| allCourseDates.get(3).after(courseExpireDate)) {
|
|
|| allCourseDates.get(3).after(courseExpireDate)) {
|
|
result.put("status", "APPLY_DATE_OVERFLOW");
|
|
result.put("status", "APPLY_DATE_OVERFLOW");
|
|
- result.put("info", "预约失败,陪练课的时间超出活动范围,请重试。");
|
|
|
|
|
|
+ result.put("info", "预约失败,陪练课的时间超出活动时间范围(2020-3-31之前),请重试。");
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
allCourseDates.sort(Comparator.comparing(Date::getTime));
|
|
allCourseDates.sort(Comparator.comparing(Date::getTime));
|
|
@@ -1784,7 +1784,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
|
|
|
if (applyTimes >= 1) {
|
|
if (applyTimes >= 1) {
|
|
result.put("status", "IS_APPLIED");
|
|
result.put("status", "IS_APPLIED");
|
|
- result.put("info", "无法重复预约,您已经预约了陪练课。");
|
|
|
|
|
|
+ result.put("info", "您已经完成陪练课预约,请勿重复预约。");
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
applyTimes += 1;
|
|
applyTimes += 1;
|