Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-webapp-plug into developer

src/main/java/com/gic/plug/web/controller/goods/GoodsDomainController.java

@@ -18,21 +18,6 @@ import com.gic.plug.web.vo.goods.GoodsDomainVO;
 @RestController
 public class GoodsDomainController {
 
-    private static Map<String, String> channelCodeAndName;
-
-    private static Map<String, String> channelCodeAndScene;
-
-    static {
-        channelCodeAndName = new HashMap<>();
-        channelCodeAndName.put(Constant.CHANNEL_CODE_ERP, "ERP");
-        channelCodeAndName.put(Constant.CHANNEL_CODE_WEIMOB, "微盟");
-        channelCodeAndName.put(Constant.CHANNEL_CODE_MALL, "GIC微商城");
-        channelCodeAndScene = new HashMap<>();
-        channelCodeAndScene.put(Constant.CHANNEL_CODE_ERP, "erp_goods");
-        channelCodeAndScene.put(Constant.CHANNEL_CODE_WEIMOB, "weimo_goods");
-        channelCodeAndScene.put(Constant.CHANNEL_CODE_MALL, "GIC微商城");
-    }
-
     @Autowired
     private GoodsDomainApiService goodsDomainApiService;
 
@@ -45,7 +30,7 @@ public class GoodsDomainController {
     */
     @RequestMapping("/get-all-goods-domain-list")
     private RestResponse getAllGoodsDomianListWith() {
-        ServiceResponse<List<GoodsDomainDTO>> serviceResponse = goodsDomainApiService.listAll(Constant.TEST_ENTERPRISE_ID);
+        ServiceResponse<List<GoodsDomainDTO>> serviceResponse = goodsDomainApiService.listAll(Constant.TEST_ENTERPRISE_ID, null);
         if (!serviceResponse.isSuccess()) {
             return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
         }
@@ -66,8 +51,8 @@ public class GoodsDomainController {
         for (Map.Entry<String, List<GoodsDomainDTO>> entry : map.entrySet()) {
             GoodsChannelVO goodsChannelVO = new GoodsChannelVO();
             goodsChannelVO.setChannelCode(entry.getKey());
-            goodsChannelVO.setChannelName(channelCodeAndName.get(entry.getKey()));
-            goodsChannelVO.setSceneCode(channelCodeAndScene.get(entry.getKey()));
+            goodsChannelVO.setChannelName(Constant.CHANNEL_CODE_AND_NAME.get(entry.getKey()));
+            goodsChannelVO.setSceneCode(Constant.CHANNEL_CODE_AND_SCENE.get(entry.getKey()));
             goodsChannelVO.setGoodsDomainList(new ArrayList<>());
             for (GoodsDomainDTO goodsDomainDTO : entry.getValue()) {
                 GoodsDomainVO goodsDomainVO = new GoodsDomainVO();