From 391f69b5ee4e2b236950d47902d5af5ae6f576ba Mon Sep 17 00:00:00 2001
From: = <=>
Date: Wed, 12 May 2021 22:46:20 +0800
Subject: [PATCH] =?UTF-8?q?'=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bweb/controller/HighMerchantController.java   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighMerchantController.java b/hai-bweb/src/main/java/com/bweb/controller/HighMerchantController.java
index bba8ad97..13316cdb 100644
--- a/hai-bweb/src/main/java/com/bweb/controller/HighMerchantController.java
+++ b/hai-bweb/src/main/java/com/bweb/controller/HighMerchantController.java
@@ -254,4 +254,19 @@ public class HighMerchantController {
             return ResponseMsgUtil.exception(e);
         }
     }
+
+    @RequestMapping(value="/getMerchantListByCompany",method = RequestMethod.GET)
+    @ResponseBody
+    @ApiOperation(value = "根据公司 查询商户列表")
+    public ResponseData getMerchantListByCompany(@RequestParam(name = "companyId", required = false) Long companyId) {
+        try {
+            Map<String, Object> map = new HashMap<>();
+            map.put("companyId", companyId);
+            return ResponseMsgUtil.success(highMerchantService.getMerchantList(map));
+
+        } catch (Exception e) {
+            log.error("HighMerchantController -> getMerchantListByCompany() error!",e);
+            return ResponseMsgUtil.exception(e);
+        }
+    }
 }