From 6aba08aa00ecc3b86f4d93b589ba281809136ff9 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 13 Jul 2022 16:59:03 +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=E5=88=86=E9=A1=B5=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basedistributor/BaseDistributorFeign.java | 5 +++ .../BaseDistributorFeignFallback.java | 7 +++ .../app/BaseDistributorsQuery.java | 21 +++++++++ .../app/BaseDistributorsVo.java | 32 ++++++++++++++ .../BusVehicleApplyDetailsVo.java | 5 +++ .../BaseDistributorMapper.java | 3 ++ .../basedistributor/BaseDistributorMapper.xml | 17 ++++++++ .../basedistributor/BaseDistributorRest.java | 9 ++++ .../BaseDistributorService.java | 20 +++++++++ .../BusVehicleApplyService.java | 17 ++++++++ .../api/busdelivered/BusDelivered.java | 2 + .../api/busdelivered/BusDeliveredDto.java | 3 ++ .../distributor/DistributorFeign.java | 30 +++++++++++++ .../distributor/DistributorFeignFallback.java | 12 ++++++ .../distributor/DistributorQuery.java | 19 ++++++++ .../distributor/DistributorVo.java | 37 ++++++++++++++++ .../intermediary/MiddlemanFeign.java | 2 +- .../distributor/DistributorRest.java | 31 +++++++++++++ .../distributor/DistributorService.java | 43 +++++++++++++++++++ 19 files changed, 314 insertions(+), 1 deletion(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsQuery.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorFeign.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorFeignFallback.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorVo.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorRest.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorService.java 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 a78da6c269..3bed397f1b 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 @@ -2,6 +2,8 @@ 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.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -84,5 +86,8 @@ public interface BaseDistributorFeign { @PostMapping("/getDistributorList") ResultBean> getDistributorList(@RequestBody PagerQuery pagerQuery); + @ApiOperation("移动端-经销商分页列表") + @PostMapping("/getDistributorListOne") + ResultBean> getDistributorListOne(@RequestBody PagerQuery pagerQuery); } \ 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 7c3a4215b4..a44aa3fa99 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 @@ -2,6 +2,8 @@ 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.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -83,5 +85,10 @@ public class BaseDistributorFeignFallback implements BaseDistributorFeign { return null; } + @Override + public ResultBean> getDistributorListOne(PagerQuery pagerQuery) { + 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/app/BaseDistributorsQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsQuery.java new file mode 100644 index 0000000000..bae9dad06c --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsQuery.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.base.api.basedistributor.app; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/7/13 15:39 + * @Description + */ +@Data +public class BaseDistributorsQuery implements Query { + private static final long serialVersionUID = 5154070887643571544L; + @ApiModelProperty(value = "优先名称") + private String name; + @ApiModelProperty(value = "用户sid") + private String userSid; + + +} 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 new file mode 100644 index 0000000000..b8412f8d51 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsVo.java @@ -0,0 +1,32 @@ +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/8 17:52 + * @Description + */ +@Data +public class BaseDistributorsVo implements Vo { + private static final long serialVersionUID = 5914392219484987169L; + + @ApiModelProperty(value = "经销商名称") + private String disName; + @ApiModelProperty(value = "经销商sid") + private String sid; + @ApiModelProperty(value = "状态") + private String state; + @ApiModelProperty(value = "所属经销商") + private String pDistributorName; + @ApiModelProperty(value = "统一信用代码") + private String registNum; + @ApiModelProperty(value = "注册地址") + private String registDetailAddress; + @ApiModelProperty(value = "经销商开票信息联系电话") + private String invoPhone; + @ApiModelProperty(value = "成立日期") + private String setUpTime; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java index eb2dc64acc..0d5a2bc7e1 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java @@ -1,5 +1,7 @@ package com.yxt.anrui.base.api.busvehicleapply; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; @@ -34,6 +36,9 @@ public class BusVehicleApplyDetailsVo implements Vo { private String remarks; @ApiModelProperty("申请人sid") private String createBySid; + @ApiModelProperty(value = "当前订金金额") + @JsonSerialize(using = ToStringSerializer.class) + private String currentAmount; @ApiModelProperty("车辆排产申请详情") private List busVehicleApplyDetailVoList = new ArrayList<>(); } 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 e37e6049aa..579f5724f5 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 @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; 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.basemiddleman.BaseMiddleman; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -103,4 +104,6 @@ public interface BaseDistributorMapper extends BaseMapper { * @return */ IPage getDistributorList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage getDistributorListOne(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } \ 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 609c84f119..d42bf3a787 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 @@ -115,4 +115,21 @@ select sid, disName orgName, pDistributorName, registNum, contract, mobile from base_distributor ${ew.customSqlSegment} + + \ 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 677028a60d..70293795a9 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 @@ -4,6 +4,8 @@ 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.biz.basedistributorappendix.BaseDistributorAppendixService; import com.yxt.anrui.base.biz.basedistributorlegal.BaseDistributorLegalService; import com.yxt.anrui.base.biz.basedistributorperson.BaseDistributorPersonService; @@ -188,4 +190,11 @@ public class BaseDistributorRest implements BaseDistributorFeign { PagerVo pv = baseDistributorService.getDistributorList(pagerQuery); return rb.success().setMsg("当前共查询到" + pv.getTotal() + "条记录").setData(pv); } + + @Override + public ResultBean> getDistributorListOne(PagerQuery pagerQuery) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = baseDistributorService.getDistributorListOne(pagerQuery); + return rb.success().setData(pv); + } } 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 5d92e1bd68..03303c73d7 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 @@ -6,6 +6,8 @@ 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.basedistributorappendix.BaseDistributorAppendix; import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendixDto; import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendixVo; @@ -525,4 +527,22 @@ public class BaseDistributorService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } + + public PagerVo getDistributorListOne(PagerQuery pagerQuery) { + IPage page = PagerUtil.queryToPage(pagerQuery); + BaseDistributorsQuery params = pagerQuery.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (params != null) { + if (StringUtils.isNotBlank(params.getUserSid())) { + ResultBean resultBean = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()); + qw.eq("bd.useOrg", resultBean.getData()); + } + if (StringUtils.isNotBlank(params.getName())) { + qw.like("bd.disName", params.getName()); + } + } + IPage pagging = baseMapper.getDistributorListOne(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java index 794b5141d5..a53d4f69ab 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java @@ -168,6 +168,7 @@ public class BusVehicleApplyService extends MybatisBaseService saveOrUpdateDto(BusVehicleApplyDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = dto.getSid(); @@ -179,13 +180,21 @@ public class BusVehicleApplyService extends MybatisBaseService busVehicleApplyDetailDtoList = dto.getBusVehicleApplyDetailDtoList(); for (BusVehicleApplyDetailDto busVehicleApplyDetailDto : busVehicleApplyDetailDtoList) { BusVehicleApplyDetail busVehicleApplyDetail = new BusVehicleApplyDetail(); BeanUtil.copyProperties(busVehicleApplyDetailDto, busVehicleApplyDetail, "sid"); busVehicleApplyDetail.setApplySid(entity.getSid()); + if (StringUtils.isNotBlank(busVehicleApplyDetailDto.getApplyForDeposit())) { + bigDecimalAll = bigDecimalAll.add(new BigDecimal(busVehicleApplyDetailDto.getApplyForDeposit())); + } busVehicleApplyDetailService.insert(busVehicleApplyDetail); } + if (bigDecimalAll.compareTo(new BigDecimal(dto.getCurrentAmount())) != 0) { + return rb.setMsg("申请订金合计计算错误"); + } + entity.setCurrentAmount(bigDecimalAll); baseMapper.insert(entity); sid = entity.getSid(); } else {//修改 @@ -195,13 +204,21 @@ public class BusVehicleApplyService extends MybatisBaseService busVehicleApplyDetailDtoList = dto.getBusVehicleApplyDetailDtoList(); for (BusVehicleApplyDetailDto busVehicleApplyDetailDto : busVehicleApplyDetailDtoList) { BusVehicleApplyDetail busVehicleApplyDetail = new BusVehicleApplyDetail(); BeanUtil.copyProperties(busVehicleApplyDetailDto, busVehicleApplyDetail, "sid"); busVehicleApplyDetail.setApplySid(dto.getSid()); + if (StringUtils.isNotBlank(busVehicleApplyDetailDto.getApplyForDeposit())) { + bigDecimalAll = bigDecimalAll.add(new BigDecimal(busVehicleApplyDetailDto.getApplyForDeposit())); + } busVehicleApplyDetailService.insert(busVehicleApplyDetail); } + if (bigDecimalAll.compareTo(new BigDecimal(dto.getCurrentAmount())) != 0) { + return rb.setMsg("申请订金合计计算错误"); + } + busVehicleApply.setCurrentAmount(bigDecimalAll); baseMapper.updateById(busVehicleApply); } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDelivered.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDelivered.java index 0efe961b47..ce20d7bbf8 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDelivered.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDelivered.java @@ -66,5 +66,7 @@ public class BusDelivered extends BaseEntity { private String idNo; @ApiModelProperty(value = "联系地址") private String address; + @ApiModelProperty(value = "成交价") + private String price; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredDto.java index 9e12868428..7b97ac62b5 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredDto.java @@ -69,4 +69,7 @@ public class BusDeliveredDto implements Dto { @ApiModelProperty(value = "联系地址") private String address; + @ApiModelProperty(value = "成交价") + private String price; + } \ No newline at end of file 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 new file mode 100644 index 0000000000..5c27d5a9f0 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorFeign.java @@ -0,0 +1,30 @@ +package com.yxt.anrui.terminal.api.autoservice.distributor; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +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; + +/** + * @Author dimengzhe + * @Date 2022/7/13 14:38 + * @Description + */ +@Api(tags = "经销商") +@FeignClient( + contextId = "anrui-terminal-Distributor", + name = "anrui-terminal", + path = "/autoservice/v1/distributor", + fallback = DistributorFeignFallback.class) +public interface DistributorFeign { + + @ApiOperation("移动端-经销商分页列表") + @PostMapping("/getDistributorList") + @ResponseBody + ResultBean> getDistributorList(@RequestBody PagerQuery pagerQuery); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorFeignFallback.java new file mode 100644 index 0000000000..2e1949d83a --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorFeignFallback.java @@ -0,0 +1,12 @@ +package com.yxt.anrui.terminal.api.autoservice.distributor; + +import org.springframework.stereotype.Component; + +/** + * @Author dimengzhe + * @Date 2022/7/13 14:39 + * @Description + */ +@Component +public class DistributorFeignFallback { +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorQuery.java new file mode 100644 index 0000000000..c9b9ab7bd7 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorQuery.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.terminal.api.autoservice.distributor; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/7/13 16:20 + * @Description + */ +@Data +public class DistributorQuery implements Query { + private static final long serialVersionUID = -3564429656889398105L; + @ApiModelProperty(value = "用户sid") + private String userSid; + @ApiModelProperty(value = "名称") + private String name; +} 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 new file mode 100644 index 0000000000..d85d1547dc --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorVo.java @@ -0,0 +1,37 @@ +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/13 14:40 + * @Description + */ +@Data +public class DistributorVo implements Vo { + private static final long serialVersionUID = -5685583365459129962L; + + @ApiModelProperty(value = "经销商sid") + private String sid; + @ApiModelProperty(value = "经销商名称") + @JsonProperty("distributorName") + private String disName; + @ApiModelProperty(value = "状态") + private String state; + @ApiModelProperty(value = "所属经销商") + private String pDistributorName; + @ApiModelProperty(value = "统一信用代码") + private String registNum; + @ApiModelProperty(value = "注册地址") + private String registDetailAddress; + @ApiModelProperty(value = "经销商开票信息联系电话") + private String invoPhone; + @ApiModelProperty(value = "成立日期") + private String setUpTime; + + + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/intermediary/MiddlemanFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/intermediary/MiddlemanFeign.java index 7cf87c258a..1ae428319e 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/intermediary/MiddlemanFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/intermediary/MiddlemanFeign.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*; */ @Api(tags = "中介人员") @FeignClient( - contextId = "anrui-terminal-BusSalesOrder", + contextId = "anrui-terminal-Middleman", name = "anrui-terminal", path = "/autoservice/v1/intermediary", fallback = MiddlemanFeignFallback.class) 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 new file mode 100644 index 0000000000..52786393f7 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorRest.java @@ -0,0 +1,31 @@ +package com.yxt.anrui.terminal.biz.autoservice.distributor; + +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; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * @Author dimengzhe + * @Date 2022/7/13 16:22 + * @Description + */ +@Api(tags = "经销商") +@Controller +@RequestMapping("/autoservice/v1/distributor") +public class DistributorRest implements DistributorFeign { + + @Autowired + private DistributorService distributorService; + + @Override + public ResultBean> getDistributorList(PagerQuery pagerQuery) { + return distributorService.pageList(pagerQuery); + } +} 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 new file mode 100644 index 0000000000..6fb2bc7e49 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorService.java @@ -0,0 +1,43 @@ +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.BaseDistributorsQuery; +import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsVo; +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; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +/** + * @Author dimengzhe + * @Date 2022/7/13 16:22 + * @Description + */ +@Service +public class DistributorService { + + @Autowired + private BaseDistributorFeign baseDistributorFeign; + + public ResultBean> pageList(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerQuery pq = CoverUtils.getPagerQuery(pagerQuery); + ResultBean> resultBean = baseDistributorFeign.getDistributorListOne(pq); + List voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), DistributorVo.class)).collect(Collectors.toList()); + PagerVo v = new PagerVo<>(); + BeanUtil.copyProperties(resultBean.getData(), v); + v.setRecords(voList); + return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v); + } +}