From 1c26712ab8178e3939147efd6a38ebffbc0fa11e Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 11 Sep 2023 18:12:29 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B5=84=E6=96=B9?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=A2=9E=E5=8A=A0=E9=99=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusNoGuaranteeCreditReviewQuery.java | 6 ++ .../BusSalesOrderBorrowerMapper.xml | 1 + .../BusSalesOrderBorrowerService.java | 8 +- .../riskcenter/api/loanfile/LoanFileEnum.java | 1 + .../api/loanfinbank/LoanFinBankDto.java | 3 + .../api/loanfinbank/LoanFinBankInitVo.java | 3 + .../LoanNoGuaranteeCreditReview.java | 6 ++ .../LoanNoGuaranteeCreditReviewDetailsVo.java | 6 ++ .../LoanNoGuaranteeCreditReviewDto.java | 6 ++ .../LoanNoGuaranteeCreditReviewFeign.java | 2 +- .../biz/loanfinbank/LoanFinBankRest.java | 10 +++ .../biz/loanfinbank/LoanFinBankService.java | 23 ++++++ .../LoanNoGuaranteeCreditReviewService.java | 73 ++++++++----------- 13 files changed, 99 insertions(+), 49 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusNoGuaranteeCreditReviewQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusNoGuaranteeCreditReviewQuery.java index f89c206bdd..0c310b806c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusNoGuaranteeCreditReviewQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusNoGuaranteeCreditReviewQuery.java @@ -37,6 +37,12 @@ public class BusNoGuaranteeCreditReviewQuery implements Query { @ApiModelProperty("资方") private String bankName; @ApiModelProperty("家访考察结果") + private String homeVisitKey; + @ApiModelProperty("信审终审结果") + private String creditReviewKey; + @ApiModelProperty("放款审核结果") + private String loanReviewKey; + @ApiModelProperty("家访考察结果") private String homeVisit; @ApiModelProperty("信审终审结果") private String creditReview; diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.xml index e940887a54..d4adce0c93 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.xml @@ -54,5 +54,6 @@ FROM bus_sales_order_borrower AS bor LEFT JOIN bus_sales_order AS bo ON bor.salesOrderSid = bo.sid LEFT JOIN anrui_riskcenter.loan_noguarantee_credit_review AS cr ON cr.salesOrderSid = bo.sid + ${ew.sqlSegment} \ No newline at end of file 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 75148e8200..287af366b5 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 @@ -239,7 +239,7 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService @@ -54,4 +56,5 @@ public class LoanFinBankDto implements Dto { private String useOrgName; @ApiModelProperty("使用组织全路径") private String orgSidPath; + private List finBankFiles = new ArrayList<>(); } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankInitVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankInitVo.java index 8fe9c55e5d..87d7183a6b 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankInitVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankInitVo.java @@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; +import java.util.ArrayList; +import java.util.List; /** * @author Administrator @@ -37,6 +39,7 @@ public class LoanFinBankInitVo implements Vo { private String contractSetValue; @ApiModelProperty("银行卡要求说明") private String bankCardRemark; + private List finBankFiles = new ArrayList<>(); // @ApiModelProperty("使用组织sid") // private String useOrgSid; // @ApiModelProperty("使用组织名称") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReview.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReview.java index e08811608d..1476d06ebf 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReview.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReview.java @@ -19,14 +19,20 @@ public class LoanNoGuaranteeCreditReview extends BaseEntity { private String salesOrderSid; @ApiModelProperty("家访考察结果") private String homeVisit; + @ApiModelProperty("家访考察结果") + private String homeVisitKey; @ApiModelProperty("家访考察日期") private String homeVisitDate; @ApiModelProperty("信审终审结果") private String creditReview; + @ApiModelProperty("信审终审结果") + private String creditReviewKey; @ApiModelProperty("信审终审日期") private String creditReviewDate; @ApiModelProperty("放款审核结果") private String loanReview; + @ApiModelProperty("放款审核结果") + private String loanReviewKey; @ApiModelProperty("放款审核日期") private String loanReviewDate; @ApiModelProperty("是否放款") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewDetailsVo.java index f27ba73cbf..775f8ec443 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewDetailsVo.java @@ -20,6 +20,12 @@ public class LoanNoGuaranteeCreditReviewDetailsVo implements Vo { @ApiModelProperty("贷款人") private String borrowerName; @ApiModelProperty("家访考察结果") + private String homeVisitKey; + @ApiModelProperty("信审终审结果") + private String creditReviewKey; + @ApiModelProperty("放款审核结果") + private String loanReviewKey; + @ApiModelProperty("家访考察结果") private String homeVisit; @ApiModelProperty("家访考察日期") private String homeVisitDate; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewDto.java index c580bd63b8..93b8fed92c 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewDto.java @@ -21,6 +21,12 @@ public class LoanNoGuaranteeCreditReviewDto implements Dto { @ApiModelProperty("贷款人") private String borrowerName; @ApiModelProperty("家访考察结果") + private String homeVisitKey; + @ApiModelProperty("信审终审结果") + private String creditReviewKey; + @ApiModelProperty("放款审核结果") + private String loanReviewKey; + @ApiModelProperty("家访考察结果") private String homeVisit; @ApiModelProperty("家访考察日期") private String homeVisitDate; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFeign.java index 8b32f11b19..3ecbc54974 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFeign.java @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.*; public interface LoanNoGuaranteeCreditReviewFeign { @ApiOperation("编辑回显、详情") - @PostMapping("/details") + @GetMapping("/details") @ResponseBody public ResultBean details(@RequestParam("salesOrderSid") String salesOrderSid); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankRest.java index 669e65c706..d995e96252 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankRest.java @@ -1,7 +1,9 @@ package com.yxt.anrui.riskcenter.biz.loanfinbank; +import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; import com.yxt.anrui.riskcenter.api.loanfinbank.*; import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy; +import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService; import com.yxt.anrui.riskcenter.biz.loanfinpolicy.LoanFinPolicyService; import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.core.query.PagerQuery; @@ -45,6 +47,8 @@ public class LoanFinBankRest implements LoanFinBankFeign { private HttpServletResponse response; @Autowired private LoanFinPolicyService loanFinPolicyService; + @Autowired + private LoanFileService loanFileService; @Override public ResultBean> listPage(PagerQuery pq) { @@ -72,6 +76,12 @@ public class LoanFinBankRest implements LoanFinBankFeign { if (i == 0) { return ResultBean.fireFail().setMessage("修改失败"); } + //删除附件表中关于该linkSid的文件 + loanFileService.deleteByLinkSid(sid); + List finBankFiles = dto.getFinBankFiles(); + if (!finBankFiles.isEmpty()) { + loanFileService.saveAll(sid, finBankFiles, LoanFileEnum.FIN_BANK.getAttachType()); + } return rb.success().setMessage("修改成功"); } else { //查询资方名称是否重复 diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankService.java index 80b46ff019..10cd6b2803 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankService.java @@ -6,7 +6,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; +import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; import com.yxt.anrui.riskcenter.api.loanfinbank.*; +import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService; +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; @@ -20,6 +24,7 @@ import org.springframework.stereotype.Service; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * Project: anrui-base(安瑞基础信息模块)
@@ -43,6 +48,10 @@ public class LoanFinBankService extends MybatisBaseService listPage(PagerQuery pq) { LoanFinBankQuery query = pq.getParams(); @@ -104,6 +113,12 @@ public class LoanFinBankService extends MybatisBaseService finBankFiles = dto.getFinBankFiles(); + if (!finBankFiles.isEmpty()) { + loanFileService.saveAll(entity.getSid(), finBankFiles, LoanFileEnum.FIN_BANK.getAttachType()); + } } public LoanFinBankVo fetchByIdVo(String id) { @@ -212,6 +227,14 @@ public class LoanFinBankService extends MybatisBaseService fileList = loanFileService.selectByLinkSid(sid, LoanFileEnum.FIN_BANK.getAttachType()); + fileList.removeAll(Collections.singleton(null)); + if (!fileList.isEmpty()) { + List finBankFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()). + collect(Collectors.toList()); + vo.setFinBankFiles(finBankFiles); + } return rb.success().setData(vo); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java index 622911b065..cbdfecaa88 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java @@ -1,31 +1,19 @@ package com.yxt.anrui.riskcenter.biz.loannoguaranteecreditreview; 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.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign; -import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; -import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; -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.loannoguaranteecreditreview.LoanNoGuaranteeCreditReview; import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReviewDetailsVo; import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReviewDto; -import com.yxt.anrui.riskcenter.api.loanparameter.*; import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService; 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; import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -43,12 +31,6 @@ import java.util.stream.Collectors; @Service public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService { - @Autowired - private SysUserFeign sysUserFeign; - @Autowired - private SysStaffOrgFeign sysStaffOrgFeign; - @Autowired - private SysOrganizationFeign sysOrganizationFeign; @Autowired private BusSalesOrderFeign busSalesOrderFeign; @Autowired @@ -61,12 +43,8 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService details(String salesOrderSid) { ResultBean rb = ResultBean.fireFail(); LoanNoGuaranteeCreditReviewDetailsVo vo = new LoanNoGuaranteeCreditReviewDetailsVo(); + vo.setSalesOrderSid(salesOrderSid); LoanNoGuaranteeCreditReview entity = baseMapper.selectOneByOrderSid(salesOrderSid); - BeanUtil.copyProperties(entity, vo); - String sid = ""; - if (StringUtils.isNotBlank(entity.getSid())) { - sid = entity.getSid(); - } BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(salesOrderSid).getData(); if (null != busSalesOrder) { if (StringUtils.isNotBlank(busSalesOrder.getStaffName())) { @@ -79,27 +57,34 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService fileList = loanFileService.selectByLinkSid(sid, LoanFileEnum.HOME_VISIT_FILES.getAttachType()); - fileList.removeAll(Collections.singleton(null)); - if (!fileList.isEmpty()) { - List homeVisitFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()). - collect(Collectors.toList()); - vo.setHomeVisitFiles(homeVisitFiles); - } - //信审终审结果截图 - fileList = loanFileService.selectByLinkSid(sid, LoanFileEnum.CREDIT_REVIEW_FILES.getAttachType()); - fileList.removeAll(Collections.singleton(null)); - if (!fileList.isEmpty()) { - List creditReviewFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList()); - vo.setCreditReviewFiles(creditReviewFiles); - } - //放款审核结果截图 - fileList = loanFileService.selectByLinkSid(sid, LoanFileEnum.LOAN_REVIEW_FILES.getAttachType()); - fileList.removeAll(Collections.singleton(null)); - if (!fileList.isEmpty()) { - List loanReviewFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList()); - vo.setLoanReviewFiles(loanReviewFiles); + if (null != entity) { + BeanUtil.copyProperties(entity, vo); + String sid = ""; + if (StringUtils.isNotBlank(entity.getSid())) { + sid = entity.getSid(); + } + //家访考察结果截图 + List fileList = loanFileService.selectByLinkSid(sid, LoanFileEnum.HOME_VISIT_FILES.getAttachType()); + fileList.removeAll(Collections.singleton(null)); + if (!fileList.isEmpty()) { + List homeVisitFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()). + collect(Collectors.toList()); + vo.setHomeVisitFiles(homeVisitFiles); + } + //信审终审结果截图 + fileList = loanFileService.selectByLinkSid(sid, LoanFileEnum.CREDIT_REVIEW_FILES.getAttachType()); + fileList.removeAll(Collections.singleton(null)); + if (!fileList.isEmpty()) { + List creditReviewFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList()); + vo.setCreditReviewFiles(creditReviewFiles); + } + //放款审核结果截图 + fileList = loanFileService.selectByLinkSid(sid, LoanFileEnum.LOAN_REVIEW_FILES.getAttachType()); + fileList.removeAll(Collections.singleton(null)); + if (!fileList.isEmpty()) { + List loanReviewFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList()); + vo.setLoanReviewFiles(loanReviewFiles); + } } return rb.success().setData(vo); } From 7eddf1a88d6c036e612dd338399eb224c777406d Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 11 Sep 2023 18:14:17 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=B4=B7=E6=AC=BE=E4=BA=BA=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/bussalesorder/BusSalesOrderFeign.java | 20 ++++ .../BusSalesOrderFeignFallback.java | 20 ++++ .../buscenter/api/bussalesorder/LenderVo.java | 26 +++++ .../api/bussalesorder/SalesLenderVo.java | 29 +++++ .../BusSalesOrderVehicle.java | 4 + .../biz/bussalesorder/BusSalesOrderRest.java | 20 ++++ .../bussalesorder/BusSalesOrderService.java | 104 ++++++++++++++++++ .../BusSalesOrderBorrowerMapper.java | 9 ++ .../BusSalesOrderBorrowerMapper.xml | 19 ++++ .../BusSalesOrderBorrowerService.java | 17 +++ .../BusSalesOrderVehicleMapper.java | 2 + .../BusSalesOrderVehicleMapper.xml | 4 + .../BusSalesOrderVehicleService.java | 4 + .../LoanOrderPreloanVo.java | 3 +- .../LoanPreloanCreditApplyService.java | 2 + .../saleOrders/AppBusSalesOrderFeign.java | 21 +++- .../AppBusSalesOrderFeignFallback.java | 20 ++++ .../autoservice/saleOrders/InputLenderVo.java | 30 +++++ .../autoservice/saleOrders/LenderListVo.java | 25 +++++ .../terminal/api/base/common/CommonFeign.java | 5 + .../saleOrders/AppBusSalesOrderRest.java | 25 ++++- .../saleOrders/AppBusSalesOrderService.java | 26 +++++ .../terminal/biz/base/common/CommonRest.java | 5 + .../biz/base/common/CommonService.java | 30 ++++- 24 files changed, 465 insertions(+), 5 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/LenderVo.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SalesLenderVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/InputLenderVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/LenderListVo.java diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index bd344a3c1a..9076e56dc0 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java @@ -351,4 +351,24 @@ public interface BusSalesOrderFeign { @GetMapping("/getSalesOrderOne") @ResponseBody ResultBean getSalesOrderOne(@RequestParam("sid") String sid); + + @ApiOperation("初始化录入贷款人列表") + @GetMapping("/saleOrderInputLender/{saleOrderSid}") + @ResponseBody + ResultBean saleOrderInputLender(@PathVariable("saleOrderSid") String saleOrderSid); + + @ApiOperation("删除销售订单贷款人") + @DeleteMapping("/deleteSaleOrderInputLender/{sid}") + @ResponseBody + ResultBean deleteSaleOrderInputLender(@PathVariable("sid") String sid); + + @ApiOperation("删除销售订单贷款人") + @PostMapping("/saveBorrowNum/{sid}/{num}") + @ResponseBody + ResultBean saveBorrowNum(@PathVariable("sid") String sid, @PathVariable("num") String num); + + @ApiOperation("保存销售订单贷款人自己") + @PostMapping("/saleOrderInputLenderOwn/{saleOrderSid}") + @ResponseBody + ResultBean saleOrderInputLenderOwn(@PathVariable("saleOrderSid") String saleOrderSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java index 6fa0ae63dc..ac629194cc 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java @@ -326,4 +326,24 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign { public ResultBean getSalesOrderOne(String sid) { return null; } + + @Override + public ResultBean saleOrderInputLender(String saleOrderSid) { + return null; + } + + @Override + public ResultBean deleteSaleOrderInputLender(String sid) { + return null; + } + + @Override + public ResultBean saveBorrowNum(String sid, String num) { + return null; + } + + @Override + public ResultBean saleOrderInputLenderOwn(String saleOrderSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/LenderVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/LenderVo.java new file mode 100644 index 0000000000..ed48c44949 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/LenderVo.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.buscenter.api.bussalesorder; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/9/11 + **/ +@Data +public class LenderVo implements Vo { + private static final long serialVersionUID = 7304958451535278499L; + + @ApiModelProperty("数量") + private String vinNum; + @ApiModelProperty("记录sid") + private String sid; + @ApiModelProperty("贷款人") + private String lenderName; + @ApiModelProperty("是否显示删除：没确认可以删除") + private boolean showDelete; + @ApiModelProperty("是否显示确认，没确认可以确认") + private boolean showConfirm; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SalesLenderVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SalesLenderVo.java new file mode 100644 index 0000000000..1c7afd8ee4 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SalesLenderVo.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.buscenter.api.bussalesorder; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/9/11 + **/ +@Data +public class SalesLenderVo { + + @ApiModelProperty("销售订单sid") + private String saleOrderSid; + @ApiModelProperty("订单台数") + private Integer orderCarNum; + @ApiModelProperty("确认台数") + private Integer confirmCarNum; + @ApiModelProperty("是否显示自己：当贷款人没有本人时才显示，当确定的台数与总台数相同时，不允许显示") + private boolean showOwn; + @ApiModelProperty("是否显示选择按钮，当确定台数与总台数相同时，不允许显示") + private boolean showSelect; + + private List lenderList = new ArrayList<>(); +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java index 2b871cd6eb..9c0e0b1c4a 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java @@ -25,6 +25,8 @@ *********************************************************/ package com.yxt.anrui.buscenter.api.bussalesordervehicle; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; @@ -66,8 +68,10 @@ public class BusSalesOrderVehicle extends BaseEntity { @ApiModelProperty("临时客户名称") private String temporaryName; @ApiModelProperty("贷款人sid") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String borrowerSid; @ApiModelProperty("贷款人") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String borrowName; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java index 073274ef41..4edeedff41 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java @@ -409,4 +409,24 @@ public class BusSalesOrderRest implements BusSalesOrderFeign { public ResultBean getSalesOrderOne(String sid) { return busSalesOrderService.getSalesOrderOne(sid); } + + @Override + public ResultBean saleOrderInputLender(String saleOrderSid) { + return busSalesOrderService.saleOrderInputLender(saleOrderSid); + } + + @Override + public ResultBean deleteSaleOrderInputLender(String sid) { + return busSalesOrderService.deleteSaleOrderInputLender(sid); + } + + @Override + public ResultBean saveBorrowNum(String sid, String num) { + return busSalesOrderService.saveBorrowNum(sid,num); + } + + @Override + public ResultBean saleOrderInputLenderOwn(String saleOrderSid) { + return busSalesOrderService.saleOrderInputLenderOwn(saleOrderSid); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index a88eeb1969..bf7125bac0 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -79,6 +79,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.*; import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageQuery; import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo; import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*; +import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower; import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit; import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDto; @@ -113,6 +114,7 @@ import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService; import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService; import com.yxt.anrui.buscenter.biz.busdepositvehicle.BusDepositVehicleService; import com.yxt.anrui.buscenter.biz.bushandover.BusHandoverService; +import com.yxt.anrui.buscenter.biz.bussalesorderborrower.BusSalesOrderBorrowerService; import com.yxt.anrui.buscenter.biz.bussalesorderdeposit.BusSalesOrderDepositService; import com.yxt.anrui.buscenter.biz.bussalesorderdiscount.BusSalesOrderDiscountService; import com.yxt.anrui.buscenter.biz.bussalesorderinsurance.BusSalesOrderInsuranceService; @@ -331,6 +333,8 @@ public class BusSalesOrderService extends MybatisBaseService saleOrderInputLender(String saleOrderSid) { + ResultBean rb = ResultBean.fireFail(); + SalesLenderVo salesLenderVo = new SalesLenderVo(); + salesLenderVo.setSaleOrderSid(saleOrderSid); + //订单总台数 + BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(saleOrderSid); + //查询该销售订单已确定的数量 + int counts = busSalesOrderBorrowerService.selectByNum(saleOrderSid); + if (busSalesOrderPrice != null) { + salesLenderVo.setOrderCarNum(busSalesOrderPrice.getQuantity()); + int allNum = busSalesOrderPrice.getQuantity(); + if (counts < allNum) { + salesLenderVo.setShowOwn(true); + salesLenderVo.setShowSelect(true); + } + } + int confirmNum = 0; + //根据销售订单sid查询所有选择的贷款人 + List lenderList = busSalesOrderBorrowerService.saleOrderInputLender(saleOrderSid); + lenderList.removeAll(Collections.singleton(null)); + if (!lenderList.isEmpty()) { + for (int i = 0; i < lenderList.size(); i++) { + LenderVo lenderVo = lenderList.get(i); + String sid = lenderVo.getSid(); + //根据销售订单贷款人表sid查询家纺准备是否存在 + int count = busSalesOrderBorrowerService.selectBorrow(sid); + if (count > 0) { + lenderVo.setShowConfirm(false); + lenderVo.setShowDelete(false); + } else { + lenderVo.setShowConfirm(true); + lenderVo.setShowDelete(true); + } + if (StringUtils.isNotBlank(lenderVo.getVinNum())) { + confirmNum = confirmNum + Integer.parseInt(lenderVo.getVinNum()); + } else { + confirmNum = confirmNum; + } + } + } + BusSalesOrderBorrower busSalesOrderBorrower = busSalesOrderBorrowerService.selectOrderSid(saleOrderSid); + if (busSalesOrderBorrower == null) { + salesLenderVo.setShowOwn(true); + } + salesLenderVo.setConfirmCarNum(confirmNum); + salesLenderVo.setLenderList(lenderList); + return rb.success().setData(salesLenderVo); + } + + public ResultBean deleteSaleOrderInputLender(String sid) { + ResultBean rb = ResultBean.fireFail(); + //删除销售订单车辆表中的贷款人的名称 + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByBorrowSid(sid); + if (busSalesOrderVehicle != null) { + busSalesOrderVehicle.setBorrowerSid(""); + busSalesOrderVehicle.setBorrowName(""); + busSalesOrderVehicleService.updateById(busSalesOrderVehicle); + } + //删除销售订单贷款表的数据 + busSalesOrderBorrowerService.deleteBySid(sid); + return rb.success(); + } + + public ResultBean saveBorrowNum(String sid, String num) { + ResultBean rb = ResultBean.fireFail(); + BusSalesOrderBorrower busSalesOrderBorrower = busSalesOrderBorrowerService.fetchBySid(sid); + if (busSalesOrderBorrower == null) { + return rb.setMsg("该贷款人不存在"); + } + //查询该销售订单已确定的数量 + int count = busSalesOrderBorrowerService.selectByNum(busSalesOrderBorrower.getSalesOrderSid()); + BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(busSalesOrderBorrower.getSalesOrderSid()); + if (busSalesOrderPrice != null) { + int allNum = busSalesOrderPrice.getQuantity(); + if (count >= allNum) { + return rb.setMsg("销售订单的剩余台数已不足"); + } + } + busSalesOrderBorrower.setVehCount(Integer.parseInt(num)); + busSalesOrderBorrowerService.updateById(busSalesOrderBorrower); + return rb.success(); + } + + public ResultBean saleOrderInputLenderOwn(String saleOrderSid) { + ResultBean rb = ResultBean.fireFail(); + //查询该销售订单的贷款人中是否已存在该客户的贷款人 + BusSalesOrderBorrower busSalesOrderBorrower = busSalesOrderBorrowerService.selectOrderSid(saleOrderSid); + if (busSalesOrderBorrower != null) { + return rb.setMsg("客户本人已存在贷款人中"); + } + BusSalesOrder busSalesOrder = fetchBySid(saleOrderSid); + busSalesOrderBorrower = new BusSalesOrderBorrower(); + busSalesOrderBorrower.setSalesOrderSid(saleOrderSid); + busSalesOrderBorrower.setCustomSid(busSalesOrder.getCustomerSid()); + busSalesOrderBorrower.setBorrowerName(busSalesOrder.getCustomerName()); + busSalesOrderBorrower.setMobile(busSalesOrder.getMobile()); + busSalesOrderBorrowerService.insert(busSalesOrderBorrower); + return rb.success(); + } } \ No newline at end of file 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 13b91fc559..8085b6ab98 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 @@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.buscenter.api.bussalesorder.LenderVo; import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusNoGuaranteeCreditReviewVo; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy; @@ -82,4 +83,12 @@ public interface BusSalesOrderBorrowerMapper extends BaseMapper saleOrderInputLender(String saleOrderSid); + + int selectBorrow(String sid); + + int selectByNum(String salesOrderSid); + + BusSalesOrderBorrower selectByOrderSids(String saleOrderSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.xml index e940887a54..b6b5351669 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.xml @@ -55,4 +55,23 @@ LEFT JOIN bus_sales_order AS bo ON bor.salesOrderSid = bo.sid LEFT JOIN anrui_riskcenter.loan_noguarantee_credit_review AS cr ON cr.salesOrderSid = bo.sid + + + + + + + + \ No newline at end of file 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 75148e8200..6db2febfea 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 @@ -28,6 +28,7 @@ package com.yxt.anrui.buscenter.biz.bussalesorderborrower; 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.buscenter.api.bussalesorder.LenderVo; import com.yxt.anrui.buscenter.api.bussalesorderborrower.*; import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice; import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDto; @@ -293,4 +294,20 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService saleOrderInputLender(String saleOrderSid) { + return baseMapper.saleOrderInputLender(saleOrderSid); + } + + public int selectBorrow(String sid) { + return baseMapper.selectBorrow(sid); + } + + public int selectByNum(String salesOrderSid) { + return baseMapper.selectByNum(salesOrderSid); + } + + public BusSalesOrderBorrower selectOrderSid(String saleOrderSid) { + return baseMapper.selectByOrderSids(saleOrderSid); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java index fcdf9325d3..d36042087d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java @@ -153,4 +153,6 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper selectListByOrdersSid(String saleOrderSid); + + BusSalesOrderVehicle selectByBorrowSid(String sid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml index 62c567ed1b..eea83b48b2 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml @@ -252,4 +252,8 @@ resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle"> select * from bus_sales_order_vehicle where salesOrderSid = #{saleOrderSid} group by borrowerSid + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java index fe71c919c4..ddf4c824bd 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java @@ -583,4 +583,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService selectListByOrdersSid(String saleOrderSid) { return baseMapper.selectListByOrdersSid(saleOrderSid); } + + public BusSalesOrderVehicle selectByBorrowSid(String sid) { + return baseMapper.selectByBorrowSid(sid); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanOrderPreloanVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanOrderPreloanVo.java index 42f9a14e1b..fc188f2b8a 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanOrderPreloanVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanOrderPreloanVo.java @@ -18,7 +18,8 @@ public class LoanOrderPreloanVo implements Vo { private String quantity; @ApiModelProperty("按钮：信用审核、当为等待中时为我知道了、信用申诉") private String confirmBtn; - + @ApiModelProperty("信用审核的sid") + private String sid; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java index 716cc72e5c..0784a7c20e 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java @@ -599,10 +599,12 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService getVinList(@PathVariable("saleOrderSid") String saleOrderSid); - @ApiOperation("初始化|录入车架号列表") + @ApiOperation("初始化|录入车架号列表2") @GetMapping("/init/saleOrderInputVin2/{saleOrderSid}") @ResponseBody ResultBean getVinList2(@PathVariable("saleOrderSid") String saleOrderSid); @@ -325,5 +325,24 @@ public interface AppBusSalesOrderFeign { @ResponseBody ResultBean judgeIsLoan(@RequestParam("sid") String sid); + @ApiOperation("初始化录入贷款人列表") + @GetMapping("/init/saleOrderInputLender/{saleOrderSid}") + @ResponseBody + ResultBean saleOrderInputLender(@PathVariable("saleOrderSid") String saleOrderSid); + + @ApiOperation("删除销售订单贷款人") + @DeleteMapping("/delete/saleOrderInputLender/{sid}") + @ResponseBody + ResultBean deleteSaleOrderInputLender(@PathVariable("sid") String sid); + + @ApiOperation("保存销售订单贷款人数量") + @PostMapping("/save/saleOrderInputLenderNum/{sid}/{num}") + @ResponseBody + ResultBean saleOrderInputLenderNum(@PathVariable("sid") String sid,@PathVariable("num")String num); + + @ApiOperation("保存销售订单贷款人自己") + @PostMapping("/save/saleOrderInputLenderOwn/{saleOrderSid}") + @ResponseBody + ResultBean saleOrderInputLenderOwn(@PathVariable("saleOrderSid")String saleOrderSid); } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java index d41e5bd4ad..329121f398 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java @@ -290,4 +290,24 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign { public ResultBean judgeIsLoan(String sid) { return null; } + + @Override + public ResultBean saleOrderInputLender(String saleOrderSid) { + return null; + } + + @Override + public ResultBean deleteSaleOrderInputLender(String sid) { + return null; + } + + @Override + public ResultBean saleOrderInputLenderNum(String sid, String num) { + return null; + } + + @Override + public ResultBean saleOrderInputLenderOwn(String saleOrderSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/InputLenderVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/InputLenderVo.java new file mode 100644 index 0000000000..914ed422d8 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/InputLenderVo.java @@ -0,0 +1,30 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/9/11 + **/ +@Data +public class InputLenderVo implements Vo { + private static final long serialVersionUID = -398449823642125912L; + @ApiModelProperty("销售订单sid") + private String saleOrderSid; + @ApiModelProperty("订单台数") + private Integer orderCarNum; + @ApiModelProperty("确认台数") + private Integer confirmCarNum; + @ApiModelProperty("是否显示自己：当贷款人没有本人时才显示，当确定的台数与总台数相同时，不允许显示") + private boolean showOwn; + @ApiModelProperty("是否显示选择按钮，当确定台数与总台数相同时，不允许显示") + private boolean showSelect; + + private List lenderList = new ArrayList<>(); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/LenderListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/LenderListVo.java new file mode 100644 index 0000000000..eb3e315688 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/LenderListVo.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/9/11 + **/ +@Data +public class LenderListVo implements Vo { + private static final long serialVersionUID = 2316054778495509308L; + @ApiModelProperty("数量") + private String vinNum; + @ApiModelProperty("记录sid") + private String sid; + @ApiModelProperty("贷款人") + private String lenderName; + @ApiModelProperty("是否显示删除：没确认可以删除") + private boolean showDelete; + @ApiModelProperty("是否显示确认，没确认可以确认") + private boolean showConfirm; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java index d7b14b15e9..cc317a0dc1 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java @@ -63,4 +63,9 @@ public interface CommonFeign { @GetMapping("/getLoanPreloan") ResultBean getLoanPreloan(@RequestParam("orderSid") String orderSid); + @ApiOperation(value = "信用申诉页面") + @ResponseBody + @GetMapping("/getLoanSs") + ResultBean getLoanSs(@RequestParam("orderSid") String orderSid); + } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java index 7ca7bfe3fd..faa2960210 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java @@ -26,6 +26,7 @@ package com.yxt.anrui.terminal.biz.autoservice.saleOrders; import com.yxt.anrui.terminal.api.autoservice.saleOrders.AppBusSalesOrderFeign; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.InputLenderVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.OrderLoanVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoQuery; @@ -116,12 +117,12 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign { @Override @ApiOperation("重新提交") public ResultBean rePublishSaleOrder(String saleOrderSid) throws InvocationTargetException, IllegalAccessException { - return appBusSalesOrderService.rePublishSaleOrder(saleOrderSid,"","",""); + return appBusSalesOrderService.rePublishSaleOrder(saleOrderSid, "", "", ""); } @Override public ResultBean rePublishSaleOrder(String saleOrderSid, String customerSid, String customerName, String customerMobile) throws InvocationTargetException, IllegalAccessException { - return appBusSalesOrderService.rePublishSaleOrder(saleOrderSid,customerSid,customerName,customerMobile); + return appBusSalesOrderService.rePublishSaleOrder(saleOrderSid, customerSid, customerName, customerMobile); } @Override @@ -383,4 +384,24 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign { return appBusSalesOrderService.judgeIsLoan(sid); } + @Override + public ResultBean saleOrderInputLender(String saleOrderSid) { + return appBusSalesOrderService.saleOrderInputLender(saleOrderSid); + } + + @Override + public ResultBean deleteSaleOrderInputLender(String sid) { + return appBusSalesOrderService.deleteSaleOrderInputLender(sid); + } + + @Override + public ResultBean saleOrderInputLenderNum(String sid, String num) { + return appBusSalesOrderService.saleOrderInputLenderNum(sid,num); + } + + @Override + public ResultBean saleOrderInputLenderOwn(String saleOrderSid) { + return appBusSalesOrderService.saleOrderInputLenderOwn(saleOrderSid); + } + } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java index 5b8a6d7e28..e9567ae22c 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java @@ -40,6 +40,7 @@ import com.yxt.anrui.buscenter.api.busmaindeposit.app.AppBusMainDepositOrderQuer import com.yxt.anrui.buscenter.api.busmaindeposit.app.AppBusMainDepositOrderVo; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; +import com.yxt.anrui.buscenter.api.bussalesorder.SalesLenderVo; import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitModelInfoQuery; import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitModelInfoVo; import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery; @@ -76,6 +77,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanOrderPreloanVo; import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApplyFeign; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.InputLenderVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.OrderLoanVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.*; import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.FlowOrderVo; @@ -733,6 +735,9 @@ public class AppBusSalesOrderService { if ("信用审核".equals(loanOrderPreloanVo.getConfirmBtn())) { CarModelVo finPage1 = commonService.getLoanPreloan(sid).getData(); orderLoanVo.setPluginPage(finPage1); + } else if ("信用申诉".equals(loanOrderPreloanVo.getConfirmBtn())) { + CarModelVo finPage1 = commonService.getLoanSs(loanOrderPreloanVo.getSid()).getData(); + orderLoanVo.setPluginPage(finPage1); } return rb.setMsg(resultBean.getMsg()).setData(orderLoanVo); } @@ -747,4 +752,25 @@ public class AppBusSalesOrderService { BeanUtil.copyProperties(vinVo, vinNoVo); return rb.success().setData(vinNoVo); } + + public ResultBean saleOrderInputLender(String saleOrderSid) { + ResultBean rb = ResultBean.fireFail(); + InputLenderVo inputLenderVo = new InputLenderVo(); + ResultBean resultBean = busSalesOrderFeign.saleOrderInputLender(saleOrderSid); + SalesLenderVo vinVo = resultBean.getData(); + BeanUtil.copyProperties(vinVo, inputLenderVo); + return rb.success().setData(inputLenderVo); + } + + public ResultBean deleteSaleOrderInputLender(String sid) { + return busSalesOrderFeign.deleteSaleOrderInputLender(sid); + } + + public ResultBean saleOrderInputLenderNum(String sid, String num) { + return busSalesOrderFeign.saveBorrowNum(sid,num); + } + + public ResultBean saleOrderInputLenderOwn(String saleOrderSid) { + return busSalesOrderFeign.saleOrderInputLenderOwn(saleOrderSid); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java index 167b323bdb..0d894b5d8b 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java @@ -63,4 +63,9 @@ public class CommonRest implements CommonFeign { public ResultBean getLoanPreloan(String orderSid) { return commonService.getLoanPreloan(orderSid); } + + @Override + public ResultBean getLoanSs(String orderSid) { + return commonService.getLoanSs(orderSid); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java index e2a3a38141..ab6189cc14 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java @@ -150,7 +150,7 @@ public class CommonService { AppSubVersionVo appSubVersionVo = voResultBean.getData(); CarModelVo carModelVo = new CarModelVo(); Map map = new HashMap<>(); - map.put("creditType",0); + map.put("creditType", 0); map.put("createSource", 2); map.put("sourceSid", orderSid); appSubVersionVo.setJson(JSONObject.toJSONString(map)); @@ -171,4 +171,32 @@ public class CommonService { carModelVo.setARouterParamValue(aRouterParamValue); return rb.success().setData(carModelVo); } + + public ResultBean getLoanSs(String orderSid) { + ResultBean rb = ResultBean.fireFail(); + String appSid = "fec4e243-491a-11ec-94cd-fa163e0cb33c"; + String moduleAction = "com.anrui.android.plugin.riskcontrol.activity.EditCreditReviewActivity3"; + ResultBean voResultBean = appSubsetVersionFeign.getLastRiskByAppSid(appSid, moduleAction); + AppSubVersionVo appSubVersionVo = voResultBean.getData(); + CarModelVo carModelVo = new CarModelVo(); + Map map = new HashMap<>(); + map.put("creditType", 2); + map.put("sid", orderSid); + map.put("addNew", true); + appSubVersionVo.setJson(JSONObject.toJSONString(map)); + BeanUtil.copyProperties(appSubVersionVo, carModelVo); + carModelVo.setRequestCode("1005"); + carModelVo.setARouterClass("com.anrui.android.plugin.riskcontrol.manager.ARouterManager"); + carModelVo.setARouterMethod("EDIT_CREDIT_REVIEW_ACTIVITY3"); + List aRouterParamType = new ArrayList<>(); + aRouterParamType.add("INT"); + aRouterParamType.add("BOOLEAN"); + List aRouterParamValue = new ArrayList<>(); + aRouterParamValue.add("2"); + aRouterParamValue.add(orderSid); + aRouterParamValue.add("true"); + carModelVo.setARouterParamType(aRouterParamType); + carModelVo.setARouterParamValue(aRouterParamValue); + return rb.success().setData(carModelVo); + } } From 36eac13541d44d17e34d64d50f1a390bb5bfaad1 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 11 Sep 2023 18:34:42 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=B4=B7=E6=AC=BE=E4=BA=BA=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanPreloanCreditApplyService.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java index 0784a7c20e..1bf0884dc0 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java @@ -599,9 +599,8 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService Date: Mon, 11 Sep 2023 20:03:12 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=B5=84=E6=96=B9=E4=BF=A1=E5=AE=A1?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E6=8E=A8=E9=80=81=E8=9E=8D=E8=B5=84=E6=94=BE?= =?UTF-8?q?=E6=AC=BE=E5=BA=94=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusSalesOrderLoancontractFeign.java | 4 ++ ...usSalesOrderLoancontractFeignFallback.java | 5 ++ .../LoanContractPush.java | 18 +++++ .../BusSalesOrderLoancontractRest.java | 5 ++ .../BusSalesOrderLoancontractService.java | 71 +++++++++++++++++++ .../api/loansolutions/LoanSolutionsFeign.java | 4 +- .../LoanSolutionsFeignFallback.java | 5 ++ .../riskcenter/api/loansolutions/PushVo.java | 19 +++++ .../LoanCapitalCreditResultService.java | 12 ++-- .../biz/loansolutions/LoanSolutionsRest.java | 6 ++ .../loansolutions/LoanSolutionsService.java | 54 ++++++++++++-- 11 files changed, 191 insertions(+), 12 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/LoanContractPush.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/PushVo.java diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java index dc06fd3301..f81bf8abd6 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java @@ -95,4 +95,8 @@ public interface BusSalesOrderLoancontractFeign { @ResponseBody public ResultBean> listPageForRepay(@RequestBody PagerQuery pq); + @ApiOperation("推送融资放款的应收") + @PostMapping("/pushLoanOrder") + @ResponseBody + ResultBean pushLoanOrder(@RequestBody LoanContractPush loanContractPush); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java index 4e44c7805c..ac6ebff43f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java @@ -89,4 +89,9 @@ public class BusSalesOrderLoancontractFeignFallback implements BusSalesOrderLoan public ResultBean> listPageForRepay(PagerQuery pq) { return null; } + + @Override + public ResultBean pushLoanOrder(LoanContractPush loanContractPush) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/LoanContractPush.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/LoanContractPush.java new file mode 100644 index 0000000000..98756f22cd --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/LoanContractPush.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.buscenter.api.bussalesorderloancontract; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/9/11 + **/ +@Data +public class LoanContractPush { + + @ApiModelProperty("消贷合同sid") + private String loanContractSid; + @ApiModelProperty("销售订单sid") + private String saleOrderSid; +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java index 6e340b277d..b883a12873 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java @@ -118,4 +118,9 @@ public class BusSalesOrderLoancontractRest implements BusSalesOrderLoancontractF PagerVo pv = busSalesOrderLoancontractService.listPageForRepay(pq); return rb.success().setData(pv); } + + @Override + public ResultBean pushLoanOrder(LoanContractPush loanContractPush) { + return busSalesOrderLoancontractService.pushLoanOrder(loanContractPush); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java index 21a7f79cb6..9bd79dc9bd 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java @@ -28,15 +28,22 @@ package com.yxt.anrui.buscenter.biz.bussalesorderloancontract; 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.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorderloancontract.*; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; +import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService; import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.UnCollectionDto; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter; import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterQuery; import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo; +import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; +import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; +import com.yxt.anrui.riskcenter.api.loansolutions.PushVo; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -47,6 +54,7 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -72,6 +80,12 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService createQueryWrapper(BusSalesOrderLoancontractQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -238,4 +252,61 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService resultBean = loanSolutionsFeign.selectMoney(saleOrderSid); + if(resultBean.getData() != null){ + PushVo pushVo = resultBean.getData(); + UnCollectionDto unCollectionDto = new UnCollectionDto(); + unCollectionDto.setContractNo(busSalesOrder.getContractNo()); +// unCollectionDto.setContractSid(contractSid); + //客户名称 + unCollectionDto.setCustomerName(busSalesOrder.getCustomerName()); + //客户sid + unCollectionDto.setCustomerSid(busSalesOrder.getCustomerSid()); + //客户类型 + unCollectionDto.setCustomerClass(busSalesOrder.getCustomerClass()); + //客户类型 + unCollectionDto.setCustomerClassKey(busSalesOrder.getCustomerClassKey()); + //客户头像 + unCollectionDto.setCustomerImage(busSalesOrder.getCustomerPhoto()); + unCollectionDto.setReceivablesName("融资放款"); + unCollectionDto.setCustomerPhone(busSalesOrder.getMobile()); + unCollectionDto.setUseOrgSid(busSalesOrder.getUseOrgSid()); + unCollectionDto.setVinNo(busSalesOrderVehicle.getLinkNo()); + unCollectionDto.setCurrentReceivableMoney(pushVo.getMoney()); + unCollectionDto.setUserSid(busSalesOrder.getCreateBySid()); + unCollectionDto.setReveivableMoney(pushVo.getMoney()); + unCollectionDto.setBusVinSid(busSalesOrderVehicle.getSid()); + unCollectionDto.setPayType(busSalesOrder.getPayType()); + unCollectionDto.setPayTypeKey(busSalesOrder.getPayTypeKey()); + unCollectionDto.setPurchaseSystemName(busSalesOrder.getPurchaseSystemName()); + unCollectionDto.setPurchaseSystemSid(busSalesOrder.getPurchaseSystemSid()); + unCollectionDto.setOrgSidPath(busSalesOrder.getOrgSidPath()); + unCollectionDto.setStaffUserSid(busSalesOrder.getCreateBySid()); + unCollectionDto.setStaffName(busSalesOrder.getStaffName()); + unCollectionDto.setStaffDeptName(busSalesOrder.getOrgName()); + unCollectionDto.setStaffDeptSid(busSalesOrder.getOrgSid()); + unCollectionDto.setUseOrgName(busSalesOrder.getUseOrgName()); + unCollectionDto.setKxState("01"); + if (StringUtils.isNotBlank(pushVo.getOtherReceivableMoney())) { + unCollectionDto.setOtherReceivableMoney(new BigDecimal(pushVo.getOtherReceivableMoney())); + } + finUncollectedDetailedFeign.saveUnCollection(unCollectionDto); + } + } + return rb.success(); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeign.java index 664e294f33..84ef5b4911 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeign.java @@ -118,5 +118,7 @@ public interface LoanSolutionsFeign { @PostMapping("/details2") ResultBean details2(@RequestBody SolutionssQuery query); - + @ApiOperation("查询融资放款的金额") + @GetMapping("/selectMoney") + ResultBean selectMoney(@RequestParam("saleOrderSid") String saleOrderSid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java index 6c245868d9..817721675d 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java @@ -88,6 +88,11 @@ public class LoanSolutionsFeignFallback implements LoanSolutionsFeign { return null; } + @Override + public ResultBean selectMoney(String saleOrderSid) { + return null; + } + /* @Override public ResultBean> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/PushVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/PushVo.java new file mode 100644 index 0000000000..f38b33a8ee --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/PushVo.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.riskcenter.api.loansolutions; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/9/11 + **/ +@Data +public class PushVo implements Vo { + private static final long serialVersionUID = 7612306872701336004L; + @ApiModelProperty("融资放款金额") + private String money; + @ApiModelProperty("厂家贴息金额") + private String otherReceivableMoney; +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java index cc6a7cbf12..9ebb3fe443 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java @@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.api.R; import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign; +import com.yxt.anrui.buscenter.api.bussalesorderloancontract.LoanContractPush; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanAttachTypeEnum; @@ -174,6 +175,13 @@ public class LoanCapitalCreditResultService extends MybatisBaseService selectMoney(String saleOrderSid) { + return loanSolutionsService.selectMoney(saleOrderSid); + } + /* @Override public ResultBean> listPage(@RequestBody PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java index d1ead49eb8..a58d9b765a 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java @@ -12,6 +12,7 @@ import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy; import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; +import com.yxt.anrui.riskcenter.api.loansolutions.PushVo; import com.yxt.anrui.riskcenter.api.loansolutions.SolutionDetailsDto; import com.yxt.anrui.riskcenter.api.loansolutions.app.*; import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateQuery; @@ -1782,9 +1783,9 @@ public class LoanSolutionsService extends MybatisBaseService selectMoney(String saleOrderSid) { + ResultBean rb = ResultBean.fireFail(); + PushVo pushVo = new PushVo(); + //融资放款=融资项目总额-融资首付-[贷款保证金]-[厂家贴息] + //根据选择的产品政策来判断，若贷款保证金为固定的，需要减去，若为敞口的，不需要减； + // 差额放款需要减厂家贴息，全额放款不需要。差额放款的厂家贴息金额存入“其他应收”字段中， + BigDecimal bg = BigDecimal.ZERO; + LoanSolutions loanSolutions = baseMapper.selectBySaleOrderSid(saleOrderSid); + if (loanSolutions != null) { + //根据产品政策sid查询 + bg = bg.add(loanSolutions.getLoanTotal()); + //查询融资首付 + LoanSolutionsOtherpolicy loanSolutionsOtherpolicy = loanSolutionsOtherpolicyService.selectByLoanSid(loanSolutions.getSid()); + if (loanSolutionsOtherpolicy != null) { + bg = bg.subtract(loanSolutionsOtherpolicy.getLoanDownPay()); + } + //查询产品政策 + LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(loanSolutions.getPolicySid()); + if (loanFinPolicy != null) { + if ("01".equals(loanFinPolicy.getBondTypeKey())) {//01固定 + LoanSolutionsDetail loanSolutionsDetail = loanSolutionsDetailService.selectLoanSid(loanSolutions.getSid()); + if (loanSolutionsDetail != null) { + if (loanSolutionsDetail.getBondAmounts() != null) { + bg = bg.subtract(loanSolutionsDetail.getBondAmounts()); + } + } + } + if ("01".equals(loanFinPolicy.getDiscountUseTypeKey())) {//01差额放款 + if (loanSolutions.getFactoryDiscount() != null) { + bg = bg.subtract(loanSolutions.getFactoryDiscount()); + pushVo.setOtherReceivableMoney(loanSolutions.getFactoryDiscountUse()); + } + } + } + } + pushVo.setMoney(bg.toString()); + return rb.success().setData(pushVo); + } + From d3526ce906f103cba9da1037bc02ce0fe5571a4e Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 12 Sep 2023 09:09:25 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E9=87=91=E8=9E=8D=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E6=94=BF=E7=AD=96=E5=A4=87=E7=94=A8=E3=80=81=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E8=9E=8D=E5=A4=87=E6=A1=88=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanFinOtherPolicyRecordApplyService.java | 8 ++++---- .../LoanFinPolicyRecordApplyService.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyService.java index 9b977f2726..b1109fd6ee 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyService.java @@ -92,8 +92,8 @@ public class LoanFinOtherPolicyRecordApplyService extends MybatisBaseService Date: Tue, 12 Sep 2023 09:30:06 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-test.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/application-test.yml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/application-test.yml index 001851c608..579dee7752 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/application-test.yml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/application-test.yml @@ -20,4 +20,8 @@ spring: password: port: 6379 timeout: 0 # 连接超时时间（毫秒） - +image: + upload: + path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload/ + url: + prefix: http://anrui.yyundong.com/upload/ From ef437bdabee16b59f2027e8ad1d2b3543b5f8a7e Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 12 Sep 2023 09:50:25 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=94=BF=E7=AD=96?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BF=85=E5=A1=AB=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/loanfinpolicy/LoanFinPolicyFeign.java | 6 +- .../api/loanfinpolicy/LoanRiskStateQuery.java | 2 + .../loanfinpolicy/LoanFinPolicyMapper.java | 2 +- .../biz/loanfinpolicy/LoanFinPolicyMapper.xml | 7 +- .../biz/loanfinpolicy/LoanFinPolicyRest.java | 4 +- .../loanfinpolicy/LoanFinPolicyService.java | 107 ++++++++++++++++-- 6 files changed, 114 insertions(+), 14 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java index 3a4dda2243..30261249d5 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java @@ -57,7 +57,11 @@ public interface LoanFinPolicyFeign { @ApiOperation("已备案的产品政策（分公司，有效期内）") @GetMapping("selectList") - ResultBean> selectList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam("isPack") String isPack, @RequestParam(value = "name", required = false) String name); + ResultBean> selectList(@RequestParam("orgPath") String orgPath, + @RequestParam("userSid") String userSid, + @RequestParam("isPack") String isPack, + @RequestParam(value = "name", required = false) String name, + @RequestParam(value = "vehTypeKey", required = false) String vehTypeKey); } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanRiskStateQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanRiskStateQuery.java index a9826a57e0..f41389ec08 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanRiskStateQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanRiskStateQuery.java @@ -18,4 +18,6 @@ public class LoanRiskStateQuery { private List sidsList = new ArrayList<>(); @ApiModelProperty("riskState为1时走禁用，为0时走启用") private String riskState; + + private String userSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.java index 554e97f727..802a301dc2 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.java @@ -27,5 +27,5 @@ public interface LoanFinPolicyMapper extends BaseMapper { AppPolicyDetailsVo getProductInfo(String sid); - List selectListOne(@Param("useOrgSid") String useOrgSid,@Param("isPack") String isPack,@Param("name") String name); + List selectListOne(@Param("deptSid") String deptSid,@Param("isPack") String isPack,@Param("name") String name,@Param("vehTypeKey") String vehTypeKey); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml index ab6befe6aa..d9fedc0726 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml @@ -106,7 +106,12 @@ from loan_fin_policy lfp where lfp.filingState = 1 and isPack = #{isPack} - and lfp.useOrgSid = #{useOrgSid} + + and lfp.useDeptSids like concat('%',#{deptSid},'%') + + + and lfp.vehTypeKey like concat('%',#{vehTypeKey},'%') + and lfp.validDateTo > now() and lfp.useSate = 0 and lfp.riskState = 0 and lfp.policyName like concat('%', #{name}, '%') diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyRest.java index f9cedbc83e..f760eb6b4b 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyRest.java @@ -69,7 +69,7 @@ public class LoanFinPolicyRest implements LoanFinPolicyFeign { } @Override - public ResultBean> selectList(String orgPath, String userSid, String isPack, String name) { - return loanFinPolicyService.selectList(orgPath, userSid, isPack, name); + public ResultBean> selectList(String orgPath, String userSid, String isPack, String name,String vehTypeKey) { + return loanFinPolicyService.selectList(orgPath, userSid, isPack, name,vehTypeKey); } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java index 455d62836d..20ec0ae733 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java @@ -52,9 +52,63 @@ public class LoanFinPolicyService extends MybatisBaseService useDeptList = dto.getUseDeptList(); + useDeptList.removeAll(Collections.singleton(null)); + if (useDeptList.isEmpty()) { + return rb.setMsg("适用销售部门不允许为空"); + } if (StringUtils.isBlank(dto.getBankSid())) { - return rb.setMsg("资方不允许为空"); + return rb.setMsg("资方简称不允许为空"); + } + List vehTypeKeyList = dto.getVehTypeKeyList(); + vehTypeKeyList.removeAll(Collections.singleton(null)); + if (vehTypeKeyList.isEmpty()) { + return rb.setMsg("车辆功能不允许为空"); + } + String guaranteeTypeKey = dto.getGuaranteeTypeKey(); + if (StringUtils.isBlank(guaranteeTypeKey)) { + return rb.setMsg("担保类型不允许为空"); + } + //首付比例 + if (StringUtils.isBlank(dto.getDownPayRatio())) { + return rb.setMsg("首付比例不允许为空"); } + //最低首付比例 + if (StringUtils.isBlank(dto.getDownPayRatioLeast())) { + return rb.setMsg("最低首付比例不允许为空"); + } + //保证金比例 + if (StringUtils.isBlank(dto.getBondRatio())) { + return rb.setMsg("保证金比例不允许为空"); + } + //保证金类型 + if (StringUtils.isBlank(dto.getBondType())) { + return rb.setMsg("保证金类型不允许为空"); + } + //期数 + if(StringUtils.isBlank(dto.getPeriodKey())){ + return rb.setMsg("期数不允许为空"); + } + //标准年利率 + if (StringUtils.isBlank(dto.getYearRatio())) { + return rb.setMsg("标准年利率不允许为空"); + } + //服务费类型 + if (StringUtils.isBlank(dto.getServiceAmountTypeValue())) { + return rb.setMsg("服务费类型不允许为空"); + } + //服务费 + if (StringUtils.isBlank(dto.getServiceAmount())) { + return rb.setMsg("服务费不允许为空"); + } + //贴息放款类型 + if (StringUtils.isBlank(dto.getDiscountUseType())) { + return rb.setMsg("贴息放款类型不允许为空"); + } + if (StringUtils.isBlank(dto.getValidDateTo())) { + return rb.setMsg("有效期至不允许为空"); + } + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); String useOrgName = ""; ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(useOrgSid); @@ -64,7 +118,6 @@ public class LoanFinPolicyService extends MybatisBaseService vehTypeKeyList = dto.getVehTypeKeyList(); if (!vehTypeKeyList.isEmpty()) { String vehTypeKey = String.join(",", vehTypeKeyList); loanFinPolicy.setVehTypeKey(vehTypeKey); @@ -74,7 +127,6 @@ public class LoanFinPolicyService extends MybatisBaseService useDeptList = dto.getUseDeptList(); String deptSids = ""; String deptNames = ""; if (!useDeptList.isEmpty()) { @@ -131,6 +183,22 @@ public class LoanFinPolicyService extends MybatisBaseService vehTypeKeyList = dto.getVehTypeKeyList(); if (!vehTypeKeyList.isEmpty()) { String vehTypeKey = String.join(",", vehTypeKeyList); loanFinPolicy.setVehTypeKey(vehTypeKey); @@ -181,7 +248,6 @@ public class LoanFinPolicyService extends MybatisBaseService useDeptList = dto.getUseDeptList(); if (!useDeptList.isEmpty()) { List deptSidsList = useDeptList.stream().map(v -> v.getDeptSid()).collect(Collectors.toList()); deptSids = String.join(",", deptSidsList); @@ -213,13 +279,13 @@ public class LoanFinPolicyService extends MybatisBaseService> selectList(String orgPath, String userSid, String isPack, String name) { + public ResultBean> selectList(String orgPath, String userSid, String isPack, String name,String vehTypeKey) { ResultBean> rb = ResultBean.fireFail(); String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); - List list = baseMapper.selectListOne(useOrgSid, isPack, name); + String deptSid = Arrays.asList(orgPath.split("/")).get(Arrays.asList(orgPath.split("/")).size()-1); + List list = baseMapper.selectListOne(deptSid, isPack, name,vehTypeKey); list.removeAll(Collections.singleton(null)); return rb.success().setData(list); }