Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc

src/main/java/com/peanut/modules/common/dao/ShopProductCourseDao.java

@@ -0,0 +1,9 @@
+package com.peanut.modules.common.dao;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.peanut.modules.common.entity.ShopProductCourseEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ShopProductCourseDao extends MPJBaseMapper<ShopProductCourseEntity> {
+}

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

@@ -0,0 +1,27 @@
+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("shop_product_course")
+public class ShopProductCourseEntity {
+
+    @TableId
+    private Integer id;
+
+    private Integer courseId;
+
+    private Integer catalogueId;
+
+    private Integer days;
+
+    private Date createTime;
+
+    @TableLogic
+    private Integer delFlag;
+}

src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueServiceImpl.java

@@ -5,9 +5,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.peanut.common.utils.R;
 import com.peanut.modules.common.dao.CourseCatalogueChapterDao;
 import com.peanut.modules.common.dao.CourseCatalogueDao;
+import com.peanut.modules.common.dao.ShopProductCourseDao;
 import com.peanut.modules.common.dao.UserToCourseDao;
 import com.peanut.modules.common.entity.CourseCatalogueChapterEntity;
 import com.peanut.modules.common.entity.CourseCatalogueEntity;
+import com.peanut.modules.common.entity.ShopProductCourseEntity;
 import com.peanut.modules.common.entity.UserToCourseEntity;
 import com.peanut.modules.master.service.CourseCatalogueService;
 import lombok.extern.slf4j.Slf4j;
@@ -24,6 +26,8 @@ public class CourseCatalogueServiceImpl extends ServiceImpl<CourseCatalogueDao,
     private CourseCatalogueChapterDao courseCatalogueChapterDao;
     @Autowired
     private UserToCourseDao userToCourseDao;
+    @Autowired
+    private ShopProductCourseDao shopProductCourseDao;
 
     @Override
     public List<CourseCatalogueEntity> getCourseCatalogues(int id) {
@@ -44,8 +48,14 @@ public class CourseCatalogueServiceImpl extends ServiceImpl<CourseCatalogueDao,
         userToCourseEntityLambdaQueryWrapper.gt(UserToCourseEntity::getEndTime,new Date());
         Integer integer1 = userToCourseDao.selectCount(userToCourseEntityLambdaQueryWrapper);
         if(integer1>0){
-            return R.error(502,"删除失败，有人以购买此课程");
+            return R.error(502,"删除失败，有人已购买此课程");
         }
+
+        Integer integer2 = shopProductCourseDao.selectCount(new LambdaQueryWrapper<ShopProductCourseEntity>().eq(ShopProductCourseEntity::getCatalogueId, id));
+        if(integer2>0){
+            return R.error(503,"删除失败，有商品已绑定此课程，请解绑或删除后再操作");
+        }
+
         this.removeById(id);
         return R.ok();
     }