Browse Source

放款差额认款推送单车返利时验证厂家贴息是否为空的情况。

master
dimengzhe 4 months ago
parent
commit
8c1d66eae3
  1. 16
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  2. 9
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java

16
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@ -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());

9
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java

@ -450,7 +450,14 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
scmVehRebateVehDto.setVinNo(baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8));
scmVehRebateVehDto.setManufactorSettlementPrice(baseVehicle.getCostPrice().toString());
scmVehRebateVehDto.setFreight(baseVehicle.getFreight().toString());
scmVehRebateVehDto.setEstimateRebate(loanDiffDetails.getRealityDiscount().add(loanDiffDetails.getRealityOtherDiscount()).toString());
BigDecimal ll = BigDecimal.ZERO;
if(loanDiffDetails.getRealityDiscount() != null){
ll = ll.add(loanDiffDetails.getRealityDiscount());
}
if(loanDiffDetails.getRealityOtherDiscount() != null){
ll = ll.add(loanDiffDetails.getRealityOtherDiscount());
}
scmVehRebateVehDto.setEstimateRebate(ll.toString());
scmVehRebateVehDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid());
scmVehRebateVehDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName());
scmVehRebateVehDtos.add(scmVehRebateVehDto);

Loading…
Cancel
Save