VIP改版
This commit is contained in:
@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import com.peanut.common.utils.R;
|
||||
import com.peanut.common.utils.ShiroUtils;
|
||||
import com.peanut.common.utils.SpdbUtil;
|
||||
import com.peanut.modules.common.dao.CourseCatalogueDao;
|
||||
@@ -14,12 +13,12 @@ import com.peanut.modules.common.dao.CourseMedicineDao;
|
||||
import com.peanut.modules.common.dao.CourseToMedicineDao;
|
||||
import com.peanut.modules.common.dao.UserCourseBuyDao;
|
||||
import com.peanut.modules.common.entity.*;
|
||||
import com.peanut.modules.common.service.UserVipService;
|
||||
import com.peanut.modules.common.to.ParamTo;
|
||||
import com.peanut.modules.medical.service.CourseMedicalService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@@ -28,7 +27,7 @@ import java.util.stream.Collectors;
|
||||
public class CourseMedicalServiceImpl extends ServiceImpl<CourseMedicineDao, CourseMedicine> implements CourseMedicalService {
|
||||
|
||||
@Autowired
|
||||
private CourseMedicineDao medicineDao;
|
||||
private UserVipService userVipService;
|
||||
@Autowired
|
||||
private CourseToMedicineDao toMedicineDao;
|
||||
@Autowired
|
||||
@@ -105,7 +104,6 @@ public class CourseMedicalServiceImpl extends ServiceImpl<CourseMedicineDao, Cou
|
||||
public Page<CourseEntity> getMedicalCoursePriceIsBuy(Map<String,Object> params) {
|
||||
Integer limit = Integer.valueOf(params.get("limit").toString());
|
||||
Integer page = Integer.valueOf(params.get("page").toString());
|
||||
String vip = ShiroUtils.getUser().getVip();
|
||||
MPJLambdaWrapper<CourseToMedicine> wrapper = new MPJLambdaWrapper<>();
|
||||
wrapper.selectAll(CourseEntity.class);
|
||||
wrapper.leftJoin(CourseEntity.class,CourseEntity::getId,CourseToMedicine::getCourseId);
|
||||
@@ -116,16 +114,15 @@ public class CourseMedicalServiceImpl extends ServiceImpl<CourseMedicineDao, Cou
|
||||
if(courseEntities.size()>0){
|
||||
for (CourseEntity co:courseEntities){
|
||||
List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper<CourseCatalogueEntity>().eq(CourseCatalogueEntity::getCourseId, co.getId()).orderByAsc(CourseCatalogueEntity::getSort));
|
||||
if (courseCatalogueEntities.size() > 0){
|
||||
for (CourseCatalogueEntity cc:courseCatalogueEntities){
|
||||
if ("0".equals(vip)||"3".equals(vip)){
|
||||
Integer i = userCourseBuyDao.selectCount(new LambdaQueryWrapper<UserCourseBuyEntity>()
|
||||
.eq(UserCourseBuyEntity::getCatalogueId, cc.getId())
|
||||
.eq(UserCourseBuyEntity::getUserId, ShiroUtils.getUId()));
|
||||
cc.setIsBuy(i>0?1:0);
|
||||
}else {
|
||||
cc.setIsBuy(1);
|
||||
}
|
||||
for (CourseCatalogueEntity cc:courseCatalogueEntities){
|
||||
UserVip userVip = userVipService.ownCourseCatalogueByVip(cc.getCourseId());
|
||||
if (userVip==null){
|
||||
Integer i = userCourseBuyDao.selectCount(new LambdaQueryWrapper<UserCourseBuyEntity>()
|
||||
.eq(UserCourseBuyEntity::getCatalogueId, cc.getId())
|
||||
.eq(UserCourseBuyEntity::getUserId, ShiroUtils.getUId()));
|
||||
cc.setIsBuy(i>0?1:0);
|
||||
}else {
|
||||
cc.setIsBuy(1);
|
||||
}
|
||||
}
|
||||
co.setCourseCatalogueEntityList(courseCatalogueEntities);
|
||||
|
||||
@@ -3,19 +3,18 @@ package com.peanut.modules.medical.service.impl;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.github.yulichang.toolkit.JoinWrappers;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import com.peanut.common.utils.R;
|
||||
import com.peanut.common.utils.ShiroUtils;
|
||||
import com.peanut.modules.common.dao.*;
|
||||
import com.peanut.modules.common.entity.*;
|
||||
import com.peanut.modules.common.service.UserVipService;
|
||||
import com.peanut.modules.common.to.ParamTo;
|
||||
import com.peanut.modules.medical.service.CourseService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@@ -23,6 +22,8 @@ import java.util.stream.Collectors;
|
||||
@Service("medicalCourseService")
|
||||
public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> implements CourseService {
|
||||
|
||||
@Autowired
|
||||
private UserVipService userVipService;
|
||||
@Autowired
|
||||
UserCourseStudyingDao studyingDao;
|
||||
@Autowired
|
||||
@@ -119,7 +120,6 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
|
||||
|
||||
@Override
|
||||
public List getUserCourseStudying(Map<String, Object> param) {
|
||||
MyUserEntity user = ShiroUtils.getUser();
|
||||
MPJLambdaWrapper<CourseEntity> wrapper = new MPJLambdaWrapper<>();
|
||||
wrapper.leftJoin(CourseToMedicine.class,CourseToMedicine::getCourseId,CourseEntity::getId);
|
||||
wrapper.leftJoin(UserCourseStudying.class,UserCourseStudying::getCourseId,CourseEntity::getId);
|
||||
@@ -133,17 +133,15 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
|
||||
if (courseCatalogueEntities.size() > 0) {
|
||||
//查询目录添加,购买的课程目录详细信息
|
||||
for (CourseCatalogueEntity courseCatalogueEntity : courseCatalogueEntities) {
|
||||
List<UserVip> userVipList = userVipDao.selectList(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId, user.getId()));
|
||||
List<UserCourseBuyEntity> userCourseBuyList = userCourseBuyDao.selectList(new LambdaQueryWrapper<UserCourseBuyEntity>().eq(UserCourseBuyEntity::getUserId, ShiroUtils.getUId()).eq(UserCourseBuyEntity::getCatalogueId, courseCatalogueEntity.getId()));
|
||||
//是否购买,生效时间
|
||||
if ("1".equals(user.getVip())||"2".equals(user.getVip())){
|
||||
//是超级会员或者医学会员
|
||||
if (userVipList.size() > 0) {
|
||||
courseCatalogueEntity.setStartTime(userVipList.get(0).getStartTime());
|
||||
courseCatalogueEntity.setEndTime(userVipList.get(0).getEndTime());
|
||||
}
|
||||
UserVip userVip = userVipService.ownCourseCatalogueByVip(courseCatalogueEntity.getCourseId());
|
||||
if (userVip!=null){
|
||||
//会员
|
||||
courseCatalogueEntity.setStartTime(userVip.getStartTime());
|
||||
courseCatalogueEntity.setEndTime(userVip.getEndTime());
|
||||
courseCatalogueEntity.setIsBuy(1);
|
||||
}else if ("0".equals(user.getVip())){
|
||||
}else {
|
||||
//普通用户
|
||||
if (userCourseBuyList.size() > 0) {
|
||||
courseCatalogueEntity.setIsBuy(1);
|
||||
@@ -152,24 +150,6 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
|
||||
}else {
|
||||
courseCatalogueEntity.setIsBuy(0);
|
||||
}
|
||||
}else if ("3".equals(user.getVip())){
|
||||
//国学会员
|
||||
//买的医学课程
|
||||
if (userCourseBuyList.size() > 0) {
|
||||
courseCatalogueEntity.setIsBuy(1);
|
||||
courseCatalogueEntity.setStartTime(userCourseBuyList.get(0).getStartTime());
|
||||
courseCatalogueEntity.setEndTime(userCourseBuyList.get(0).getEndTime());
|
||||
}else {
|
||||
//国学课程会员免费
|
||||
List<CourseToSociologyEntity> courseToSociologyList = courseToSociologyDao.selectList(new LambdaQueryWrapper<CourseToSociologyEntity>().eq(CourseToSociologyEntity::getCourseId, courseCatalogueEntity.getCourseId()));
|
||||
if (courseToSociologyList.size() > 0) {
|
||||
courseCatalogueEntity.setIsBuy(1);
|
||||
courseCatalogueEntity.setStartTime(userVipList.get(0).getStartTime());
|
||||
courseCatalogueEntity.setEndTime(userVipList.get(0).getEndTime());
|
||||
}else {
|
||||
courseCatalogueEntity.setIsBuy(0);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -181,25 +161,24 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
|
||||
|
||||
@Override
|
||||
public Page<CourseEntity> getUserCourseBuy(Map<String, Object> param) {
|
||||
MyUserEntity user =ShiroUtils.getUser();
|
||||
MPJLambdaWrapper<CourseEntity> wrapper = new MPJLambdaWrapper<>();
|
||||
wrapper.leftJoin(CourseToMedicine.class,CourseToMedicine::getCourseId,CourseEntity::getId);
|
||||
//0-普通 1超级vip 2医学vip 3国学vip
|
||||
if ("0".equals(user.getVip())||"3".equals(user.getVip())){
|
||||
if (userVipService.noMedicalVip()){
|
||||
wrapper.leftJoin(CourseCatalogueEntity.class,CourseCatalogueEntity::getCourseId,CourseEntity::getId);
|
||||
wrapper.leftJoin(UserCourseBuyEntity.class,UserCourseBuyEntity::getCatalogueId,CourseCatalogueEntity::getId);
|
||||
wrapper.eq(UserCourseBuyEntity::getUserId,user.getId());
|
||||
if ("3".equals(user.getVip())){
|
||||
MPJLambdaWrapper<CourseEntity> vipWrapper = new MPJLambdaWrapper<>(CourseEntity.class);
|
||||
vipWrapper.leftJoin(CourseToMedicine.class,CourseToMedicine::getCourseId,CourseEntity::getId);
|
||||
vipWrapper.exists("select * from course_to_sociology where del_flag = 0 and course_id = t.id");
|
||||
vipWrapper.selectAll(CourseEntity.class);
|
||||
vipWrapper.first("(");
|
||||
vipWrapper.last(")");
|
||||
wrapper.first("(");
|
||||
wrapper.last(")");
|
||||
wrapper.union(vipWrapper);
|
||||
wrapper.eq(UserCourseBuyEntity::getUserId,ShiroUtils.getUId());
|
||||
}else {
|
||||
List list = new ArrayList<>();//通过顶级标签获取最下层标签
|
||||
if (userVipService.isMedicalVip()){
|
||||
userVipService.bottomLabel(1,list);
|
||||
}
|
||||
if (userVipService.isAcupunctureVip()){
|
||||
userVipService.bottomLabel(2,list);
|
||||
}
|
||||
if (userVipService.istumorVip()){
|
||||
userVipService.bottomLabel(5,list);
|
||||
}
|
||||
wrapper.in(CourseToMedicine::getMedicalId,list);
|
||||
}
|
||||
if (StringUtils.isNotEmpty(param.get("medicalId").toString())){
|
||||
wrapper.eq(CourseToMedicine::getMedicalId,param.get("medicalId"));
|
||||
@@ -212,87 +191,67 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
|
||||
wrapper.orderByAsc(CourseEntity::getSort);
|
||||
Page<CourseEntity> courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(Long.parseLong(param.get("page").toString()), Long.parseLong(param.get("limit").toString())), CourseEntity.class, wrapper);
|
||||
List<CourseEntity> courseEntities = courseEntityPage.getRecords();
|
||||
if(courseEntities!=null&&courseEntities.size()>0){
|
||||
for (CourseEntity co:courseEntities){
|
||||
int i = studyingDao.selectCount(new LambdaQueryWrapper<UserCourseStudying>().eq(UserCourseStudying::getCourseId,co.getId()).eq(UserCourseStudying::getUserId,user.getId()));
|
||||
co.setIsStudying(i>0?1:0);
|
||||
MPJLambdaWrapper<CourseCatalogueEntity> catalogueWrapper = new MPJLambdaWrapper();
|
||||
catalogueWrapper.eq(CourseCatalogueEntity::getCourseId, co.getId());
|
||||
catalogueWrapper.orderByAsc(CourseCatalogueEntity::getSort);
|
||||
List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(catalogueWrapper);
|
||||
if (courseCatalogueEntities.size() > 0) {
|
||||
//查询目录添加,购买的课程目录详细信息
|
||||
for (CourseCatalogueEntity courseCatalogueEntity : courseCatalogueEntities) {
|
||||
List<UserCourseBuyEntity> userCourseBuyList = userCourseBuyDao.selectList(new LambdaQueryWrapper<UserCourseBuyEntity>().eq(UserCourseBuyEntity::getUserId, user.getId()).eq(UserCourseBuyEntity::getCatalogueId, courseCatalogueEntity.getId()));
|
||||
List<UserVip> userVipList = userVipDao.selectList(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId, user.getId()));
|
||||
//完成度、上次学习时间
|
||||
// catalogueCompletion(courseCatalogueEntity);
|
||||
//是否购买,生效时间
|
||||
if ("1".equals(user.getVip())||"2".equals(user.getVip())){
|
||||
//是超级会员或者医学学会员
|
||||
if (userVipList.size() > 0) {
|
||||
courseCatalogueEntity.setStartTime(userVipList.get(0).getStartTime());
|
||||
courseCatalogueEntity.setEndTime(userVipList.get(0).getEndTime());
|
||||
}
|
||||
for (CourseEntity co:courseEntities){
|
||||
int i = studyingDao.selectCount(new LambdaQueryWrapper<UserCourseStudying>()
|
||||
.eq(UserCourseStudying::getCourseId,co.getId())
|
||||
.eq(UserCourseStudying::getUserId,ShiroUtils.getUId()));
|
||||
co.setIsStudying(i>0?1:0);
|
||||
MPJLambdaWrapper<CourseCatalogueEntity> catalogueWrapper = new MPJLambdaWrapper();
|
||||
catalogueWrapper.eq(CourseCatalogueEntity::getCourseId, co.getId());
|
||||
catalogueWrapper.orderByAsc(CourseCatalogueEntity::getSort);
|
||||
List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(catalogueWrapper);
|
||||
if (courseCatalogueEntities.size() > 0) {
|
||||
//查询目录添加,购买的课程目录详细信息
|
||||
for (CourseCatalogueEntity courseCatalogueEntity : courseCatalogueEntities) {
|
||||
//是否购买,生效时间
|
||||
UserVip userVip = userVipService.ownCourseCatalogueByVip(courseCatalogueEntity.getCourseId());
|
||||
if (userVip!=null){
|
||||
//会员
|
||||
courseCatalogueEntity.setStartTime(userVip.getStartTime());
|
||||
courseCatalogueEntity.setEndTime(userVip.getEndTime());
|
||||
courseCatalogueEntity.setIsBuy(1);
|
||||
}else {
|
||||
//普通用户
|
||||
List<UserCourseBuyEntity> userCourseBuyList = userCourseBuyDao.selectList(new LambdaQueryWrapper<UserCourseBuyEntity>()
|
||||
.eq(UserCourseBuyEntity::getUserId, ShiroUtils.getUId())
|
||||
.eq(UserCourseBuyEntity::getCatalogueId, courseCatalogueEntity.getId()));
|
||||
if (userCourseBuyList.size() > 0) {
|
||||
courseCatalogueEntity.setIsBuy(1);
|
||||
}else if ("0".equals(user.getVip())){
|
||||
//普通用户
|
||||
if (userCourseBuyList.size() > 0) {
|
||||
courseCatalogueEntity.setIsBuy(1);
|
||||
courseCatalogueEntity.setStartTime(userCourseBuyList.get(0).getStartTime());
|
||||
courseCatalogueEntity.setEndTime(userCourseBuyList.get(0).getEndTime());
|
||||
}else {
|
||||
courseCatalogueEntity.setIsBuy(0);
|
||||
}
|
||||
}else if ("3".equals(user.getVip())){
|
||||
//国学会员
|
||||
//买的医学课程
|
||||
if (userCourseBuyList.size() > 0) {
|
||||
courseCatalogueEntity.setIsBuy(1);
|
||||
courseCatalogueEntity.setStartTime(userCourseBuyList.get(0).getStartTime());
|
||||
courseCatalogueEntity.setEndTime(userCourseBuyList.get(0).getEndTime());
|
||||
}else {
|
||||
//国学课程会员免费
|
||||
List<CourseToSociologyEntity> courseToSociologyList = courseToSociologyDao.selectList(new LambdaQueryWrapper<CourseToSociologyEntity>().eq(CourseToSociologyEntity::getCourseId, courseCatalogueEntity.getCourseId()));
|
||||
if (courseToSociologyList.size() > 0) {
|
||||
courseCatalogueEntity.setIsBuy(1);
|
||||
courseCatalogueEntity.setStartTime(userVipList.get(0).getStartTime());
|
||||
courseCatalogueEntity.setEndTime(userVipList.get(0).getEndTime());
|
||||
}else {
|
||||
courseCatalogueEntity.setIsBuy(0);
|
||||
}
|
||||
}
|
||||
courseCatalogueEntity.setStartTime(userCourseBuyList.get(0).getStartTime());
|
||||
courseCatalogueEntity.setEndTime(userCourseBuyList.get(0).getEndTime());
|
||||
}else {
|
||||
courseCatalogueEntity.setIsBuy(0);
|
||||
}
|
||||
}
|
||||
}
|
||||
co.setCourseCatalogueEntityList(courseCatalogueEntities);
|
||||
}
|
||||
co.setCourseCatalogueEntityList(courseCatalogueEntities);
|
||||
}
|
||||
return courseEntityPage;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List getCourseExpire(Map<String, Object> param) {
|
||||
String vip = ShiroUtils.getUser().getVip();
|
||||
if ("0".equals(vip)||"3".equals(vip)){
|
||||
MPJLambdaWrapper<CourseEntity> wrapper = new MPJLambdaWrapper<>();
|
||||
wrapper.distinct();
|
||||
wrapper.leftJoin(CourseCatalogueEntity.class,CourseCatalogueEntity::getCourseId,CourseEntity::getId);
|
||||
wrapper.rightJoin(UserCourseBuyEntity.class,UserCourseBuyEntity::getCatalogueId,CourseCatalogueEntity::getId);
|
||||
wrapper.rightJoin(CourseToMedicine.class,CourseToMedicine::getCourseId,CourseEntity::getId);
|
||||
//关掉本次查询del_flg = 0的条件,查询过期课程
|
||||
wrapper.disableSubLogicDel();
|
||||
wrapper.eq(UserCourseBuyEntity::getUserId,param.get("userId"));
|
||||
wrapper.eq(UserCourseBuyEntity::getDelFlag,-1);
|
||||
wrapper.selectAll(CourseEntity.class);
|
||||
wrapper.selectAs(CourseCatalogueEntity::getId,"catalogueId");
|
||||
wrapper.selectAs(CourseCatalogueEntity::getTitle,"catalogueTitle");
|
||||
wrapper.orderByAsc(CourseEntity::getSort);
|
||||
wrapper.orderByAsc(CourseCatalogueEntity::getSort);
|
||||
List<Map<String,Object>> courseEntities = this.getBaseMapper().selectMaps(wrapper);
|
||||
List<Map<String,Object>> res = new ArrayList<>();
|
||||
//如果过期又开通,去除
|
||||
for (Map<String,Object> c : courseEntities) {
|
||||
MPJLambdaWrapper<CourseEntity> wrapper = new MPJLambdaWrapper<>();
|
||||
wrapper.distinct();
|
||||
wrapper.leftJoin(CourseCatalogueEntity.class,CourseCatalogueEntity::getCourseId,CourseEntity::getId);
|
||||
wrapper.rightJoin(UserCourseBuyEntity.class,UserCourseBuyEntity::getCatalogueId,CourseCatalogueEntity::getId);
|
||||
wrapper.rightJoin(CourseToMedicine.class,CourseToMedicine::getCourseId,CourseEntity::getId);
|
||||
//关掉本次查询del_flg = 0的条件,查询过期课程
|
||||
wrapper.disableSubLogicDel();
|
||||
wrapper.eq(UserCourseBuyEntity::getUserId,param.get("userId"));
|
||||
wrapper.eq(UserCourseBuyEntity::getDelFlag,-1);
|
||||
wrapper.selectAll(CourseEntity.class);
|
||||
wrapper.selectAs(CourseCatalogueEntity::getId,"catalogueId");
|
||||
wrapper.selectAs(CourseCatalogueEntity::getTitle,"catalogueTitle");
|
||||
wrapper.orderByAsc(CourseEntity::getSort);
|
||||
wrapper.orderByAsc(CourseCatalogueEntity::getSort);
|
||||
List<Map<String,Object>> courseEntities = this.getBaseMapper().selectMaps(wrapper);
|
||||
List<Map<String,Object>> res = new ArrayList<>();
|
||||
//如果过期又开通,去除
|
||||
for (Map<String,Object> c : courseEntities) {
|
||||
UserVip userVip = userVipService.ownCourseCatalogueByVip((int)c.get("id"));
|
||||
if (userVip == null) {
|
||||
int ucb = userCourseBuyDao.selectCount(new LambdaQueryWrapper<UserCourseBuyEntity>()
|
||||
.eq(UserCourseBuyEntity::getUserId,param.get("userId"))
|
||||
.eq(UserCourseBuyEntity::getCatalogueId,c.get("catalogueId")));
|
||||
@@ -300,10 +259,8 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
|
||||
res.add(c);
|
||||
}
|
||||
}
|
||||
return res;
|
||||
}else {
|
||||
return null;
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
@@ -322,22 +279,11 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
|
||||
.orderByAsc(ShopProduct::getSort));
|
||||
flag.put("shopProductList",shopProductList);
|
||||
}
|
||||
//获取用户身份和此课程的关系
|
||||
MyUserEntity userEntity = myUserDao.selectById(uId);
|
||||
HashMap<String, String> userVip = new HashMap<>();
|
||||
userVip.put("vip",userEntity.getVip());
|
||||
if (userEntity.getVip().equals("3")){
|
||||
Integer integer = courseToSociologyDao.selectCount(new LambdaQueryWrapper<CourseToSociologyEntity>().eq(CourseToSociologyEntity::getCourseId, id));
|
||||
userVip.put("vipCan",integer>0?"1":"0");
|
||||
}
|
||||
flag.put("vip",userVip);
|
||||
//目录信息
|
||||
List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper<CourseCatalogueEntity>().eq(CourseCatalogueEntity::getCourseId, id).orderByAsc(CourseCatalogueEntity::getSort));
|
||||
|
||||
for (CourseCatalogueEntity c :courseCatalogueEntities){
|
||||
List<UserCourseBuyEntity> userCourseBuyList = userCourseBuyDao.selectList(new LambdaQueryWrapper<UserCourseBuyEntity>().eq(UserCourseBuyEntity::getUserId, uId).eq(UserCourseBuyEntity::getCatalogueId, c.getId()));
|
||||
//完成度、上次学习时间
|
||||
// catalogueCompletion(c);
|
||||
catalogueCompletion(c);//完成度、上次学习时间
|
||||
if (userCourseBuyList.size() > 0) {
|
||||
c.setIsBuy(1);
|
||||
c.setStartTime(userCourseBuyList.get(0).getStartTime());
|
||||
@@ -373,28 +319,26 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
|
||||
}
|
||||
|
||||
private void catalogueCompletion(CourseCatalogueEntity c){
|
||||
List<CourseCatalogueChapterEntity> courseCatalogueChapterEntities = courseCatalogueChapterDao.selectList(new LambdaQueryWrapper<CourseCatalogueChapterEntity>().eq(CourseCatalogueChapterEntity::getCatalogueId, c.getId()));
|
||||
Integer act = 0;
|
||||
Date date = null;
|
||||
for (CourseCatalogueChapterEntity cc : courseCatalogueChapterEntities){
|
||||
List<CourseCatalogueChapterVideoEntity> courseCatalogueChapterVideoEntities = courseCatalogueChapterVideoDao.selectList(new LambdaQueryWrapper<CourseCatalogueChapterVideoEntity>().eq(CourseCatalogueChapterVideoEntity::getChapterId, cc.getId()));
|
||||
List<Integer> collect = courseCatalogueChapterVideoEntities.stream().map(CourseCatalogueChapterVideoEntity::getId).collect(Collectors.toList());
|
||||
if(collect.size()==0){
|
||||
continue;
|
||||
}
|
||||
List<UserCourseVideoPositionEntity> videoPositionList = userCourseVideoPositionDao.selectList(new LambdaQueryWrapper<UserCourseVideoPositionEntity>().eq(UserCourseVideoPositionEntity::getUserId, ShiroUtils.getUId()).in(UserCourseVideoPositionEntity::getVideoId, collect).orderByDesc(UserCourseVideoPositionEntity::getCreateTime));
|
||||
if (videoPositionList.size()>0){
|
||||
act++;
|
||||
if (date!=null){
|
||||
date = date.getTime()>videoPositionList.get(0).getUpdateTime().getTime()?date:videoPositionList.get(0).getUpdateTime();
|
||||
}else {
|
||||
date = videoPositionList.get(0).getUpdateTime();
|
||||
List<CourseCatalogueChapterEntity> chapterList = courseCatalogueChapterDao.selectList(new LambdaQueryWrapper<CourseCatalogueChapterEntity>().eq(CourseCatalogueChapterEntity::getCatalogueId, c.getId()));
|
||||
if (chapterList.size() > 0){
|
||||
List<Integer> collect = chapterList.stream().map(CourseCatalogueChapterEntity::getId).collect(Collectors.toList());
|
||||
List<CourseCatalogueChapterVideoEntity> videoList = courseCatalogueChapterVideoDao
|
||||
.selectList(new LambdaQueryWrapper<CourseCatalogueChapterVideoEntity>()
|
||||
.in(CourseCatalogueChapterVideoEntity::getChapterId, collect));
|
||||
if (videoList.size() > 0) {
|
||||
List<Integer> videoCollect = videoList.stream().map(CourseCatalogueChapterVideoEntity::getId).collect(Collectors.toList());
|
||||
List<UserCourseVideoPositionEntity> videoPositionList = userCourseVideoPositionDao
|
||||
.selectList(new LambdaQueryWrapper<UserCourseVideoPositionEntity>()
|
||||
.eq(UserCourseVideoPositionEntity::getUserId, ShiroUtils.getUId())
|
||||
.in(UserCourseVideoPositionEntity::getVideoId, videoCollect)
|
||||
.orderByDesc(UserCourseVideoPositionEntity::getCreateTime));
|
||||
if (videoPositionList.size()>0){
|
||||
int completion = videoPositionList.size() * 100 / videoList.size();
|
||||
c.setCompletion(completion);
|
||||
c.setLastStudyTime(videoPositionList.get(0).getCreateTime());
|
||||
}
|
||||
}
|
||||
}
|
||||
int completion = courseCatalogueChapterEntities.size()==0?0:act * 100 / courseCatalogueChapterEntities.size();
|
||||
c.setCompletion(completion);
|
||||
c.setLastStudyTime(date);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user