移动端-经销商详情

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributor.java

@@ -32,15 +32,33 @@ public class BaseDistributor extends BaseEntity {
     @ApiModelProperty("统一社会信用代码")
     private String registNum;
     @ApiModelProperty("成立时间")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date setUpTime;
     @ApiModelProperty("注册（登记）地址")
     private String registDetailAddress;
+    /* @ApiModelProperty("经营地址（省市县）code")
+     private String managementAddressCode;
+     @ApiModelProperty("经营地址（省市县）")
+     private String managementAddress;
+     @ApiModelProperty("实际经营地址")
+     private String managementDetailAddress;*/
+    @ApiModelProperty(value = "省")
+    private String provinceCode;
+    @ApiModelProperty(value = "县区")
+    private String cityCode;
     @ApiModelProperty("经营地址（省市县）code")
     private String managementAddressCode;
-    @ApiModelProperty("经营地址（省市县）")
-    private String managementAddress;
-    @ApiModelProperty("实际经营地址")
+
+    @ApiModelProperty(value = "经营地址省")
+    private String managementDetailAddressProvince;
+    @ApiModelProperty(value = "经营地址市")
+    private String managementDetailAddressCity;
+    @ApiModelProperty(value = "经营地址县区")
+    private String managementDetailAddressCounty;
+
+    /*    @ApiModelProperty("经营地址（省市县）")
+        private String managementAddress;*/
+    @ApiModelProperty("实际经营地址:详细地址")
     private String managementDetailAddress;
     @ApiModelProperty("联系人")
     private String contract;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorDetailsVo.java

@@ -3,12 +3,9 @@ package com.yxt.anrui.base.api.basedistributor;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendixDto;
 import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendixVo;
-import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaffDto;
 import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaffVo;
 import com.yxt.common.core.vo.Vo;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -31,11 +28,29 @@ public class BaseDistributorDetailsVo implements Vo {
     private Date setUpTime;
     @ApiModelProperty("注册（登记）地址")
     private String registDetailAddress;
-    @ApiModelProperty("经营地址（省市县）code")
+    /*@ApiModelProperty("经营地址（省市县）code")
     private String managementAddressCode;
     @ApiModelProperty("经营地址（省市县）")
     private String managementAddress;
     @ApiModelProperty("实际经营地址")
+    private String managementDetailAddress;*/
+    @ApiModelProperty(value = "省")
+    private String provinceCode;
+    @ApiModelProperty(value = "县区")
+    private String cityCode;
+    @ApiModelProperty("经营地址（省市县）code")
+    private String managementAddressCode;
+
+    @ApiModelProperty(value = "经营地址省")
+    private String managementDetailAddressProvince;
+    @ApiModelProperty(value = "经营地址市")
+    private String managementDetailAddressCity;
+    @ApiModelProperty(value = "经营地址县区")
+    private String managementDetailAddressCounty;
+
+    /*    @ApiModelProperty("经营地址（省市县）")
+        private String managementAddress;*/
+    @ApiModelProperty("实际经营地址:详细地址")
     private String managementDetailAddress;
     @ApiModelProperty("联系人")
     private String contract;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorDto.java

@@ -3,7 +3,6 @@ package com.yxt.anrui.base.api.basedistributor;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.yxt.anrui.base.api.baseaffiliatcompanyappendix.BaseAffiliatCompanyAppendixDto;
 import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendixDto;
 import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaffDto;
 import com.yxt.common.core.dto.Dto;
@@ -11,8 +10,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
 import java.util.Date;
 import java.util.List;
 
@@ -40,15 +37,28 @@ public class BaseDistributorDto implements Dto {
     @ApiModelProperty("统一社会信用代码")
     private String registNum;
     @ApiModelProperty("成立日期")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date setUpTime;
     @ApiModelProperty("注册（登记）地址")
     private String registDetailAddress;
+
+    @ApiModelProperty(value = "省")
+    private String provinceCode;
+    @ApiModelProperty(value = "县区")
+    private String cityCode;
     @ApiModelProperty("经营地址（省市县）code")
     private String managementAddressCode;
-    @ApiModelProperty("经营地址（省市县）")
-    private String managementAddress;
-    @ApiModelProperty("实际经营地址")
+
+    @ApiModelProperty(value = "经营地址省")
+    private String managementDetailAddressProvince;
+    @ApiModelProperty(value = "经营地址市")
+    private String managementDetailAddressCity;
+    @ApiModelProperty(value = "经营地址县区")
+    private String managementDetailAddressCounty;
+
+/*    @ApiModelProperty("经营地址（省市县）")
+    private String managementAddress;*/
+    @ApiModelProperty("实际经营地址:详细地址")
     private String managementDetailAddress;
     @ApiModelProperty("联系人")
     private String contract;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java

@@ -1,9 +1,6 @@
 package com.yxt.anrui.base.api.basedistributor;
 
-import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsListQuery;
-import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsListVo;
-import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsQuery;
-import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsVo;
+import com.yxt.anrui.base.api.basedistributor.app.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -82,6 +79,8 @@ public interface BaseDistributorFeign {
     @GetMapping("/getBaseDistributorList")
     ResultBean<List<PcBaseDistributorVo>> getBaseDistributorList(@SpringQueryMap PcBaseDistributorQuery query);
 
+    //---------------------------------------移动端-------------------------------------------------//
+
     @ApiOperation("移动端-销售订单-经销商分页列表")
     @PostMapping("/getDistributorList")
     ResultBean<PagerVo<BaseDistributorsListVo>> getDistributorList(@RequestBody PagerQuery<BaseDistributorsListQuery> pagerQuery);
@@ -90,4 +89,7 @@ public interface BaseDistributorFeign {
     @PostMapping("/getDistributorListOne")
     ResultBean<PagerVo<BaseDistributorsVo>> getDistributorListOne(@RequestBody PagerQuery<BaseDistributorsQuery> pagerQuery);
 
+    @ApiOperation("移动-经销商详情")
+    @GetMapping("/getDistributorDetail/{sid}")
+    ResultBean<BaseDisDetailsVo> getDistributorDetail(@PathVariable("sid") String sid);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java

@@ -1,9 +1,6 @@
 package com.yxt.anrui.base.api.basedistributor;
 
-import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsListQuery;
-import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsListVo;
-import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsQuery;
-import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsVo;
+import com.yxt.anrui.base.api.basedistributor.app.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -90,5 +87,10 @@ public class BaseDistributorFeignFallback implements BaseDistributorFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<BaseDisDetailsVo> getDistributorDetail(String distributorSid) {
+        return null;
+    }
+
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorVo.java

@@ -34,16 +34,32 @@ public class BaseDistributorVo implements Vo {
     @ApiModelProperty("统一社会信用代码")
     private String registNum;
     @ApiModelProperty("成立时间")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date setUpTime;
     @ApiModelProperty("注册（登记）地址")
     private String registDetailAddress;
+    /* @ApiModelProperty("经营地址（省市县）code")
+     private String managementAddressCode;
+     @ApiModelProperty("经营地址（省市县）")
+     private String managementAddress;
+     @ApiModelProperty("实际经营地址")
+     private String managementDetailAddress;*/
+    @ApiModelProperty(value = "省")
+    private String provinceCode;
+    @ApiModelProperty(value = "县区")
+    private String cityCode;
     @ApiModelProperty("经营地址（省市县）code")
     private String managementAddressCode;
-    @ApiModelProperty("经营地址（省市县）")
-    private String managementAddress;
-    @ApiModelProperty("实际经营地址")
+
+    @ApiModelProperty(value = "经营地址省")
+    private String managementDetailAddressProvince;
+    @ApiModelProperty(value = "经营地址市")
+    private String managementDetailAddressCity;
+    @ApiModelProperty(value = "经营地址县区")
+    private String managementDetailAddressCounty;
+    @ApiModelProperty("实际经营地址:详细地址")
     private String managementDetailAddress;
+
     @ApiModelProperty("联系人")
     private String contract;
     @ApiModelProperty("联系人手机号码")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDisDetailsVo.java

@@ -0,0 +1,27 @@
+package com.yxt.anrui.base.api.basedistributor.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/14 14:32
+ * @Description
+ */
+@Data
+public class BaseDisDetailsVo implements Vo {
+    private static final long serialVersionUID = 5373789509599475050L;
+    @ApiModelProperty(value = "经销商基础信息")
+    private BaseInfoVo baseInfo;
+    @ApiModelProperty(value = "开票信息")
+    private BaseInvoiceInfoVo invoiceInfo;
+    @ApiModelProperty(value = "附件清单")
+    private BaseFileVo fileInfo;
+    @ApiModelProperty(value = "人员列表")
+    private List<BaseRecordsVo> records;
+
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.base.api.basedistributor.app;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -20,6 +21,7 @@ public class BaseDistributorsVo implements Vo {
     @ApiModelProperty(value = "状态")
     private String state;
     @ApiModelProperty(value = "所属经销商")
+    @JsonProperty("pDistributorName")
     private String pDistributorName;
     @ApiModelProperty(value = "统一信用代码")
     private String registNum;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseFileVo.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.base.api.basedistributor.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/14 16:55
+ * @Description
+ */
+@Data
+public class BaseFileVo implements Vo {
+    private static final long serialVersionUID = -3804365219633341569L;
+    @ApiModelProperty(value = "营业执照")
+    private List<String> businessLicense = new ArrayList<>();
+    @ApiModelProperty(value = "道路运输许可证")
+    private List<String> transportPermit = new ArrayList<>();
+    @ApiModelProperty(value = "法人身份证")
+    private List<String> corporateIdCard = new ArrayList<>();
+    @ApiModelProperty(value = "其他资料")
+    private List<String> otherInfo = new ArrayList<>();
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseInfoVo.java

@@ -0,0 +1,72 @@
+package com.yxt.anrui.base.api.basedistributor.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/14 14:35
+ * @Description
+ */
+@Data
+public class BaseInfoVo implements Vo {
+    private static final long serialVersionUID = 1011189994712618847L;
+
+    @ApiModelProperty(value = "所属经销商")
+    private String pDistributorName;
+    @ApiModelProperty(value = "所属经销商sid")
+    private String pDistributorSid;
+
+    @ApiModelProperty(value = "经销商")
+    private String disName;
+    @ApiModelProperty(value = "统一信用代码")
+    private String registNum;
+
+    @ApiModelProperty(value = "注册地址")
+    private String registDetailAddress;
+
+    @ApiModelProperty(value = "实际经营地址")
+    private String managementDetailAddress;
+
+    @ApiModelProperty(value = "实际经营地址code")
+    private String managementDetailAddressCode;
+
+    @ApiModelProperty(value = "实际经营地址省")
+    private String managementDetailAddressProvince;
+
+    @ApiModelProperty(value = "实际经营地址市")
+    private String managementDetailAddressCity;
+    @ApiModelProperty(value = "实际经营地址县")
+    private String managementDetailAddressCounty;
+
+    @ApiModelProperty(value = "成立日期")
+    private String setUpTime;
+
+    @ApiModelProperty(value = "开始合作日期")
+    private String startCoopDate;
+
+    @ApiModelProperty(value = "是否担保value")
+    private String isGuarantee;
+
+    @ApiModelProperty(value = "是否担保key")
+    private String isGuaranteeKey;
+
+    @ApiModelProperty(value = "实际控制人")
+    private String legalName;
+
+    @ApiModelProperty(value = "身份证号码")
+    private String legalIdCard;
+
+    @ApiModelProperty(value = "实际控制人联系电话")
+    private String legalMobile;
+
+    @ApiModelProperty(value = "负责人")
+    private String contract;
+
+    @ApiModelProperty(value = "负责人联系电话")
+    private String mobile;
+
+    @ApiModelProperty(value = "经销商sid")
+    private String distributorSid;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseInvoiceInfoVo.java

@@ -0,0 +1,21 @@
+package com.yxt.anrui.base.api.basedistributor.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/14 16:51
+ * @Description
+ */
+@Data
+public class BaseInvoiceInfoVo implements Vo {
+    private static final long serialVersionUID = 624910447728208372L;
+    @ApiModelProperty(value = "开票信息")
+    private String invoPhone;
+    @ApiModelProperty(value = "开户行")
+    private String invoBank;
+    @ApiModelProperty(value = "银行账号")
+    private String invoBankNum;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseRecordsVo.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.base.api.basedistributor.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/14 16:59
+ * @Description
+ */
+@Data
+public class BaseRecordsVo implements Vo {
+    private static final long serialVersionUID = -733771436985238343L;
+    @ApiModelProperty(value = "姓名")
+    private String name;
+    @ApiModelProperty(value = "联系电话")
+    private String mobile;
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+    @ApiModelProperty(value = "身份类型")
+    private String identityValue;
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.basedistributor.*;
 import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsListVo;
 import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsVo;
+import com.yxt.anrui.base.api.basedistributor.app.BaseInfoVo;
+import com.yxt.anrui.base.api.basedistributor.app.BaseInvoiceInfoVo;
 import com.yxt.anrui.base.api.basemiddleman.BaseMiddleman;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -106,4 +108,8 @@ public interface BaseDistributorMapper extends BaseMapper<BaseDistributor> {
     IPage<BaseDistributorsListVo> getDistributorList(IPage<BaseDistributorsListVo> page, @Param(Constants.WRAPPER) QueryWrapper<BaseMiddleman> qw);
 
     IPage<BaseDistributorsVo> getDistributorListOne(IPage<BaseDistributor> page, @Param(Constants.WRAPPER) QueryWrapper<BaseDistributor> qw);
+
+    BaseInfoVo getDistributorDetail(String sid);
+
+    BaseInvoiceInfoVo getInfo(String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml

@@ -132,4 +132,37 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="getDistributorDetail" resultType="com.yxt.anrui.base.api.basedistributor.app.BaseInfoVo">
+        select bd.pDistributorName,
+               bd.pDistributorSid,
+               bd.disName,
+               bd.registNum,
+               bd.registDetailAddress,
+               concat_ws('/', bd.provinceCode, bd.cityCode, bd.managementAddressCode) as managementDetailAddressCode,
+               bd.managementDetailAddressProvince,
+               bd.managementDetailAddressCity,
+               bd.managementDetailAddressCounty,
+               bd.managementDetailAddress,
+               DATE_FORMAT(bd.setUpTime, '%Y-%d-%m')                                  as setUpTime,
+               bd.startCoopDate,
+               bd.isGuarantee                                                         as isGuaranteeKey,
+               case bd.isGuarantee
+                   when 1 then '是'
+                   when 0 then '否' end                                                as isGuarantee,
+               bd.legalName,
+               bd.legalIdCard,
+               bd.legalMobile,
+               bd.mobile,
+               bd.sid                                                                    distributorSid,
+               bd.contract
+        from base_distributor bd
+        where bd.sid = #{sid}
+    </select>
+
+    <select id="getInfo" resultType="com.yxt.anrui.base.api.basedistributor.app.BaseInvoiceInfoVo">
+        select bd.invoPhone, bd.invoBank, bd.invoBankNum
+        from base_distributor bd
+        where bd.sid = #{sid}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java

@@ -2,10 +2,7 @@ package com.yxt.anrui.base.biz.basedistributor;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basedistributor.*;
-import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsListQuery;
-import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsListVo;
-import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsQuery;
-import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsVo;
+import com.yxt.anrui.base.api.basedistributor.app.*;
 import com.yxt.anrui.base.biz.basedistributorappendix.BaseDistributorAppendixService;
 import com.yxt.anrui.base.biz.basedistributorlegal.BaseDistributorLegalService;
 import com.yxt.anrui.base.biz.basedistributorperson.BaseDistributorPersonService;
@@ -197,4 +194,9 @@ public class BaseDistributorRest implements BaseDistributorFeign {
         PagerVo<BaseDistributorsVo> pv = baseDistributorService.getDistributorListOne(pagerQuery);
         return rb.success().setData(pv);
     }
+
+    @Override
+    public ResultBean<BaseDisDetailsVo> getDistributorDetail(String distributorSid) {
+        return baseDistributorService.getDistributorDetail(distributorSid);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@@ -4,10 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basedistributor.*;
-import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsListQuery;
-import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsListVo;
-import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsQuery;
-import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsVo;
+import com.yxt.anrui.base.api.basedistributor.app.*;
 import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendix;
 import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendixDto;
 import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendixVo;
@@ -30,10 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Project: anrui-base(安瑞基础信息模块) <br/>
@@ -545,4 +539,34 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
         PagerVo<BaseDistributorsVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+
+    public ResultBean<BaseDisDetailsVo> getDistributorDetail(String sid) {
+        ResultBean<BaseDisDetailsVo> rb = ResultBean.fireFail();
+        BaseDistributor baseDistributor = fetchBySid(sid);
+        if (baseDistributor == null) {
+            return rb.setMsg("该经销商不存在");
+        }
+        BaseDisDetailsVo vo = new BaseDisDetailsVo();
+        BaseInfoVo baseInfoVo = baseMapper.getDistributorDetail(sid);
+        vo.setBaseInfo(baseInfoVo);
+        //开票信息
+        BaseInvoiceInfoVo baseInvoiceInfoVo = baseMapper.getInfo(sid);
+        vo.setInvoiceInfo(baseInvoiceInfoVo);
+        BaseFileVo baseFileVo = new BaseFileVo();
+        //附件清单
+        List<String> businessLicense = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "0001");
+        List<String> transportPermit = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "0002");
+        List<String> corporateIdCard = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "0003");
+        List<String> otherInfo = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "0004");
+        baseFileVo.setBusinessLicense(businessLicense);
+        baseFileVo.setOtherInfo(otherInfo);
+        baseFileVo.setCorporateIdCard(corporateIdCard);
+        baseFileVo.setTransportPermit(transportPermit);
+        vo.setFileInfo(baseFileVo);
+        //人员列表
+        List<BaseRecordsVo> records = baseDistributorStaffService.selectByVo(sid);
+        records.removeAll(Collections.singleton(null));
+        vo.setRecords(records);
+        return rb.success().setData(vo);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorappendix/BaseDistributorAppendixMapper.java

@@ -42,4 +42,6 @@ public interface BaseDistributorAppendixMapper extends BaseMapper<BaseDistributo
 
     @Select("select * from base_distributor_appendix where linkSid = #{sid} and attachType = #{attachType}")
     List<BaseDistributorAppendixVo> selByLinkSidAndAttachType(@Param("sid") String sid, @Param("attachType") String attachType);
+
+    List<String> selByLinkSidAndAttachTypeOne(@Param("sid") String sid, @Param("s") String s, @Param("path") String path);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorappendix/BaseDistributorAppendixMapper.xml

@@ -2,18 +2,17 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.base.biz.basedistributorappendix.BaseDistributorAppendixMapper">
     <select id="selectListVo" resultType="com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendixVo">
-        SELECT
-        bda.sid,
-        -- 文件名
-        bda.fileName,
-        -- 文件类型
-        bda.fileType,
-        -- 上传人
-        bda.createBySid,
-        -- 上传时间
-        bda.createTime,
-        -- 资料路径
-        concat(#{path}, bda.filePath) as filePath
+        SELECT bda.sid,
+               -- 文件名
+               bda.fileName,
+               -- 文件类型
+               bda.fileType,
+               -- 上传人
+               bda.createBySid,
+               -- 上传时间
+               bda.createTime,
+               -- 资料路径
+               concat(#{path}, bda.filePath) as filePath
         FROM base_distributor_appendix bda
         <where>
             ${ew.sqlSegment}
@@ -37,4 +36,11 @@
         from base_distributor_appendix
         where filePath = #{path}
     </delete>
+
+    <select id="selByLinkSidAndAttachTypeOne" resultType="java.lang.String">
+        select concat(#{path}, filePath) as filePath
+        from base_distributor_appendix
+        where linkSid = #{sid}
+          and attachType = #{s}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorappendix/BaseDistributorAppendixService.java

@@ -219,4 +219,9 @@ public class BaseDistributorAppendixService extends MybatisBaseService<BaseDistr
     public List<BaseDistributorAppendixVo> selByLinkSidAndAttachType(String sid,String attachType) {
         return baseMapper.selByLinkSidAndAttachType(sid,attachType);
     }
+
+    public List<String> selByLinkSidAndAttachTypeOne(String sid, String s) {
+        String path = fileUploadComponent.getUrlPrefix();
+        return baseMapper.selByLinkSidAndAttachTypeOne(sid,s,path);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorstaff/BaseDistributorStaffMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.base.api.basedistributor.app.BaseRecordsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -61,4 +62,6 @@ public interface BaseDistributorStaffMapper extends BaseMapper<BaseDistributorSt
 
     @Select("select * from base_distributor_staff where distributorSid = #{sid} AND isDelete = 0")
     List<BaseDistributorStaffVo> selbyDistributorSid(String sid);
+
+    List<BaseRecordsVo> selectByVo(String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorstaff/BaseDistributorStaffMapper.xml

@@ -17,22 +17,33 @@
             --  备注
             remarks
         from base_distributor_staff
-        where isDelete = 0 and distributorSid = #{sid}
+        where isDelete = 0
+          and distributorSid = #{sid}
     </select>
     <select id="selectBySid" resultType="com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaff">
         SELECT *
-        FROM base_distributor_staff WHERE distributorSid = #{sid}
+        FROM base_distributor_staff
+        WHERE distributorSid = #{sid}
     </select>
     <!--根据经销商sid删除人员信息-->
-<!--    <delete id="deleteStaff">-->
-<!--        delete-->
-<!--        from base_distributor_staff-->
-<!--        where distributorSid = #{sid}-->
-<!--    </delete>-->
+    <!--    <delete id="deleteStaff">-->
+    <!--        delete-->
+    <!--        from base_distributor_staff-->
+    <!--        where distributorSid = #{sid}-->
+    <!--    </delete>-->
     <!--根据sid删除人员信息-->
     <delete id="delBySid">
         delete
         from base_distributor_staff
         where sid = #{sid}
     </delete>
+
+    <select id="selectByVo" resultType="com.yxt.anrui.base.api.basedistributor.app.BaseRecordsVo">
+        select bs.name,
+               bs.mobile,
+               bs.remarks,
+               bs.identityValue
+        from base_distributor_staff bs
+        where distributorSid = #{sid}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorstaff/BaseDistributorStaffService.java

@@ -3,6 +3,7 @@ package com.yxt.anrui.base.biz.basedistributorstaff;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basedistributor.app.BaseRecordsVo;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -78,4 +79,8 @@ public class BaseDistributorStaffService extends MybatisBaseService<BaseDistribu
     public List<BaseDistributorStaffVo> selbyDistributorSid(String sid) {
         return baseMapper.selbyDistributorSid(sid);
     }
+
+    public List<BaseRecordsVo> selectByVo(String sid) {
+        return baseMapper.selectByVo(sid);
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisBaseInfoVo.java

@@ -0,0 +1,75 @@
+package com.yxt.anrui.terminal.api.autoservice.distributor;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/14 15:57
+ * @Description
+ */
+@Data
+public class DisBaseInfoVo implements Vo {
+    private static final long serialVersionUID = 542120074428670391L;
+
+    @ApiModelProperty(value = "所属经销商")
+    @JsonProperty("pDistributorName")
+    private String pDistributorName;
+    @ApiModelProperty(value = "所属经销商sid")
+    @JsonProperty("pDistributorSid")
+    private String pDistributorSid;
+
+    @ApiModelProperty(value = "经销商")
+    private String disName;
+    @ApiModelProperty(value = "统一信用代码")
+    private String registNum;
+
+    @ApiModelProperty(value = "注册地址")
+    private String registDetailAddress;
+
+    @ApiModelProperty(value = "实际经营地址")
+    private String managementDetailAddress;
+
+    @ApiModelProperty(value = "实际经营地址code")
+    private String managementDetailAddressCode;
+
+    @ApiModelProperty(value = "实际经营地址省")
+    private String managementDetailAddressProvince;
+
+    @ApiModelProperty(value = "实际经营地址市")
+    private String managementDetailAddressCity;
+    @ApiModelProperty(value = "实际经营地址县")
+    private String managementDetailAddressCounty;
+
+    @ApiModelProperty(value = "成立日期")
+    private String setUpTime;
+
+    @ApiModelProperty(value = "开始合作日期")
+    private String startCoopDate;
+
+    @ApiModelProperty(value = "是否担保value")
+    private String isGuarantee;
+
+    @ApiModelProperty(value = "是否担保key")
+    private String isGuaranteeKey;
+
+    @ApiModelProperty(value = "实际控制人")
+    private String legalName;
+
+    @ApiModelProperty(value = "身份证号码")
+    private String legalIdCard;
+
+    @ApiModelProperty(value = "实际控制人联系电话")
+    private String legalMobile;
+
+    @ApiModelProperty(value = "负责人")
+    private String contract;
+
+    @ApiModelProperty(value = "负责人联系电话")
+    private String mobile;
+
+    @ApiModelProperty(value = "经销商sid")
+    private String distributorSid;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisDetailsVo.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.terminal.api.autoservice.distributor;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/14 15:56
+ * @Description
+ */
+@Data
+public class DisDetailsVo implements Vo {
+    private static final long serialVersionUID = -5987626766518176420L;
+
+    private DisBaseInfoVo baseInfo;
+
+    private DisIncoinceInfoVo invoiceInfo;
+
+    private DisFileVo fileInfo;
+
+    private List<DisRecordVo> records = new ArrayList<>();
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisFileVo.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.terminal.api.autoservice.distributor;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/14 16:08
+ * @Description
+ */
+@Data
+public class DisFileVo implements Vo {
+    private static final long serialVersionUID = -8111648542227774384L;
+    @ApiModelProperty(value = "营业执照")
+    private List<String> businessLicense = new ArrayList<>();
+    @ApiModelProperty(value = "道路运输许可证")
+    private List<String> transportPermit = new ArrayList<>();
+    @ApiModelProperty(value = "法人身份证")
+    private List<String> corporateIdCard = new ArrayList<>();
+    @ApiModelProperty(value = "其他资料")
+    private List<String> otherInfo = new ArrayList<>();
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisIncoinceInfoVo.java

@@ -0,0 +1,22 @@
+package com.yxt.anrui.terminal.api.autoservice.distributor;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/14 16:05
+ * @Description
+ */
+@Data
+public class DisIncoinceInfoVo implements Vo {
+    private static final long serialVersionUID = 3329256771099490666L;
+    @ApiModelProperty(value = "联系电话")
+    private String invoPhone;
+    @ApiModelProperty(value = "开户行")
+    private String invoBank;
+
+    @ApiModelProperty(value = "银行账号")
+    private String invoBankNum;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisRecordVo.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.terminal.api.autoservice.distributor;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/14 16:11
+ * @Description
+ */
+@Data
+public class DisRecordVo implements Vo {
+    private static final long serialVersionUID = -2317202203093022032L;
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "联系电话")
+    private String mobile;
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+    @ApiModelProperty(value = "身份类型")
+    private String identityValue;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorFeign.java

@@ -6,9 +6,7 @@ import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @Author dimengzhe
@@ -27,4 +25,10 @@ public interface DistributorFeign {
     @PostMapping("/getDistributorList")
     @ResponseBody
     ResultBean<PagerVo<DistributorVo>> getDistributorList(@RequestBody PagerQuery<DistributorQuery> pagerQuery);
+
+    @ApiOperation("移动端-经销商分页列表")
+    @GetMapping("/getDistributorDetail/{distributorSid}")
+    @ResponseBody
+    ResultBean<DisDetailsVo> getDistributorDetail(@PathVariable(value = "distributorSid") String distributorSid);
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorVo.java

@@ -15,6 +15,7 @@ public class DistributorVo implements Vo {
     private static final long serialVersionUID = -5685583365459129962L;
 
     @ApiModelProperty(value = "经销商sid")
+    @JsonProperty("distributorSid")
     private String sid;
     @ApiModelProperty(value = "经销商名称")
     @JsonProperty("distributorName")
@@ -22,6 +23,7 @@ public class DistributorVo implements Vo {
     @ApiModelProperty(value = "状态")
     private String state;
     @ApiModelProperty(value = "所属经销商")
+    @JsonProperty("pDistributorName")
     private String pDistributorName;
     @ApiModelProperty(value = "统一信用代码")
     private String registNum;

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorRest.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.biz.autoservice.distributor;
 
+import com.yxt.anrui.terminal.api.autoservice.distributor.DisDetailsVo;
 import com.yxt.anrui.terminal.api.autoservice.distributor.DistributorFeign;
 import com.yxt.anrui.terminal.api.autoservice.distributor.DistributorQuery;
 import com.yxt.anrui.terminal.api.autoservice.distributor.DistributorVo;
@@ -28,4 +29,9 @@ public class DistributorRest implements DistributorFeign {
     public ResultBean<PagerVo<DistributorVo>> getDistributorList(PagerQuery<DistributorQuery> pagerQuery) {
         return distributorService.pageList(pagerQuery);
     }
+
+    @Override
+    public ResultBean<DisDetailsVo> getDistributorDetail(String sid) {
+        return distributorService.getDistributorDetail(sid);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorService.java

@@ -3,8 +3,10 @@ package com.yxt.anrui.terminal.biz.autoservice.distributor;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.yxt.anrui.base.api.basedistributor.BaseDistributorFeign;
+import com.yxt.anrui.base.api.basedistributor.app.BaseDisDetailsVo;
 import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsQuery;
 import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsVo;
+import com.yxt.anrui.terminal.api.autoservice.distributor.DisDetailsVo;
 import com.yxt.anrui.terminal.api.autoservice.distributor.DistributorQuery;
 import com.yxt.anrui.terminal.api.autoservice.distributor.DistributorVo;
 import com.yxt.anrui.terminal.config.CoverUtils;
@@ -40,4 +42,15 @@ public class DistributorService {
         v.setRecords(voList);
         return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v);
     }
+
+    public ResultBean<DisDetailsVo> getDistributorDetail(String sid) {
+        ResultBean<DisDetailsVo> rb = ResultBean.fireFail();
+        ResultBean<BaseDisDetailsVo> getDistributorDetail = baseDistributorFeign.getDistributorDetail(sid);
+        if (!getDistributorDetail.getSuccess()) {
+            return rb.setMsg(getDistributorDetail.getMsg());
+        }
+        DisDetailsVo vo = new DisDetailsVo();
+        BeanUtil.copyProperties(getDistributorDetail.getData(), vo);
+        return rb.success().setData(vo);
+    }
 }