From c437b1136adf09d3dd3f837c1fe2c86e7956e589 Mon Sep 17 00:00:00 2001 From: wuchang2 <3101459313@qq.com> Date: Sun, 17 Nov 2024 22:03:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=8A=E5=89=8D=E5=87=A0=E5=A4=A9=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=9A=84=E6=96=B9=E6=B3=95=E6=8D=A2=E6=88=90=E4=BA=86?= =?UTF-8?q?mybatis=5Fpuls=E7=9A=84=E6=96=B9=E6=B3=95=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/product/domain/ProjectInfo.java | 1 + .../muyu/product/domain/RuleInfoUpdRes.java | 1 + .../product/domain/model/ProjectAddModel.java | 2 ++ .../domain/req/ProjectInfoEditReq.java | 2 ++ .../product/service/CategoryInfoService.java | 2 +- .../impl/AttributeGroupServiceImpl.java | 13 ++++++--- .../service/impl/CategoryInfoServiceImpl.java | 27 ++++++++++++------- .../service/impl/RuleInfoServiceImpl.java | 15 ++++++----- 8 files changed, 42 insertions(+), 21 deletions(-) diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectInfo.java index 156bd38..d39fd61 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectInfo.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectInfo.java @@ -145,6 +145,7 @@ public class ProjectInfo extends BaseEntity { .status(projectInfoEditReq.getStatus()) .ruleId(projectInfoEditReq.getRuleId()) .brandId(projectInfoEditReq.getBrandId()) + .remark(projectInfoEditReq.getRemark()) .build(); } diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleInfoUpdRes.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleInfoUpdRes.java index 7f97a0b..7d5618f 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleInfoUpdRes.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleInfoUpdRes.java @@ -29,5 +29,6 @@ public class RuleInfoUpdRes { private String status; private String remark; + private List ruleAttrList; } diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/ProjectAddModel.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/ProjectAddModel.java index 33bc029..8601fab 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/ProjectAddModel.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/ProjectAddModel.java @@ -56,4 +56,6 @@ public class ProjectAddModel extends BaseEntity { /** 品牌 */ @ApiModelProperty(name = "品牌", value = "品牌") private Long brandId; + + private String remark; } diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoEditReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoEditReq.java index 4711de1..2173b72 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoEditReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoEditReq.java @@ -63,4 +63,6 @@ public class ProjectInfoEditReq extends BaseEntity { @ApiModelProperty(name = "品牌", value = "品牌") private Long brandId; + private String remark; + } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CategoryInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CategoryInfoService.java index fb1f7a3..821180f 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CategoryInfoService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CategoryInfoService.java @@ -74,7 +74,7 @@ public interface CategoryInfoService extends IService { Boolean updId(Long id, CategoryInfoUpdReq categoryInfoUpdReq); - Result del(Long ids); + Result del(Long id); CategoryInfoUpdReq getUpdById(Long id); diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeGroupServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeGroupServiceImpl.java index a6a7066..0776a6d 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeGroupServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeGroupServiceImpl.java @@ -43,6 +43,9 @@ public class AttributeGroupServiceImpl extends ServiceImpl attributeList = attributeGroupEditReq.getAttributeList(); - for (AttributeInfoSaveReq attributeInfoSaveReq : attributeList) { - attributeGroupUpdMapper.attriAddGroup(id,attributeInfoSaveReq.getId()); + attributeGroupService.remove(new LambdaQueryWrapper().eq(AsAttributeGroup::getGroupId,id)); + + if (null!=attributeGroupEditReq.getAttributeList()){ + attributeGroupEditReq.getAttributeList().stream().forEach(attributeInfoSaveReq -> { + attributeGroupUpdMapper.attriAddGroup(id,attributeInfoSaveReq.getId()); + }); } } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CategoryInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CategoryInfoServiceImpl.java index ec6bc14..73536e0 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CategoryInfoServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CategoryInfoServiceImpl.java @@ -291,11 +291,17 @@ public class CategoryInfoServiceImpl extends ServiceImpl().eq(AsCategoryAttributeGroup::getCategoryId,id)); + LambdaQueryWrapper groupServiceLambdaQueryWrapper = new LambdaQueryWrapper<>(); + groupServiceLambdaQueryWrapper.eq(AsCategoryAttributeGroup::getCategoryId,id); + asCategoryAttributeGroupService.remove(groupServiceLambdaQueryWrapper); - asCategoryAttributeService.remove(new LambdaQueryWrapper().eq(AsCategoryAttribute::getCategoryId,id)); + LambdaQueryWrapper asCategoryBrandLambdaQueryWrapper = new LambdaQueryWrapper<>(); + asCategoryBrandLambdaQueryWrapper.eq(AsCategoryBrand::getCategoryId,id); + asCategoryBrandService.remove(asCategoryBrandLambdaQueryWrapper); - asCategoryBrandService.remove(new LambdaQueryWrapper().eq(AsCategoryBrand::getCategoryId,id)); + LambdaQueryWrapper asCategoryAttributeLambdaQueryWrapper = new LambdaQueryWrapper<>(); + asCategoryAttributeLambdaQueryWrapper.eq(AsCategoryAttribute::getCategoryId,id); + asCategoryAttributeService.remove(asCategoryAttributeLambdaQueryWrapper); if (null!=categoryInfoUpdReq.getBrandIdList()){ categoryInfoUpdReq.getBrandIdList().stream().forEach(brandId->{ @@ -324,17 +330,17 @@ public class CategoryInfoServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("parent_id",ids); List categoryInfos = categoryInfoMapper.selectList(queryWrapper); - - if(0 == categoryInfos.size()){//无子级 + if(categoryInfos.size()==0){//长度为0 就是没有子集 //是否有商品关联关系 List list = categoryInfoMapper.selectProjectInfoById(ids); // 商品信息对象 project_info - if(0 == list.size()) {//无商品关联 - categoryInfoMapper.delete(new LambdaQueryWrapper().eq(CategoryInfo::getId, ids)); - return Result.success("删除成功"); + if(list.size()==0) {//商品的列表长度为0 就是没有集合 + LambdaQueryWrapper eq = new LambdaQueryWrapper().eq(CategoryInfo::getId, ids); + categoryInfoMapper.delete(eq); + return Result.success("删除...成功了..."); } - return Result.error("有商品关联关系无法删除...."); + return Result.error("不能删除不能删除因为有商品...."); } - return Result.error("有子级无法删除....."); + return Result.error("不能删除不能删除有孩子....."); } @Override @@ -391,6 +397,7 @@ public class CategoryInfoServiceImpl extends ServiceImpl @Override public void updRuleId(Long id, RuleInfoUpdRes ruleInfoUpdRes) { - ruleInfoUpdMapper.del(id); - List ruleAttrList = ruleInfoUpdRes.getRuleAttrList(); - for (RuleAttrAddModel ruleAttrAddModel : ruleAttrList) { - List valueList = ruleAttrAddModel.getValueList(); - String join = String.join(",",valueList); - ruleInfoUpdMapper.addRuleInfo(id,ruleAttrAddModel.getName(),join); + ruleAttrInfoService.remove(new LambdaQueryWrapper().eq(RuleAttrInfo::getRuleId,id)); + + if (null!=ruleInfoUpdRes.getRuleAttrList()){ + ruleInfoUpdRes.getRuleAttrList().stream().forEach(ruleAttrAddModel -> { + List valueList = ruleAttrAddModel.getValueList(); + String join = String.join(",", valueList); + ruleInfoUpdMapper.addRuleInfo(id,ruleAttrAddModel.getName(),join); + }); } + } }