Merge branch 'dev' of http://129.211.31.58:3000/JavaProject/mall-cloud into dev

# Conflicts:
#	mall-services/mall-product/src/main/java/com/mall/product/domain/vo/AttrGroupVo.java
#	mall-services/mall-product/src/main/java/com/mall/product/service/impl/AttrGroupServiceImpl.java

mall-services/mall-product/src/main/java/com/mall/product/domain/vo/AttrGroupVo.java

@@ -5,6 +5,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
@@ -30,7 +32,7 @@ public class AttrGroupVo {
     private Long catelogId;
 
     @Schema(name = "catelogPaths", title = "分类路径")
-    private Long[] catelogPaths;
+    private List<Long> catelogPaths;
 
 }
 

mall-services/mall-product/src/main/java/com/mall/product/service/impl/AttrGroupServiceImpl.java

@@ -10,7 +10,6 @@ import com.mall.product.domain.vo.AttrGroupVo;
 import com.mall.product.mapper.AttrGroupMapper;
 import com.mall.product.service.AttrGroupService;
 import com.mall.product.service.CategoryService;
-import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -27,11 +26,14 @@ import java.util.List;
  */
 @Service
 @Transactional
-@RequiredArgsConstructor
 public class AttrGroupServiceImpl extends ServiceImpl<AttrGroupMapper, AttrGroupEntity> implements AttrGroupService {
 
     private final CategoryService categoryService;
 
+    public AttrGroupServiceImpl(CategoryService categoryService) {
+        this.categoryService = categoryService;
+    }
+
     /**
      * * 属性分组 服务实现类
      *
@@ -95,8 +97,13 @@ public class AttrGroupServiceImpl extends ServiceImpl<AttrGroupMapper, AttrGroup
     public AttrGroupVo getAttrGroupById(Long attrGroupId) {
         AttrGroupEntity attrGroupEntity = getById(attrGroupId);
         Long catelogId = attrGroupEntity.getCatelogId();
-        
+
+        // 找到后代所有的路径
         List<Long> catelogIds = categoryService.findCatelogPath(catelogId);
-        return null;
+
+        AttrGroupVo attrGroupVo = new AttrGroupVo();
+        BeanUtils.copyProperties(attrGroupEntity, attrGroupVo);
+        attrGroupVo.setCatelogPaths(catelogIds);
+        return attrGroupVo;
     }
 }