From ce4355d2b1eda887db24189a23ac6b8d291dce80 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Thu, 11 Apr 2024 17:33:14 +0800 Subject: [PATCH 1/4] 1 --- .../modules/common/dao/CourseMarketDao.java | 9 ++++++ .../modules/common/dao/CourseToMarketDao.java | 9 ++++++ .../modules/common/dao/ShopProductDao.java | 3 +- .../common/entity/CourseMarketEntity.java | 28 +++++++++++++++++++ .../common/entity/CourseToMarketEntity.java | 25 +++++++++++++++++ .../controller/CourseController.java | 28 +++++++++++++++++++ .../sociology/controller/HomeController.java | 13 ++++----- .../controller/ProductController.java | 14 ---------- .../controller/ShopProductController.java | 27 ++++++++++++++++++ .../sociology/service/CourseService.java | 2 ++ .../sociology/service/ShopProductService.java | 11 ++++++++ .../service/impl/CourseServiceImpl.java | 12 ++++++++ .../service/impl/ShopProductServiceImpl.java | 27 ++++++++++++++++++ 13 files changed, 185 insertions(+), 23 deletions(-) create mode 100644 src/main/java/com/peanut/modules/common/dao/CourseMarketDao.java create mode 100644 src/main/java/com/peanut/modules/common/dao/CourseToMarketDao.java create mode 100644 src/main/java/com/peanut/modules/common/entity/CourseMarketEntity.java create mode 100644 src/main/java/com/peanut/modules/common/entity/CourseToMarketEntity.java delete mode 100644 src/main/java/com/peanut/modules/sociology/controller/ProductController.java create mode 100644 src/main/java/com/peanut/modules/sociology/controller/ShopProductController.java create mode 100644 src/main/java/com/peanut/modules/sociology/service/ShopProductService.java create mode 100644 src/main/java/com/peanut/modules/sociology/service/impl/ShopProductServiceImpl.java diff --git a/src/main/java/com/peanut/modules/common/dao/CourseMarketDao.java b/src/main/java/com/peanut/modules/common/dao/CourseMarketDao.java new file mode 100644 index 00000000..b0443f02 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/dao/CourseMarketDao.java @@ -0,0 +1,9 @@ +package com.peanut.modules.common.dao; + +import com.github.yulichang.base.MPJBaseMapper; +import com.peanut.modules.common.entity.CourseMarketEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CourseMarketDao extends MPJBaseMapper { +} diff --git a/src/main/java/com/peanut/modules/common/dao/CourseToMarketDao.java b/src/main/java/com/peanut/modules/common/dao/CourseToMarketDao.java new file mode 100644 index 00000000..f08c4659 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/dao/CourseToMarketDao.java @@ -0,0 +1,9 @@ +package com.peanut.modules.common.dao; + +import com.github.yulichang.base.MPJBaseMapper; +import com.peanut.modules.common.entity.CourseToMarketEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CourseToMarketDao extends MPJBaseMapper { +} diff --git a/src/main/java/com/peanut/modules/common/dao/ShopProductDao.java b/src/main/java/com/peanut/modules/common/dao/ShopProductDao.java index 5cbf9a9d..21081724 100644 --- a/src/main/java/com/peanut/modules/common/dao/ShopProductDao.java +++ b/src/main/java/com/peanut/modules/common/dao/ShopProductDao.java @@ -1,5 +1,6 @@ package com.peanut.modules.common.dao; +import com.github.yulichang.base.MPJBaseMapper; import com.peanut.modules.common.entity.ShopProduct; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -14,7 +15,7 @@ import java.util.List; * @date 2022-10-28 09:43:14 */ @Mapper -public interface ShopProductDao extends BaseMapper { +public interface ShopProductDao extends MPJBaseMapper { List appGetCategoryList(Integer catId); diff --git a/src/main/java/com/peanut/modules/common/entity/CourseMarketEntity.java b/src/main/java/com/peanut/modules/common/entity/CourseMarketEntity.java new file mode 100644 index 00000000..fe176fa0 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/entity/CourseMarketEntity.java @@ -0,0 +1,28 @@ +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("course_market") +public class CourseMarketEntity { + @TableId + private Integer id; + + private Integer pid; + + private Integer isLast; + + private String title; + + private Integer sort; + + private Date createTime; + + @TableLogic + private Integer delFlag; +} diff --git a/src/main/java/com/peanut/modules/common/entity/CourseToMarketEntity.java b/src/main/java/com/peanut/modules/common/entity/CourseToMarketEntity.java new file mode 100644 index 00000000..0cf4f244 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/entity/CourseToMarketEntity.java @@ -0,0 +1,25 @@ +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("course_to_market") +public class CourseToMarketEntity { + + @TableId + private Integer id; + + private Integer courseId; + + private Integer sociologyId; + + private Date createTime; + + @TableLogic + private Integer delFlag; +} diff --git a/src/main/java/com/peanut/modules/sociology/controller/CourseController.java b/src/main/java/com/peanut/modules/sociology/controller/CourseController.java index dede07e6..149a5215 100644 --- a/src/main/java/com/peanut/modules/sociology/controller/CourseController.java +++ b/src/main/java/com/peanut/modules/sociology/controller/CourseController.java @@ -3,6 +3,7 @@ package com.peanut.modules.sociology.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.peanut.common.utils.R; import com.peanut.common.utils.ShiroUtils; +import com.peanut.modules.common.entity.CourseEntity; import com.peanut.modules.common.to.ParamTo; import com.peanut.modules.sociology.service.CourseService; import lombok.extern.slf4j.Slf4j; @@ -19,6 +20,11 @@ public class CourseController { @Autowired private CourseService courseService; + /** + * 获取用户最近学习课程列表 + * @param param + * @return + */ @RequestMapping("/getUserLateCourseList") public R getUserLateCourseList(@RequestBody ParamTo param){ Integer userId = ShiroUtils.getUId(); @@ -27,4 +33,26 @@ public class CourseController { return R.ok().put("page",userLateCourseList); } + /** + * 获取营销标签下的课程列表 + * @param param + * @return + */ + @RequestMapping("/getMarketCourseList") + public R getMarketCourseList(@RequestBody ParamTo param){ + Page marketCourseList = courseService.getMarketCourseList(param); + return R.ok().put("courseList",marketCourseList); + } + + /** + * 获取国学标签下的课程列表 + * @param param + * @return + */ + @RequestMapping("/getSociologyCourseList") + public R getSociologyCourseList(@RequestBody ParamTo param){ + Page sociologyCourseList = courseService.getSociologyCourseList(param); + return R.ok().put("courses",sociologyCourseList); + } + } diff --git a/src/main/java/com/peanut/modules/sociology/controller/HomeController.java b/src/main/java/com/peanut/modules/sociology/controller/HomeController.java index 413b09fe..6908073e 100644 --- a/src/main/java/com/peanut/modules/sociology/controller/HomeController.java +++ b/src/main/java/com/peanut/modules/sociology/controller/HomeController.java @@ -33,19 +33,16 @@ public class HomeController { return R.ok().put("myCourse",courseList); } + /** + *获取国学标签列表 + * @param param + * @return + */ @RequestMapping("/getSociologyLabels") public R getSociologyLabels(@RequestBody ParamTo param){ List sociologyLabels = courseSociologyService.getSociologyLabels(param.getId()); return R.ok().put("labels",sociologyLabels); } - @RequestMapping("/getSociologyCourseList") - public R getSociologyCourseList(@RequestBody ParamTo param){ - Page sociologyCourseList = courseService.getSociologyCourseList(param); - return R.ok().put("courses",sociologyCourseList); - } - - - } diff --git a/src/main/java/com/peanut/modules/sociology/controller/ProductController.java b/src/main/java/com/peanut/modules/sociology/controller/ProductController.java deleted file mode 100644 index 7f539ae8..00000000 --- a/src/main/java/com/peanut/modules/sociology/controller/ProductController.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.peanut.modules.sociology.controller; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@Slf4j -@RestController("sociologyProduct") -@RequestMapping("sociology/product") -public class ProductController { - - - -} diff --git a/src/main/java/com/peanut/modules/sociology/controller/ShopProductController.java b/src/main/java/com/peanut/modules/sociology/controller/ShopProductController.java new file mode 100644 index 00000000..c50aef59 --- /dev/null +++ b/src/main/java/com/peanut/modules/sociology/controller/ShopProductController.java @@ -0,0 +1,27 @@ +package com.peanut.modules.sociology.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.peanut.common.utils.R; +import com.peanut.modules.common.to.ParamTo; +import com.peanut.modules.sociology.service.ShopProductService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Slf4j +@RestController("sociologyProduct") +@RequestMapping("sociology/product") +public class ShopProductController { + @Autowired + private ShopProductService shopProductService; + + @RequestMapping("/getMarketProductList") + public R getMarketProductList(@RequestBody ParamTo param){ + Page marketProductList = shopProductService.getMarketProductList(param); + return R.ok().put("products",marketProductList); + } + + +} diff --git a/src/main/java/com/peanut/modules/sociology/service/CourseService.java b/src/main/java/com/peanut/modules/sociology/service/CourseService.java index 8117a7f5..ab8f0a84 100644 --- a/src/main/java/com/peanut/modules/sociology/service/CourseService.java +++ b/src/main/java/com/peanut/modules/sociology/service/CourseService.java @@ -17,4 +17,6 @@ public interface CourseService extends IService { Page getUserLateCourseList(ParamTo param); + Page getMarketCourseList(ParamTo param); + } diff --git a/src/main/java/com/peanut/modules/sociology/service/ShopProductService.java b/src/main/java/com/peanut/modules/sociology/service/ShopProductService.java new file mode 100644 index 00000000..f6f27ff7 --- /dev/null +++ b/src/main/java/com/peanut/modules/sociology/service/ShopProductService.java @@ -0,0 +1,11 @@ +package com.peanut.modules.sociology.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.ShopProduct; +import com.peanut.modules.common.to.ParamTo; + +public interface ShopProductService extends IService { + + Page getMarketProductList(ParamTo param); +} 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 3a7592d7..4447f5fc 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 @@ -8,6 +8,7 @@ import com.peanut.modules.common.dao.CourseDao; import com.peanut.modules.common.dao.CourseToSociologyDao; import com.peanut.modules.common.dao.UserToCourseDao; import com.peanut.modules.common.entity.CourseEntity; +import com.peanut.modules.common.entity.CourseToMarketEntity; import com.peanut.modules.common.entity.CourseToSociologyEntity; import com.peanut.modules.common.entity.UserToCourseEntity; import com.peanut.modules.common.to.ParamTo; @@ -65,6 +66,17 @@ public class CourseServiceImpl extends ServiceImpl impl wrapper.selectAll(CourseEntity.class); wrapper.leftJoin(UserToCourseEntity.class,UserToCourseEntity::getCourseId,CourseEntity::getId); wrapper.eq(UserToCourseEntity::getUserId,param.getId()); + wrapper.orderByDesc(UserToCourseEntity::getUpdateTime); + Page courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()), CourseEntity.class, wrapper); + return courseEntityPage; + } + + @Override + public Page getMarketCourseList(ParamTo param) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + wrapper.selectAll(CourseEntity.class); + wrapper.leftJoin(CourseToMarketEntity.class,CourseToMarketEntity::getCourseId,CourseEntity::getId); + wrapper.eq(CourseToMarketEntity::getId,param.getId()); Page courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()), CourseEntity.class, wrapper); return courseEntityPage; } diff --git a/src/main/java/com/peanut/modules/sociology/service/impl/ShopProductServiceImpl.java b/src/main/java/com/peanut/modules/sociology/service/impl/ShopProductServiceImpl.java new file mode 100644 index 00000000..2a478b97 --- /dev/null +++ b/src/main/java/com/peanut/modules/sociology/service/impl/ShopProductServiceImpl.java @@ -0,0 +1,27 @@ +package com.peanut.modules.sociology.service.impl; + +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.modules.common.dao.ShopProductDao; +import com.peanut.modules.common.entity.ShopProduct; +import com.peanut.modules.common.entity.ShopProductToSociologyMarket; +import com.peanut.modules.common.to.ParamTo; +import com.peanut.modules.sociology.service.ShopProductService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service("sociologyShopProduct") +public class ShopProductServiceImpl extends ServiceImpl implements ShopProductService { + + @Override + public Page getMarketProductList(ParamTo param) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + wrapper.selectAll(ShopProduct.class); + wrapper.leftJoin(ShopProductToSociologyMarket.class,ShopProductToSociologyMarket::getProductId,ShopProduct::getProductId); + wrapper.eq(ShopProductToSociologyMarket::getSociologyMarketId,param.getId()); + Page shopProductPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()), ShopProduct.class, wrapper); + return shopProductPage; + } +} From cb9f55475f9eba6fce41b2872592b814daa07d62 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Fri, 12 Apr 2024 09:45:39 +0800 Subject: [PATCH 2/4] 1 --- .../modules/master/controller/CourseSociologyController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/peanut/modules/master/controller/CourseSociologyController.java b/src/main/java/com/peanut/modules/master/controller/CourseSociologyController.java index 38ceb2c4..e4990d80 100644 --- a/src/main/java/com/peanut/modules/master/controller/CourseSociologyController.java +++ b/src/main/java/com/peanut/modules/master/controller/CourseSociologyController.java @@ -47,8 +47,7 @@ public class CourseSociologyController { @RequestMapping("/editCourseSociology") public R editCourseSociology(@RequestBody CourseSociologyEntity courseSociologyEntity){ - courseSociologyService.editCourseSociology(courseSociologyEntity); - return R.ok(); + return courseSociologyService.editCourseSociology(courseSociologyEntity); } @RequestMapping("/getCourseListForSociology") From bf1def1c3d6fda1c247bcbeb7770c1a7133aa27f Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Fri, 12 Apr 2024 11:24:25 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=B0=8Fbug=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/peanut/modules/common/entity/CourseEntity.java | 2 ++ .../master/controller/CourseSociologyController.java | 10 +++++++--- .../modules/master/service/impl/CourseServiceImpl.java | 1 + .../service/impl/CourseSociologyServiceImpl.java | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/peanut/modules/common/entity/CourseEntity.java b/src/main/java/com/peanut/modules/common/entity/CourseEntity.java index 63d34b30..e45f20fd 100644 --- a/src/main/java/com/peanut/modules/common/entity/CourseEntity.java +++ b/src/main/java/com/peanut/modules/common/entity/CourseEntity.java @@ -30,4 +30,6 @@ public class CourseEntity { @TableField(exist = false) private List courseCatalogueEntityList; + @TableField(exist = false) + private Integer bindId; } diff --git a/src/main/java/com/peanut/modules/master/controller/CourseSociologyController.java b/src/main/java/com/peanut/modules/master/controller/CourseSociologyController.java index e4990d80..c68bf056 100644 --- a/src/main/java/com/peanut/modules/master/controller/CourseSociologyController.java +++ b/src/main/java/com/peanut/modules/master/controller/CourseSociologyController.java @@ -37,7 +37,7 @@ public class CourseSociologyController { @RequestMapping("/addCourseSociology") public R addCourseSociology(@RequestBody CourseSociologyEntity courseSociologyEntity){ courseSociologyService.save(courseSociologyEntity); - return R.ok(); + return R.ok().put("sociology",courseSociologyEntity); } @RequestMapping("/delCourseSociology") @@ -69,8 +69,12 @@ public class CourseSociologyController { @RequestMapping("/unbindCourseAndSociology") public R unbindCourseAndSociology(@RequestBody CourseToSociologyEntity courseToSociologyEntity){ - courseToSociologyService.removeById(courseToSociologyEntity.getId()); - return R.ok(); + boolean b = courseToSociologyService.removeById(courseToSociologyEntity.getId()); + if(b){ + return R.ok(); + }else { + return R.error("error"); + } } } diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java index cd8f2c0b..a442659b 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java @@ -98,6 +98,7 @@ public class CourseServiceImpl extends ServiceImpl impl public List getCourseListForSociology(int sociologyId) { MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); wrapper.selectAll(CourseEntity.class); + wrapper.selectAs(CourseToSociologyEntity::getId,"bindId"); wrapper.leftJoin(CourseEntity.class,CourseEntity::getId,CourseToSociologyEntity::getCourseId); wrapper.eq(CourseToSociologyEntity::getSociologyId,sociologyId); List courseEntities = courseToSociologyDao.selectJoinList(CourseEntity.class, wrapper); 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 04658262..167f11d4 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 @@ -60,7 +60,7 @@ public class CourseSociologyServiceImpl extends ServiceImpl sociologys(int id){ From 5d5aefd2617a7f55a021e69ef4c2ccf504aeba1d Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Fri, 12 Apr 2024 15:05:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=B0=8Fbug=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/common/dao/UserCourseBuyDao.java | 9 +++++ .../common/entity/UserCourseBuyEntity.java | 34 +++++++++++++++++++ .../common/entity/UserToCourseEntity.java | 8 ----- .../impl/CourseCatalogueServiceImpl.java | 12 +++---- .../service/impl/CourseServiceImpl.java | 4 +-- .../impl/CourseSociologyServiceImpl.java | 8 ++--- 6 files changed, 55 insertions(+), 20 deletions(-) create mode 100644 src/main/java/com/peanut/modules/common/dao/UserCourseBuyDao.java create mode 100644 src/main/java/com/peanut/modules/common/entity/UserCourseBuyEntity.java 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);