'提交代码'

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);
+        }
+    }
 }