From 0798eeeeea8f154801eff20f8a2ac06665216f37 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 22 May 2024 10:19:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=92=E6=89=A3=E7=94=B3=E8=AF=B7=E9=80=9A?= =?UTF-8?q?=E8=BF=87=E5=90=8E=EF=BC=8C=E8=BF=98=E6=AC=BE=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E6=98=AF=E5=90=A6=E6=9B=BE=E9=80=BE=E6=9C=9F?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=BA=E6=98=AF=EF=BC=8C=E4=B8=94=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=8E=A8=E9=80=81=E8=BF=87=E7=9A=84=EF=BC=8C=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E8=B4=A2=E5=8A=A1=E6=9C=AC=E9=87=91=E8=BD=AC=E7=B4=AF?= =?UTF-8?q?=E6=AC=A0=E5=87=AD=E8=AF=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanBuckleApplyService.java | 118 +++++++++++++++--- 1 file changed, 100 insertions(+), 18 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java index b2d8ae6269..b3b0cf9441 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java @@ -682,20 +682,16 @@ public class LoanBuckleApplyService extends MybatisBaseService records = loanBuckleApplyRecordService.selByMainSid(businessSid); - if (!records.isEmpty()) { + LoanBuckleApply loanBuckleApply = fetchBySid(businessSid); + if (null != loanBuckleApply) { + List records = loanRepaymentPlanDetailsService.selListForLateVoucher(loanBuckleApply.getUseOrgSid()); List planSids = new ArrayList<>(); - List finalPlanSids = new ArrayList<>(); - records.stream().forEach(r -> { - planSids.add(r.getRepaymentHistorySid()); - }); - if (!planSids.isEmpty()) { - List vouchers = loanRepaymentPlanDetailsService.selPushLaterVoucherOnBuckle(planSids); - if (!vouchers.isEmpty()) { - GeneralVoucher generalVoucher = new GeneralVoucher(); - List voucherDetails = new ArrayList<>(); - for (LoanPlanDetailsVoForLateVoucher planDetails : vouchers) { - finalPlanSids.add(planDetails.getPlanSid()); + if (!records.isEmpty()) { + GeneralVoucher generalVoucher = new GeneralVoucher(); + List voucherDetails = new ArrayList<>(); + for (LoanPlanDetailsVoForLateVoucher planDetails : records) { + if (null != planDetails) { + planSids.add(planDetails.getPlanSid()); GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail(); if (StringUtils.isNotBlank(planDetails.getUseOrgSid())) { String useOrgSid = planDetails.getUseOrgSid(); @@ -758,16 +754,102 @@ public class LoanBuckleApplyService extends MybatisBaseService records = loanBuckleApplyRecordService.selByMainSid(businessSid); +// if (!records.isEmpty()) { +// List planSids = new ArrayList<>(); +// List finalPlanSids = new ArrayList<>(); +// records.stream().forEach(r -> { +// planSids.add(r.getRepaymentHistorySid()); +// }); +// if (!planSids.isEmpty()) { +// List vouchers = loanRepaymentPlanDetailsService.selPushLaterVoucherOnBuckle(planSids); +// if (!vouchers.isEmpty()) { +// GeneralVoucher generalVoucher = new GeneralVoucher(); +// List voucherDetails = new ArrayList<>(); +// for (LoanPlanDetailsVoForLateVoucher planDetails : vouchers) { +// finalPlanSids.add(planDetails.getPlanSid()); +// GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail(); +// if (StringUtils.isNotBlank(planDetails.getUseOrgSid())) { +// String useOrgSid = planDetails.getUseOrgSid(); +// SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); +// if (null != organizationVo) { +// generalVoucher.setUseOrgCode(organizationVo.getOrgCode()); +// } +// } +// if (StringUtils.isNotBlank(planDetails.getScheduleSid())) { +// LoanRepaymentSchedule repaymentSchedule = loanRepaymentScheduleService.fetchBySid(planDetails.getScheduleSid()); +// if (null != repaymentSchedule) { +// if (StringUtils.isNotBlank(repaymentSchedule.getCwDeptNo())) { +// voucherDetail.setDeptCode(repaymentSchedule.getCwDeptNo()); +// } +// } +// } +// BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData(); +// BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(planDetails.getSalesOrderSid()).getData(); +// if (null != salesOrder) { +// if (null != busSalesOrderVehicle) { +// String customerNumber = ""; +// //判断财务系统是否有客户 +// Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData(); +// String linkNo = ""; +// BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData(); +// if (!aBoolean) { +// // List bdCustomers = new ArrayList<>(); +// BdCustomer bdCustomer = new BdCustomer(); +// bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo()); +// bdCustomer.setFShortName(salesOrder.getContractNo()); +// BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData(); +// bdCustomer.setTOrgIds(data.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(); +// } +// voucherDetail.setCustomerCode(customerNumber); +// } +// } +// if (StringUtils.isNotBlank(planDetails.getOutstandingMoney())) { +// voucherDetail.setAmount(new BigDecimal(planDetails.getOutstandingMoney())); +// } +// voucherDetails.add(voucherDetail); +// +// } +// generalVoucher.setVoucherDetails(voucherDetails); +// finKingDeeFeign.saveLateVoucher(generalVoucher); +// } +// } +// if (!finalPlanSids.isEmpty()) { +// int i = loanRepaymentPlanDetailsService.updateOweState(finalPlanSids); +// } +// } } private void pushBuckleVoucher(String businessSid) {