zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

我的课程-过期课程-添加VIP过滤

Browse Source
This commit is contained in:
wuchunlei
2024-06-18 14:07:11 +08:00
parent 15c1781360
commit 1949d2f7c0
3 changed files with 48 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/peanut/modules/common/entity/MyUserEntity.java
View File

@@ -57,7 +57,7 @@ public class MyUserEntity implements Serializable {
*/ */
private String password; private String password;
/** /**
* 0-普通 1-vip * 0-普通 1-vip //0-普通 1超级vip 2医学vip 3国学vip
*/ */
private String vip; private String vip;
/** /**

40
src/main/java/com/peanut/modules/medical/service/impl/CourseServiceImpl.java
View File

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.peanut.common.utils.ShiroUtils;
import com.peanut.modules.common.dao.*; import com.peanut.modules.common.dao.*;
import com.peanut.modules.common.entity.*; import com.peanut.modules.common.entity.*;
import com.peanut.modules.common.to.ParamTo; import com.peanut.modules.common.to.ParamTo;
@@ -117,21 +118,26 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
@Override @Override
public List getCourseExpire(Map<String, Object> param) { public List getCourseExpire(Map<String, Object> param) {
MPJLambdaWrapper<CourseEntity> wrapper = new MPJLambdaWrapper<>(); String vip = ShiroUtils.getUser().getVip();
wrapper.distinct(); if ("0".equals(vip)||"3".equals(vip)){
wrapper.leftJoin(CourseCatalogueEntity.class,CourseCatalogueEntity::getCourseId,CourseEntity::getId); MPJLambdaWrapper<CourseEntity> wrapper = new MPJLambdaWrapper<>();
//关掉本次查询del_flg = 0的条件，查询过期课程 wrapper.distinct();
wrapper.disableSubLogicDel().rightJoin(UserCourseBuyEntity.class,UserCourseBuyEntity::getCatalogueId,CourseCatalogueEntity::getId); wrapper.leftJoin(CourseCatalogueEntity.class,CourseCatalogueEntity::getCourseId,CourseEntity::getId);
wrapper.rightJoin(CourseToMedicine.class,CourseToMedicine::getCourseId,CourseEntity::getId); //关掉本次查询del_flg = 0的条件，查询过期课程
wrapper.eq(UserCourseBuyEntity::getUserId,param.get("userId")); wrapper.disableSubLogicDel().rightJoin(UserCourseBuyEntity.class,UserCourseBuyEntity::getCatalogueId,CourseCatalogueEntity::getId);
wrapper.eq(UserCourseBuyEntity::getDelFlag,-1); wrapper.rightJoin(CourseToMedicine.class,CourseToMedicine::getCourseId,CourseEntity::getId);
wrapper.selectAll(CourseEntity.class); wrapper.eq(UserCourseBuyEntity::getUserId,param.get("userId"));
wrapper.selectAs(CourseCatalogueEntity::getId,"catalogueId"); wrapper.eq(UserCourseBuyEntity::getDelFlag,-1);
wrapper.selectAs(CourseCatalogueEntity::getTitle,"catalogueTitle"); wrapper.selectAll(CourseEntity.class);
wrapper.orderByAsc(CourseEntity::getSort); wrapper.selectAs(CourseCatalogueEntity::getId,"catalogueId");
wrapper.orderByAsc(CourseCatalogueEntity::getSort); wrapper.selectAs(CourseCatalogueEntity::getTitle,"catalogueTitle");
List courseEntities = this.getBaseMapper().selectMaps(wrapper); wrapper.orderByAsc(CourseEntity::getSort);
return courseEntities; wrapper.orderByAsc(CourseCatalogueEntity::getSort);
List courseEntities = this.getBaseMapper().selectMaps(wrapper);
return courseEntities;
}else {
return null;
}
} }
@@ -152,6 +158,8 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
courseEntities = toMedicineDao.selectJoinList(CourseEntity.class, wrapper); courseEntities = toMedicineDao.selectJoinList(CourseEntity.class, wrapper);
if(courseEntities!=null&&courseEntities.size()>0){ if(courseEntities!=null&&courseEntities.size()>0){
for (CourseEntity co:courseEntities){ 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);
List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper<CourseCatalogueEntity>().eq(CourseCatalogueEntity::getCourseId, co.getId()).orderByAsc(CourseCatalogueEntity::getSort)); List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper<CourseCatalogueEntity>().eq(CourseCatalogueEntity::getCourseId, co.getId()).orderByAsc(CourseCatalogueEntity::getSort));
co.setCourseCatalogueEntityList(courseCatalogueEntities); co.setCourseCatalogueEntityList(courseCatalogueEntities);
} }
@@ -170,6 +178,8 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
courseEntities = courseBuyDao.selectJoinList(CourseEntity.class, wrapper); courseEntities = courseBuyDao.selectJoinList(CourseEntity.class, wrapper);
if(courseEntities!=null&&courseEntities.size()>0){ if(courseEntities!=null&&courseEntities.size()>0){
for (CourseEntity co:courseEntities){ 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);
List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList( List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(
new MPJLambdaWrapper<CourseCatalogueEntity>() new MPJLambdaWrapper<CourseCatalogueEntity>()
.selectAll(CourseCatalogueEntity.class) .selectAll(CourseCatalogueEntity.class)

39
src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java
View File

@@ -24,8 +24,6 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
@Autowired @Autowired
private MyUserService userService; private MyUserService userService;
@Autowired @Autowired
private UserToCourseDao userToCourseDao;
@Autowired
private CourseToSociologyDao courseToSociologyDao; private CourseToSociologyDao courseToSociologyDao;
@Autowired @Autowired
private CourseCatalogueDao courseCatalogueDao; private CourseCatalogueDao courseCatalogueDao;
@@ -293,21 +291,26 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
@Override @Override
public List getCourseExpire(Map<String, Object> param) { public List getCourseExpire(Map<String, Object> param) {
MPJLambdaWrapper<CourseEntity> wrapper = new MPJLambdaWrapper<>(); String vip = ShiroUtils.getUser().getVip();
wrapper.distinct(); if ("0".equals(vip)||"2".equals(vip)){
wrapper.leftJoin(CourseCatalogueEntity.class,CourseCatalogueEntity::getCourseId,CourseEntity::getId); MPJLambdaWrapper<CourseEntity> wrapper = new MPJLambdaWrapper<>();
//关掉本次查询del_flg = 0的条件，查询过期课程 wrapper.distinct();
wrapper.disableSubLogicDel().rightJoin(UserCourseBuyEntity.class,UserCourseBuyEntity::getCatalogueId,CourseCatalogueEntity::getId); wrapper.leftJoin(CourseCatalogueEntity.class,CourseCatalogueEntity::getCourseId,CourseEntity::getId);
wrapper.rightJoin(CourseToSociologyEntity.class,CourseToSociologyEntity::getCourseId,CourseEntity::getId); //关掉本次查询del_flg = 0的条件，查询过期课程
wrapper.eq(UserCourseBuyEntity::getUserId,param.get("userId")); wrapper.disableSubLogicDel().rightJoin(UserCourseBuyEntity.class,UserCourseBuyEntity::getCatalogueId,CourseCatalogueEntity::getId);
wrapper.eq(UserCourseBuyEntity::getDelFlag,-1); wrapper.rightJoin(CourseToSociologyEntity.class,CourseToSociologyEntity::getCourseId,CourseEntity::getId);
wrapper.selectAll(CourseEntity.class); wrapper.eq(UserCourseBuyEntity::getUserId,param.get("userId"));
wrapper.selectAs(CourseCatalogueEntity::getId,"catalogueId"); wrapper.eq(UserCourseBuyEntity::getDelFlag,-1);
wrapper.selectAs(CourseCatalogueEntity::getTitle,"catalogueTitle"); wrapper.selectAll(CourseEntity.class);
wrapper.orderByAsc(CourseEntity::getSort); wrapper.selectAs(CourseCatalogueEntity::getId,"catalogueId");
wrapper.orderByAsc(CourseCatalogueEntity::getSort); wrapper.selectAs(CourseCatalogueEntity::getTitle,"catalogueTitle");
List courseEntities = this.getBaseMapper().selectMaps(wrapper); wrapper.orderByAsc(CourseEntity::getSort);
return courseEntities; wrapper.orderByAsc(CourseCatalogueEntity::getSort);
List courseEntities = this.getBaseMapper().selectMaps(wrapper);
return courseEntities;
}else {
return null;
}
} }
@@ -348,6 +351,8 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
courseEntities = userCourseBuyDao.selectJoinList(CourseEntity.class, wrapper); courseEntities = userCourseBuyDao.selectJoinList(CourseEntity.class, wrapper);
if(courseEntities!=null&&courseEntities.size()>0){ if(courseEntities!=null&&courseEntities.size()>0){
for (CourseEntity co:courseEntities){ 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);
List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList( List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(
new MPJLambdaWrapper<CourseCatalogueEntity>() new MPJLambdaWrapper<CourseCatalogueEntity>()
.selectAll(CourseCatalogueEntity.class) .selectAll(CourseCatalogueEntity.class)