修改品类信息(2)

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoSaveReq.java

@@ -50,8 +50,9 @@ public class CategoryInfoSaveReq extends TreeEntity {
     @ApiModelProperty(name = "介绍", value = "介绍")
     private String introduction;
 
+    private List<Long> attributeIdList;
 
     private List<Long> attributeGroupIdList;
-    private List<Long> attributeIdList;
+
     private List<Long> brandIdList;
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeInfoController.java

@@ -94,20 +94,19 @@ public class AttributeInfoController extends BaseController {
      * 修改商品属性
      */
     @RequiresPermissions("product:attribute:edit")
-    @Log(title = "商品属性",businessType = BusinessType.UPDATE)
+    @Log(title = "商品属性", businessType = BusinessType.UPDATE)
     @PutMapping("/{id}")
     @ApiOperation("修改商品属性")
     public Result<String> edit(@PathVariable Long id, @RequestBody AttributeInfoEditReq attributeInfoEditReq) {
         return toAjax(attributeInfoService.updateById(AttributeInfo.editBuild(id,attributeInfoEditReq)));
     }
 
-
     /**
      * 删除商品属性
      */
     @RequiresPermissions("product:attribute:remove")
     @Log(title = "商品属性", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+    @DeleteMapping("/{ids}")
     @ApiOperation("删除商品属性")
     @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = String.class, example = "1,2,3,4")
     public Result<String> remove(@PathVariable List<Long> ids) {

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeGroupServiceImpl.java

@@ -46,10 +46,6 @@ public class AttributeGroupServiceImpl extends ServiceImpl<AttributeGroupMapper,
 
     /**
      * 分页查询
-     *
-     * @param attributeGroupQuery 分组对象
-     *
-     * @return 返回结果
      */
     @Override
     public TableDataInfo<AttributeGroupPageResp> page (AttributeGroup attributeGroupQuery) {
@@ -68,29 +64,25 @@ public class AttributeGroupServiceImpl extends ServiceImpl<AttributeGroupMapper,
     }
 
     /**
-     * 属性组
+     * 查询属性组列表
      */
     @Override
-    public List<AttributeGroup> list(AttributeGroup attributeGroup) {
+    public List<AttributeGroup> list (AttributeGroup attributeGroup) {
         LambdaQueryWrapper<AttributeGroup> queryWrapper = new LambdaQueryWrapper<>();
 
-        if(ObjUtils.notNull(attributeGroup.getName())){
+        if (ObjUtils.notNull(attributeGroup.getName())) {
-            queryWrapper.like(AttributeGroup::getName,attributeGroup.getName());
+            queryWrapper.like(AttributeGroup::getName, attributeGroup.getName());
         }
 
-        if(ObjUtils.notNull(attributeGroup.getStates())){
+        if (ObjUtils.notNull(attributeGroup.getStates())) {
-            queryWrapper.eq(AttributeGroup::getStates,attributeGroup.getStates());
+            queryWrapper.eq(AttributeGroup::getStates, attributeGroup.getStates());
         }
+
         return list(queryWrapper);
     }
 
-
     /**
-     * 保存
+     * 属性组保存模型
-     *
-     * @param attributeGroupSaveModel 属性组保存模型
-     *
-     * @return 是否成功
      */
     @Override
     @Transactional

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeInfoServiceImpl.java

@@ -31,9 +31,6 @@ public class AttributeInfoServiceImpl extends ServiceImpl<AttributeInfoMapper, A
 
     /**
      * 查询商品属性列表
-     *
-     * @param attributeInfo 商品属性
-     * @return 商品属性
      */
     @Override
     public List<AttributeInfo> list(AttributeInfo attributeInfo) {
@@ -53,10 +50,6 @@ public class AttributeInfoServiceImpl extends ServiceImpl<AttributeInfoMapper, A
 
     /**
      * 通过groupId查询属性集合
-     *
-     * @param groupId 属性组Id
-     *
-     * @return 属性集合
      */
     @Override
     public List<AttributeInfo> attributeListByGroupId (Long groupId) {

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CategoryInfoServiceImpl.java

@@ -38,18 +38,9 @@ public class CategoryInfoServiceImpl extends ServiceImpl<CategoryInfoMapper, Cat
     @Autowired
     private AttributeInfoService attributeInfoService;
 
-    @Autowired
-    private AsAttributeGroupService asAttributeGroupService;
-
-    @Autowired
-    private BrandInfoService brandInfoService;
-
 
     /**
      * 查询品类信息列表
-     *
-     * @param categoryInfo 品类信息
-     * @return 品类信息
      */
     @Override
     public List<CategoryInfo> list(CategoryInfo categoryInfo) {
@@ -75,11 +66,6 @@ public class CategoryInfoServiceImpl extends ServiceImpl<CategoryInfoMapper, Cat
         if (ObjUtils.notNull(categoryInfo.getIntroduction())){
             queryWrapper.eq(CategoryInfo::getIntroduction, categoryInfo.getIntroduction());
         }
-
-
-
-
-
         return list(queryWrapper);
     }
 
@@ -94,8 +80,6 @@ public class CategoryInfoServiceImpl extends ServiceImpl<CategoryInfoMapper, Cat
 
     /**
      * 通过品类id获取属性组集合
-     * @param categoryId
-     * @return 属性组集合
      */
     @Override
     public List<AttributeGroup> getAttributeGroupList(Long categoryId) {
@@ -104,8 +88,6 @@ public class CategoryInfoServiceImpl extends ServiceImpl<CategoryInfoMapper, Cat
 
     /**
      * 通过品类id获取属性集合
-     * @param categoryId
-     * @return 属性集合
      */
     @Override
     public List<AttributeInfo> getAttributeInfoList(Long categoryId) {
@@ -130,8 +112,6 @@ public class CategoryInfoServiceImpl extends ServiceImpl<CategoryInfoMapper, Cat
 
     /**
      * 通过品类id获取品牌集合
-     * @param categoryId
-     * @return 品牌集合
      */
     @Override
     public List<BrandInfo> getBrandInfoList(Long categoryId) {