From a438370d1d7e246f1a4c40e22a42446b736c7363 Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Mon, 9 Sep 2024 14:14:14 +0800
Subject: [PATCH] update

---
 .../CourseCatalogueChapterVideoServiceImpl.java   | 15 ++++++++-------
 .../sociology/service/impl/CourseServiceImpl.java |  6 +++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueChapterVideoServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueChapterVideoServiceImpl.java
index 316726c9..31a996ee 100644
--- a/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueChapterVideoServiceImpl.java
+++ b/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueChapterVideoServiceImpl.java
@@ -72,9 +72,9 @@ public class CourseCatalogueChapterVideoServiceImpl extends ServiceImpl<CourseCa
         Integer uId = ShiroUtils.getUId();
         MyUserEntity userEntity = userDao.selectById(uId);
         //审查课程观看权限
-//        if(courseCatalogueChapterEntity.getIsAudition()==0&&!courseCheckVip(userEntity,courseCatalogueEntity.getCourseId())&&!courseCheckBuy(userEntity,courseCatalogueEntity)){
-//            return R.error(505,"鉴权失败！");
-//        }
+        if(courseCatalogueChapterEntity.getIsAudition()==0&&!courseCheckVip(userEntity,courseCatalogueEntity.getCourseId())&&!courseCheckBuy(userEntity,courseCatalogueEntity)){
+            return R.error(505,"鉴权失败！");
+        }
         //处理课程开始计时的逻辑
         if(courseCatalogueChapterEntity.getIsAudition()==0){
             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){
-        if(u.getVip()=="1"){
+        if(u.getVip().equals("1")){
             return true;
         }
-        if(u.getVip()=="3"){
+        if(u.getVip().equals("3")){
             Integer integer = courseToSociologyDao.selectCount(new LambdaQueryWrapper<CourseToSociologyEntity>().eq(CourseToSociologyEntity::getCourseId, courseId));
             if(integer>0){
                 return true;
             }
         }
-        if(u.getVip()=="2"){
+        if(u.getVip().equals("2")){
             Integer integer = courseToMedicineDao.selectCount(new LambdaQueryWrapper<CourseToMedicine>().eq(CourseToMedicine::getCourseId, courseId));
             if(integer>0){
                 return true;
@@ -208,7 +208,8 @@ public class CourseCatalogueChapterVideoServiceImpl extends ServiceImpl<CourseCa
         LambdaQueryWrapper<UserCourseBuyEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(UserCourseBuyEntity::getUserId,u.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);
         return integer>0;
     }
diff --git a/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java b/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java
index 90e75936..0174e5c8 100644
--- a/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java
+++ b/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java
@@ -70,14 +70,14 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
         wrapper.orderByAsc(CourseToSociologyEntity::getSort);
         Page<CourseEntity> courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()),CourseEntity.class, wrapper);
         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);
             List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper<CourseCatalogueEntity>().eq(CourseCatalogueEntity::getCourseId, c.getId()));
             if (courseCatalogueEntities != null && courseCatalogueEntities.size() > 0){
                 for (CourseCatalogueEntity cc : courseCatalogueEntities) {
                     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));
-                        cc.setIsBuy(i>0?1:0);
+                        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(cou>0?1:0);
                     }else {
                         cc.setIsBuy(1);
                     }