新增查询二级分类，商品列表描述返回

src/main/java/com/mmc/pms/controller/BackstageCategoriesController.java

@@ -95,6 +95,15 @@ public class BackstageCategoriesController {
     return categoriesService.getClassifyDetails(id);
   }
 
+  @ApiOperation(value = "获取二级分类")
+  @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ClassifyDetailsDTO.class)})
+  @GetMapping("getSubClassifyList")
+  public ResultBody<List<ClassifyDetailsDTO>> getSubClassifyList(
+          @ApiParam(value = "父分类id", required = true) @RequestParam(value = "id") Integer id) {
+    return categoriesService.getSubClassifyList(id);
+  }
+
+
   @ApiOperation(value = "分类详情下关联业务列表")
   @ApiResponses({@ApiResponse(code = 200, message = "OK", response = RelevantBusinessVO.class)})
   @GetMapping("queryRelevantBusiness")

src/main/java/com/mmc/pms/dao/CategoriesDao.java

@@ -64,4 +64,6 @@ public interface CategoriesDao {
   List<Categories> getCategoriesListByDirectoryIds(List<Integer> directoryIds);
 
   int countChildById(Integer id);
+
+    List<Categories> getSubClassifyList(Integer id);
 }

src/main/java/com/mmc/pms/entity/GoodsInfo.java

@@ -60,6 +60,8 @@ public class GoodsInfo implements Serializable {
 
   private String directoryName;
 
+  private String goodsDesc;
+
   private static final long serialVersionUID = 1L;
 
   public GoodsInfo(GoodsAddVO goodsAddVO) {
@@ -87,7 +89,7 @@ public class GoodsInfo implements Serializable {
   }
 
   public LeaseGoodsInfoDTO buildLeaseGoodsInfoDTO() {
-    return LeaseGoodsInfoDTO.builder().id(id).goodsName(goodsName).images(mainImg).build();
+    return LeaseGoodsInfoDTO.builder().id(id).goodsName(goodsName).description(goodsDesc).images(mainImg).build();
   }
 
   public GoodsInfoListDTO buildGoodsInfoListDTO() {

src/main/java/com/mmc/pms/model/lease/dto/LeaseGoodsInfoDTO.java

@@ -24,6 +24,8 @@ public class LeaseGoodsInfoDTO implements Serializable {
     private String goodsName;
     @ApiModelProperty(value = "商品图片")
     private String images;
+    @ApiModelProperty(value = "描述")
+    private String description;
     @ApiModelProperty(value = "价格")
     private BigDecimal price;
 }

src/main/java/com/mmc/pms/service/CategoriesService.java

@@ -3,6 +3,7 @@ package com.mmc.pms.service;
 import com.mmc.pms.common.ResultBody;
 import com.mmc.pms.entity.Categories;
 import com.mmc.pms.model.categories.dto.AllCategoryDTO;
+import com.mmc.pms.model.categories.dto.ClassifyDetailsDTO;
 import com.mmc.pms.model.categories.vo.ClassifyInfoVO;
 import com.mmc.pms.model.categories.vo.DirectoryInfoVO;
 import com.mmc.pms.model.sale.vo.QueryClassifyVO;
@@ -49,4 +50,6 @@ public interface CategoriesService {
     List<Categories> getCategoriesListByIds(Set<Integer> ids);
 
     List<AllCategoryDTO> feigQqueryCategoryInfoByType(Integer type);
+
+    ResultBody<List<ClassifyDetailsDTO>> getSubClassifyList(Integer id);
 }

src/main/java/com/mmc/pms/service/impl/CategoriesServiceImpl.java

@@ -12,10 +12,7 @@ import com.mmc.pms.entity.DirectoryDO;
 import com.mmc.pms.entity.GoodsInfo;
 import com.mmc.pms.entity.ServiceDO;
 import com.mmc.pms.feign.ImsAppApi;
-import com.mmc.pms.model.categories.dto.AllCategoryDTO;
-import com.mmc.pms.model.categories.dto.CategoriesDTO;
-import com.mmc.pms.model.categories.dto.CategoriesInfoListDTO;
-import com.mmc.pms.model.categories.dto.ClassifyInfoDTO;
+import com.mmc.pms.model.categories.dto.*;
 import com.mmc.pms.model.categories.vo.ClassifyInfoVO;
 import com.mmc.pms.model.categories.vo.CurriculumInfoVO;
 import com.mmc.pms.model.categories.vo.DirectoryInfoVO;
@@ -374,4 +371,14 @@ public class CategoriesServiceImpl implements CategoriesService {
           .ifPresent(allCategoryDTO::setCategoriesInfoListDTO);
     }
   }
+
+  @Override
+  public ResultBody<List<ClassifyDetailsDTO>> getSubClassifyList(Integer id) {
+    List<Categories> categoriesList = categoriesDao.getSubClassifyList(id);
+    if (CollectionUtils.isNotEmpty(categoriesList)){
+      List<ClassifyDetailsDTO> list = categoriesList.stream().map(Categories::buildClassifyDetailsDTO).collect(Collectors.toList());
+      return ResultBody.success(list);
+    }
+    return ResultBody.success();
+  }
 }

src/main/resources/mapper/CategoriesDao.xml

@@ -223,6 +223,18 @@
             AND c2.is_deleted = 0
         WHERE c1.id = #{id}
     </select>
+    <select id="getSubClassifyList" resultType="com.mmc.pms.entity.Categories">
+        select id,
+               parent_id,
+               directory_id,
+               `name`,
+               icon,
+               description,
+               remark,
+               create_time
+        from categories
+        where parent_id = #{id}
+    </select>
 
     <update id="deleteById">
         UPDATE `categories`

src/main/resources/mapper/WebDeviceDao.xml

@@ -177,10 +177,11 @@
 
     <select id="listWareInfoPage" resultType="com.mmc.pms.entity.GoodsInfo">
         SELECT
-        gi.id,gi.goods_name,img.img_url mainImg
+        gi.id,gi.goods_name,img.img_url mainImg,gd.goods_desc
         FROM
         goods_info gi
         INNER JOIN goods_img img ON gi.id = img.goods_info_id and img.img_type = 0 AND img.is_deleted = 0
+        INNER JOIN goods_detail gd ON gd.goods_info_id = gi.id
         <where>
             gi.is_deleted = 0 and gi.shelf_status = 1 and gi.goods_type = #{type}
             <if test="param.categoryId != null">