|
|
@ -682,20 +682,16 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa |
|
|
|
} |
|
|
|
|
|
|
|
private void pushLaterBuckleVoucher(String businessSid) { |
|
|
|
List<LoanBuckleApplyRecord> records = loanBuckleApplyRecordService.selByMainSid(businessSid); |
|
|
|
if (!records.isEmpty()) { |
|
|
|
LoanBuckleApply loanBuckleApply = fetchBySid(businessSid); |
|
|
|
if (null != loanBuckleApply) { |
|
|
|
List<LoanPlanDetailsVoForLateVoucher> records = loanRepaymentPlanDetailsService.selListForLateVoucher(loanBuckleApply.getUseOrgSid()); |
|
|
|
List<String> planSids = new ArrayList<>(); |
|
|
|
List<String> finalPlanSids = new ArrayList<>(); |
|
|
|
records.stream().forEach(r -> { |
|
|
|
planSids.add(r.getRepaymentHistorySid()); |
|
|
|
}); |
|
|
|
if (!planSids.isEmpty()) { |
|
|
|
List<LoanPlanDetailsVoForLateVoucher> vouchers = loanRepaymentPlanDetailsService.selPushLaterVoucherOnBuckle(planSids); |
|
|
|
if (!vouchers.isEmpty()) { |
|
|
|
GeneralVoucher generalVoucher = new GeneralVoucher(); |
|
|
|
List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>(); |
|
|
|
for (LoanPlanDetailsVoForLateVoucher planDetails : vouchers) { |
|
|
|
finalPlanSids.add(planDetails.getPlanSid()); |
|
|
|
if (!records.isEmpty()) { |
|
|
|
GeneralVoucher generalVoucher = new GeneralVoucher(); |
|
|
|
List<GeneralVoucher.GeneralVoucherDetail> 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<LoanBuckleApplyMa |
|
|
|
voucherDetail.setAmount(new BigDecimal(planDetails.getOutstandingMoney())); |
|
|
|
} |
|
|
|
voucherDetails.add(voucherDetail); |
|
|
|
|
|
|
|
} |
|
|
|
generalVoucher.setVoucherDetails(voucherDetails); |
|
|
|
finKingDeeFeign.saveLateVoucher(generalVoucher); |
|
|
|
} |
|
|
|
generalVoucher.setVoucherDetails(voucherDetails); |
|
|
|
finKingDeeFeign.saveLateVoucher(generalVoucher); |
|
|
|
} |
|
|
|
if (!finalPlanSids.isEmpty()) { |
|
|
|
int i = loanRepaymentPlanDetailsService.updateOweState(finalPlanSids); |
|
|
|
if (!planSids.isEmpty()) { |
|
|
|
int i = loanRepaymentPlanDetailsService.updateOweState(planSids); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// List<LoanBuckleApplyRecord> records = loanBuckleApplyRecordService.selByMainSid(businessSid);
|
|
|
|
// if (!records.isEmpty()) {
|
|
|
|
// List<String> planSids = new ArrayList<>();
|
|
|
|
// List<String> finalPlanSids = new ArrayList<>();
|
|
|
|
// records.stream().forEach(r -> {
|
|
|
|
// planSids.add(r.getRepaymentHistorySid());
|
|
|
|
// });
|
|
|
|
// if (!planSids.isEmpty()) {
|
|
|
|
// List<LoanPlanDetailsVoForLateVoucher> vouchers = loanRepaymentPlanDetailsService.selPushLaterVoucherOnBuckle(planSids);
|
|
|
|
// if (!vouchers.isEmpty()) {
|
|
|
|
// GeneralVoucher generalVoucher = new GeneralVoucher();
|
|
|
|
// List<GeneralVoucher.GeneralVoucherDetail> 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<BdCustomer> 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<String> 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) { |
|
|
|