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 ef1d5fbd4b..2c82f34093 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 @@ -700,74 +700,80 @@ public class LoanBuckleApplyService extends MybatisBaseService 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(); - 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()); + if (StringUtils.isNotBlank(planDetails.getOverdueState())) { + if (planDetails.getOverdueState().equals("0")) { + if (null != planDetails) { + planSids.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()); + } } - } - } - 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()); + if (StringUtils.isNotBlank(planDetails.getScheduleSid())) { + LoanRepaymentSchedule repaymentSchedule = loanRepaymentScheduleService.fetchBySid(planDetails.getScheduleSid()); + if (null != repaymentSchedule) { + if (StringUtils.isNotBlank(repaymentSchedule.getCwDeptNo())) { + voucherDetail.setDeptCode(repaymentSchedule.getCwDeptNo()); } } - // bdCustomers.add(bdCustomer); - ResultBean resultBean = finKingDeeFeign.draftBdCustomer(bdCustomer); - if (resultBean.getSuccess()) { - customerNumber = bdCustomer.getFNumber(); + } + 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); } - } else { - customerNumber = busSalesOrderVehicle.getTemporaryNo(); } - voucherDetail.setCustomerCode(customerNumber); + if (StringUtils.isNotBlank(planDetails.getOutstandingMoney())) { + voucherDetail.setAmount(new BigDecimal(planDetails.getOutstandingMoney())); + } + voucherDetails.add(voucherDetail); } } - if (StringUtils.isNotBlank(planDetails.getOutstandingMoney())) { - voucherDetail.setAmount(new BigDecimal(planDetails.getOutstandingMoney())); - } - voucherDetails.add(voucherDetail); } } - generalVoucher.setVoucherDetails(voucherDetails); - finKingDeeFeign.saveLateVoucher(generalVoucher); + if (!voucherDetails.isEmpty()) { + generalVoucher.setVoucherDetails(voucherDetails); + finKingDeeFeign.saveLateVoucher(generalVoucher); + } } if (!planSids.isEmpty()) { int i = loanRepaymentPlanDetailsService.updateOweState(planSids); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/ScheduledRepaymentPlanDetailsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/ScheduledRepaymentPlanDetailsService.java index ef4e24cdbb..1c96488d42 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/ScheduledRepaymentPlanDetailsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/ScheduledRepaymentPlanDetailsService.java @@ -88,93 +88,99 @@ public class ScheduledRepaymentPlanDetailsService { 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(); - voucherDetail.setDataTime(time); - if (StringUtils.isNotBlank(planDetails.getUseOrgSid())) { - String useOrgSid = planDetails.getUseOrgSid(); - SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); - if (null != organizationVo) { - generalVoucher.setUseOrgCode(organizationVo.getOrgCode()); - } - } - String cwDeptNo = ""; - if (StringUtils.isNotBlank(planDetails.getScheduleSid())) { - LoanRepaymentSchedule repaymentSchedule = loanRepaymentScheduleService.fetchBySid(planDetails.getScheduleSid()); - if (null != repaymentSchedule) { - if (StringUtils.isNotBlank(repaymentSchedule.getCwDeptNo())) { - voucherDetail.setDeptCode(repaymentSchedule.getCwDeptNo()); - cwDeptNo = repaymentSchedule.getCwDeptNo(); + if (StringUtils.isNotBlank(planDetails.getOverdueState())) { + if (planDetails.getOverdueState().equals("0")) { + if (null != planDetails) { + planSids.add(planDetails.getPlanSid()); + GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail(); + voucherDetail.setDataTime(time); + if (StringUtils.isNotBlank(planDetails.getUseOrgSid())) { + String useOrgSid = planDetails.getUseOrgSid(); + SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); + if (null != organizationVo) { + generalVoucher.setUseOrgCode(organizationVo.getOrgCode()); + } } - } - } - BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData(); - BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(planDetails.getSalesOrderSid()).getData(); - if (null != salesOrder) { - if (null != busSalesOrderVehicle) { - String customerNumber = ""; - //判断财务系统是否有客户 - try { - 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()); - if (StringUtils.isNotBlank(salesOrder.getPurchaseSystemSid())) { - BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData(); - if (null != data) { - if (StringUtils.isNotBlank(data.getOrgCode())) { - bdCustomer.setTOrgIds(data.getOrgCode()); + String cwDeptNo = ""; + if (StringUtils.isNotBlank(planDetails.getScheduleSid())) { + LoanRepaymentSchedule repaymentSchedule = loanRepaymentScheduleService.fetchBySid(planDetails.getScheduleSid()); + if (null != repaymentSchedule) { + if (StringUtils.isNotBlank(repaymentSchedule.getCwDeptNo())) { + voucherDetail.setDeptCode(repaymentSchedule.getCwDeptNo()); + cwDeptNo = repaymentSchedule.getCwDeptNo(); + } + } + } + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData(); + BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(planDetails.getSalesOrderSid()).getData(); + if (null != salesOrder) { + if (null != busSalesOrderVehicle) { + String customerNumber = ""; + //判断财务系统是否有客户 + try { + 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()); + if (StringUtils.isNotBlank(salesOrder.getPurchaseSystemSid())) { + BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData(); + if (null != data) { + if (StringUtils.isNotBlank(data.getOrgCode())) { + bdCustomer.setTOrgIds(data.getOrgCode()); + } else { + bdCustomer.setTOrgIds(cwDeptNo); + } + } else { + bdCustomer.setTOrgIds(cwDeptNo); + } } else { bdCustomer.setTOrgIds(cwDeptNo); } + 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 { - bdCustomer.setTOrgIds(cwDeptNo); - } - } else { - bdCustomer.setTOrgIds(cwDeptNo); - } - 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()); + customerNumber = busSalesOrderVehicle.getTemporaryNo(); } + voucherDetail.setCustomerCode(customerNumber); + } catch (Exception e) { + e.printStackTrace(); } - // bdCustomers.add(bdCustomer); - ResultBean resultBean = finKingDeeFeign.draftBdCustomer(bdCustomer); - if (resultBean.getSuccess()) { - customerNumber = bdCustomer.getFNumber(); - } - } else { - customerNumber = busSalesOrderVehicle.getTemporaryNo(); } - voucherDetail.setCustomerCode(customerNumber); - } catch (Exception e) { - e.printStackTrace(); } + if (StringUtils.isNotBlank(planDetails.getOutstandingMoney())) { + voucherDetail.setAmount(new BigDecimal(planDetails.getOutstandingMoney())); + } + voucherDetails.add(voucherDetail); } } - if (StringUtils.isNotBlank(planDetails.getOutstandingMoney())) { - voucherDetail.setAmount(new BigDecimal(planDetails.getOutstandingMoney())); - } - voucherDetails.add(voucherDetail); } } - generalVoucher.setVoucherDetails(voucherDetails); - finKingDeeFeign.saveLateVoucher(generalVoucher); + if (!voucherDetails.isEmpty()) { + generalVoucher.setVoucherDetails(voucherDetails); + finKingDeeFeign.saveLateVoucher(generalVoucher); + } } if (!planSids.isEmpty()) { int i = loanRepaymentPlanDetailsService.updateOweState(planSids);