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

src/main/java/com/peanut/modules/common/entity/MyUserEntity.java

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

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

@@ -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.service.impl.ServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.peanut.common.utils.ShiroUtils;
 import com.peanut.modules.common.dao.*;
 import com.peanut.modules.common.entity.*;
 import com.peanut.modules.common.to.ParamTo;
@@ -117,6 +118,8 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
 
     @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);
@@ -132,6 +135,9 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
             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);
             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);
                     List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper<CourseCatalogueEntity>().eq(CourseCatalogueEntity::getCourseId, co.getId()).orderByAsc(CourseCatalogueEntity::getSort));
                     co.setCourseCatalogueEntityList(courseCatalogueEntities);
                 }
@@ -170,6 +178,8 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
             courseEntities = courseBuyDao.selectJoinList(CourseEntity.class, wrapper);
             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);
                     List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(
                             new MPJLambdaWrapper<CourseCatalogueEntity>()
                                     .selectAll(CourseCatalogueEntity.class)

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

@@ -24,8 +24,6 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
     @Autowired
     private MyUserService userService;
     @Autowired
-    private UserToCourseDao userToCourseDao;
-    @Autowired
     private CourseToSociologyDao courseToSociologyDao;
     @Autowired
     private CourseCatalogueDao courseCatalogueDao;
@@ -293,6 +291,8 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
 
     @Override
     public List getCourseExpire(Map<String, Object> param) {
+        String vip = ShiroUtils.getUser().getVip();
+        if ("0".equals(vip)||"2".equals(vip)){
             MPJLambdaWrapper<CourseEntity> wrapper = new MPJLambdaWrapper<>();
             wrapper.distinct();
             wrapper.leftJoin(CourseCatalogueEntity.class,CourseCatalogueEntity::getCourseId,CourseEntity::getId);
@@ -308,6 +308,9 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
             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);
             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);
                     List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(
                             new MPJLambdaWrapper<CourseCatalogueEntity>()
                                     .selectAll(CourseCatalogueEntity.class)