修改商家入驻

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/CompanySearchDTO.java

+package com.github.wxiaoqi.security.admin.dto;
+
+import com.github.wxiaoqi.security.common.vo.DataInter;
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CompanySearchDTO extends PageParam implements DataInter {
+    Integer addrCity;
+    String lon;
+    String lat;
+    Integer state;
+    Integer isShow;
+    Integer isDel;
+    Integer addrProvince;
+
+    Long companyId;
+
+    String name;
+
+    Integer id;
+
+    List<Integer> companyIds;
+
+    List<Integer> dataCorporationIds;
+
+    List<Integer> dataCompanyIds;
+
+
+}

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

@@ -15,6 +15,6 @@ public class CompanyApplyVo extends CompanyInfoApply {
 
 
     @ApiModelProperty("商家名称")
-    private Integer branchName;
+    private String branchName;
 
 }

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

+package com.github.wxiaoqi.security.admin.vo;
+
+
+import com.github.wxiaoqi.security.admin.entity.BranchCompany;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class CompanySearchVO extends BranchCompany {
+    BigDecimal distance;
+
+    String companyName;
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/BranchCompanyMapper.java

@@ -2,10 +2,16 @@ package com.github.wxiaoqi.security.admin.mapper;
 
 
 
+import com.github.wxiaoqi.security.admin.dto.CompanySearchDTO;
 import com.github.wxiaoqi.security.admin.entity.BranchCompany;
+import com.github.wxiaoqi.security.admin.vo.CompanySearchVO;
 import tk.mybatis.mapper.additional.idlist.SelectByIdListMapper;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.util.List;
+
 public interface BranchCompanyMapper extends Mapper<BranchCompany>, SelectByIdListMapper<BranchCompany,Integer> {
 
+    //List<CompanySearchVO> search(CompanySearchDTO companySearchDTO);
+
 }
\ No newline at end of file