diff --git a/src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java b/src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java index a42dfd7a..097292cb 100644 --- a/src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java +++ b/src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java @@ -86,14 +86,30 @@ public class BookLabelAndMarketController { @RequestMapping(path = "/saveOrUpdateLabel") public R saveOrUpdateLabel(@RequestBody ShopProductBookLabel label) { - labelService.saveOrUpdate(label); - return R.ok().put("result",label); + if (label.getIsLast()==1){ + labelService.saveOrUpdate(label); + return R.ok().put("result",label); + }else { + return R.error("父标签非最后一集"); + } } @RequestMapping(path = "/delLabel") public R delLabel(String id) { - labelService.removeById(id); - return R.ok(); + ShopProductBookLabel label = labelService.getById(id); + if (label.getIsLast()==1){ + MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); + wrapper.eq(ShopProductToBookLabel::getBookLabelId,id); + List tolables = toLabelService.list(wrapper); + if (tolables.size()>0){ + return R.error("请先移除商品"); + }else { + labelService.removeById(id); + return R.ok(); + } + }else { + return R.error("请先删除子集,设置成最后一集"); + } } @RequestMapping(path = "/getMarketById") @@ -103,14 +119,30 @@ public class BookLabelAndMarketController { @RequestMapping(path = "/saveOrUpdateMarket") public R saveOrUpdateMarket(@RequestBody ShopProductBookMarket market) { - marketService.saveOrUpdate(market); - return R.ok().put("result",market); + if (market.getIsLast()==1){ + marketService.saveOrUpdate(market); + return R.ok().put("result",market); + }else { + return R.error("父标签非最后一集"); + } } @RequestMapping(path = "/delMarket") public R delMarket(String id) { - marketService.removeById(id); - return R.ok(); + ShopProductBookMarket market = marketService.getById(id); + if (market.getIsLast()==1){ + MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); + wrapper.eq(ShopProductToBookMarket::getBookMarketId,id); + List tomarkets = toMarketService.list(wrapper); + if (tomarkets.size()>0){ + return R.error("请先移除商品"); + }else { + marketService.removeById(id); + return R.ok(); + } + }else { + return R.error("请先删除子集,设置成最后一集"); + } } @@ -220,4 +252,8 @@ public class BookLabelAndMarketController { + + + + }