From c1eeabca3de851ca493a94b2d5ad19e0a2bf1f4e Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 7 Feb 2024 18:00:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=9B=9E=E8=B4=AD=E7=94=B3?= =?UTF-8?q?=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanRepurchaseApplyDetailsVo.java | 4 +- .../app/AppRepurchaseDetailsVo.java | 3 +- .../LoanRepurchaseApplyMapper.java | 6 + .../LoanRepurchaseApplyMapper.xml | 118 ++++++++++++++++++ .../LoanRepurchaseApplyService.java | 81 ++++++++++-- .../risk/repurchase/RepurchaseDetailsVo.java | 3 +- .../risk/repurchase/RepurchaseService.java | 7 ++ 7 files changed, 210 insertions(+), 12 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyDetailsVo.java index 062c085cc3..93454e7414 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyDetailsVo.java @@ -122,8 +122,10 @@ public class LoanRepurchaseApplyDetailsVo implements Vo { private String bankReceivingAccount; @ApiModelProperty("资方收款账号") private String bankAccountNo; + @ApiModelProperty("付款后需备注内容") + private String payRemarks; private List buyfiles = new ArrayList<>(); // 回购情况附件 - + private String salesOrderSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/app/AppRepurchaseDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/app/AppRepurchaseDetailsVo.java index 181d73a1d1..fff8aebe50 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/app/AppRepurchaseDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/app/AppRepurchaseDetailsVo.java @@ -17,7 +17,6 @@ public class AppRepurchaseDetailsVo { private String sid; private String publishInfo; // 发起部门-发起人 private String time; //申请日期 - private List files = new ArrayList<>(); private String taskId; private String procInsId; @ApiModelProperty("催收记录") @@ -103,6 +102,8 @@ public class AppRepurchaseDetailsVo { private String bankReceivingAccount; @ApiModelProperty("资方收款账号") private String bankAccountNo; + @ApiModelProperty("付款后需备注内容") + private String payRemarks; private List buyfiles = new ArrayList<>(); // 回购情况附件 @ApiModelProperty("销售订单sid") private String salesOrderSid; diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.java index 0e9293cee6..cde60fc65d 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.java @@ -7,7 +7,9 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter; import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo; import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply; +import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyDetailsVo; import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyVo; +import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.app.AppRepurchaseDetailsVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -23,4 +25,8 @@ public interface LoanRepurchaseApplyMapper extends BaseMapper listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + AppRepurchaseDetailsVo appDetail(@Param("sid") String sid); + + LoanRepurchaseApplyDetailsVo fetchDetailsBySid(@Param("sid") String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.xml index c598dd7d2b..950f576db8 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.xml @@ -28,4 +28,122 @@ ${ew.sqlSegment} + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java index 405304a45c..f8b96a4d20 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java @@ -8,15 +8,21 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; +import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; import com.yxt.anrui.riskcenter.api.loanparameter.*; -import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply; -import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyDetailsVo; -import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyQuery; -import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyVo; +import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanSolutionsDetailsssVo; +import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.*; import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.app.AppRepurchaseDetailsVo; +import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; +import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; import com.yxt.anrui.riskcenter.api.loansubletapply.LoanSubletApply; +import com.yxt.anrui.riskcenter.api.loansubletapply.LoanSubletApplyFile; import com.yxt.anrui.riskcenter.api.loansubletapply.LoanSubletApplyQuery; import com.yxt.anrui.riskcenter.api.loansubletapply.LoanSubletApplyVo; +import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService; +import com.yxt.anrui.riskcenter.biz.loansolutions.LoanSolutionsService; +import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -26,6 +32,11 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + /** * @description: @@ -41,7 +52,12 @@ public class LoanRepurchaseApplyService extends MybatisBaseService listPage(PagerQuery pq) { IPage page = PagerUtil.queryToPage(pq); @@ -151,15 +167,62 @@ public class LoanRepurchaseApplyService extends MybatisBaseService fetchDetailsBySid(String sid) { ResultBean rb = ResultBean.fireFail(); - LoanRepurchaseApplyDetailsVo vo = new LoanRepurchaseApplyDetailsVo(); - - + LoanRepurchaseApplyDetailsVo vo = baseMapper.fetchDetailsBySid(sid); + if (vo != null) { + //------金融方案----------- + ResultBean solutionsDetailsVoResultBean = loanSolutionsService.selectDetailss(vo.getSalesOrderSid()); + if (solutionsDetailsVoResultBean.getData() != null) { + LoanRepurchaseSolutionsDetailsssVo solutionsDetailsssVo = new LoanRepurchaseSolutionsDetailsssVo(); + BeanUtil.copyProperties(solutionsDetailsVoResultBean.getData(), solutionsDetailsssVo); + vo.setSolutionsDetailsssVo(solutionsDetailsssVo); + } + List fileList1 = loanFileService.selectByLinkSid(sid, LoanFileEnum.REPURCHASE_BANKFILE.getAttachType()); + fileList1.removeAll(Collections.singleton(null)); + if (!fileList1.isEmpty()) { + List files = fileList1.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()). + collect(Collectors.toList()); + List applyFiles = new ArrayList<>(); + for (String file : files) { + LoanRepurchaseApplyFile applyFile = new LoanRepurchaseApplyFile(); + applyFile.setUrl(file); + applyFiles.add(applyFile); + } + vo.setBankfiles(applyFiles); + } + List fileList2 = loanFileService.selectByLinkSid(sid, LoanFileEnum.REPURCHASE_BACKBUYFILE.getAttachType()); + fileList2.removeAll(Collections.singleton(null)); + if (!fileList2.isEmpty()) { + List files = fileList2.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()). + collect(Collectors.toList()); + List applyFiles = new ArrayList<>(); + for (String file : files) { + LoanRepurchaseApplyFile applyFile = new LoanRepurchaseApplyFile(); + applyFile.setUrl(file); + applyFiles.add(applyFile); + } + vo.setBuyfiles(applyFiles); + } + } return rb.success().setData(vo); } public ResultBean appDetail(String sid) { ResultBean rb = ResultBean.fireFail(); - AppRepurchaseDetailsVo vo = new AppRepurchaseDetailsVo(); + AppRepurchaseDetailsVo vo = baseMapper.appDetail(sid); + List fileList1 = loanFileService.selectByLinkSid(sid, LoanFileEnum.REPURCHASE_BANKFILE.getAttachType()); + fileList1.removeAll(Collections.singleton(null)); + if (!fileList1.isEmpty()) { + List files = fileList1.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()). + collect(Collectors.toList()); + vo.setBankfiles(files); + } + List fileList2 = loanFileService.selectByLinkSid(sid, LoanFileEnum.REPURCHASE_BACKBUYFILE.getAttachType()); + fileList2.removeAll(Collections.singleton(null)); + if (!fileList2.isEmpty()) { + List files = fileList2.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()). + collect(Collectors.toList()); + vo.setBuyfiles(files); + } return rb.success().setData(vo); } } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repurchase/RepurchaseDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repurchase/RepurchaseDetailsVo.java index a5eedf47a1..1b6a068956 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repurchase/RepurchaseDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repurchase/RepurchaseDetailsVo.java @@ -19,7 +19,6 @@ public class RepurchaseDetailsVo implements Vo { private String sid; private String publishInfo; // 发起部门-发起人 private String time; //申请日期 - private List files = new ArrayList<>(); private String taskId; private String procInsId; @ApiModelProperty("催收记录") @@ -105,6 +104,8 @@ public class RepurchaseDetailsVo implements Vo { private String bankReceivingAccount; @ApiModelProperty("资方收款账号") private String bankAccountNo; + @ApiModelProperty("付款后需备注内容") + private String payRemarks; private List buyfiles = new ArrayList<>(); // 回购情况附件 @ApiModelProperty("销售订单sid") private String salesOrderSid; diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repurchase/RepurchaseService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repurchase/RepurchaseService.java index c43e1b50da..e441b5d745 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repurchase/RepurchaseService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repurchase/RepurchaseService.java @@ -12,6 +12,7 @@ import com.yxt.anrui.riskcenter.api.loanredemptionapply.flow.*; import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyFeign; import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.app.AppRepurchaseDetailsVo; import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.flow.*; +import com.yxt.anrui.terminal.api.base.common.CarModelVo; import com.yxt.anrui.terminal.api.risk.redemption.RedemptionDetailsVo; import com.yxt.anrui.terminal.api.risk.redemption.flow.AppRedemptionDelegateQuery; import com.yxt.anrui.terminal.api.risk.redemption.flow.AppRedemptionTaskQuery; @@ -22,6 +23,7 @@ import com.yxt.anrui.terminal.api.risk.repurchase.flow.AppRepurchaseDelegateQuer import com.yxt.anrui.terminal.api.risk.repurchase.flow.AppRepurchaseTaskQuery; import com.yxt.anrui.terminal.api.risk.repurchase.flow.CompleteRepurchaseDto; import com.yxt.anrui.terminal.api.risk.repurchase.flow.RepurchaseFlowableQuery; +import com.yxt.anrui.terminal.biz.base.common.CommonService; import com.yxt.common.core.result.ResultBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -43,6 +45,8 @@ public class RepurchaseService { private SysStaffOrgFeign sysStaffOrgFeign; @Autowired private LoanRepurchaseApplyFeign loanRepurchaseApplyFeign; + @Autowired + private CommonService commonService; public ResultBean detail(String sid) { ResultBean rb = ResultBean.fireFail(); @@ -50,6 +54,9 @@ public class RepurchaseService { AppRepurchaseDetailsVo data = loanRepurchaseApplyFeign.appDetail(sid).getData(); if (null != data) { BeanUtil.copyProperties(data, vo); + ResultBean getLoanSolution = commonService.getLoanSolution(data.getSalesOrderSid()); + CarModelVo carModelVo = getLoanSolution.getData(); + vo.setJrfa(carModelVo); } return rb.success().setData(vo); }