From ca07a71498ed65e42a9bd64151f73171134b760e Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 14 Jul 2022 17:53:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF-=E7=BB=8F=E9=94=80?= =?UTF-8?q?=E5=95=86=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basedistributor/BaseDistributor.java | 26 ++++++- .../BaseDistributorDetailsVo.java | 23 +++++- .../basedistributor/BaseDistributorDto.java | 24 ++++-- .../basedistributor/BaseDistributorFeign.java | 10 ++- .../BaseDistributorFeignFallback.java | 10 ++- .../basedistributor/BaseDistributorVo.java | 24 +++++- .../basedistributor/app/BaseDisDetailsVo.java | 27 +++++++ .../app/BaseDistributorsVo.java | 2 + .../api/basedistributor/app/BaseFileVo.java | 26 +++++++ .../api/basedistributor/app/BaseInfoVo.java | 72 ++++++++++++++++++ .../app/BaseInvoiceInfoVo.java | 21 ++++++ .../basedistributor/app/BaseRecordsVo.java | 25 +++++++ .../BaseDistributorMapper.java | 6 ++ .../basedistributor/BaseDistributorMapper.xml | 33 ++++++++ .../basedistributor/BaseDistributorRest.java | 10 ++- .../BaseDistributorService.java | 40 ++++++++-- .../BaseDistributorAppendixMapper.java | 2 + .../BaseDistributorAppendixMapper.xml | 30 +++++--- .../BaseDistributorAppendixService.java | 5 ++ .../BaseDistributorStaffMapper.java | 3 + .../BaseDistributorStaffMapper.xml | 25 +++++-- .../BaseDistributorStaffService.java | 5 ++ .../distributor/DisBaseInfoVo.java | 75 +++++++++++++++++++ .../autoservice/distributor/DisDetailsVo.java | 25 +++++++ .../autoservice/distributor/DisFileVo.java | 26 +++++++ .../distributor/DisIncoinceInfoVo.java | 22 ++++++ .../autoservice/distributor/DisRecordVo.java | 26 +++++++ .../distributor/DistributorFeign.java | 10 ++- .../distributor/DistributorVo.java | 2 + .../distributor/DistributorRest.java | 6 ++ .../distributor/DistributorService.java | 13 ++++ 31 files changed, 593 insertions(+), 61 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDisDetailsVo.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseFileVo.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseInfoVo.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseInvoiceInfoVo.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseRecordsVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisBaseInfoVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisDetailsVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisFileVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisIncoinceInfoVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisRecordVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributor.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributor.java index 2a8f50c71a..9af51447ae 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributor.java +++ b/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; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorDetailsVo.java index 6eef3c5db2..99541a864a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorDetailsVo.java +++ b/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; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorDto.java index 34f92f27bb..ca99df98a4 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorDto.java +++ b/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; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java index 3bed397f1b..c9b4f4f9c9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java +++ b/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> getBaseDistributorList(@SpringQueryMap PcBaseDistributorQuery query); + //---------------------------------------移动端-------------------------------------------------// + @ApiOperation("移动端-销售订单-经销商分页列表") @PostMapping("/getDistributorList") ResultBean> getDistributorList(@RequestBody PagerQuery pagerQuery); @@ -90,4 +89,7 @@ public interface BaseDistributorFeign { @PostMapping("/getDistributorListOne") ResultBean> getDistributorListOne(@RequestBody PagerQuery pagerQuery); + @ApiOperation("移动-经销商详情") + @GetMapping("/getDistributorDetail/{sid}") + ResultBean getDistributorDetail(@PathVariable("sid") String sid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java index a44aa3fa99..9d1f67a8dc 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java +++ b/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 getDistributorDetail(String distributorSid) { + return null; + } + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorVo.java index 2b0902e886..8c3c617c99 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorVo.java +++ b/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("联系人手机号码") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDisDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDisDetailsVo.java new file mode 100644 index 0000000000..49ac1bf739 --- /dev/null +++ b/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 records; + + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsVo.java index b8412f8d51..3f75aa9f16 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsVo.java +++ b/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; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseFileVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseFileVo.java new file mode 100644 index 0000000000..9db2b87625 --- /dev/null +++ b/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 businessLicense = new ArrayList<>(); + @ApiModelProperty(value = "道路运输许可证") + private List transportPermit = new ArrayList<>(); + @ApiModelProperty(value = "法人身份证") + private List corporateIdCard = new ArrayList<>(); + @ApiModelProperty(value = "其他资料") + private List otherInfo = new ArrayList<>(); +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseInfoVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseInfoVo.java new file mode 100644 index 0000000000..3bb8c0bdc2 --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseInvoiceInfoVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseInvoiceInfoVo.java new file mode 100644 index 0000000000..677d7e860a --- /dev/null +++ b/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; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseRecordsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseRecordsVo.java new file mode 100644 index 0000000000..edbfcdbe7a --- /dev/null +++ b/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; +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java index 579f5724f5..f48c4d0eb9 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java +++ b/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 { IPage getDistributorList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); IPage getDistributorListOne(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + BaseInfoVo getDistributorDetail(String sid); + + BaseInvoiceInfoVo getInfo(String sid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml index d42bf3a787..e750f68316 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml @@ -132,4 +132,37 @@ ${ew.sqlSegment} + + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java index 70293795a9..539d3ec140 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java +++ b/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 pv = baseDistributorService.getDistributorListOne(pagerQuery); return rb.success().setData(pv); } + + @Override + public ResultBean getDistributorDetail(String distributorSid) { + return baseDistributorService.getDistributorDetail(distributorSid); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java index 03303c73d7..5b84ecc9da 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java +++ b/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(安瑞基础信息模块)
@@ -545,4 +539,34 @@ public class BaseDistributorService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } + + public ResultBean getDistributorDetail(String sid) { + ResultBean 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 businessLicense = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "0001"); + List transportPermit = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "0002"); + List corporateIdCard = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "0003"); + List otherInfo = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "0004"); + baseFileVo.setBusinessLicense(businessLicense); + baseFileVo.setOtherInfo(otherInfo); + baseFileVo.setCorporateIdCard(corporateIdCard); + baseFileVo.setTransportPermit(transportPermit); + vo.setFileInfo(baseFileVo); + //人员列表 + List records = baseDistributorStaffService.selectByVo(sid); + records.removeAll(Collections.singleton(null)); + vo.setRecords(records); + return rb.success().setData(vo); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorappendix/BaseDistributorAppendixMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorappendix/BaseDistributorAppendixMapper.java index b4e5169f36..320d9cf40b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorappendix/BaseDistributorAppendixMapper.java +++ b/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 selByLinkSidAndAttachType(@Param("sid") String sid, @Param("attachType") String attachType); + + List selByLinkSidAndAttachTypeOne(@Param("sid") String sid, @Param("s") String s, @Param("path") String path); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorappendix/BaseDistributorAppendixMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorappendix/BaseDistributorAppendixMapper.xml index 2b19032470..e5a271565c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorappendix/BaseDistributorAppendixMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorappendix/BaseDistributorAppendixMapper.xml @@ -2,18 +2,17 @@ + select concat(#{path}, filePath) as filePath + from base_distributor_appendix + where linkSid = #{sid} + and attachType = #{s} + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorappendix/BaseDistributorAppendixService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorappendix/BaseDistributorAppendixService.java index 913848cd23..4b3c3bdea2 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorappendix/BaseDistributorAppendixService.java +++ b/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 selByLinkSidAndAttachType(String sid,String attachType) { return baseMapper.selByLinkSidAndAttachType(sid,attachType); } + + public List selByLinkSidAndAttachTypeOne(String sid, String s) { + String path = fileUploadComponent.getUrlPrefix(); + return baseMapper.selByLinkSidAndAttachTypeOne(sid,s,path); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorstaff/BaseDistributorStaffMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorstaff/BaseDistributorStaffMapper.java index 64e886254e..46aa84efab 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorstaff/BaseDistributorStaffMapper.java +++ b/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 selbyDistributorSid(String sid); + + List selectByVo(String sid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorstaff/BaseDistributorStaffMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorstaff/BaseDistributorStaffMapper.xml index 4719c77262..bbe14e6189 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorstaff/BaseDistributorStaffMapper.xml +++ b/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} - - - - - + + + + + delete from base_distributor_staff where sid = #{sid} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorstaff/BaseDistributorStaffService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorstaff/BaseDistributorStaffService.java index 31433ac87d..97d18bd79c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorstaff/BaseDistributorStaffService.java +++ b/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 selbyDistributorSid(String sid) { return baseMapper.selbyDistributorSid(sid); } + + public List selectByVo(String sid) { + return baseMapper.selectByVo(sid); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisBaseInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisBaseInfoVo.java new file mode 100644 index 0000000000..d48cd46e4f --- /dev/null +++ b/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; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisDetailsVo.java new file mode 100644 index 0000000000..4d8575d212 --- /dev/null +++ b/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 records = new ArrayList<>(); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisFileVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisFileVo.java new file mode 100644 index 0000000000..18807eb235 --- /dev/null +++ b/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 businessLicense = new ArrayList<>(); + @ApiModelProperty(value = "道路运输许可证") + private List transportPermit = new ArrayList<>(); + @ApiModelProperty(value = "法人身份证") + private List corporateIdCard = new ArrayList<>(); + @ApiModelProperty(value = "其他资料") + private List otherInfo = new ArrayList<>(); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisIncoinceInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisIncoinceInfoVo.java new file mode 100644 index 0000000000..67dd5cb40b --- /dev/null +++ b/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; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisRecordVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisRecordVo.java new file mode 100644 index 0000000000..58efd83c66 --- /dev/null +++ b/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; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorFeign.java index 5c27d5a9f0..778ab3dad1 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorFeign.java +++ b/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> getDistributorList(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("移动端-经销商分页列表") + @GetMapping("/getDistributorDetail/{distributorSid}") + @ResponseBody + ResultBean getDistributorDetail(@PathVariable(value = "distributorSid") String distributorSid); + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorVo.java index d85d1547dc..65e3f4475d 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorVo.java +++ b/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; diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorRest.java index 52786393f7..eccdc7855b 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorRest.java +++ b/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> getDistributorList(PagerQuery pagerQuery) { return distributorService.pageList(pagerQuery); } + + @Override + public ResultBean getDistributorDetail(String sid) { + return distributorService.getDistributorDetail(sid); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorService.java index 6fb2bc7e49..0d5ee3d1dc 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorService.java +++ b/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 getDistributorDetail(String sid) { + ResultBean rb = ResultBean.fireFail(); + ResultBean 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); + } }