|
@@ -35,6 +35,7 @@ import com.zhongzheng.modules.course.service.ICourseSubjectService;
|
|
|
import com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo;
|
|
import com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo;
|
|
|
import com.zhongzheng.modules.grade.service.IClassGradeUserService;
|
|
import com.zhongzheng.modules.grade.service.IClassGradeUserService;
|
|
|
import com.zhongzheng.modules.grade.vo.ClassGradeUserGoodsVo;
|
|
import com.zhongzheng.modules.grade.vo.ClassGradeUserGoodsVo;
|
|
|
|
|
+import com.zhongzheng.modules.inform.domain.InformRemind;
|
|
|
import com.zhongzheng.modules.system.service.ISysConfigService;
|
|
import com.zhongzheng.modules.system.service.ISysConfigService;
|
|
|
import com.zhongzheng.modules.user.bo.*;
|
|
import com.zhongzheng.modules.user.bo.*;
|
|
|
import com.zhongzheng.modules.user.domain.*;
|
|
import com.zhongzheng.modules.user.domain.*;
|
|
@@ -185,6 +186,18 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
|
|
|
List<ClassGradeUserGoodsVo> classGradeUserGoodsVos = iClassGradeUserService.listUser(classGradeUserQueryBo);
|
|
List<ClassGradeUserGoodsVo> classGradeUserGoodsVos = iClassGradeUserService.listUser(classGradeUserQueryBo);
|
|
|
userVo.setClassGradeUserGoodsVoList(classGradeUserGoodsVos);
|
|
userVo.setClassGradeUserGoodsVoList(classGradeUserGoodsVos);
|
|
|
userVo.setOrderNum(userVo.getGoodsCourseNum());
|
|
userVo.setOrderNum(userVo.getGoodsCourseNum());
|
|
|
|
|
+
|
|
|
|
|
+ UserVisitLog userVisitLog = iUserVisitLogService.getOne(new LambdaQueryWrapper<UserVisitLog>().eq(UserVisitLog::getUserId, userVo.getUserId()).orderByDesc(UserVisitLog::getId).last("limit 1"));
|
|
|
|
|
+ if(Validator.isNotEmpty(userVisitLog)){
|
|
|
|
|
+ userVo.setLastVisitTime(userVisitLog.getCreateTime());
|
|
|
|
|
+ userVo.setVisitFromPlat(Integer.parseInt(userVisitLog.getFromPlat()));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ UserStudyLog userStudyLog = iUserStudyLogService.getOne(new LambdaQueryWrapper<UserStudyLog>().eq(UserStudyLog::getUserId, userVo.getUserId()).orderByDesc(UserStudyLog::getId).last("limit 1"));
|
|
|
|
|
+ if(Validator.isNotEmpty(userStudyLog)){
|
|
|
|
|
+ userVo.setLastStudyTime(userStudyLog.getCreateTime());
|
|
|
|
|
+ userVo.setStudyFromPlat(Integer.parseInt(userStudyLog.getFromPlat()));
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
return list;
|
|
return list;
|
|
|
}
|
|
}
|