From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期一, 29 七月 2024 18:51:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrandServiceImpl.java | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrandServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrandServiceImpl.java index 2dd1b72..2b6135e 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrandServiceImpl.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrandServiceImpl.java @@ -1,7 +1,9 @@ package com.ruoyi.goods.service.impl; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.utils.page.BeanUtils; import com.ruoyi.common.core.utils.page.PageDTO; @@ -9,9 +11,12 @@ import com.ruoyi.goods.controller.management.dto.GoodsBrandQuery; import com.ruoyi.goods.controller.management.vo.GoodsBrandVO; import com.ruoyi.goods.mapper.GoodsBrandMapper; +import com.ruoyi.goods.mapper.GoodsSkuMapper; import com.ruoyi.goods.service.IGoodsBrandService; import com.ruoyi.system.api.domain.GoodsBrand; +import com.ruoyi.system.api.domain.GoodsSku; import java.util.List; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; /** @@ -23,8 +28,10 @@ * @since 2024-05-16 */ @Service +@RequiredArgsConstructor public class GoodsBrandServiceImpl extends ServiceImpl<GoodsBrandMapper, GoodsBrand> implements IGoodsBrandService { + private final GoodsSkuMapper goodsSkuMapper; /** * 获取商品品牌列表。 * <p>此方法通过调用{@code list()}方法获取原始列表,并使用BeanUtils的{@code copyList}方法将其复制为{@code @@ -77,4 +84,13 @@ } } + @Override + public void delete(Long id) { + Long count = goodsSkuMapper.selectCount( + Wrappers.lambdaQuery(GoodsSku.class).eq(GoodsSku::getBrandId, id)); + if (count > 0) { + throw new ServiceException("该品牌已有商品关联,不能删除"); + } + this.removeById(id); + } } -- Gitblit v1.7.1