|
|
@ -4796,9 +4796,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
|
} else { |
|
|
|
customerNumber = busSalesOrderVehicle.getTemporaryNo(); |
|
|
|
} |
|
|
|
if ("9".equals(busSalesOrderVehicle.getRiskState().toString()) || "1".equals(busSalesOrderVehicle.getRiskState().toString()) || "11".equals(busSalesOrderVehicle.getRiskState().toString())) {//赎回中-赎回凭证--交回--转租中
|
|
|
|
if ("4".equals(busSalesOrderVehicle.getRiskState().toString()) || "1".equals(busSalesOrderVehicle.getRiskState().toString()) || "11".equals(busSalesOrderVehicle.getRiskState().toString())) {//赎回中-赎回凭证--交回--转租中
|
|
|
|
////营业费用_催收费用 上门催收费用--收回车辆费用(赎回通过后推送的费用)
|
|
|
|
if ("9".equals(busSalesOrderVehicle.getRiskState().toString()) || "1".equals(busSalesOrderVehicle.getRiskState().toString())){ |
|
|
|
if ("4".equals(busSalesOrderVehicle.getRiskState().toString()) || "1".equals(busSalesOrderVehicle.getRiskState().toString())){ |
|
|
|
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf2 = new Voucher.VoucherResultDetailDto(); |
|
|
|
if ("收回车辆费用".equals(v.getReceivablesName())) { |
|
|
|
all = all.add(new BigDecimal(v.getSubscriptionMoney())); |
|
|
@ -4840,7 +4840,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
|
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto(); |
|
|
|
if ("月还".equals(v.getReceivablesName()) || "资方逾期利息".equals(v.getReceivablesName())) { |
|
|
|
all = all.add(new BigDecimal(v.getSubscriptionMoney())); |
|
|
|
if ("9".equals(busSalesOrderVehicle.getRiskState().toString()) || "1".equals(busSalesOrderVehicle.getRiskState().toString())){ |
|
|
|
if ("4".equals(busSalesOrderVehicle.getRiskState().toString()) || "1".equals(busSalesOrderVehicle.getRiskState().toString())){ |
|
|
|
voucherResultDetailDtoDf.setSummary("收款-赎回款"); |
|
|
|
}else{ |
|
|
|
voucherResultDetailDtoDf.setSummary("收款-转租款"); |
|
|
@ -5031,7 +5031,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
|
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto(); |
|
|
|
if ("资金占用费".equals(v.getReceivablesName())) { |
|
|
|
all = all.add(new BigDecimal(v.getSubscriptionMoney())); |
|
|
|
if ("9".equals(busSalesOrderVehicle.getRiskState().toString()) || "1".equals(busSalesOrderVehicle.getRiskState().toString())){ |
|
|
|
if ("4".equals(busSalesOrderVehicle.getRiskState().toString()) || "1".equals(busSalesOrderVehicle.getRiskState().toString())){ |
|
|
|
voucherResultDetailDtoDf2.setSummary("收款-赎回款"); |
|
|
|
}else{ |
|
|
|
voucherResultDetailDtoDf2.setSummary("收款-转租款"); |
|
|
@ -5045,7 +5045,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
|
list.add(voucherResultDetailDtoDf2); |
|
|
|
} |
|
|
|
|
|
|
|
} else if ("10".equals(busSalesOrderVehicle.getRiskState().toString())) {//二次销售中-二次销售凭证
|
|
|
|
} else if ("5".equals(busSalesOrderVehicle.getRiskState().toString())) {//二次销售中-二次销售凭证
|
|
|
|
|
|
|
|
if ("月还".equals(v.getReceivablesName()) || "资方逾期利息".equals(v.getReceivablesName())) { |
|
|
|
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto(); |
|
|
@ -5274,7 +5274,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
|
) { |
|
|
|
otherMoney = otherMoney.add(new BigDecimal(v.getSubscriptionMoney())); |
|
|
|
} |
|
|
|
}else if("6".equals(busSalesOrderVehicle.getRiskState().toString())){//亏损立案
|
|
|
|
}else if("11".equals(busSalesOrderVehicle.getRiskState().toString())){//亏损立案
|
|
|
|
if("诉讼保全费".equals(v.getReceivablesName()) || "诉讼费用".equals(v.getReceivablesName())){ |
|
|
|
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto(); |
|
|
|
all3 = all3.add(new BigDecimal(v.getSubscriptionMoney())); |
|
|
@ -5508,7 +5508,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}else if("7".equals(busSalesOrderVehicle.getRiskState().toString())){//亏损执行
|
|
|
|
}else if("12".equals(busSalesOrderVehicle.getRiskState().toString())){//亏损执行
|
|
|
|
if("诉讼保全费".equals(v.getReceivablesName()) || "诉讼费用".equals(v.getReceivablesName())){ |
|
|
|
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto(); |
|
|
|
all4 = all4.add(new BigDecimal(v.getSubscriptionMoney())); |
|
|
|