店铺管理接口优化

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/GoodsClient.java

@@ -98,8 +98,8 @@ public interface GoodsClient {
      * @param param
      * @return
      */
-    @GetMapping("/goods/getCategoryAndGoods")
-    Map<String, Object> getCategoryAndGoods(@SpringQueryMap GoodsQueryParam param);
+    @GetMapping("/goods/getMerchantGoodsList")
+    List<GoodsDTO> getMerchantGoodsList(@SpringQueryMap GoodsQueryParam param);
 
     /**
      * 获取商品的订单量以及交易金额

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/controller/GoodsController.java

@@ -119,9 +119,9 @@ public class GoodsController {
      * @param param
      * @return
      */
-    @GetMapping("/goods/getCategoryAndGoods")
-    public Map<String, Object> getCategoryAndGoods(GoodsQueryParam param) {
-        return goodsService.getCategoryAndGoods(param);
+    @GetMapping("/goods/getMerchantGoodsList")
+    public List<GoodsDTO> getMerchantGoodsList(GoodsQueryParam param) {
+        return goodsService.getMerchantGoodsList(param);
     }
 
     /**

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/GoodsService.java

@@ -91,7 +91,7 @@ public interface GoodsService extends IService<Goods> {
      * @param param
      * @return
      */
-    Map<String,Object> getCategoryAndGoods(GoodsQueryParam param);
+    List<GoodsDTO> getMerchantGoodsList(GoodsQueryParam param);
 
     /**
      * 获取商品的订单量以及交易金额

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/GoodsServiceImpl.java

@@ -164,7 +164,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
 
 
     @Override
-    public Map<String,Object> getCategoryAndGoods(GoodsQueryParam param){
+    public List<GoodsDTO> getMerchantGoodsList(GoodsQueryParam param){
         Map<String,Object> goodsMap = new HashMap<>();
         List<Goods> goods = this.lambdaQuery()
                 .like(StringUtils.notEmpty(param.getGoodsName()),Goods::getName,param.getGoodsName())
@@ -177,15 +177,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         if (goodsList == null && goodsList.size() < 1 ){
             return null;
         }
-        goodsMap.put("goodsList",goodsList);
-        List<Long> idSet = goodsList.stream()
-                .map(GoodsDTO::getCategoryId) // 将每个Person对象映射到其id
-                .collect(Collectors.toList());
-        if (!idSet.isEmpty()) {
-            List<CategoryDTO> categories = this.categoryService.listCategories(idSet);
-            goodsMap.put("categories",categories);
-        }
-        return goodsMap;
+        return goodsList;
     }
 
     /**