diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 2a3892c23e..d9250f77a5 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -3179,6 +3179,19 @@ public class FinCollectionConfirmationService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + FinCollectionConfirmation finalConfirmation = confirmation; + Future future1 = pool.submit(() -> { + pushLoanDiff(finalConfirmation); + }); + } catch (Exception e) { + e.printStackTrace(); + } return rb.success(); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffRest.java index 273d7af1d1..225ea0022f 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffRest.java @@ -61,6 +61,11 @@ public class LoanDiffRest implements LoanDiffFeign { return loanDiffService.complete(bv); } + @Override + public ResultBean ctDiff(String sid) { + return loanDiffService.ctDiff(sid); + } + @Override public ResultBean> getPreviousNodesForReject(DiffApplyNodeQuery query) { return loanDiffService.getPreviousNodesForReject(query); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java index 2a598d7c24..29bb7de485 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java @@ -155,24 +155,24 @@ public class LoanDiffService extends MybatisBaseService loanDiffDetails = dto.getLoanDiffDetails(); loanDiffDetails.removeAll(Collections.singleton(null)); - if(!loanDiffDetails.isEmpty()){ + if (!loanDiffDetails.isEmpty()) { for (int i = 0; i < loanDiffDetails.size(); i++) { LoanDiffDetailsDto loanDiffDetailsDto = loanDiffDetails.get(i); BigDecimal bigAll = BigDecimal.ZERO; BigDecimal diffLoan = new BigDecimal(loanDiffDetailsDto.getDiffLoan()); - if(StringUtils.isNotBlank(loanDiffDetailsDto.getRealityDiscount())){ + if (StringUtils.isNotBlank(loanDiffDetailsDto.getRealityDiscount())) { bigAll = bigAll.add(new BigDecimal(loanDiffDetailsDto.getRealityDiscount())); } - if(StringUtils.isNotBlank(loanDiffDetailsDto.getRealityLoanMargin())){ + if (StringUtils.isNotBlank(loanDiffDetailsDto.getRealityLoanMargin())) { bigAll = bigAll.add(new BigDecimal(loanDiffDetailsDto.getRealityLoanMargin())); } - if(StringUtils.isNotBlank(loanDiffDetailsDto.getRealityOtherDiscount())){ + if (StringUtils.isNotBlank(loanDiffDetailsDto.getRealityOtherDiscount())) { bigAll = bigAll.add(new BigDecimal(loanDiffDetailsDto.getRealityOtherDiscount())); } - if(StringUtils.isNotBlank(loanDiffDetailsDto.getRealityPremium())){ + if (StringUtils.isNotBlank(loanDiffDetailsDto.getRealityPremium())) { bigAll = bigAll.add(new BigDecimal(loanDiffDetailsDto.getRealityPremium())); } - if(bigAll.compareTo(diffLoan) != 0){ + if (bigAll.compareTo(diffLoan) != 0) { return rb.setMsg("放款差额不等于其他四项实际之和,不允许提交"); } } @@ -299,7 +299,7 @@ public class LoanDiffService extends MybatisBaseService collectionDetailDtoListOne = new ArrayList<>(); SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(busSalesOrder.getOrgSid()).getData(); if (loanDiffDetails.getRealityLoanMargin() != null) {//实扣贷款保证金 - if(loanDiffDetails.getRealityLoanMargin().compareTo(BigDecimal.ZERO) != 0){ + if (loanDiffDetails.getRealityLoanMargin().compareTo(BigDecimal.ZERO) != 0) { CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto(); creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode()); creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getRealityLoanMargin().toString()); creditResultDetailDto.setUseTo(CwSystemYT.GDBZJ.getType()); creditResultDetailDto.setRemarks(CwSystemYT.GDBZJ.getMark()); - if(baseVehicle != null){ + if (baseVehicle != null) { String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8); creditResultDetailDto.setMaterialNo(vinNo); } @@ -353,13 +353,13 @@ public class LoanDiffService extends MybatisBaseService loanDiffDetailssDtos = dto.getLoanDiffDetailssDtos(); loanDiffDetailssDtos.removeAll(Collections.singleton(null)); - String billNo =getApplyCode(loanDiff.getOrgSidPath()); + String billNo = getApplyCode(loanDiff.getOrgSidPath()); loanDiff.setBillNo(billNo); if (!loanDiffDetailssDtos.isEmpty()) { for (int i = 0; i < loanDiffDetailssDtos.size(); i++) { @@ -788,4 +788,10 @@ public class LoanDiffService extends MybatisBaseService