diff --git a/src/main/java/com/peanut/modules/book/controller/ShopProductController.java b/src/main/java/com/peanut/modules/book/controller/ShopProductController.java index 067c5ebf..f4f75b96 100644 --- a/src/main/java/com/peanut/modules/book/controller/ShopProductController.java +++ b/src/main/java/com/peanut/modules/book/controller/ShopProductController.java @@ -463,7 +463,7 @@ public class ShopProductController { } /** - * 删除 + * 删除(废弃) */ @RequestMapping("/delete") public R delete(@RequestBody Integer[] productIds) { 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 add27c2e..8d9d48bf 100644 --- a/src/main/java/com/peanut/modules/master/controller/ShopProductController.java +++ b/src/main/java/com/peanut/modules/master/controller/ShopProductController.java @@ -73,6 +73,12 @@ public class ShopProductController { return R.ok(); } + @RequestMapping("/delShopProduct") + public R delShopProduct(@RequestBody Map map){ + int productId = map.get("productId"); + return shopProductService.delShopProduct(productId); + } + @RequestMapping("/bindProductAndBookMarket") public R bindProductAndBookMarket(@RequestBody Map map){ String[] productIds = map.get("productId").split(","); 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 75f57583..081c63df 100644 --- a/src/main/java/com/peanut/modules/master/service/ShopProductService.java +++ b/src/main/java/com/peanut/modules/master/service/ShopProductService.java @@ -56,4 +56,6 @@ public interface ShopProductService extends IService { R bindProductAndCourse(ShopProductCourseEntity shopProductCourseEntity); R unbindProductAndCourse(int productId,int catalogueId); + + R delShopProduct(int productId); } 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 56bc4ae3..f9469255 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 @@ -275,6 +275,21 @@ public class ShopProductServiceImpl extends ServiceImpl().eq(ShopProductToMedicineLabel::getProductId,productId)); + shopProductToMedicineMarketDao.delete(new LambdaQueryWrapper().eq(ShopProductToMedicineMarket::getProductId,productId)); + shopProductToSociologyLabelDao.delete(new LambdaQueryWrapper().eq(ShopProductToSociologyLabel::getProductId,productId)); + shopProductToSociologyMarketDao.delete(new LambdaQueryWrapper().eq(ShopProductToSociologyMarket::getProductId,productId)); + shopProductToBookLabelDao.delete(new LambdaQueryWrapper().eq(ShopProductToBookLabel::getProductId,productId)); + shopProductToBookMarketDao.delete(new LambdaQueryWrapper().eq(ShopProductToBookMarket::getProductId,productId)); + shopProductBookDao.delete(new LambdaQueryWrapper().eq(ShopProductBookEntity::getProductId, productId)); + shopProductCourseDao.delete(new LambdaQueryWrapper().eq(ShopProductCourseEntity::getProductId,productId)); + this.removeById(productId); + return R.ok(); + } + @Override public Map getProductToLabel(Integer productId) { HashMap flag = new HashMap<>();