Merge remote-tracking branch 'origin/zcc'

2024-07-01 14:32:22 +08:00
parent dd4b840f86 9cdeefb99b
commit 54f97188dd
8 changed files with 137 additions and 72 deletions
--- a/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java
+++ b/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java
@@ -293,7 +293,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
                        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()));
                        //完成度、上次学习时间
-                        catalogueCompletion(courseCatalogueEntity);
+//                        catalogueCompletion(courseCatalogueEntity);
                        //是否购买，生效时间
                        if ("1".equals(user.getVip())||"3".equals(user.getVip())){
                            //是超级会员或者国学会员