From f4e7108a0ad08f75fac4ef3819103c5a6bf21c12 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 12 Jul 2024 16:14:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E6=AC=BE=E8=AE=A1=E5=88=92=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusSalesOrderBorrowerFeign.java | 5 +++ .../BusSalesOrderBorrowerMapper.java | 3 ++ .../BusSalesOrderBorrowerRest.java | 7 ++++ .../BusSalesOrderBorrowerService.java | 4 +++ .../LoanRepaymentScheduleFeign.java | 9 +++++- .../LoanRepaymentScheduleFeignFallback.java | 7 ++-- .../LoanRepaymentScheduleRest.java | 7 ++++ .../LoanRepaymentScheduleService.java | 29 +++++++++++++++++ .../repaymentplan/RepaymentPlanFeign.java | 4 +++ .../RepaymentPlanFeignFallback.java | 5 +++ .../repaymentplan/RepaymentPlanVehWxVo.java | 17 ++++++++++ .../risk/repaymentplan/RepaymentPlanWxVo.java | 29 +++++++++++++++++ .../risk/repaymentplan/RepaymentPlanRest.java | 5 +++ .../repaymentplan/RepaymentPlanService.java | 32 ++++++++++++++++--- 14 files changed, 156 insertions(+), 7 deletions(-) create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanVehWxVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanWxVo.java diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java index ccd51f2e89..1ece09d950 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java @@ -114,4 +114,9 @@ public interface BusSalesOrderBorrowerFeign { @ApiOperation("批量保存") @PostMapping("/saveList") ResultBean saveList(@RequestBody List borrowers); + + @ApiOperation("根据客户sid查询贷款人sid") + @PostMapping("/selectByCustomSid") + @ResponseBody + ResultBean selectByCustomSid(@RequestParam("customSid") String customSid); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java index 090548d0b3..ce57ecac82 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java @@ -104,4 +104,7 @@ public interface BusSalesOrderBorrowerMapper extends BaseMapper list); + + @Select("select sid from bus_sales_order_loancontract where customSid = #{customSid}") + String selectByCustomSid(String customSid); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerRest.java index ab183ed049..279c8b0a08 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerRest.java @@ -138,4 +138,11 @@ public class BusSalesOrderBorrowerRest implements BusSalesOrderBorrowerFeign { int i = busSalesOrderBorrowerService.saveList(borrowers); return rb.success(); } + + @Override + public ResultBean selectByCustomSid(String customSid) { + ResultBean rb = ResultBean.fireFail(); + String borrowerSid = busSalesOrderBorrowerService.selectByCustomSid(customSid); + return rb.success().setData(borrowerSid); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java index 4999d706d0..d6735ee3dd 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java @@ -333,4 +333,8 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService borrowers) { return baseMapper.saveList(borrowers); } + + public String selectByCustomSid(String customSid) { + return baseMapper.selectByCustomSid(customSid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java index fd2236b6aa..fc635f37e6 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java @@ -121,5 +121,12 @@ public interface LoanRepaymentScheduleFeign { @ResponseBody public ResultBean> getRepaymentPlanListByVinNo(@RequestParam("vinNo") String vinNo, @RequestParam("sid") String sid); - + /** + * 根据条件分页查询数据的列表（已测试） + * + */ + @ApiOperation("微信小程序还款计划列表") + @PostMapping("/getRepaymentPlanListWx") + @ResponseBody + ResultBean> getRepaymentPlanListWx(PagerQuery pagerQuery); } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java index cbe93a8ce2..ca2739cae9 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java @@ -22,8 +22,6 @@ import java.util.List; @Component public class LoanRepaymentScheduleFeignFallback implements LoanRepaymentScheduleFeign { - - @Override public ResultBean loanCreateSchedule(String salesOrderSid) { return null; @@ -104,4 +102,9 @@ public class LoanRepaymentScheduleFeignFallback implements LoanRepaymentSchedule public ResultBean> getRepaymentPlanListByVinNo(String vinNo,String sid) { return null; } + + @Override + public ResultBean> getRepaymentPlanListWx(PagerQuery pagerQuery) { + return null; + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java index 52519a25c8..c62a782a18 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java @@ -120,4 +120,11 @@ public class LoanRepaymentScheduleRest implements LoanRepaymentScheduleFeign { public ResultBean> getRepaymentPlanListByVinNo(String vinNo,String sid) { return loanRepaymentScheduleService.getRepaymentPlanListByVinNo(vinNo,sid); } + + @Override + public ResultBean> getRepaymentPlanListWx(PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo page = loanRepaymentScheduleService.getRepaymentPlanListWx(pq); + return rb.success().setData(page); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java index 3977e55312..0c6f178c89 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java @@ -6949,4 +6949,33 @@ public class LoanRepaymentScheduleService extends MybatisBaseService getRepaymentPlanListWx(PagerQuery pq) { + IPage page = PagerUtil.queryToPage(pq); + AppRepaymentPlanQuery pagerQuery = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("isDelete", 0); + qw.orderByDesc("createTime"); + String userSid = pagerQuery.getUserSid(); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData(); + CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.selByMobile(sysUserVo.getMobile()).getData(); + String borrSid = busSalesOrderBorrowerFeign.selectByCustomSid(crmCustomerTempVo.getSid()).getData(); + qw.eq("borrowerSid", borrSid); + if (StringUtils.isNotBlank(pagerQuery.getNames())) { + qw.and(wrapper -> wrapper.like("loanContractNo", pagerQuery.getNames()).or().like("borrowerName", pagerQuery.getNames()).or().like("bankName", pagerQuery.getNames())); + } + IPage pagging = baseMapper.getRepaymentPlanList(page, qw); + List records = pagging.getRecords(); + records.removeAll(Collections.singleton(null)); + if (!records.isEmpty()) { + String urlPrefix = docPdfComponent.getPrefixTemplateUrl(); + for (AppRepaymentPlanVo record : records) { + if (StringUtils.isNotBlank(record.getDownloadUrl())) { + record.setDownloadUrl(urlPrefix + record.getDownloadUrl()); + } + } + } + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanFeign.java index 015969a206..7f337ef0b2 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanFeign.java @@ -29,6 +29,10 @@ public interface RepaymentPlanFeign { @ResponseBody public ResultBean> getRepaymentPlanList(@RequestBody PagerQuery pq); + @ApiOperation("微信小程序还款计划列表") + @PostMapping("/getRepaymentPlanListWx") + @ResponseBody + public ResultBean> getRepaymentPlanListWx(@RequestBody PagerQuery pq); @ApiOperation("查看还款计划表") @GetMapping("/getRepaymentPlanListBySid") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanFeignFallback.java index e8c1a3fae8..def09b0c0b 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanFeignFallback.java @@ -22,6 +22,11 @@ public class RepaymentPlanFeignFallback implements RepaymentPlanFeign { return null; } + @Override + public ResultBean> getRepaymentPlanListWx(PagerQuery pq) { + return null; + } + @Override public ResultBean getRepaymentPlanListBySid(String sid) { return null; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanVehWxVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanVehWxVo.java new file mode 100644 index 0000000000..26fc876483 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanVehWxVo.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.terminal.api.risk.repaymentplan; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/8/28 10:33 + */ +@Data +public class RepaymentPlanVehWxVo implements Vo { + + @ApiModelProperty("车架号") + private String vinNo; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanWxVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanWxVo.java new file mode 100644 index 0000000000..aa92b83616 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanWxVo.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.terminal.api.risk.repaymentplan; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/8/28 10:33 + */ +@Data +public class RepaymentPlanWxVo implements Vo { + + @ApiModelProperty("业务sid") + private String sid; + @ApiModelProperty("消贷合同编号") + private String contractId; + @ApiModelProperty("贷款人名称") + private String lenderName; + @ApiModelProperty("金融产品") + private String financial; + @ApiModelProperty("销售专员") + private String salesName; + @ApiModelProperty("车辆信息") + private List repaymentPlanVehWxVoList; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repaymentplan/RepaymentPlanRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repaymentplan/RepaymentPlanRest.java index 04e328afa0..e84329b4a7 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repaymentplan/RepaymentPlanRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repaymentplan/RepaymentPlanRest.java @@ -31,6 +31,11 @@ public class RepaymentPlanRest implements RepaymentPlanFeign { return repaymentPlanService.getRepaymentPlanList(pq); } + @Override + public ResultBean> getRepaymentPlanListWx(PagerQuery pq) { + return repaymentPlanService.getRepaymentPlanListWx(pq); + } + @Override public ResultBean getRepaymentPlanListBySid(String sid) { return repaymentPlanService.getRepaymentPlanListBySid(sid); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repaymentplan/RepaymentPlanService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repaymentplan/RepaymentPlanService.java index f7da5eaa59..d5f994c24d 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repaymentplan/RepaymentPlanService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repaymentplan/RepaymentPlanService.java @@ -7,10 +7,7 @@ import com.yxt.anrui.terminal.api.risk.mortgage.AppMortgageInformationTransactDe import com.yxt.anrui.terminal.api.risk.mortgage.AppMortgageInformationTransactDto; import com.yxt.anrui.terminal.api.risk.mortgage.AppMortgageInformationTransactQuery; import com.yxt.anrui.terminal.api.risk.mortgage.AppMortgageInformationTransactVo; -import com.yxt.anrui.terminal.api.risk.repaymentplan.RepaymentPlanDetailsVo; -import com.yxt.anrui.terminal.api.risk.repaymentplan.RepaymentPlanListDetailsVo; -import com.yxt.anrui.terminal.api.risk.repaymentplan.RepaymentPlanQuery; -import com.yxt.anrui.terminal.api.risk.repaymentplan.RepaymentPlanVo; +import com.yxt.anrui.terminal.api.risk.repaymentplan.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -70,4 +67,31 @@ public class RepaymentPlanService { } return rb.success().setData(vo); } + + public ResultBean> getRepaymentPlanListWx(PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pagerVo = new PagerVo<>(); + PagerQuery pagerQuery = new PagerQuery<>(); + BeanUtil.copyProperties(pq, pagerQuery); + ResultBean> repaymentPlanList = loanRepaymentScheduleFeign.getRepaymentPlanListWx(pagerQuery); + if (repaymentPlanList.getSuccess()) { + PagerVo data = repaymentPlanList.getData(); + BeanUtil.copyProperties(data, pagerVo); + List vehWxVos = new ArrayList<>(); + for (AppRepaymentPlanVo record : data.getRecords()) { + String vinNo = record.getVinNo(); + String[] vinNos = vinNo.split(","); + for (String no : vinNos) { + RepaymentPlanVehWxVo repaymentPlanVehWxVo = new RepaymentPlanVehWxVo(); + repaymentPlanVehWxVo.setVinNo(no); + vehWxVos.add(repaymentPlanVehWxVo); + } + } + List records = pagerVo.getRecords(); + for (RepaymentPlanWxVo record : records) { + record.setRepaymentPlanVehWxVoList(vehWxVos); + } + } + return rb.success().setData(pagerVo); + } }