diff --git a/src/main/java/com/peanut/modules/master/controller/ShopProductController.java b/src/main/java/com/peanut/modules/master/controller/ShopProductController.java index 425cfbc9..a3b07869 100644 --- a/src/main/java/com/peanut/modules/master/controller/ShopProductController.java +++ b/src/main/java/com/peanut/modules/master/controller/ShopProductController.java @@ -185,10 +185,12 @@ public class ShopProductController { @RequestMapping("/bindProductAndCourse") public R bindProductAndCourse(@RequestBody ShopProductCourseEntity shopProductCourseEntity){ - shopProductService.bindProductAndCourse(shopProductCourseEntity); - return null; + return shopProductService.bindProductAndCourse(shopProductCourseEntity); } - + @RequestMapping("/unbindProductAndCourse") + public R unbindProductAndCourse(@RequestBody Map map){ + return shopProductService.unbindProductAndCourse(map.get("productId"),map.get("catalogueId")); + } } diff --git a/src/main/java/com/peanut/modules/master/service/ShopProductService.java b/src/main/java/com/peanut/modules/master/service/ShopProductService.java index eb852559..75f57583 100644 --- a/src/main/java/com/peanut/modules/master/service/ShopProductService.java +++ b/src/main/java/com/peanut/modules/master/service/ShopProductService.java @@ -53,5 +53,7 @@ public interface ShopProductService extends IService { Map getCanBindProductAndCourse(ParamTo param); - void bindProductAndCourse(ShopProductCourseEntity shopProductCourseEntity); + R bindProductAndCourse(ShopProductCourseEntity shopProductCourseEntity); + + R unbindProductAndCourse(int productId,int catalogueId); } diff --git a/src/main/java/com/peanut/modules/master/service/impl/ShopProductServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/ShopProductServiceImpl.java index 6926e334..c46642e4 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/ShopProductServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/ShopProductServiceImpl.java @@ -257,8 +257,22 @@ public class ShopProductServiceImpl extends ServiceImpl().eq(ShopProductCourseEntity::getProductId, shopProductCourseEntity.getProductId()).eq(ShopProductCourseEntity::getCourseId, shopProductCourseEntity.getCourseId())); + if(integer>0){ + return R.error("不可重复绑定"); + } + CourseCatalogueEntity courseCatalogueEntity = courseCatalogueDao.selectById(shopProductCourseEntity.getCatalogueId()); + shopProductCourseEntity.setCourseId(courseCatalogueEntity.getId()); + shopProductCourseDao.insert(shopProductCourseEntity); + return R.ok(); + } + + @Override + public R unbindProductAndCourse(int productId, int catalogueId) { + shopProductCourseDao.delete(new LambdaQueryWrapper().eq(ShopProductCourseEntity::getProductId,productId).eq(ShopProductCourseEntity::getCatalogueId,catalogueId)); + return R.ok(); } @Override