Merge remote-tracking branch 'origin/dev-chw' into dev-chw

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/CompanySearchVO.java

@@ -11,4 +11,6 @@ public class CompanySearchVO extends BranchCompany {
     BigDecimal distance;
 
     String companyName;
+
+    String levelName;
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/AdminCompanyInfoController.java

@@ -60,6 +60,13 @@ public class AdminCompanyInfoController extends BaseController<CompanyInfoApplyB
     }
 
 
+    @GetMapping("info/{id}")
+    @ApiModelProperty("商家信息")
+    public  ObjectRestResponse info(@PathVariable("id") Long id ) {
+        return ObjectRestResponse.succ(companyInfoBiz.selectById(id));
+    }
+
+
     @PostMapping("audit")
     @ApiModelProperty("商家入驻审核")
     public  ObjectRestResponse audit(@RequestBody CompanyInfoApply companyInfoApply) {
@@ -103,4 +110,14 @@ public class AdminCompanyInfoController extends BaseController<CompanyInfoApplyB
     }
 
 
+    @GetMapping("getList")
+    @ApiModelProperty("商家列表")
+    public  ObjectRestResponse getList(CompanyInfoFindDTO companyInfoFindDTO) {
+        return ObjectRestResponse.succ( companyInfoBiz.getList(companyInfoFindDTO));
+    }
+
+
+
+
+
 }

ace-modules/ace-admin/src/main/resources/mapper/BranchCompanyMapper.xml

@@ -22,12 +22,13 @@
     </resultMap>
 
     <select id="search" parameterType="com.github.wxiaoqi.security.admin.dto.CompanySearchDTO" resultType="com.github.wxiaoqi.security.admin.vo.CompanySearchVO">
-        select c.*,i.name as companyName
+        select c.*,i.name as companyName,l.name as levelName
         <if test="lon != null and lat != null">
             , st_distance_sphere(point(#{lon}, #{lat}), point(c.longitude, c.latitude)) as distance
         </if>
         from branch_company c
         LEFT JOIN  company_info i on  c.company_id=i.id
+        LEFT JOIN  branch_company_level l on  c.branch_type=l.level
         <where>
              c.is_del = 0
             <if test="id != null">