From 6634cff88b8062e2c40b43bcb10ab67349fdd947 Mon Sep 17 00:00:00 2001 From: Yen Date: Thu, 1 Dec 2022 14:37:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=A0=E9=99=A4=E6=8B=A6?= =?UTF-8?q?=E6=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/GoodsCategoryController.java | 17 +++++++++++++++++ .../goods/controller/GoodsSkuController.java | 16 ++++++++++++++++ .../goods/controller/GoodsSpuController.java | 17 ++++++++++++++++- 3 files changed, 49 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java index bda2289e..ee837e01 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java @@ -1,6 +1,7 @@ package com.qs.serve.modules.goods.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; @@ -14,6 +15,11 @@ import com.qs.serve.modules.goods.entity.bo.GoodsCategoryBo; import com.qs.serve.modules.goods.entity.bo.GoodsCategoryLevelBo; import com.qs.serve.modules.goods.entity.bo.GoodsCategoryTreeVo; import com.qs.serve.modules.goods.service.GoodsSpuService; +import com.qs.serve.modules.tbs.common.TbsGoodsType; +import com.qs.serve.modules.tbs.entity.TbsActivityGoods; +import com.qs.serve.modules.tbs.entity.TbsBudgetCondition; +import com.qs.serve.modules.tbs.service.TbsActivityGoodsService; +import com.qs.serve.modules.tbs.service.TbsBudgetConditionService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.prepost.PreAuthorize; @@ -39,6 +45,8 @@ public class GoodsCategoryController { private GoodsCategoryService goodsCategoryService; private GoodsSpuService goodsSpuService; + private TbsActivityGoodsService activityGoodsService; + private TbsBudgetConditionService budgetConditionService; /** * 翻页查询 @@ -167,6 +175,15 @@ public class GoodsCategoryController { @SysLog(module = SystemModule.GOODS, title = "分类", biz = BizType.DELETE) @PreAuthorize("hasRole('goods:category:delete')") public R deleteById(@PathVariable("id") Long id){ + QueryWrapper lqw = new QueryWrapper<>(); + lqw.in("target_type", TbsGoodsType.brand.name(),TbsGoodsType.category.name(),TbsGoodsType.series.name()); + lqw.eq("target_id",id); + if(activityGoodsService.count(lqw)>0){ + return R.error("活动含有当前分类，删除失败"); + } + if(budgetConditionService.count(lqw)>0){ + return R.error("预算含有当前分类，删除失败"); + } boolean result = goodsCategoryService.removeById(id); return R.isTrue(result); } diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java index c8faf8f3..931cfe7b 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java @@ -1,6 +1,7 @@ package com.qs.serve.modules.goods.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; @@ -12,6 +13,10 @@ import com.qs.serve.modules.goods.entity.bo.GoodsSkuBo; import com.qs.serve.modules.goods.entity.vo.GoodSkuVo; import com.qs.serve.modules.goods.entity.vo.GoodsSkuSpecValueVo; import com.qs.serve.modules.goods.service.GoodsSkuSpecValueService; +import com.qs.serve.modules.tbs.common.TbsGoodsType; +import com.qs.serve.modules.tbs.entity.TbsActivityGoods; +import com.qs.serve.modules.tbs.service.TbsActivityGoodsService; +import com.qs.serve.modules.tbs.service.TbsBudgetConditionService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.prepost.PreAuthorize; @@ -36,6 +41,8 @@ public class GoodsSkuController { private GoodsSkuService goodsSkuService; private GoodsSkuSpecValueService goodsSkuSpecValueService; + private TbsActivityGoodsService activityGoodsService; + private TbsBudgetConditionService budgetConditionService; /** * 列表(传入spuId获取spu规格列表) @@ -136,6 +143,15 @@ public class GoodsSkuController { @SysLog(module = SystemModule.GOODS, title = "sku", biz = BizType.DELETE) @PreAuthorize("hasRole('goods:sku:delete')") public R deleteById(@PathVariable("id") Long id){ + QueryWrapper lqw1 = new QueryWrapper<>(); + lqw1.in("target_type", TbsGoodsType.sku.name()); + lqw1.eq("target_id",id); + if(activityGoodsService.count(lqw1)>0){ + return R.error("活动含有当前商品，删除失败"); + } + if(budgetConditionService.count(lqw1)>0){ + return R.error("预算含有当前商品，删除失败"); + } boolean result = goodsSkuService.removeById(id); if(result){ //删除商品规格值 diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java index 9e564c33..1486c5c9 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java @@ -1,6 +1,7 @@ package com.qs.serve.modules.goods.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; @@ -19,6 +20,10 @@ import com.qs.serve.modules.goods.entity.vo.GoodsSpuVo; import com.qs.serve.modules.goods.service.GoodsSkuService; import com.qs.serve.modules.goods.service.GoodsSkuSpecValueService; import com.qs.serve.modules.goods.service.GoodsSpuSpecService; +import com.qs.serve.modules.tbs.common.TbsGoodsType; +import com.qs.serve.modules.tbs.entity.TbsActivityGoods; +import com.qs.serve.modules.tbs.service.TbsActivityGoodsService; +import com.qs.serve.modules.tbs.service.TbsBudgetConditionService; import io.netty.util.internal.StringUtil; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -46,6 +51,8 @@ public class GoodsSpuController { private GoodsSpuService goodsSpuService; private GoodsSpuSpecService goodsSpuSpecService; private GoodsSkuSpecValueService goodsSkuSpecValueService; + private TbsActivityGoodsService activityGoodsService; + private TbsBudgetConditionService budgetConditionService; /** * 翻页搜索 @@ -117,7 +124,15 @@ public class GoodsSpuController { @SysLog(module = SystemModule.GOODS, title = "spu", biz = BizType.DELETE) @PreAuthorize("hasRole('goods:spu:delete')") public R deleteById(@PathVariable("id") Long id){ - //todo 拦截删除商品 + QueryWrapper lqw1 = new QueryWrapper<>(); + lqw1.in("target_type", TbsGoodsType.spu.name()); + lqw1.eq("target_id",id); + if(activityGoodsService.count(lqw1)>0){ + return R.error("活动含有当前商品，删除失败"); + } + if(budgetConditionService.count(lqw1)>0){ + return R.error("预算含有当前商品，删除失败"); + } boolean result = goodsSpuService.removeById(id); if(result){ //删除商品规格