From bbf1bd502f5449485d5cff5f1aacb657c2d8edcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B2=B3=E5=B9=B3?= <14767849+liuehping@user.noreply.gitee.com> Date: Sat, 16 Nov 2024 09:11:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E6=A0=BC=E4=BF=A1=E6=81=AF=E6=9C=89?= =?UTF-8?q?=E5=95=86=E5=93=81=E4=B8=8D=E8=83=BD=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/domain/resp/RuleInfoResp.java | 1 + .../controller/RuleInfoController.java | 10 ++++++++ .../muyu/product/mapper/RuleInfoMapper.java | 2 ++ .../muyu/product/service/RuleInfoService.java | 2 ++ .../service/impl/RuleInfoServiceImpl.java | 23 ++++++++++++++++++- .../mapper/product/RuleInfoMapper.xml | 3 +++ 6 files changed, 40 insertions(+), 1 deletion(-) diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/RuleInfoResp.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/RuleInfoResp.java index 8596383..bab214e 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/RuleInfoResp.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/RuleInfoResp.java @@ -36,6 +36,7 @@ public class RuleInfoResp extends BaseEntity { * 规格属性集合 */ private List ruleAttrList; + private Boolean dis; public static RuleInfoResp infoBuild (RuleInfo ruleInfo, Function> ruleAttrList) { return RuleInfoResp.builder() diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleInfoController.java index fdd78e5..f1df00f 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleInfoController.java @@ -130,4 +130,14 @@ public class RuleInfoController extends BaseController { public Result remove(@PathVariable List ids) { return toAjax(ruleInfoService.removeBatchByIds(ids)); } + + + /** + * 校验是否存在商品信息 + */ + @GetMapping("have") + @ApiOperation("校验是否存在商品信息") + public Result have(Long id) { + return Result.success(ruleInfoService.have(id)); + } } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/RuleInfoMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/RuleInfoMapper.java index 925c03f..e73928b 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/RuleInfoMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/RuleInfoMapper.java @@ -22,4 +22,6 @@ public interface RuleInfoMapper extends BaseMapper { void deleteRule(Long id); void addRuleAttrModel(@Param("id") Long id, @Param("name") String name, @Param("valueData") String substring); + + Integer have(Long id); } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/RuleInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/RuleInfoService.java index 0cccb2c..5c0e2cb 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/RuleInfoService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/RuleInfoService.java @@ -42,4 +42,6 @@ public interface RuleInfoService extends IService { void edit(Long id, RuleAttrInfoReq ruleInfoEditReq); + + Result have(Long id); } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleInfoServiceImpl.java index aaaaade..fc5e030 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleInfoServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleInfoServiceImpl.java @@ -2,6 +2,7 @@ package com.muyu.product.service.impl; import java.util.List; +import java.util.Objects; import com.github.pagehelper.PageInfo; @@ -11,6 +12,7 @@ import com.muyu.common.core.utils.ObjUtils; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.product.domain.AttributeInfo; +import com.muyu.product.domain.ProjectInfo; import com.muyu.product.domain.RuleAttrInfo; import com.muyu.product.domain.model.RuleAttrAddModel; import com.muyu.product.domain.model.RuleInfoAddModel; @@ -20,6 +22,7 @@ import com.muyu.product.domain.req.RuleInfoQueryReq; import com.muyu.product.domain.req.RuleInfoSaveReq; import com.muyu.product.domain.resp.RuleGroupUpdResp; import com.muyu.product.domain.resp.RuleInfoResp; +import com.muyu.product.service.ProjectInfoService; import com.muyu.product.service.RuleAttrInfoService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -45,6 +48,8 @@ public class RuleInfoServiceImpl extends ServiceImpl i private RuleAttrInfoService ruleAttrInfoService; @Autowired private RuleInfoMapper ruleAttrInfoMapper; + @Autowired + private ProjectInfoService projectInfoService; /** * 查询商品规格列表 @@ -103,7 +108,14 @@ public class RuleInfoServiceImpl extends ServiceImpl i })) .toList(); boolean isPage = ruleInfoQueryReq.getParams().get("isPage") == null || Convert.toBool(ruleInfoQueryReq.getParams().get("isPage"), true); - + List projectInfoList = projectInfoService.list(); + for (ProjectInfo projectInfo : projectInfoList) { + for (RuleInfoResp ruleInfoResp : ruleInfoRespList) { + if (Objects.equals(projectInfo.getId(), ruleInfoResp.getId())){ + ruleInfoResp.setDis(true); + } + } + } return TableDataInfo.builder() .rows(ruleInfoRespList) .total(isPage ? new PageInfo<>(list).getTotal() : 0) @@ -173,4 +185,13 @@ public class RuleInfoServiceImpl extends ServiceImpl i // } } + + @Override + public Result have(Long id) { + Integer count = ruleAttrInfoMapper.have(id); + if (count>0){ + return Result.error(400,"规格下有商品，无法删除"); + } + return Result.success(count); + } } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/RuleInfoMapper.xml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/RuleInfoMapper.xml index c8b20c8..ca4dfc0 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/RuleInfoMapper.xml +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/RuleInfoMapper.xml @@ -53,4 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" INNER JOIN rule_attr_info ON rule_info.id = rule_attr_info.rule_id WHERE rule_info.`id`=#{id} +