|
|
@ -2234,7 +2234,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
|
scmVehRebateVehDto.setVinNo(baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8)); |
|
|
|
scmVehRebateVehDto.setManufactorSettlementPrice(baseVehicle.getCostPrice().toString()); |
|
|
|
scmVehRebateVehDto.setFreight(baseVehicle.getFreight().toString()); |
|
|
|
scmVehRebateVehDto.setEstimateRebate(loanSolutions.getActualDiscount().add(loanSolutionsOtherpolicy.getOtherActualDiscount()).toString()); |
|
|
|
BigDecimal ll = BigDecimal.ZERO; |
|
|
|
if(loanSolutions.getActualDiscount() != null){ |
|
|
|
ll = ll.add(loanSolutions.getActualDiscount()); |
|
|
|
} |
|
|
|
if(loanSolutionsOtherpolicy != null && loanSolutionsOtherpolicy.getOtherActualDiscount() != null){ |
|
|
|
ll = ll.add(loanSolutionsOtherpolicy.getOtherActualDiscount()); |
|
|
|
} |
|
|
|
scmVehRebateVehDto.setEstimateRebate(ll.toString()); |
|
|
|
scmVehRebateVehDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid()); |
|
|
|
scmVehRebateVehDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName()); |
|
|
|
scmVehRebateVehDtos.add(scmVehRebateVehDto); |
|
|
@ -2396,6 +2403,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
|
scmVehRebateVehDto.setVinNo(baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8)); |
|
|
|
scmVehRebateVehDto.setManufactorSettlementPrice(baseVehicle.getCostPrice().toString()); |
|
|
|
scmVehRebateVehDto.setFreight(baseVehicle.getFreight().toString()); |
|
|
|
BigDecimal ll = BigDecimal.ZERO; |
|
|
|
if(loanSolutions.getActualDiscount() != null){ |
|
|
|
ll = ll.add(loanSolutions.getActualDiscount()); |
|
|
|
} |
|
|
|
if(loanSolutionsOtherpolicy != null && loanSolutionsOtherpolicy.getOtherActualDiscount() != null){ |
|
|
|
ll = ll.add(loanSolutionsOtherpolicy.getOtherActualDiscount()); |
|
|
|
} |
|
|
|
scmVehRebateVehDto.setEstimateRebate(loanSolutions.getActualDiscount().add(loanSolutionsOtherpolicy.getOtherActualDiscount()).toString()); |
|
|
|
scmVehRebateVehDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid()); |
|
|
|
scmVehRebateVehDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName()); |
|
|
|