|
@@ -2282,7 +2282,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
SysConfig practicePayMaxMonthConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_PAY_MAX_MONTH);
|
|
|
SysConfig practicePayDrillTimesOnOneWeekConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_PAY_DRILL_TIMES_ON_ONE_WEEK);
|
|
|
SysConfig practicePromotionActivityStartDateConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_PROMOTION_ACTIVITY_START_DATE);
|
|
|
- SysConfig practiceFreeApplyExpireDateConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_FREE_APPLY_EXPIRE_DATE);
|
|
|
+ SysConfig practiceBuyActivityExpireDateConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_BUY_ACTIVITY_EXPIRE_DATE);
|
|
|
SysUserCashAccount userCashAccount = sysUserCashAccountService.getLocked(userId);
|
|
|
Student student = studentDao.get(userId);
|
|
|
List<Subject> subjects = subjectDao.findBySubjectByIdList(practiceSubjectIdListConfig.getParanValue());
|
|
@@ -2306,7 +2306,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
result.put("practiceGroupSellPrice", practiceGroupSellPrice);
|
|
|
result.put("balance", Objects.isNull(userCashAccount)?0:userCashAccount.getBalance());
|
|
|
result.put("practicePromotionActivityStartTime", practicePromotionActivityStartDateConfig.getParanValue());
|
|
|
- result.put("practiceActivityExpireDate", practiceFreeApplyExpireDateConfig.getParanValue());
|
|
|
+ result.put("practiceActivityExpireDate", practiceBuyActivityExpireDateConfig.getParanValue());
|
|
|
return result;
|
|
|
}
|
|
|
|