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

update

Browse Source
This commit is contained in:
wangjinlei
2024-09-09 14:14:14 +08:00
parent beb4ef6297
commit a438370d1d
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueChapterVideoServiceImpl.java
View File

@@ -72,9 +72,9 @@ public class CourseCatalogueChapterVideoServiceImpl extends ServiceImpl<CourseCa
Integer uId = ShiroUtils.getUId(); Integer uId = ShiroUtils.getUId();
MyUserEntity userEntity = userDao.selectById(uId); MyUserEntity userEntity = userDao.selectById(uId);
//审查课程观看权限 //审查课程观看权限
// if(courseCatalogueChapterEntity.getIsAudition()==0&&!courseCheckVip(userEntity,courseCatalogueEntity.getCourseId())&&!courseCheckBuy(userEntity,courseCatalogueEntity)){ if(courseCatalogueChapterEntity.getIsAudition()==0&&!courseCheckVip(userEntity,courseCatalogueEntity.getCourseId())&&!courseCheckBuy(userEntity,courseCatalogueEntity)){
// return R.error(505,"鉴权失败！"); return R.error(505,"鉴权失败！");
// } }
//处理课程开始计时的逻辑 //处理课程开始计时的逻辑
if(courseCatalogueChapterEntity.getIsAudition()==0){ if(courseCatalogueChapterEntity.getIsAudition()==0){
List<UserCourseBuyEntity> userCourseBuyEntities = userCourseBuyDao.selectList(new LambdaQueryWrapper<UserCourseBuyEntity>() List<UserCourseBuyEntity> userCourseBuyEntities = userCourseBuyDao.selectList(new LambdaQueryWrapper<UserCourseBuyEntity>()
@@ -186,16 +186,16 @@ public class CourseCatalogueChapterVideoServiceImpl extends ServiceImpl<CourseCa
} }
private boolean courseCheckVip(MyUserEntity u,int courseId){ private boolean courseCheckVip(MyUserEntity u,int courseId){
if(u.getVip()=="1"){ if(u.getVip().equals("1")){
return true; return true;
} }
if(u.getVip()=="3"){ if(u.getVip().equals("3")){
Integer integer = courseToSociologyDao.selectCount(new LambdaQueryWrapper<CourseToSociologyEntity>().eq(CourseToSociologyEntity::getCourseId, courseId)); Integer integer = courseToSociologyDao.selectCount(new LambdaQueryWrapper<CourseToSociologyEntity>().eq(CourseToSociologyEntity::getCourseId, courseId));
if(integer>0){ if(integer>0){
return true; return true;
} }
} }
if(u.getVip()=="2"){ if(u.getVip().equals("2")){
Integer integer = courseToMedicineDao.selectCount(new LambdaQueryWrapper<CourseToMedicine>().eq(CourseToMedicine::getCourseId, courseId)); Integer integer = courseToMedicineDao.selectCount(new LambdaQueryWrapper<CourseToMedicine>().eq(CourseToMedicine::getCourseId, courseId));
if(integer>0){ if(integer>0){
return true; return true;
@@ -208,7 +208,8 @@ public class CourseCatalogueChapterVideoServiceImpl extends ServiceImpl<CourseCa
LambdaQueryWrapper<UserCourseBuyEntity> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<UserCourseBuyEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(UserCourseBuyEntity::getUserId,u.getId()); wrapper.eq(UserCourseBuyEntity::getUserId,u.getId());
wrapper.eq(UserCourseBuyEntity::getCatalogueId,courseCatalogueEntity.getId()); wrapper.eq(UserCourseBuyEntity::getCatalogueId,courseCatalogueEntity.getId());
wrapper.and(r->r.isNull(UserCourseBuyEntity::getEndTime).or().gt(UserCourseBuyEntity::getEndTime,new Date())); wrapper.and(i -> i.apply("end_time IS NULL OR end_time > {0}", new Date()));
// wrapper.and(r->r.isNull(UserCourseBuyEntity::getEndTime).or().gt(UserCourseBuyEntity::getEndTime,new Date()));
Integer integer = userCourseBuyDao.selectCount(wrapper); Integer integer = userCourseBuyDao.selectCount(wrapper);
return integer>0; return integer>0;
} }

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

@@ -70,14 +70,14 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
wrapper.orderByAsc(CourseToSociologyEntity::getSort); wrapper.orderByAsc(CourseToSociologyEntity::getSort);
Page<CourseEntity> courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()),CourseEntity.class, wrapper); Page<CourseEntity> courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()),CourseEntity.class, wrapper);
for (CourseEntity c:courseEntityPage.getRecords()){ for (CourseEntity c:courseEntityPage.getRecords()){
Integer integer = userCourseBuyDao.selectCount(new LambdaQueryWrapper<UserCourseBuyEntity>().eq(UserCourseBuyEntity::getCourseId, c.getId()).eq(UserCourseBuyEntity::getUserId,uId)); Integer integer = userCourseBuyDao.selectCount(new LambdaQueryWrapper<UserCourseBuyEntity>().eq(UserCourseBuyEntity::getCourseId, c.getId()).eq(UserCourseBuyEntity::getUserId,uId).and(i -> i.apply("end_time IS NULL OR end_time > {0}", new Date())));
c.setIsBuy(integer>0?1:0); c.setIsBuy(integer>0?1:0);
List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper<CourseCatalogueEntity>().eq(CourseCatalogueEntity::getCourseId, c.getId())); List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper<CourseCatalogueEntity>().eq(CourseCatalogueEntity::getCourseId, c.getId()));
if (courseCatalogueEntities != null && courseCatalogueEntities.size() > 0){ if (courseCatalogueEntities != null && courseCatalogueEntities.size() > 0){
for (CourseCatalogueEntity cc : courseCatalogueEntities) { for (CourseCatalogueEntity cc : courseCatalogueEntities) {
if ("0".equals(user.getVip())||"2".equals(user.getVip())){ if ("0".equals(user.getVip())||"2".equals(user.getVip())){
Integer i = userCourseBuyDao.selectCount(new LambdaQueryWrapper<UserCourseBuyEntity>().eq(UserCourseBuyEntity::getCatalogueId, cc.getId()).eq(UserCourseBuyEntity::getUserId,uId)); Integer cou = userCourseBuyDao.selectCount(new LambdaQueryWrapper<UserCourseBuyEntity>().eq(UserCourseBuyEntity::getCatalogueId, cc.getId()).eq(UserCourseBuyEntity::getUserId,uId).and(i -> i.apply("end_time IS NULL OR end_time > {0}", new Date())));
cc.setIsBuy(i>0?1:0); cc.setIsBuy(cou>0?1:0);
}else { }else {
cc.setIsBuy(1); cc.setIsBuy(1);
} }