yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
ligaode 7 months ago
parent
ccd385c09d b711e92d2b
commit
c4de0e1bb2
2 changed files with 145 additions and 133 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 124
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java
  2. 154
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/ScheduledRepaymentPlanDetailsService.java

124
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java
View File

@ -700,74 +700,80 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
GeneralVoucher generalVoucher = new GeneralVoucher(); GeneralVoucher generalVoucher = new GeneralVoucher();
List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>(); List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
for (LoanPlanDetailsVoForLateVoucher planDetails : records) { for (LoanPlanDetailsVoForLateVoucher planDetails : records) {
if (null != planDetails) { if (StringUtils.isNotBlank(planDetails.getOverdueState())) {
planSids.add(planDetails.getPlanSid()); if (planDetails.getOverdueState().equals("0")) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail(); if (null != planDetails) {
if (StringUtils.isNotBlank(planDetails.getUseOrgSid())) { planSids.add(planDetails.getPlanSid());
String useOrgSid = planDetails.getUseOrgSid(); GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); if (StringUtils.isNotBlank(planDetails.getUseOrgSid())) {
if (null != organizationVo) { String useOrgSid = planDetails.getUseOrgSid();
generalVoucher.setUseOrgCode(organizationVo.getOrgCode()); 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.getScheduleSid())) {
} LoanRepaymentSchedule repaymentSchedule = loanRepaymentScheduleService.fetchBySid(planDetails.getScheduleSid());
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData(); if (null != repaymentSchedule) {
BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(planDetails.getSalesOrderSid()).getData(); if (StringUtils.isNotBlank(repaymentSchedule.getCwDeptNo())) {
if (null != salesOrder) { voucherDetail.setDeptCode(repaymentSchedule.getCwDeptNo());
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); BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData();
if (resultBean.getSuccess()) { BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(planDetails.getSalesOrderSid()).getData();
customerNumber = bdCustomer.getFNumber(); 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);
} }
} 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); if (!voucherDetails.isEmpty()) {
finKingDeeFeign.saveLateVoucher(generalVoucher); generalVoucher.setVoucherDetails(voucherDetails);
finKingDeeFeign.saveLateVoucher(generalVoucher);
}
} }
if (!planSids.isEmpty()) { if (!planSids.isEmpty()) {
int i = loanRepaymentPlanDetailsService.updateOweState(planSids); int i = loanRepaymentPlanDetailsService.updateOweState(planSids);

154
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/ScheduledRepaymentPlanDetailsService.java
View File

@ -88,93 +88,99 @@ public class ScheduledRepaymentPlanDetailsService {
GeneralVoucher generalVoucher = new GeneralVoucher(); GeneralVoucher generalVoucher = new GeneralVoucher();
List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>(); List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
for (LoanPlanDetailsVoForLateVoucher planDetails : records) { for (LoanPlanDetailsVoForLateVoucher planDetails : records) {
if (null != planDetails) { if (StringUtils.isNotBlank(planDetails.getOverdueState())) {
planSids.add(planDetails.getPlanSid()); if (planDetails.getOverdueState().equals("0")) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail(); if (null != planDetails) {
voucherDetail.setDataTime(time); planSids.add(planDetails.getPlanSid());
if (StringUtils.isNotBlank(planDetails.getUseOrgSid())) { GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
String useOrgSid = planDetails.getUseOrgSid(); voucherDetail.setDataTime(time);
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); if (StringUtils.isNotBlank(planDetails.getUseOrgSid())) {
if (null != organizationVo) { String useOrgSid = planDetails.getUseOrgSid();
generalVoucher.setUseOrgCode(organizationVo.getOrgCode()); 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();
} }
} String cwDeptNo = "";
} if (StringUtils.isNotBlank(planDetails.getScheduleSid())) {
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData(); LoanRepaymentSchedule repaymentSchedule = loanRepaymentScheduleService.fetchBySid(planDetails.getScheduleSid());
BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(planDetails.getSalesOrderSid()).getData(); if (null != repaymentSchedule) {
if (null != salesOrder) { if (StringUtils.isNotBlank(repaymentSchedule.getCwDeptNo())) {
if (null != busSalesOrderVehicle) { voucherDetail.setDeptCode(repaymentSchedule.getCwDeptNo());
String customerNumber = ""; cwDeptNo = repaymentSchedule.getCwDeptNo();
//判断财务系统是否有客户 }
try { }
Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData(); }
String linkNo = ""; BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData();
BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData(); BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(planDetails.getSalesOrderSid()).getData();
if (!aBoolean) { if (null != salesOrder) {
// List<BdCustomer> bdCustomers = new ArrayList<>(); if (null != busSalesOrderVehicle) {
BdCustomer bdCustomer = new BdCustomer(); String customerNumber = "";
bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo()); //判断财务系统是否有客户
bdCustomer.setFShortName(salesOrder.getContractNo()); try {
if (StringUtils.isNotBlank(salesOrder.getPurchaseSystemSid())) { Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData(); String linkNo = "";
if (null != data) { BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
if (StringUtils.isNotBlank(data.getOrgCode())) { if (!aBoolean) {
bdCustomer.setTOrgIds(data.getOrgCode()); // List<BdCustomer> 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 { } else {
bdCustomer.setTOrgIds(cwDeptNo); 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<String> resultBean = finKingDeeFeign.draftBdCustomer(bdCustomer);
if (resultBean.getSuccess()) {
customerNumber = bdCustomer.getFNumber();
}
} else { } else {
bdCustomer.setTOrgIds(cwDeptNo); customerNumber = busSalesOrderVehicle.getTemporaryNo();
}
} 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());
} }
voucherDetail.setCustomerCode(customerNumber);
} catch (Exception e) {
e.printStackTrace();
} }
// bdCustomers.add(bdCustomer);
ResultBean<String> 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); if (!voucherDetails.isEmpty()) {
finKingDeeFeign.saveLateVoucher(generalVoucher); generalVoucher.setVoucherDetails(voucherDetails);
finKingDeeFeign.saveLateVoucher(generalVoucher);
}
} }
if (!planSids.isEmpty()) { if (!planSids.isEmpty()) {
int i = loanRepaymentPlanDetailsService.updateOweState(planSids); int i = loanRepaymentPlanDetailsService.updateOweState(planSids);

Write Preview
Loading…
Cancel
Save