From bde10c0af7769acd50b6c65b86337f4b438dbafa Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 27 May 2025 09:02:23 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=9B=9E=E8=B4=AD=E6=94=B6=E8=BD=A6?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E4=BA=8C=E6=AC=A1=E9=94=80=E5=94=AE=E5=87=AD?= =?UTF-8?q?=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 10 +++- .../LoanOutboundApplyService.java | 56 +++++++++++++++++++ .../LoanRepurchaseApplyMapper.java | 2 + .../LoanRepurchaseApplyMapper.xml | 4 ++ .../LoanRepurchaseApplyService.java | 4 ++ .../LoanReturnInboundApplyService.java | 30 +++++++++- .../LoanSecondarySalesNotApplyService.java | 32 +++++++++++ 7 files changed, 134 insertions(+), 4 deletions(-) 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 fb06b30d79..96e4d1f724 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 @@ -5363,9 +5363,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService listPage(PagerQuery pq) { IPage page = PagerUtil.queryToPage(pq); @@ -945,6 +953,30 @@ public class LoanOutboundApplyService extends MybatisBaseService + + \ 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 37c8c6bf11..f935cdb44a 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 @@ -1473,4 +1473,8 @@ public class LoanRepurchaseApplyService extends MybatisBaseService listPageVo(PagerQuery pq) { LoanReturnInboundApplyQuery query = pq.getParams(); @@ -725,7 +733,27 @@ public class LoanReturnInboundApplyService extends MybatisBaseService listPageVo(PagerQuery pq) { LoanSecondarySalesNotApplyQuery query = pq.getParams(); @@ -682,6 +690,30 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService Date: Tue, 27 May 2025 09:04:15 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=9B=9E=E8=B4=AD=E6=94=B6=E8=BD=A6?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E4=BA=8C=E6=AC=A1=E9=94=80=E5=94=AE=E5=87=AD?= =?UTF-8?q?=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9d41aeac66..5cbd93890a 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 @@ -231,6 +231,6 @@ \ No newline at end of file From 24a64f1f4f0fc3e3ec9da0a7e05729b3af0bf64e Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 27 May 2025 09:34:33 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=AF=89=E8=AE=BC=E5=87=AD=E8=AF=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=9E=E8=B4=AD=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanCaseCloseApplyService.java | 35 +++- .../LoanCaseExecuteApplyService.java | 172 +++++++++++++----- .../LoanLawsuitSubApplyService.java | 77 ++++++++ 3 files changed, 239 insertions(+), 45 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java index c33e649080..3e194720c0 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java @@ -80,6 +80,8 @@ import com.yxt.anrui.riskcenter.api.loancaseprogresstrial.LoanCaseProgressTrial; import com.yxt.anrui.riskcenter.api.loancaseprogressveh.LoanCaseProgressVeh; import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; +import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply; +import com.yxt.anrui.riskcenter.api.loanrepurchasecost.LoanRepurchaseCost; import com.yxt.anrui.riskcenter.api.loanrestorereportapply.AlrepaidAndArrVo; import com.yxt.anrui.riskcenter.biz.loancasecloseveh.LoanCaseCloseVehService; import com.yxt.anrui.riskcenter.biz.loancaseexecuteveh.LoanCaseExecuteVehService; @@ -90,6 +92,8 @@ import com.yxt.anrui.riskcenter.biz.loancaseprogresstrial.LoanCaseProgressTrialS import com.yxt.anrui.riskcenter.biz.loancaseprogressveh.LoanCaseProgressVehService; import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService; import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService; +import com.yxt.anrui.riskcenter.biz.loanrepurchaseapply.LoanRepurchaseApplyService; +import com.yxt.anrui.riskcenter.biz.loanrepurchasecost.LoanRepurchaseCostService; import com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyService; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.messagecenter.api.message.MessageFeign; @@ -172,6 +176,10 @@ public class LoanCaseCloseApplyService extends MybatisBaseService listPageVo(PagerQuery pq) { LoanCaseCloseApplyQuery query = pq.getParams(); @@ -513,7 +521,7 @@ public class LoanCaseCloseApplyService extends MybatisBaseService zxjaBusVinSidList = new ArrayList<>(); List ssjaBusVinSidList = new ArrayList<>(); List busVinSidList = loanCaseProgressVehService.selectByMainSid(finalLoanCaseCloseApply.getBusSid()); @@ -664,8 +672,33 @@ public class LoanCaseCloseApplyService extends MybatisBaseService listPageVo(PagerQuery pq) { LoanCaseExecuteApplyQuery query = pq.getParams(); @@ -508,27 +516,29 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService busVinSidList = loanCaseProgressVehService.selectByMainSid(loanCaseExecuteApply.getBusSid()); - BusVinStateSetQuery busVinStateSetQuery = new BusVinStateSetQuery(); - if(busVinSidList.isEmpty()){ - busVinStateSetQuery.setState(12);//执行 - busVinStateSetQuery.setBusVinSidList(busVinSidList); - ResultBean resultBean1 = busSalesOrderVehicleFeign.setRiskState(busVinStateSetQuery); - } try { ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() .setNameFormat("demo-pool-%d").build(); ExecutorService pool = new org.apache.tomcat.util.threads.ThreadPoolExecutor(2, 100, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue(1024), namedThreadFactory, new org.apache.tomcat.util.threads.ThreadPoolExecutor.AbortPolicy()); + LoanCaseExecuteApply finalLoanCaseExecuteApply = loanCaseExecuteApply; Future future1 = pool.submit(() -> { //推送财务凭证 //TOdO: pushRiskToFin(bv.getBusinessSid()); + List busVinSidList = loanCaseProgressVehService.selectByMainSid(finalLoanCaseExecuteApply.getBusSid()); + BusVinStateSetQuery busVinStateSetQuery = new BusVinStateSetQuery(); + if(busVinSidList.isEmpty()){ + busVinStateSetQuery.setState(12);//执行 + busVinStateSetQuery.setBusVinSidList(busVinSidList); + ResultBean resultBean1 = busSalesOrderVehicleFeign.setRiskState(busVinStateSetQuery); + } }); } catch (Exception e) { e.printStackTrace(); } + } else { //极光推送 loanCaseExecuteApply = fetchBySid(businessSid); @@ -561,6 +571,7 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService voucherResultDetailDtos = new ArrayList<>(); + List voucherResultDetailDtos2 = new ArrayList<>(); SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(loanCaseExecuteApply.getDeptSid()).getData(); List busVinSidList = loanCaseProgressVehService.selectByMainSid(loanCaseExecuteApply.getBusSid()); BigDecimal executeAmountInArear= loanCaseExecuteApply.getExecuteAmountInArear();//其中执行欠款金额 @@ -648,54 +659,127 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService 0) { - voucherResultDetailDtoDf.setSummary(customerNumber + "转执行"); - voucherResultDetailDtoDf.setSubjectNo("1201.03.04.02"); - //核算部门 - voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode()); - //核算客户 - voucherResultDetailDtoDf.setDimensionCustom(customerNumber); - voucherResultDetailDtoDf.setCredit(all.toString()); - voucherResultDetailDtos.add(voucherResultDetailDtoDf); - } + if("9".equals(busSalesOrderVehicle.getRiskState().toString())){ + //贷方 + Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto(); + //借方 + Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto(); + Voucher.VoucherResultDetailDto voucherResultDetailDtoJf2 = new Voucher.VoucherResultDetailDto(); + //-------------------------------------------应收贷款车欠款_待处理欠款_处置车辆_已诉讼-当前欠款合计 + if (all.compareTo(BigDecimal.ZERO) > 0) { + voucherResultDetailDtoDf.setSummary(customerNumber + "转执行"); + voucherResultDetailDtoDf.setSubjectNo("1201.03.03"); + //核算部门 + voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode()); + //核算客户 + voucherResultDetailDtoDf.setDimensionCustom(customerNumber); + voucherResultDetailDtoDf.setCredit(all.toString()); + voucherResultDetailDtos2.add(voucherResultDetailDtoDf); + } - //---------------------------------------------待处理财产损溢 风险准备金（输入）-预申请坏账金额 - if (ysqhz.compareTo(BigDecimal.ZERO) > 0) { - voucherResultDetailDtoJf.setSummary(customerNumber + "转执行"); - voucherResultDetailDtoJf.setSubjectNo("1911.05"); - //核算部门 - voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode()); - //核算客户 - voucherResultDetailDtoJf.setDimensionCustom(customerNumber); - voucherResultDetailDtoJf.setDebit(ysqhz.toString()); - voucherResultDetailDtos.add(voucherResultDetailDtoJf); - } + //---------------------------------------------待处理财产损溢 风险准备金（输入）-预申请坏账金额 + if (ysqhz.compareTo(BigDecimal.ZERO) > 0) { + voucherResultDetailDtoJf.setSummary(customerNumber + "转执行"); + voucherResultDetailDtoJf.setSubjectNo("1911.05"); + //核算部门 + voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode()); + //核算客户 + voucherResultDetailDtoJf.setDimensionCustom(customerNumber); + voucherResultDetailDtoJf.setDebit(ysqhz.toString()); + voucherResultDetailDtos2.add(voucherResultDetailDtoJf); + } + + //--------------------------------------------应收贷款车欠款_待处理欠款_待执行-其中执行欠款金额 + if (qzzxqk.compareTo(BigDecimal.ZERO) > 0) { + voucherResultDetailDtoJf2.setSummary(customerNumber + "转执行"); + voucherResultDetailDtoJf2.setSubjectNo("1201.03.05"); + //核算部门 + voucherResultDetailDtoJf2.setDimensionDept(deptVo.getOrgCode()); + //核算客户 + voucherResultDetailDtoJf2.setDimensionCustom(customerNumber); + voucherResultDetailDtoJf2.setDebit(qzzxqk.toString()); + voucherResultDetailDtos2.add(voucherResultDetailDtoJf2); + } + + }else if("11".equals(busSalesOrderVehicle.getRiskState().toString())){ + //贷方 + Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto(); + //借方 + Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto(); + Voucher.VoucherResultDetailDto voucherResultDetailDtoJf2 = new Voucher.VoucherResultDetailDto(); + //-------------------------------------------应收贷款车欠款_待处理欠款_处置车辆_已诉讼-当前欠款合计 + if (all.compareTo(BigDecimal.ZERO) > 0) { + voucherResultDetailDtoDf.setSummary(customerNumber + "转执行"); + voucherResultDetailDtoDf.setSubjectNo("1201.03.04.02"); + //核算部门 + voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode()); + //核算客户 + voucherResultDetailDtoDf.setDimensionCustom(customerNumber); + voucherResultDetailDtoDf.setCredit(all.toString()); + voucherResultDetailDtos.add(voucherResultDetailDtoDf); + } - //--------------------------------------------应收贷款车欠款_待处理欠款_待执行-其中执行欠款金额 - if (qzzxqk.compareTo(BigDecimal.ZERO) > 0) { - voucherResultDetailDtoJf2.setSummary(customerNumber + "转执行"); - voucherResultDetailDtoJf2.setSubjectNo("1201.03.05"); - //核算部门 - voucherResultDetailDtoJf2.setDimensionDept(deptVo.getOrgCode()); - //核算客户 - voucherResultDetailDtoJf2.setDimensionCustom(customerNumber); - voucherResultDetailDtoJf2.setDebit(qzzxqk.toString()); - voucherResultDetailDtos.add(voucherResultDetailDtoJf2); + //---------------------------------------------待处理财产损溢 风险准备金（输入）-预申请坏账金额 + if (ysqhz.compareTo(BigDecimal.ZERO) > 0) { + voucherResultDetailDtoJf.setSummary(customerNumber + "转执行"); + voucherResultDetailDtoJf.setSubjectNo("1911.05"); + //核算部门 + voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode()); + //核算客户 + voucherResultDetailDtoJf.setDimensionCustom(customerNumber); + voucherResultDetailDtoJf.setDebit(ysqhz.toString()); + voucherResultDetailDtos.add(voucherResultDetailDtoJf); + } + + //--------------------------------------------应收贷款车欠款_待处理欠款_待执行-其中执行欠款金额 + if (qzzxqk.compareTo(BigDecimal.ZERO) > 0) { + voucherResultDetailDtoJf2.setSummary(customerNumber + "转执行"); + voucherResultDetailDtoJf2.setSubjectNo("1201.03.05"); + //核算部门 + voucherResultDetailDtoJf2.setDimensionDept(deptVo.getOrgCode()); + //核算客户 + voucherResultDetailDtoJf2.setDimensionCustom(customerNumber); + voucherResultDetailDtoJf2.setDebit(qzzxqk.toString()); + voucherResultDetailDtos.add(voucherResultDetailDtoJf2); + } } } + if (!voucherResultDetailDtos.isEmpty()) { voucher.setResultDetails(voucherResultDetailDtos); finKingDeeFeign.saveVoucher(voucher); } + if (!voucherResultDetailDtos2.isEmpty()) { + voucher.setResultDetails(voucherResultDetailDtos2); + finKingDeeFeign.saveVoucher(voucher); + } } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitsubapply/LoanLawsuitSubApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitsubapply/LoanLawsuitSubApplyService.java index 39f6405422..fd17d65795 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitsubapply/LoanLawsuitSubApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitsubapply/LoanLawsuitSubApplyService.java @@ -64,6 +64,8 @@ import com.yxt.anrui.riskcenter.api.loanlawsuitapply.LoanLawsuitVehVo; import com.yxt.anrui.riskcenter.api.loanlawsuitsubapply.flow.*; import com.yxt.anrui.riskcenter.api.loanlawsuitsubveh.LoanLawsuitSubVehDetailsVo; import com.yxt.anrui.riskcenter.api.loanlawsuitsubveh.LoanLawsuitSubVehDto; +import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply; +import com.yxt.anrui.riskcenter.api.loanrepurchasecost.LoanRepurchaseCost; import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApply; import com.yxt.anrui.riskcenter.api.loansettleapply.SettleApplyCommonVo; import com.yxt.anrui.riskcenter.biz.loancaseprogress.LoanCaseProgressService; @@ -72,6 +74,7 @@ import com.yxt.anrui.riskcenter.biz.loanlawsuitsubveh.LoanLawsuitSubVehService; import com.yxt.anrui.riskcenter.biz.loanlawsuitveh.LoanLawsuitVehService; import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService; import com.yxt.anrui.riskcenter.biz.loanrepurchaseapply.LoanRepurchaseApplyService; +import com.yxt.anrui.riskcenter.biz.loanrepurchasecost.LoanRepurchaseCostService; import com.yxt.anrui.riskcenter.biz.loansettleapply.LoanSettleApplyService; import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDetailsVo; import com.yxt.common.core.result.ResultBean; @@ -136,6 +139,8 @@ public class LoanLawsuitSubApplyService extends MybatisBaseService listPageVo(PagerQuery pq) { LoanLawsuitSubApplyQuery query = pq.getParams(); @@ -590,6 +595,30 @@ public class LoanLawsuitSubApplyService extends MybatisBaseService Date: Tue, 27 May 2025 10:04:56 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=9B=9E=E8=B4=AD=E7=BB=93=E6=B8=85?= =?UTF-8?q?=E5=87=AD=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 1 + .../fin/biz/kingdee/FinKingDeeFeignRest.java | 18 ++++- .../LoanSettleApplyService.java | 78 ++++++++++++------- 3 files changed, 64 insertions(+), 33 deletions(-) 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 96e4d1f724..70f498add1 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 @@ -6673,6 +6673,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService 0) { Voucher.VoucherResultDetailDto voucherDetail = new Voucher.VoucherResultDetailDto(); voucherDetail.setSummary("贷款保证金抵结清款"); - voucherDetail.setSubjectNo(bankCode); + if("1".equals(busSalesOrderVehicle.getRepoState().toString())){ + voucherDetail.setSubjectNo("1201.02.03"); + }else{ + voucherDetail.setSubjectNo(bankCode); + } voucherDetail.setDimensionDept(deptCode); voucherDetail.setDimensionCustom(customerNumber); voucherDetail.setCredit(finVo.getSubtrahend().toString()); @@ -2506,32 +2510,36 @@ public class LoanSettleApplyService extends MybatisBaseService 0) { - Voucher.VoucherResultDetailDto voucherDetail1 = new Voucher.VoucherResultDetailDto(); - voucherDetail1.setSummary(planDetails.getBankName() + "结清"); - voucherDetail1.setSubjectNo(bankCode); - voucherDetail1.setDimensionDept(deptCode); - voucherDetail1.setDimensionCustom(customerNumber); - voucherDetail1.setDebit(bbjDDMoney.toString()); - resultDetails.add(voucherDetail1); - Voucher.VoucherResultDetailDto voucherDetail2 = new Voucher.VoucherResultDetailDto(); - String bankSid = loanSettleApply.getBankSid(); - LoanFinBank loanFinBank = loanFinBankService.fetchBySid(bankSid); - if(loanFinBank != null){ - voucherDetail2.setBank(loanFinBank.getBankNo()); + if("0".equals(busSalesOrderVehicle.getRepoState().toString())){//未回购 + //资方结清款付款 + if (zfJQK.compareTo(BigDecimal.ZERO) <= 0) { + if (topping == 1) { + if (bbjDDMoney.compareTo(BigDecimal.ZERO) > 0) { + Voucher.VoucherResultDetailDto voucherDetail1 = new Voucher.VoucherResultDetailDto(); + voucherDetail1.setSummary(planDetails.getBankName() + "结清"); + voucherDetail1.setSubjectNo(bankCode); + voucherDetail1.setDimensionDept(deptCode); + voucherDetail1.setDimensionCustom(customerNumber); + voucherDetail1.setDebit(bbjDDMoney.toString()); + resultDetails.add(voucherDetail1); + Voucher.VoucherResultDetailDto voucherDetail2 = new Voucher.VoucherResultDetailDto(); + String bankSid = loanSettleApply.getBankSid(); + LoanFinBank loanFinBank = loanFinBankService.fetchBySid(bankSid); + if(loanFinBank != null){ + voucherDetail2.setBank(loanFinBank.getBankNo()); + } + voucherDetail2.setSummary(planDetails.getBankName() + "个贷保证金抵结清款"); + voucherDetail2.setSubjectNo("1009.01.00"); + voucherDetail2.setDimensionDept(deptCode); + voucherDetail2.setDimensionCustom(customerNumber); + voucherDetail2.setCredit(bbjDDMoney.toString()); + resultDetails.add(voucherDetail2); } - voucherDetail2.setSummary(planDetails.getBankName() + "个贷保证金抵结清款"); - voucherDetail2.setSubjectNo("1009.01.00"); - voucherDetail2.setDimensionDept(deptCode); - voucherDetail2.setDimensionCustom(customerNumber); - voucherDetail2.setCredit(bbjDDMoney.toString()); - resultDetails.add(voucherDetail2); } } + } + //贷款保证金扣罚 if (amountAll.compareTo(BigDecimal.ZERO) > 0) { Voucher.VoucherResultDetailDto voucherDetail = new Voucher.VoucherResultDetailDto(); @@ -4271,10 +4279,16 @@ public class LoanSettleApplyService extends MybatisBaseService Date: Tue, 27 May 2025 10:13:09 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=9B=9E=E8=B4=AD=E7=BB=93=E6=B8=85?= =?UTF-8?q?=E5=87=AD=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/fin/api/kingdee/voucher/CollectionVoucher.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/CollectionVoucher.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/CollectionVoucher.java index e3a9715687..ce835c0387 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/CollectionVoucher.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/CollectionVoucher.java @@ -54,5 +54,7 @@ public class CollectionVoucher { public BigDecimal balance; @ApiModelProperty("减数适用于结清时计算差额") public BigDecimal subtrahend; + + public Integer repoState; } }