feign接口

mec-client-api/src/main/java/com/ym/mec/mall/MallFeignService.java

@@ -3,15 +3,15 @@ package com.ym.mec.mall;
 import com.baomidou.mybatisplus.extension.api.R;
 import com.baomidou.mybatisplus.extension.enums.ApiErrorCode;
 import com.ym.mec.common.config.FeignConfiguration;
-import com.ym.mec.common.dto.OrderCreate;
-import com.ym.mec.common.dto.PmsProductDto;
-import com.ym.mec.common.dto.PmsProductQueryParamDto;
+import com.ym.mec.common.dto.*;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.mall.fallback.MallFeignServiceFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @FeignClient(name = "${app-config.open-feign.mall-server.name:mall-server}",
 		contextId = "MallFeignService",
 		url = "${app-config.open-feign.mall-server.url:}",
@@ -36,4 +36,15 @@ public interface MallFeignService {
     @GetMapping(value = "/product/updateOrderStatus", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
     boolean productUpdateOrderStatus(@RequestParam("orderNo") String orderNo,@RequestParam("status") Integer status);
 
+
+    //根据品牌名称分页获取品牌列表
+    @RequestMapping(value = "/brand/list", method = RequestMethod.GET)
+    List<BrandDto> getList();
+
+
+    // 查询所有一级分类及子分类
+    @RequestMapping(value = "/productCategory/list/withChildren", method = RequestMethod.GET)
+    @ResponseBody
+    List<ProductCategoryDto> listWithChildren();
+
 }

mec-client-api/src/main/java/com/ym/mec/mall/fallback/MallFeignServiceFallback.java

@@ -1,8 +1,6 @@
 package com.ym.mec.mall.fallback;
 
-import com.ym.mec.common.dto.OrderCreate;
-import com.ym.mec.common.dto.PmsProductDto;
-import com.ym.mec.common.dto.PmsProductQueryParamDto;
+import com.ym.mec.common.dto.*;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.mall.MallFeignService;
 import org.springframework.stereotype.Component;
@@ -34,5 +32,15 @@ public class MallFeignServiceFallback implements MallFeignService {
         return false;
     }
 
+    @Override
+    public List<BrandDto> getList() {
+        return null;
+    }
+
+    @Override
+    public List<ProductCategoryDto> listWithChildren() {
+        return null;
+    }
+
 
 }

mec-common/common-core/src/main/java/com/ym/mec/common/dto/BrandDto.java

@@ -0,0 +1,13 @@
+package com.ym.mec.common.dto;
+
+import lombok.Data;
+
+@Data
+public class BrandDto {
+
+    // 品牌ID
+    private Long id;
+
+    // 品牌名称
+    private String name;
+}

mec-common/common-core/src/main/java/com/ym/mec/common/dto/ProductCategoryDto.java

@@ -0,0 +1,15 @@
+package com.ym.mec.common.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ProductCategoryDto {
+
+    private Long id;
+
+    private Long parentId;
+
+    private String name;
+}

mec-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/controller/open/OpenController.java

@@ -5,11 +5,15 @@ import com.ym.mec.common.dto.PmsProductDto;
 import com.ym.mec.common.dto.PmsProductQueryParamDto;
 import com.ym.mec.common.page.PageInfo;
 import com.yonge.cooleshow.admin.controller.OmsOrderReturnApplyController;
+import com.yonge.cooleshow.admin.dto.PmsProductCategoryWithChildrenItem;
 import com.yonge.cooleshow.admin.service.OmsOrderReturnApplyService;
+import com.yonge.cooleshow.admin.service.PmsBrandService;
+import com.yonge.cooleshow.admin.service.PmsProductCategoryService;
 import com.yonge.cooleshow.admin.service.PmsProductService;
 import com.yonge.cooleshow.mall.common.api.CommonPage;
 import com.yonge.cooleshow.mall.common.api.CommonResult;
 import com.yonge.cooleshow.mall.common.enums.OrderCacheEnum;
+import com.yonge.cooleshow.mbg.model.PmsBrand;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.redisson.api.RLock;
@@ -47,6 +51,12 @@ public class OpenController {
     @Autowired
     private PmsProductService productService;
 
+    @Autowired
+    private PmsBrandService brandService;
+
+    @Autowired
+    private PmsProductCategoryService productCategoryService;
+
     private static final Logger log = LoggerFactory.getLogger(OmsOrderReturnApplyController.class);
 
     @ApiOperation("完成退货测试接口")
@@ -87,4 +97,21 @@ public class OpenController {
         return pageInfo;
 
     }
+
+
+    @ApiOperation(value = "根据品牌名称分页获取品牌列表")
+    @RequestMapping(value = "/brand/list", method = RequestMethod.GET)
+    @ResponseBody
+    public List<PmsBrand> getList() {
+        List<PmsBrand> brandList = brandService.listBrand("", 1, 9999);
+        return brandList;
+    }
+
+    @ApiOperation("查询所有一级分类及子分类")
+    @RequestMapping(value = "/productCategory/list/withChildren", method = RequestMethod.GET)
+    @ResponseBody
+    public List<PmsProductCategoryWithChildrenItem> listWithChildren() {
+        List<PmsProductCategoryWithChildrenItem> list = productCategoryService.listWithChildren();
+        return list;
+    }
 }