From eb5e74bda95bc536ec209b321eda60077660ce43 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 29 Apr 2025 11:55:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E5=9B=9E=E8=BD=A6=E8=BE=86=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=8E=A8=E9=80=81=E6=89=A3=E5=9B=9E=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=87=AD=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AlrepaidAndArrVo.java | 2 + .../LoanRepaymentPlanDetailsMapper.java | 6 + .../LoanRepaymentPlanDetailsMapper.xml | 79 +++++++++ .../LoanRepaymentPlanDetailsService.java | 18 +- .../LoanRestoreReportApplyMapper.java | 2 + .../LoanRestoreReportApplyMapper.xml | 22 +++ .../LoanRestoreReportApplyService.java | 3 + .../LoanReturnInboundApplyService.java | 163 +++++++++++++++++- 8 files changed, 292 insertions(+), 3 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/AlrepaidAndArrVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/AlrepaidAndArrVo.java index 1f4e7baf77..e2b5370427 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/AlrepaidAndArrVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/AlrepaidAndArrVo.java @@ -53,4 +53,6 @@ public class AlrepaidAndArrVo implements Vo { private String alRepaidMoneyConPeriod; // 已还金额换算期数 @ApiModelProperty("逾期金额换算期数") private String beOverdueMoneyAndPeriod; // 逾期金额换算期数 + + private String money; } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java index 3de1615f0f..6cfb9c2948 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java @@ -103,4 +103,10 @@ public interface LoanRepaymentPlanDetailsMapper extends BaseMapper planSids); int updateDataTime(@Param("format") String format); + + List selectByBusVinSid(@Param("busVinSid") String busVinSid); + + String getYqLq(@Param("busVinSid") String busVinSid); + + String getBj(@Param("busVinSid") String busVinSid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml index 2e0ba598e4..562fba9461 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml @@ -934,4 +934,83 @@ AND scheduleSid = #{scheduleSid} GROUP BY dueDate + + + + + + diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java index 315b6d35e4..e3ae42acf8 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java @@ -121,6 +121,7 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService selByMainSidAndPolicyOrOther(String sid, String s) { - return baseMapper.selByMainSidAndPolicyOrOther(sid,s); + return baseMapper.selByMainSidAndPolicyOrOther(sid, s); } public void updateImportDataList(List planDetails) { @@ -372,4 +374,16 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService selectByBusVinSid(String busVinSid) { + return baseMapper.selectByBusVinSid(busVinSid); + } + //逾期且累欠的金额 + public String getYqLq(String busVinSid){ + return baseMapper.getYqLq(busVinSid); + } + + public String getBj(String busVinSid) { + return baseMapper.getBj(busVinSid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.java index 60b4237e78..ea93b402d6 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.java @@ -76,4 +76,6 @@ public interface LoanRestoreReportApplyMapper extends BaseMapper0 + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java index 2a3c9a017c..a4248c4ee3 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java @@ -699,6 +699,9 @@ public class LoanRestoreReportApplyService extends MybatisBaseService listPageVo(PagerQuery pq) { LoanReturnInboundApplyQuery query = pq.getParams(); @@ -562,7 +585,7 @@ public class LoanReturnInboundApplyService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + LoanReturnInboundApply finalLoanReturnInboundApply = loanReturnInboundApply; + Future future1 = pool.submit(() -> { + //推送财务凭证 + //TOdO: + pushRiskToFin(finalLoanReturnInboundApply); + }); + } catch (Exception e) { + e.printStackTrace(); + } + } else { //极光推送 @@ -598,6 +637,128 @@ public class LoanReturnInboundApplyService extends MybatisBaseService bdCustomers = new ArrayList<>(); + BdCustomer bdCustomer = new BdCustomer(); + bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo()); + bdCustomer.setFShortName(salesOrder.getContractNo()); + if (StringUtils.isNotBlank(salesOrder.getPurchaseSystemSid())) { + BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData(); + bdCustomer.setTOrgIds(data.getOrgCode()); + } + bdCustomer.setTOrgIds(deptVo.getOrgCode()); + if (org.apache.commons.lang3.StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) { + String vinNo = busSalesOrderVehicle.getLinkNo(); + if (vinNo.length() > 8) { + linkNo = vinNo.substring(vinNo.length() - 8); + } else { + linkNo = busSalesOrderVehicle.getLinkNo(); + } + if (null != borrowerDetailsVo) { + bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + linkNo); + } + } else { + if (null != borrowerDetailsVo) { + bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getTemporaryNo()); + } + } + // bdCustomers.add(bdCustomer); + ResultBean resultBean = finKingDeeFeign.draftBdCustomer(bdCustomer); + if (resultBean.getSuccess()) { + customerNumber = bdCustomer.getFNumber(); + } + } else { + customerNumber = busSalesOrderVehicle.getTemporaryNo(); + } + } + } + AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr2(loanReturnInboundApply.getBusVinSid()); + //应收贷款车欠款_待处理欠款_扣回车辆 + BigDecimal all = BigDecimal.ZERO; + //应收贷款车欠款_到期欠款_累欠 + BigDecimal lqMoney = BigDecimal.ZERO; + //应收贷款车欠款_未到期欠款_未到期欠款 + BigDecimal wdqMoney = BigDecimal.ZERO; + //应收贷款车欠款_到期欠款_本金 + BigDecimal bjMoney = BigDecimal.ZERO; + String lq = loanRepaymentPlanDetailsService.getYqLq(loanReturnInboundApply.getBusVinSid()); + lqMoney = lqMoney.add(new BigDecimal(StringUtils.isBlank(lq)? "0" :lq)); + //未到期欠款 + String wdq = alrepaidAndArrVo.getUnexpiredMoney(); + wdqMoney = wdqMoney.add(new BigDecimal(StringUtils.isBlank(wdq)?"0":wdq)); + String bj = loanRepaymentPlanDetailsService.getBj(loanReturnInboundApply.getBusVinSid()); + bjMoney = bjMoney.add(new BigDecimal(StringUtils.isBlank(bj)?"0":bj)); + all = lqMoney.add(wdqMoney).add(bjMoney); + + + + + List voucherResultDetailDtos = new ArrayList<>(); + //借方 + Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto(); + //贷方 + Voucher.VoucherResultDetailDto voucherResultDetailDtoDf1 = new Voucher.VoucherResultDetailDto(); + Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto(); + Voucher.VoucherResultDetailDto voucherResultDetailDtoDf3 = new Voucher.VoucherResultDetailDto(); + + //-------------------------------------------应收贷款车欠款_待处理欠款_扣回车辆 + voucherResultDetailDtoJf.setSummary("扣回车辆入库"); + voucherResultDetailDtoJf.setSubjectNo("1201.03.01"); + //核算部门 + voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode()); + //核算客户 + voucherResultDetailDtoJf.setDimensionCustom(customerNumber); + voucherResultDetailDtoJf.setDebit(all.toString()); + voucherResultDetailDtos.add(voucherResultDetailDtoJf); + //---------------------------------------------应收贷款车欠款_到期欠款_累欠 + voucherResultDetailDtoDf1.setSummary("扣回车辆入库"); + voucherResultDetailDtoDf1.setSubjectNo("1201.02.03"); + //核算部门 + voucherResultDetailDtoDf1.setDimensionDept(deptVo.getOrgCode()); + //核算客户 + voucherResultDetailDtoDf1.setDimensionCustom(customerNumber); + voucherResultDetailDtoDf1.setCredit(lqMoney.toString()); + voucherResultDetailDtos.add(voucherResultDetailDtoDf1); + //--------------------------------------------应收贷款车欠款_未到期欠款_未到期欠款 + voucherResultDetailDtoDf2.setSummary("扣回车辆入库"); + voucherResultDetailDtoDf2.setSubjectNo("1201.01.00"); + //核算部门 + voucherResultDetailDtoDf2.setDimensionDept(deptVo.getOrgCode()); + //核算客户 + voucherResultDetailDtoDf2.setDimensionCustom(customerNumber); + voucherResultDetailDtoDf2.setCredit(wdqMoney.toString()); + voucherResultDetailDtos.add(voucherResultDetailDtoDf2); + //-------------------------------------------应收贷款车欠款_到期欠款_本金 + voucherResultDetailDtoDf3.setSummary("扣回车辆入库"); + voucherResultDetailDtoDf3.setSubjectNo("1201.02.01"); + //核算部门 + voucherResultDetailDtoDf3.setDimensionDept(deptVo.getOrgCode()); + //核算客户 + voucherResultDetailDtoDf3.setDimensionCustom(customerNumber); + voucherResultDetailDtoDf3.setCredit(bjMoney.toString()); + voucherResultDetailDtos.add(voucherResultDetailDtoDf3); + voucher.setResultDetails(voucherResultDetailDtos); + finKingDeeFeign.saveVoucher(voucher); + } + private int submitBusinessData(SubmitReturnInbondApplyDto dto, LoanReturnInboundApply loanReturnInboundApply) { int r = 0; if (StringUtils.isBlank(dto.getSid())) {