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 d5251963..93becf61 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 @@ -252,8 +252,8 @@ public class GoodsCategoryController { if(goodsSpuService.count(spuLqw)>0){ return R.error("含有商品,删除失败"); } - boolean result = goodsCategoryService.removeById(id); - return R.isTrue(result); + goodsCategoryService.deleteCateById(id); + return R.ok(); } } diff --git a/src/main/java/com/qs/serve/modules/goods/mapper/GoodsCategoryMapper.java b/src/main/java/com/qs/serve/modules/goods/mapper/GoodsCategoryMapper.java index 096ae7bb..89e34a14 100644 --- a/src/main/java/com/qs/serve/modules/goods/mapper/GoodsCategoryMapper.java +++ b/src/main/java/com/qs/serve/modules/goods/mapper/GoodsCategoryMapper.java @@ -1,7 +1,10 @@ package com.qs.serve.modules.goods.mapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.qs.serve.modules.goods.entity.GoodsCategory; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Update; /** * 分类 Mapper @@ -10,5 +13,7 @@ import com.qs.serve.modules.goods.entity.GoodsCategory; */ public interface GoodsCategoryMapper extends BaseMapper { + @Update("update goods_category set del_flag = 1 , `code`= #{obj.code} where id = #{obj.id}") + int deleteByCate(@Param("obj") GoodsCategory entity); } diff --git a/src/main/java/com/qs/serve/modules/goods/service/GoodsCategoryService.java b/src/main/java/com/qs/serve/modules/goods/service/GoodsCategoryService.java index f31686e8..6b30bf90 100644 --- a/src/main/java/com/qs/serve/modules/goods/service/GoodsCategoryService.java +++ b/src/main/java/com/qs/serve/modules/goods/service/GoodsCategoryService.java @@ -19,5 +19,7 @@ public interface GoodsCategoryService extends IService { void modifyLevel(GoodsCategoryLevelBo category); + void deleteCateById(Long id); + } diff --git a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCategoryServiceImpl.java b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCategoryServiceImpl.java index e562ff6a..9ca21875 100644 --- a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCategoryServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCategoryServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.qs.serve.common.util.Assert; import com.qs.serve.common.util.CollectionUtil; import com.qs.serve.common.util.CopierUtil; +import com.qs.serve.common.util.IdUtil; import com.qs.serve.modules.goods.common.GoodsConst; import com.qs.serve.modules.goods.entity.GoodsSpu; import com.qs.serve.modules.goods.entity.bo.GoodsCategoryLevelBo; @@ -161,5 +162,11 @@ public class GoodsCategoryServiceImpl extends ServiceImpl todoLqw = new LambdaQueryWrapper<>(); + todoLqw.eq(TbsCostTodo::getCostApplyId,id); + Long countTodo = tbsCostTodoMapper.selectCount(todoLqw); + if(countTodo<1){ + Assert.throwEx("请补充协议条款,申请后不可更变条款"); + } LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.eq(TbsActivityPayCondition::getCostApplyId,id); payConditions = tbsActivityPayConditionMapper.selectList(lqw);