From 5fef221d30a73d0d58f45fb9ba4a2abfb6eb66d4 Mon Sep 17 00:00:00 2001 From: 33442 <3344239868@qq.com> Date: Sat, 16 Nov 2024 09:10:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- muyu-modules/muyu-job/pom.xml | 2 + .../muyu/job/controller/SysJobController.java | 1 + .../muyu/product/domain/AttributeGroup.java | 5 ++ .../com/muyu/product/domain/RuleInfo.java | 6 ++ .../domain/resp/CategoryInfoUpdReq.java | 56 +++++++++++++++++++ .../product/domain/resp/RuleInfoResp.java | 2 + .../muyu/product/MuYuProductApplication.java | 1 - .../controller/AttributeGroupController.java | 13 +++++ .../controller/CategoryInfoController.java | 6 +- .../controller/RuleInfoController.java | 11 ++++ .../mapper/AsAttributeGroupInfoMapper.java | 3 + .../mapper/AsAttributeGroupMapper.java | 2 + .../AsCategoryAttributeGroupMapper.java | 1 + .../mapper/AsCategoryAttributeMapper.java | 2 + .../product/mapper/AsCategoryBrandMapper.java | 2 + .../product/mapper/CategoryInfoMapper.java | 3 + .../AsCategoryAttributeGroupService.java | 2 + .../service/AsCategoryAttributeService.java | 1 + .../service/AsCategoryBrandService.java | 1 + .../service/AttributeGroupService.java | 3 +- .../product/service/CategoryInfoService.java | 3 + .../AsCategoryAttributeGroupServiceImpl.java | 11 ++++ .../impl/AsCategoryAttributeServiceImpl.java | 9 +++ .../impl/AsCategoryBrandServiceImpl.java | 9 +++ .../impl/AttributeGroupServiceImpl.java | 6 +- .../service/impl/CategoryInfoServiceImpl.java | 34 +++++++++++ .../service/impl/RuleInfoServiceImpl.java | 17 ++++++ .../product/AsAttributeGroupInfoMapper.xml | 1 + .../mapper/product/AsAttributeGroupMapper.xml | 3 + .../product/AsCategoryAttributeMapper.xml | 3 + .../mapper/product/AsCategoryBrandMapper.xml | 3 + .../mapper/product/CategoryInfoMapper.xml | 3 + .../mapper/product/RuleInfoUpdMapper.xml | 14 +++++ 33 files changed, 233 insertions(+), 6 deletions(-) create mode 100644 muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/CategoryInfoUpdReq.java create mode 100644 muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/RuleInfoUpdMapper.xml diff --git a/muyu-modules/muyu-job/pom.xml b/muyu-modules/muyu-job/pom.xml index 431b576..44fb942 100644 --- a/muyu-modules/muyu-job/pom.xml +++ b/muyu-modules/muyu-job/pom.xml @@ -84,6 +84,8 @@ muyu-common-core + + diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/controller/SysJobController.java b/muyu-modules/muyu-job/src/main/java/com/muyu/job/controller/SysJobController.java index 692dee7..6d941d4 100644 --- a/muyu-modules/muyu-job/src/main/java/com/muyu/job/controller/SysJobController.java +++ b/muyu-modules/muyu-job/src/main/java/com/muyu/job/controller/SysJobController.java @@ -30,6 +30,7 @@ import java.util.List; @RestController @RequestMapping("/job") public class SysJobController extends BaseController { + @Autowired private ISysJobService jobService; diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeGroup.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeGroup.java index e9450e2..3779d46 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeGroup.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeGroup.java @@ -81,4 +81,9 @@ public class AttributeGroup extends BaseEntity { .build(); } + public static AttributeGroup edUpdBuild(Long id, String states) { + return AttributeGroup.builder() + .id(id) + .states(states).build(); + } } diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleInfo.java index 4eea0a5..d92b2f5 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleInfo.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleInfo.java @@ -98,4 +98,10 @@ public class RuleInfo extends BaseEntity { .createTime(new Date()) .build(); } + + public static RuleInfo editUpdRuleStatusBuild(Long id, String status) { + return RuleInfo.builder() + .id(id) + .status(status).build(); + } } diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/CategoryInfoUpdReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/CategoryInfoUpdReq.java new file mode 100644 index 0000000..af0facc --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/CategoryInfoUpdReq.java @@ -0,0 +1,56 @@ +package com.muyu.product.domain.resp; + +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class CategoryInfoUpdReq { + + /** 主键 */ + + @ApiModelProperty(name = "主键", value = "主键") + private Long id; + + /** 品类名称 */ + + @ApiModelProperty(name = "品类名称", value = "品类名称", required = true) + private String name; + + /** 图片 */ + + @ApiModelProperty(name = "图片", value = "图片", required = true) + private String image; + + /** 是否启用 */ + + @ApiModelProperty(name = "是否启用", value = "是否启用", required = true) + private String start; + + /** 介绍 */ + + @ApiModelProperty(name = "介绍", value = "介绍") + private String introduction; + + /** + * 商品属性组关联ID + */ + private List attributeInfoList; + /** + * 商品属性关联ID + */ + private List attributeGroupList; + + /** + * 商品品牌组关联ID + */ + private List brandInfoList; + +} 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..52a31f0 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 @@ -32,6 +32,8 @@ public class RuleInfoResp extends BaseEntity { /** 规格状态 */ private String status; + private Boolean flan=false; + /** * 规格属性集合 */ diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/MuYuProductApplication.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/MuYuProductApplication.java index 84b6d80..25e964e 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/MuYuProductApplication.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/MuYuProductApplication.java @@ -19,5 +19,4 @@ public class MuYuProductApplication { public static void main (String[] args) { SpringApplication.run(MuYuProductApplication.class, args); } - } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java index 9670381..c2041fc 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java @@ -117,4 +117,17 @@ public class AttributeGroupController extends BaseController { } + /** + * 修改属性状态 + * + * @return + */ + @RequiresPermissions("product:attributeGroup:edit") + @Log(title = "状态", businessType = BusinessType.UPDATE) + @ApiOperation("修改属性状态") + @PutMapping("/{id}/{states}") + public Result updStatus(@PathVariable Long id, @PathVariable String states) { + return toAjax(attributeGroupService.updateById(AttributeGroup.edUpdBuild(id,states))); + } + } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java index 55dbaef..eaaaf32 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java @@ -10,6 +10,7 @@ import com.muyu.product.domain.AttributeInfo; import com.muyu.product.domain.BrandInfo; import com.muyu.product.domain.model.CategoryInfoSaveModel; import com.muyu.product.domain.resp.CategoryCommonElementResp; +import com.muyu.product.domain.resp.CategoryInfoUpdReq; import com.muyu.product.domain.resp.CategoryParentCommonElementResp; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; @@ -112,8 +113,9 @@ public class CategoryInfoController extends BaseController { @Log(title = "品类信息", businessType = BusinessType.UPDATE) @PutMapping("/{id}") @ApiOperation("修改品类信息") - public Result edit(@PathVariable Long id, @RequestBody CategoryInfoEditReq categoryInfoEditReq) { - return toAjax(categoryInfoService.updateById(CategoryInfo.editBuild(id,categoryInfoEditReq))); + public Result edit(@PathVariable Long id, @RequestBody CategoryInfoUpdReq categoryInfoUpdReq) { + Boolean b= categoryInfoService.updCateId(id,categoryInfoUpdReq); + return toAjax(categoryInfoService.updateById(CategoryInfo.editBuild(id,categoryInfoUpdReq))); } /** 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 120fa1b..64575e3 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 @@ -116,4 +116,15 @@ public class RuleInfoController extends BaseController { public Result remove(@PathVariable List ids) { return toAjax(ruleInfoService.removeBatchByIds(ids)); } + + /** + * 修改商品规格状态 + */ + @RequiresPermissions("product:rule:edit") + @Log(title = "商品规格", businessType = BusinessType.UPDATE) + @PutMapping("/{id}/{status}") + @ApiOperation("修改商品规格状态") + public Result updRuleStatus(@PathVariable Long id, @PathVariable String status) { + return toAjax(ruleInfoService.updateById(RuleInfo.editUpdRuleStatusBuild(id,status))); + } } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsAttributeGroupInfoMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsAttributeGroupInfoMapper.java index 3a320de..0b0cc20 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsAttributeGroupInfoMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsAttributeGroupInfoMapper.java @@ -2,6 +2,7 @@ package com.muyu.product.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.AttributeGroup; +import com.muyu.product.domain.resp.AttributeGroupUpdResp; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.mybatis.spring.annotation.MapperScan; @@ -13,4 +14,6 @@ public interface AsAttributeGroupInfoMapper{ void addAttributeInfo(@Param("id") Long id, @Param("ids") Long ids); + + } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsAttributeGroupMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsAttributeGroupMapper.java index 1b420df..1e37132 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsAttributeGroupMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsAttributeGroupMapper.java @@ -3,6 +3,7 @@ package com.muyu.product.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.AsAttributeGroup; +import org.apache.ibatis.annotations.Param; /** * 属性与组中间Mapper接口 @@ -12,4 +13,5 @@ import com.muyu.product.domain.AsAttributeGroup; */ public interface AsAttributeGroupMapper extends BaseMapper { + void addByCategory(@Param("id") Long id, @Param("attributeGroupId") Long attributeGroupId); } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryAttributeGroupMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryAttributeGroupMapper.java index b09e788..109e0f5 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryAttributeGroupMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryAttributeGroupMapper.java @@ -12,4 +12,5 @@ import com.muyu.product.domain.AsCategoryAttributeGroup; */ public interface AsCategoryAttributeGroupMapper extends BaseMapper { + } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryAttributeMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryAttributeMapper.java index 66c2e87..27de6e9 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryAttributeMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryAttributeMapper.java @@ -12,4 +12,6 @@ import com.muyu.product.domain.AsCategoryAttribute; */ public interface AsCategoryAttributeMapper extends BaseMapper { + + void addByCategory(Long id, Long attributeId); } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryBrandMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryBrandMapper.java index 3e8c164..388c810 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryBrandMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryBrandMapper.java @@ -12,4 +12,6 @@ import com.muyu.product.domain.AsCategoryBrand; */ public interface AsCategoryBrandMapper extends BaseMapper { + + void addByCategory(Long id, Long brandId); } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CategoryInfoMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CategoryInfoMapper.java index 6ed8f75..82c1897 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CategoryInfoMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CategoryInfoMapper.java @@ -3,6 +3,8 @@ package com.muyu.product.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.CategoryInfo; +import com.muyu.product.domain.resp.CategoryInfoUpdReq; +import org.apache.ibatis.annotations.Param; /** * 品类信息Mapper接口 @@ -12,4 +14,5 @@ import com.muyu.product.domain.CategoryInfo; */ public interface CategoryInfoMapper extends BaseMapper { + Boolean updById(@Param("id") Long id, @Param("categoryInfoUpdReq") CategoryInfoUpdReq categoryInfoUpdReq); } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryAttributeGroupService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryAttributeGroupService.java index fb3b15f..d08a7cf 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryAttributeGroupService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryAttributeGroupService.java @@ -19,4 +19,6 @@ public interface AsCategoryAttributeGroupService extends IService list(AsCategoryAttributeGroup asCategoryAttributeGroup); + void addByCategory(Long id, Long attributeGroupId); + } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryAttributeService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryAttributeService.java index 365d74b..a6b1c3b 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryAttributeService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryAttributeService.java @@ -19,4 +19,5 @@ public interface AsCategoryAttributeService extends IService list(AsCategoryAttribute asCategoryAttribute); + void addByCategory(Long id, Long attributeId); } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryBrandService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryBrandService.java index a1ccaa9..059e1aa 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryBrandService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryBrandService.java @@ -19,4 +19,5 @@ public interface AsCategoryBrandService extends IService { */ public List list(AsCategoryBrand asCategoryBrand); + void addByCategory(Long id, Long brandId); } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AttributeGroupService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AttributeGroupService.java index 6ee488f..44b9fa7 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AttributeGroupService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AttributeGroupService.java @@ -5,7 +5,6 @@ import java.util.List; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.product.domain.AttributeGroup; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.product.domain.AttributeInfo; import com.muyu.product.domain.model.AttributeGroupSaveModel; import com.muyu.product.domain.req.AttributeGroupEditReq; import com.muyu.product.domain.resp.AttributeGroupPageResp; @@ -49,4 +48,6 @@ public interface AttributeGroupService extends IService { AttributeGroupUpdResp getUpdById(Long id); void updAttributeGroupInfo(Long id, AttributeGroupEditReq attributeGroupEditReq); + + } 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 9b99d9d..4bba3f9 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 @@ -9,6 +9,7 @@ import com.muyu.product.domain.CategoryInfo; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.product.domain.model.CategoryInfoSaveModel; import com.muyu.product.domain.resp.CategoryCommonElementResp; +import com.muyu.product.domain.resp.CategoryInfoUpdReq; import com.muyu.product.domain.resp.CategoryParentCommonElementResp; /** @@ -69,4 +70,6 @@ public interface CategoryInfoService extends IService { CategoryCommonElementResp getTemplateAttributeByCateGoryId (Long cateGoryId); public List getCommon (Long categoryId, IService iService, IService bsiService); + + Boolean updCateId(Long id, CategoryInfoUpdReq categoryInfoUpdReq); } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsCategoryAttributeGroupServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsCategoryAttributeGroupServiceImpl.java index a279181..7c6cd1f 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsCategoryAttributeGroupServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsCategoryAttributeGroupServiceImpl.java @@ -3,7 +3,9 @@ package com.muyu.product.service.impl; import java.util.List; import com.muyu.common.core.utils.ObjUtils; +import com.muyu.product.mapper.AsAttributeGroupMapper; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.muyu.product.mapper.AsCategoryAttributeGroupMapper; import com.muyu.product.domain.AsCategoryAttributeGroup; @@ -21,6 +23,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @Service public class AsCategoryAttributeGroupServiceImpl extends ServiceImpl implements AsCategoryAttributeGroupService { + + @Autowired + private AsAttributeGroupMapper asAttributeGroupMapper; + /** * 查询品类属性组中间列表 * @@ -46,4 +52,9 @@ public class AsCategoryAttributeGroupServiceImpl extends ServiceImpl implements AsCategoryAttributeService { + @Autowired + private AsCategoryAttributeMapper asCategoryAttributeMapper; + /** * 查询品类属性中间列表 * @@ -46,4 +50,9 @@ public class AsCategoryAttributeServiceImpl extends ServiceImpl implements AsCategoryBrandService { + @Autowired + private AsCategoryBrandMapper asCategoryBrandMapper; + /** * 查询品类品牌中间列表 * @@ -46,4 +50,9 @@ public class AsCategoryBrandServiceImpl extends ServiceImpl implements CategoryInfoService { + @Autowired + private CategoryInfoMapper categoryInfoMapper; + @Autowired private AsCategoryAttributeService asCategoryAttributeService; @@ -270,6 +274,36 @@ public class CategoryInfoServiceImpl extends ServiceImpl().eq(AsCategoryAttribute::getCategoryId, id)); + + asCategoryBrandService.remove(new LambdaQueryWrapper().eq(AsCategoryBrand::getCategoryId, id)); + + asCategoryAttributeGroupService.remove(new LambdaQueryWrapper().eq(AsCategoryAttributeGroup::getCategoryId, id)); + + + if(null!=categoryInfoUpdReq.getAttributeInfoList()){ + categoryInfoUpdReq.getAttributeInfoList().stream().forEach(attributeId->{ + asCategoryAttributeService.addByCategory(id,attributeId); + }); + } + if(null!=categoryInfoUpdReq.getBrandInfoList()){ + categoryInfoUpdReq.getBrandInfoList().stream().forEach(brandId->{ + asCategoryBrandService.addByCategory(id,brandId); + }); + } + if(null!=categoryInfoUpdReq.getAttributeGroupList()){ + categoryInfoUpdReq.getAttributeGroupList().stream().forEach(attributeGroupId->{ + asCategoryAttributeGroupService.addByCategory(id,attributeGroupId); + }); + } + return b; + } + /** * 通过品类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 773603a..400a456 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 @@ -12,6 +12,7 @@ import com.muyu.common.core.text.Convert; 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.ProjectInfo; import com.muyu.product.domain.RuleAttrInfo; import com.muyu.product.domain.model.RuleAttrAddModel; import com.muyu.product.domain.model.RuleInfoAddModel; @@ -19,7 +20,9 @@ import com.muyu.product.domain.req.RuleInfoQueryReq; import com.muyu.product.domain.resp.RuleInfoResp; import com.muyu.product.domain.resp.RuleInfoUpdResp; import com.muyu.product.mapper.RuleInfoUpdMapper; +import com.muyu.product.service.ProjectInfoService; import com.muyu.product.service.RuleAttrInfoService; +import io.jsonwebtoken.lang.Collections; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -45,6 +48,9 @@ public class RuleInfoServiceImpl extends ServiceImpl @Autowired private RuleInfoUpdMapper ruleInfoUpdMapper; + @Autowired + private ProjectInfoService projectInfoService; + /** * 查询商品规格列表 * @@ -107,6 +113,17 @@ public class RuleInfoServiceImpl extends ServiceImpl .toList(); boolean isPage = ruleInfoQueryReq.getParams().get("isPage") == null || Convert.toBool(ruleInfoQueryReq.getParams().get("isPage"), true); + ruleInfoRespList.forEach(ruleInfoResp -> { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(ProjectInfo::getRuleId,ruleInfoResp.getId()); + List list1 = projectInfoService.list(lambdaQueryWrapper); + if(!Collections.isEmpty(list1)){ + ruleInfoResp.setFlan(true); + } + }); + + + return TableDataInfo.builder() .rows(ruleInfoRespList) .total(isPage ? new PageInfo<>(list).getTotal() : 0) diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsAttributeGroupInfoMapper.xml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsAttributeGroupInfoMapper.xml index c1f9c78..eff4f9e 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsAttributeGroupInfoMapper.xml +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsAttributeGroupInfoMapper.xml @@ -7,6 +7,7 @@ insert into as_attribute_group (group_id,attribute_id) values (#{id},#{ids}) + delete from as_attribute_group where group_id=#{id} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsAttributeGroupMapper.xml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsAttributeGroupMapper.xml index 05c468d..070377a 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsAttributeGroupMapper.xml +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsAttributeGroupMapper.xml @@ -18,4 +18,7 @@ select id, group_id, attribute_id, remark, create_by, create_time, update_by, update_time from as_attribute_group + + insert into as_category_attribute_group (category_id,attribute_group_id) values (#{id},#{attributeGroupId}) + diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsCategoryAttributeMapper.xml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsCategoryAttributeMapper.xml index d5544af..3c9e5af 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsCategoryAttributeMapper.xml +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsCategoryAttributeMapper.xml @@ -18,4 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, category_id, attribute_id, remark, create_by, create_time, update_by, update_time from as_category_attribute + + insert into as_category_attribute_group (category_id,attribute_id) values (#{id},#{attributeId}) + diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsCategoryBrandMapper.xml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsCategoryBrandMapper.xml index 048317d..4a7f521 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsCategoryBrandMapper.xml +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsCategoryBrandMapper.xml @@ -18,4 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, category_id, brand_id, remark, create_by, create_time, update_by, update_time from as_category_brand + + insert into as_category_attribute_group (category_id,brand_id) values (#{id},#{brandId}) + diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/CategoryInfoMapper.xml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/CategoryInfoMapper.xml index 99be65b..1b939d3 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/CategoryInfoMapper.xml +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/CategoryInfoMapper.xml @@ -21,4 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, name, image, parent_id, start, introduction, remark, create_by, create_time, update_by, update_time from category_info + + UPDATE category_info SET `name` = #{categoryInfoUpdReq.name},`start` =#{categoryInfoUpdReq.start}, `introduction` = #{categoryInfoUpdReq.introduction} WHERE `id` = #{id}; + diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/RuleInfoUpdMapper.xml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/RuleInfoUpdMapper.xml new file mode 100644 index 0000000..506e1e0 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/RuleInfoUpdMapper.xml @@ -0,0 +1,14 @@ + + + + + insert into rule_attr_info (rule_id,name,attr_value,create_by,create_time,update_by,update_time) values (#{ruleId},#{name},#{join},"admin",now(),"admin",now()) + + + + + delete from rule_attr_info where rule_id=#{id} + +