diff --git a/src/main/java/com/peanut/modules/common/dao/UserCourseBuyDao.java b/src/main/java/com/peanut/modules/common/dao/UserCourseBuyDao.java new file mode 100644 index 00000000..ed74bf89 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/dao/UserCourseBuyDao.java @@ -0,0 +1,9 @@ +package com.peanut.modules.common.dao; + +import com.github.yulichang.base.MPJBaseMapper; +import com.peanut.modules.common.entity.UserCourseBuyEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface UserCourseBuyDao extends MPJBaseMapper { +} diff --git a/src/main/java/com/peanut/modules/common/entity/UserCourseBuyEntity.java b/src/main/java/com/peanut/modules/common/entity/UserCourseBuyEntity.java new file mode 100644 index 00000000..58f41957 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/entity/UserCourseBuyEntity.java @@ -0,0 +1,34 @@ +package com.peanut.modules.common.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +@Data +@TableName("user_course_buy") +public class UserCourseBuyEntity { + + @TableId + private Integer id; + + private Integer userId; + + private Integer courseId; + + private Integer catalogueId; + + private Date createTime; + + private Integer days; + + private Date startTime; + + private Date endTime; + + @TableLogic + private Integer delFlag; + +} diff --git a/src/main/java/com/peanut/modules/common/entity/UserToCourseEntity.java b/src/main/java/com/peanut/modules/common/entity/UserToCourseEntity.java index a83f1391..442333e7 100644 --- a/src/main/java/com/peanut/modules/common/entity/UserToCourseEntity.java +++ b/src/main/java/com/peanut/modules/common/entity/UserToCourseEntity.java @@ -18,18 +18,10 @@ public class UserToCourseEntity { private Integer courseId; - private Integer catalogueId; - private Date createTime; - private Integer days; - private Date updateTime; - private Date startTime; - - private Date endTime; - @TableLogic private Integer delFlag; } diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueServiceImpl.java index f9a810ea..dd03bfe0 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueServiceImpl.java @@ -19,7 +19,7 @@ public class CourseCatalogueServiceImpl extends ServiceImpl0){ return R.error(502,"删除失败,请先清空章节"); } - LambdaQueryWrapper userToCourseEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); - userToCourseEntityLambdaQueryWrapper.eq(UserToCourseEntity::getCatalogueId,id); - userToCourseEntityLambdaQueryWrapper.gt(UserToCourseEntity::getEndTime,new Date()); - Integer integer1 = userToCourseDao.selectCount(userToCourseEntityLambdaQueryWrapper); + LambdaQueryWrapper userCourseBuyEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); + userCourseBuyEntityLambdaQueryWrapper.eq(UserCourseBuyEntity::getCatalogueId,id); + userCourseBuyEntityLambdaQueryWrapper.gt(UserCourseBuyEntity::getEndTime,new Date()); + Integer integer1 = userCourseBuyDao.selectCount(userCourseBuyEntityLambdaQueryWrapper); if(integer1>0){ return R.error(502,"删除失败,有人已购买此课程"); } @@ -63,7 +63,7 @@ public class CourseCatalogueServiceImpl extends ServiceImpl impl @Override public R delCourse(int id) { - CourseCatalogueEntity courseCatalogueEntity = courseCatalogueDao.selectOne(new LambdaQueryWrapper().eq(CourseCatalogueEntity::getCourseId, id)); - if (courseCatalogueEntity!=null){ + Integer integer = courseCatalogueDao.selectCount(new LambdaQueryWrapper().eq(CourseCatalogueEntity::getCourseId, id)); + if (integer>0){ return R.error(501,"请先删除目录后再删除!"); } this.removeById(id); diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseSociologyServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseSociologyServiceImpl.java index 167f11d4..7e857d31 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/CourseSociologyServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/CourseSociologyServiceImpl.java @@ -29,13 +29,13 @@ public class CourseSociologyServiceImpl extends ServiceImpl().eq(CourseSociologyEntity::getPid, id)); - if(one!=null){ + int count = this.count(new LambdaQueryWrapper().eq(CourseSociologyEntity::getPid, id)); + if(count>0){ return R.error(501,"删除失败,请先删除子项目后再尝试"); } //查看绑定关系是否存在 - CourseToSociologyEntity courseToSociologyEntity = courseToSociologyDao.selectOne(new LambdaQueryWrapper().eq(CourseToSociologyEntity::getSociologyId, id)); - if(courseToSociologyEntity!=null){ + Integer integer = courseToSociologyDao.selectCount(new LambdaQueryWrapper().eq(CourseToSociologyEntity::getSociologyId, id)); + if(integer>0){ return R.error(502,"删除失败,请先解绑课程与国学标签的绑定关系"); } this.removeById(id);