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

金融认款的月还、垫资方逾期利息若为回购则削减平台垫款应收

zhanglei
dimengzhe 2 weeks ago
parent
7d31f01499
commit
d2a40e4a6c
1 changed files with 1193 additions and 982 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. 211
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

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

@ -4438,6 +4438,34 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//推送间还待转付列表 //推送间还待转付列表
if (v.getReceivablesName().equals("月还") || v.getReceivablesName().equals("资方逾期利息")) { if (v.getReceivablesName().equals("月还") || v.getReceivablesName().equals("资方逾期利息")) {
if (null != planDetails) { if (null != planDetails) {
if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//回购
if (v.getReceivablesName().equals("月还")) {
if (null != planDetails.getPaymentMoney()) {
if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 1) {
BigDecimal paymentMoney = planDetails.getPaymentMoney();
String subscriptionMoney = v.getSubscriptionMoney();
BigDecimal subtract = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
planDetails.setPaymentMoney(subtract);
loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
}
}
}
if (v.getReceivablesName().equals("资方逾期利息")){
if (null != planDetails.getPaymentInterest()) {
if (planDetails.getPaymentInterest().compareTo(BigDecimal.ZERO) == 1) {
BigDecimal paymentInterest = planDetails.getPaymentInterest();
String subscriptionMoney = v.getSubscriptionMoney();
BigDecimal subtract = paymentInterest.subtract(new BigDecimal(subscriptionMoney));
planDetails.setPaymentInterest(subtract);
BigDecimal paymentMoney = planDetails.getPaymentMoney();
BigDecimal subtract2 = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
planDetails.setPaymentMoney(subtract2);
loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
}
}
}
}else{
if (v.getReceivablesName().equals("月还")) { if (v.getReceivablesName().equals("月还")) {
//推送间还认款记录 //推送间还认款记录
LoanRepaymentHistory historyEntity = new LoanRepaymentHistory(); LoanRepaymentHistory historyEntity = new LoanRepaymentHistory();
@ -4615,6 +4643,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//推送间还月还收款凭证 //推送间还月还收款凭证
CollectionVoucher.CollectionVoucherDetail d = getDueMoneyAndOverDueMoneyVoucher(v, collectionDate); CollectionVoucher.CollectionVoucherDetail d = getDueMoneyAndOverDueMoneyVoucher(v, collectionDate);
voucherDetails.add(d); voucherDetails.add(d);
}
} }
//认资金占用费消减平台资金占用费 //认资金占用费消减平台资金占用费
if (v.getReceivablesName().equals("资金占用费")) { if (v.getReceivablesName().equals("资金占用费")) {
@ -4857,6 +4888,34 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
voucherResultDetailDtoDf.setDimensionCustom(customerNumber); voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf.setCredit(v.getSubscriptionMoney()); voucherResultDetailDtoDf.setCredit(v.getSubscriptionMoney());
list.add(voucherResultDetailDtoDf); list.add(voucherResultDetailDtoDf);
if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//回购
if("月还".equals(v.getReceivablesName())){
if (null != planDetails.getPaymentMoney()) {
if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 1) {
BigDecimal paymentMoney = planDetails.getPaymentMoney();
String subscriptionMoney = v.getSubscriptionMoney();
BigDecimal subtract = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
planDetails.setPaymentMoney(subtract);
loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
}
}
}
if("资方逾期利息".equals(v.getReceivablesName())){
if (null != planDetails.getPaymentInterest()) {
if (planDetails.getPaymentInterest().compareTo(BigDecimal.ZERO) == 1) {
BigDecimal paymentInterest = planDetails.getPaymentInterest();
String subscriptionMoney = v.getSubscriptionMoney();
BigDecimal subtract = paymentInterest.subtract(new BigDecimal(subscriptionMoney));
planDetails.setPaymentInterest(subtract);
BigDecimal paymentMoney = planDetails.getPaymentMoney();
BigDecimal subtract2 = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
planDetails.setPaymentMoney(subtract2);
loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
}
}
}
}else{
if("月还".equals(v.getReceivablesName())){ if("月还".equals(v.getReceivablesName())){
//推送间还认款记录 //推送间还认款记录
LoanRepaymentHistory historyEntity = new LoanRepaymentHistory(); LoanRepaymentHistory historyEntity = new LoanRepaymentHistory();
@ -5030,6 +5089,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
} }
} }
} }
}
//应收贷款车欠款_到期欠款_逾期利息--资金占用费 //应收贷款车欠款_到期欠款_逾期利息--资金占用费
if ("资金占用费".equals(v.getReceivablesName())) { if ("资金占用费".equals(v.getReceivablesName())) {
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto(); Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto();
@ -5061,6 +5122,34 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
voucherResultDetailDtoDf.setDimensionCustom(customerNumber); voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf.setCredit(v.getSubscriptionMoney()); voucherResultDetailDtoDf.setCredit(v.getSubscriptionMoney());
list2.add(voucherResultDetailDtoDf); list2.add(voucherResultDetailDtoDf);
if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//回购
if("月还".equals(v.getReceivablesName())){
if (null != planDetails.getPaymentMoney()) {
if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 1) {
BigDecimal paymentMoney = planDetails.getPaymentMoney();
String subscriptionMoney = v.getSubscriptionMoney();
BigDecimal subtract = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
planDetails.setPaymentMoney(subtract);
loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
}
}
}
if("资方逾期利息".equals(v.getReceivablesName())){
if (null != planDetails.getPaymentInterest()) {
if (planDetails.getPaymentInterest().compareTo(BigDecimal.ZERO) == 1) {
BigDecimal paymentInterest = planDetails.getPaymentInterest();
String subscriptionMoney = v.getSubscriptionMoney();
BigDecimal subtract = paymentInterest.subtract(new BigDecimal(subscriptionMoney));
planDetails.setPaymentInterest(subtract);
BigDecimal paymentMoney = planDetails.getPaymentMoney();
BigDecimal subtract2 = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
planDetails.setPaymentMoney(subtract2);
loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
}
}
}
}else{
if("月还".equals(v.getReceivablesName())){ if("月还".equals(v.getReceivablesName())){
//推送间还认款记录 //推送间还认款记录
LoanRepaymentHistory historyEntity = new LoanRepaymentHistory(); LoanRepaymentHistory historyEntity = new LoanRepaymentHistory();
@ -5234,6 +5323,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
} }
} }
}
if ("资金占用费".equals(v.getReceivablesName())) { if ("资金占用费".equals(v.getReceivablesName())) {
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto(); Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto();
all2 = all2.add(new BigDecimal(v.getSubscriptionMoney())); all2 = all2.add(new BigDecimal(v.getSubscriptionMoney()));
@ -5354,6 +5445,34 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
voucherResultDetailDtoDf.setDimensionCustom(customerNumber); voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf.setCredit(v.getSubscriptionMoney()); voucherResultDetailDtoDf.setCredit(v.getSubscriptionMoney());
list3.add(voucherResultDetailDtoDf); list3.add(voucherResultDetailDtoDf);
if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//回购
if("月还".equals(v.getReceivablesName())){
if (null != planDetails.getPaymentMoney()) {
if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 1) {
BigDecimal paymentMoney = planDetails.getPaymentMoney();
String subscriptionMoney = v.getSubscriptionMoney();
BigDecimal subtract = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
planDetails.setPaymentMoney(subtract);
loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
}
}
}
if("资方逾期利息".equals(v.getReceivablesName())){
if (null != planDetails.getPaymentInterest()) {
if (planDetails.getPaymentInterest().compareTo(BigDecimal.ZERO) == 1) {
BigDecimal paymentInterest = planDetails.getPaymentInterest();
String subscriptionMoney = v.getSubscriptionMoney();
BigDecimal subtract = paymentInterest.subtract(new BigDecimal(subscriptionMoney));
planDetails.setPaymentInterest(subtract);
BigDecimal paymentMoney = planDetails.getPaymentMoney();
BigDecimal subtract2 = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
planDetails.setPaymentMoney(subtract2);
loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
}
}
}
}else{
if("月还".equals(v.getReceivablesName())){ if("月还".equals(v.getReceivablesName())){
//推送间还认款记录 //推送间还认款记录
LoanRepaymentHistory historyEntity = new LoanRepaymentHistory(); LoanRepaymentHistory historyEntity = new LoanRepaymentHistory();
@ -5528,6 +5647,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
} }
} }
}
@ -5544,6 +5665,34 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
voucherResultDetailDtoDf.setDimensionCustom(customerNumber); voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf.setCredit(v.getSubscriptionMoney()); voucherResultDetailDtoDf.setCredit(v.getSubscriptionMoney());
list4.add(voucherResultDetailDtoDf); list4.add(voucherResultDetailDtoDf);
if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//回购
if("月还".equals(v.getReceivablesName())){
if (null != planDetails.getPaymentMoney()) {
if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 1) {
BigDecimal paymentMoney = planDetails.getPaymentMoney();
String subscriptionMoney = v.getSubscriptionMoney();
BigDecimal subtract = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
planDetails.setPaymentMoney(subtract);
loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
}
}
}
if("资方逾期利息".equals(v.getReceivablesName())){
if (null != planDetails.getPaymentInterest()) {
if (planDetails.getPaymentInterest().compareTo(BigDecimal.ZERO) == 1) {
BigDecimal paymentInterest = planDetails.getPaymentInterest();
String subscriptionMoney = v.getSubscriptionMoney();
BigDecimal subtract = paymentInterest.subtract(new BigDecimal(subscriptionMoney));
planDetails.setPaymentInterest(subtract);
BigDecimal paymentMoney = planDetails.getPaymentMoney();
BigDecimal subtract2 = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
planDetails.setPaymentMoney(subtract2);
loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
}
}
}
}else{
if("月还".equals(v.getReceivablesName())){ if("月还".equals(v.getReceivablesName())){
//推送间还认款记录 //推送间还认款记录
LoanRepaymentHistory historyEntity = new LoanRepaymentHistory(); LoanRepaymentHistory historyEntity = new LoanRepaymentHistory();
@ -5717,6 +5866,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
} }
} }
} }
}
//---------预提费用_诉讼保全费 //---------预提费用_诉讼保全费
if("诉讼保全费".equals(v.getReceivablesName()) || "诉讼费用".equals(v.getReceivablesName())){ if("诉讼保全费".equals(v.getReceivablesName()) || "诉讼费用".equals(v.getReceivablesName())){
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto(); Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
@ -5867,6 +6018,34 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
voucherResultDetailDtoDf.setDimensionCustom(customerNumber); voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf.setCredit(v.getSubscriptionMoney()); voucherResultDetailDtoDf.setCredit(v.getSubscriptionMoney());
list5.add(voucherResultDetailDtoDf); list5.add(voucherResultDetailDtoDf);
if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//回购
if("月还".equals(v.getReceivablesName())){
if (null != planDetails.getPaymentMoney()) {
if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 1) {
BigDecimal paymentMoney = planDetails.getPaymentMoney();
String subscriptionMoney = v.getSubscriptionMoney();
BigDecimal subtract = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
planDetails.setPaymentMoney(subtract);
loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
}
}
}
if("资方逾期利息".equals(v.getReceivablesName())){
if (null != planDetails.getPaymentInterest()) {
if (planDetails.getPaymentInterest().compareTo(BigDecimal.ZERO) == 1) {
BigDecimal paymentInterest = planDetails.getPaymentInterest();
String subscriptionMoney = v.getSubscriptionMoney();
BigDecimal subtract = paymentInterest.subtract(new BigDecimal(subscriptionMoney));
planDetails.setPaymentInterest(subtract);
BigDecimal paymentMoney = planDetails.getPaymentMoney();
BigDecimal subtract2 = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
planDetails.setPaymentMoney(subtract2);
loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
}
}
}
}else{
if("月还".equals(v.getReceivablesName())){ if("月还".equals(v.getReceivablesName())){
//推送间还认款记录 //推送间还认款记录
LoanRepaymentHistory historyEntity = new LoanRepaymentHistory(); LoanRepaymentHistory historyEntity = new LoanRepaymentHistory();
@ -6040,6 +6219,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
} }
} }
} }
}
}else if("7".equals(busSalesOrderVehicle.getRiskState().toString())){//处置损失 }else if("7".equals(busSalesOrderVehicle.getRiskState().toString())){//处置损失
if ("月还".equals(v.getReceivablesName()) || "资方逾期利息".equals(v.getReceivablesName())) { if ("月还".equals(v.getReceivablesName()) || "资方逾期利息".equals(v.getReceivablesName())) {
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto(); Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
@ -6052,6 +6233,34 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
voucherResultDetailDtoDf.setDimensionCustom(customerNumber); voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf.setCredit(v.getSubscriptionMoney()); voucherResultDetailDtoDf.setCredit(v.getSubscriptionMoney());
list6.add(voucherResultDetailDtoDf); list6.add(voucherResultDetailDtoDf);
if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//回购
if("月还".equals(v.getReceivablesName())){
if (null != planDetails.getPaymentMoney()) {
if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 1) {
BigDecimal paymentMoney = planDetails.getPaymentMoney();
String subscriptionMoney = v.getSubscriptionMoney();
BigDecimal subtract = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
planDetails.setPaymentMoney(subtract);
loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
}
}
}
if("资方逾期利息".equals(v.getReceivablesName())){
if (null != planDetails.getPaymentInterest()) {
if (planDetails.getPaymentInterest().compareTo(BigDecimal.ZERO) == 1) {
BigDecimal paymentInterest = planDetails.getPaymentInterest();
String subscriptionMoney = v.getSubscriptionMoney();
BigDecimal subtract = paymentInterest.subtract(new BigDecimal(subscriptionMoney));
planDetails.setPaymentInterest(subtract);
BigDecimal paymentMoney = planDetails.getPaymentMoney();
BigDecimal subtract2 = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
planDetails.setPaymentMoney(subtract2);
loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
}
}
}
}else{
if("月还".equals(v.getReceivablesName())){ if("月还".equals(v.getReceivablesName())){
//推送间还认款记录 //推送间还认款记录
LoanRepaymentHistory historyEntity = new LoanRepaymentHistory(); LoanRepaymentHistory historyEntity = new LoanRepaymentHistory();
@ -6226,6 +6435,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
} }
} }
}
if("资金占用费".equals(v.getReceivablesName())){ if("资金占用费".equals(v.getReceivablesName())){
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto(); Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto();
all6 = all6.add(new BigDecimal(v.getSubscriptionMoney())); all6 = all6.add(new BigDecimal(v.getSubscriptionMoney()));

Write Preview
Loading…
Cancel
Save