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

回购结清凭证

zhanglei
dimengzhe 1 week ago
parent
24a64f1f4f
commit
04c4486c3f
3 changed files with 64 additions and 33 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. 1
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  2. 18
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
  3. 78
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java

1
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
View File

@ -6673,6 +6673,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
} }
voucherDetail.setCustomerCode(customerNumber); voucherDetail.setCustomerCode(customerNumber);
voucherDetail.setCustomerName(customerName); voucherDetail.setCustomerName(customerName);
voucherDetail.setRepoState(busSalesOrderVehicle.getRepoState());
} }
try { try {
voucherDetail.setDataTime(sdf.parse(collectionDate)); voucherDetail.setDataTime(sdf.parse(collectionDate));

18
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
View File

@ -1436,7 +1436,11 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
if (voucherDetail.getSubtrahend().compareTo(BigDecimal.ZERO) != 0) { if (voucherDetail.getSubtrahend().compareTo(BigDecimal.ZERO) != 0) {
Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方 Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方
dto2.setSummary("结清名义价款"); dto2.setSummary("结清名义价款");
dto2.setSubjectNo(bankCode); if(voucherDetail.getRepoState() != null && "1".equals(voucherDetail.getRepoState())){
dto2.setSubjectNo("1201.02.03");
}else{
dto2.setSubjectNo(bankCode);
}
dto2.setDimensionDept(voucherDetail.getDeptCode()); dto2.setDimensionDept(voucherDetail.getDeptCode());
dto2.setDimensionCustom(voucherDetail.getCustomerCode()); dto2.setDimensionCustom(voucherDetail.getCustomerCode());
dto2.setCredit(String.valueOf(voucherDetail.getSubtrahend())); dto2.setCredit(String.valueOf(voucherDetail.getSubtrahend()));
@ -1456,7 +1460,11 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
if (voucherDetail.getSubtrahend().compareTo(BigDecimal.ZERO) != 0) { if (voucherDetail.getSubtrahend().compareTo(BigDecimal.ZERO) != 0) {
Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方 Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方
dto2.setSummary("还其他费用-合同违约金"); dto2.setSummary("还其他费用-合同违约金");
dto2.setSubjectNo(bankCode); if(voucherDetail.getRepoState() != null && "1".equals(voucherDetail.getRepoState())){
dto2.setSubjectNo("1201.02.03");
}else{
dto2.setSubjectNo(bankCode);
}
dto2.setDimensionDept(voucherDetail.getDeptCode()); dto2.setDimensionDept(voucherDetail.getDeptCode());
dto2.setDimensionCustom(voucherDetail.getCustomerCode()); dto2.setDimensionCustom(voucherDetail.getCustomerCode());
dto2.setCredit(String.valueOf(voucherDetail.getSubtrahend())); dto2.setCredit(String.valueOf(voucherDetail.getSubtrahend()));
@ -1476,7 +1484,11 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
if (voucherDetail.getSubtrahend().compareTo(BigDecimal.ZERO) != 0) { if (voucherDetail.getSubtrahend().compareTo(BigDecimal.ZERO) != 0) {
Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方 Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方
dto2.setSummary("还其他费用-资方其他费用"); dto2.setSummary("还其他费用-资方其他费用");
dto2.setSubjectNo(bankCode); if(voucherDetail.getRepoState() != null && "1".equals(voucherDetail.getRepoState())){
dto2.setSubjectNo("1201.02.03");
}else{
dto2.setSubjectNo(bankCode);
}
dto2.setDimensionDept(voucherDetail.getDeptCode()); dto2.setDimensionDept(voucherDetail.getDeptCode());
dto2.setDimensionCustom(voucherDetail.getCustomerCode()); dto2.setDimensionCustom(voucherDetail.getCustomerCode());
dto2.setCredit(String.valueOf(voucherDetail.getSubtrahend())); dto2.setCredit(String.valueOf(voucherDetail.getSubtrahend()));

78
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
View File

@ -2393,7 +2393,11 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
if (finVo.getSubtrahend().compareTo(BigDecimal.ZERO) > 0) { if (finVo.getSubtrahend().compareTo(BigDecimal.ZERO) > 0) {
Voucher.VoucherResultDetailDto voucherDetail = new Voucher.VoucherResultDetailDto(); Voucher.VoucherResultDetailDto voucherDetail = new Voucher.VoucherResultDetailDto();
voucherDetail.setSummary("贷款保证金抵结清款"); voucherDetail.setSummary("贷款保证金抵结清款");
voucherDetail.setSubjectNo(bankCode); if("1".equals(busSalesOrderVehicle.getRepoState().toString())){
voucherDetail.setSubjectNo("1201.02.03");
}else{
voucherDetail.setSubjectNo(bankCode);
}
voucherDetail.setDimensionDept(deptCode); voucherDetail.setDimensionDept(deptCode);
voucherDetail.setDimensionCustom(customerNumber); voucherDetail.setDimensionCustom(customerNumber);
voucherDetail.setCredit(finVo.getSubtrahend().toString()); voucherDetail.setCredit(finVo.getSubtrahend().toString());
@ -2506,32 +2510,36 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
resultDetails.add(voucherDetail); resultDetails.add(voucherDetail);
amountAll = amountAll.add(bzjKFCw); amountAll = amountAll.add(bzjKFCw);
} }
//资方结清款付款 if("0".equals(busSalesOrderVehicle.getRepoState().toString())){//未回购
if (zfJQK.compareTo(BigDecimal.ZERO) <= 0) { //资方结清款付款
if (topping == 1) { if (zfJQK.compareTo(BigDecimal.ZERO) <= 0) {
if (bbjDDMoney.compareTo(BigDecimal.ZERO) > 0) { if (topping == 1) {
Voucher.VoucherResultDetailDto voucherDetail1 = new Voucher.VoucherResultDetailDto(); if (bbjDDMoney.compareTo(BigDecimal.ZERO) > 0) {
voucherDetail1.setSummary(planDetails.getBankName() + "结清"); Voucher.VoucherResultDetailDto voucherDetail1 = new Voucher.VoucherResultDetailDto();
voucherDetail1.setSubjectNo(bankCode); voucherDetail1.setSummary(planDetails.getBankName() + "结清");
voucherDetail1.setDimensionDept(deptCode); voucherDetail1.setSubjectNo(bankCode);
voucherDetail1.setDimensionCustom(customerNumber); voucherDetail1.setDimensionDept(deptCode);
voucherDetail1.setDebit(bbjDDMoney.toString()); voucherDetail1.setDimensionCustom(customerNumber);
resultDetails.add(voucherDetail1); voucherDetail1.setDebit(bbjDDMoney.toString());
Voucher.VoucherResultDetailDto voucherDetail2 = new Voucher.VoucherResultDetailDto(); resultDetails.add(voucherDetail1);
String bankSid = loanSettleApply.getBankSid(); Voucher.VoucherResultDetailDto voucherDetail2 = new Voucher.VoucherResultDetailDto();
LoanFinBank loanFinBank = loanFinBankService.fetchBySid(bankSid); String bankSid = loanSettleApply.getBankSid();
if(loanFinBank != null){ LoanFinBank loanFinBank = loanFinBankService.fetchBySid(bankSid);
voucherDetail2.setBank(loanFinBank.getBankNo()); if(loanFinBank != null){
voucherDetail2.setBank(loanFinBank.getBankNo());
}
voucherDetail2.setSummary(planDetails.getBankName() + "个贷保证金抵结清款");
voucherDetail2.setSubjectNo("1009.01.00");
voucherDetail2.setDimensionDept(deptCode);
voucherDetail2.setDimensionCustom(customerNumber);
voucherDetail2.setCredit(bbjDDMoney.toString());
resultDetails.add(voucherDetail2);
} }
voucherDetail2.setSummary(planDetails.getBankName() + "个贷保证金抵结清款");
voucherDetail2.setSubjectNo("1009.01.00");
voucherDetail2.setDimensionDept(deptCode);
voucherDetail2.setDimensionCustom(customerNumber);
voucherDetail2.setCredit(bbjDDMoney.toString());
resultDetails.add(voucherDetail2);
} }
} }
} }
//贷款保证金扣罚 //贷款保证金扣罚
if (amountAll.compareTo(BigDecimal.ZERO) > 0) { if (amountAll.compareTo(BigDecimal.ZERO) > 0) {
Voucher.VoucherResultDetailDto voucherDetail = new Voucher.VoucherResultDetailDto(); Voucher.VoucherResultDetailDto voucherDetail = new Voucher.VoucherResultDetailDto();
@ -4271,10 +4279,16 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
// voucherDetail.setRelief(companyRelief); // voucherDetail.setRelief(companyRelief);
// voucherDetail.setNoRelief(noRelief); // voucherDetail.setNoRelief(noRelief);
voucherDetail.setPaymentCharges(shouxufeiCW); voucherDetail.setPaymentCharges(shouxufeiCW);
voucherDetails.add(voucherDetail); if("0".equals(busSalesOrderVehicle.getRepoState().toString())){
voucherDetails.add(voucherDetail);
}
} }
paymentVoucher.setVoucherDetails(voucherDetails); if(!voucherDetails.isEmpty()){
finKingDeeFeign.saveSettleBankVoucher(paymentVoucher); paymentVoucher.setVoucherDetails(voucherDetails);
finKingDeeFeign.saveSettleBankVoucher(paymentVoucher);
}
} }
} }
@ -4383,11 +4397,15 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
voucherDetail.setSubtrahend(bbjDDMoney); voucherDetail.setSubtrahend(bbjDDMoney);
voucherDetail.setBalance(sub.add(shouxufeiCW)); voucherDetail.setBalance(sub.add(shouxufeiCW));
voucherDetail.setPaymentCharges(shouxufeiCW); voucherDetail.setPaymentCharges(shouxufeiCW);
voucherDetails.add(voucherDetail); if("0".equals(busSalesOrderVehicle.getRepoState().toString())){//未回购
voucherDetails.add(voucherDetail);
}
}
if(!voucherDetails.isEmpty()){
paymentVoucher.setVoucherDetails(voucherDetails);
RskVoucher rskVoucher = returnSettleBankVoucher(paymentVoucher);
return rb.success().setData(rskVoucher);
} }
paymentVoucher.setVoucherDetails(voucherDetails);
RskVoucher rskVoucher = returnSettleBankVoucher(paymentVoucher);
return rb.success().setData(rskVoucher);
} }
} }
return rb.success(); return rb.success();

Write Preview
Loading…
Cancel
Save