|
@@ -658,8 +658,8 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
|
|
|
//判断结业
|
|
|
long nowTime = System.currentTimeMillis() / 1000;
|
|
|
ClassGradeUserQueryBo queryBo = new ClassGradeUserQueryBo();
|
|
|
- queryBo.setGradeId(bo.getGradeId());
|
|
|
- queryBo.setUserId(bo.getUserId());
|
|
|
+ queryBo.setGradeId(classGradeUser.getGradeId());
|
|
|
+ queryBo.setUserId(classGradeUser.getUserId());
|
|
|
ClassPeriodStudentVo classPeriodStudentVo = classGradeUserMapper.userPeriodStatus(queryBo);
|
|
|
if (Validator.isEmpty(classPeriodStudentVo.getClassStartTime())) {
|
|
|
//没设置永久有效
|
|
@@ -675,8 +675,8 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
|
|
|
UserPeriodQueryBo periodQueryBo = new UserPeriodQueryBo();
|
|
|
periodQueryBo.setOrderGoodsId(bo.getOrderGoodsId());
|
|
|
periodQueryBo.setPeriodStatus(1);
|
|
|
- periodQueryBo.setUserId(bo.getUserId());
|
|
|
- periodQueryBo.setGradeId(bo.getGradeId());
|
|
|
+ periodQueryBo.setUserId(classGradeUser.getUserId());
|
|
|
+ periodQueryBo.setGradeId(classGradeUser.getGradeId());
|
|
|
List<UserPeriodStatusVo> upsList = userPeriodStatusService.selectPeriodStatus(periodQueryBo);
|
|
|
for(UserPeriodStatusVo periodStatusVo : upsList){
|
|
|
UserPeriod period = getById(periodStatusVo.getPeriodId());
|