|
@@ -945,6 +945,9 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
+ SysConfig practiceFreeApplyExpireDateConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_FREE_APPLY_EXPIRE_DATE);
|
|
|
+ Date practiceFreeApplyExpireDate = DateUtil.stringToDate(practiceFreeApplyExpireDateConfig.getParanValue());
|
|
|
+
|
|
|
Date now = new Date();
|
|
|
Calendar calendar = Calendar.getInstance();
|
|
|
calendar.setFirstDayOfWeek(Calendar.MONDAY);
|
|
@@ -955,7 +958,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
calendar.set(Calendar.MILLISECOND, 0);
|
|
|
calendar.add(Calendar.DATE, 1);
|
|
|
Date applyStartDate = calendar.getTime();
|
|
|
- Date applyEndDate = DateUtil.stringToDate("2020-05-24", "yyyy-MM-dd");
|
|
|
+ Date applyEndDate = practiceFreeApplyExpireDate;
|
|
|
Date firstMonday = DateUtil.getWeekDayWithDate(applyStartDate, Calendar.MONDAY);
|
|
|
Date secondSunday = DateUtil.getWeekDayWithDate(applyEndDate, Calendar.SUNDAY);
|
|
|
|