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

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

master
dimengzhe 4 months ago
parent
d05d224ccd
commit
0ae7a3d224
1 changed files with 16 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 46
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

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

@ -2213,7 +2213,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
scmVehRebateDto.setRebateTypeKey("029");
scmVehRebateDto.setRebateTypeValue("金融贴息");
scmVehRebateDto.setRebateName("金融贴息");
scmVehRebateDto.setCalculationStandard(loanSolutions.getActualDiscount().add(loanSolutionsOtherpolicy.getOtherActualDiscount()).toString());
BigDecimal all = BigDecimal.ZERO;
if(loanSolutions.getActualDiscount() != null){
all = all.add(loanSolutions.getActualDiscount());
}
if(loanSolutionsOtherpolicy != null && loanSolutionsOtherpolicy.getOtherActualDiscount() != null){
all = all.add(loanSolutionsOtherpolicy.getOtherActualDiscount());
}
scmVehRebateDto.setCalculationStandard(all.toString());
scmVehRebateDto.setPalceGenDate(DateUtil.format(new Date(), "yyyy-MM"));
scmVehRebateDto.setCalculationModeKey("002");
scmVehRebateDto.setCalculationModeValue("固定金额");
@ -2368,7 +2375,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
scmVehRebateDto.setRebateTypeKey("029");
scmVehRebateDto.setRebateTypeValue("金融贴息");
scmVehRebateDto.setRebateName("金融贴息");
scmVehRebateDto.setCalculationStandard(loanSolutions.getActualDiscount().add(loanSolutionsOtherpolicy.getOtherActualDiscount()).toString());
BigDecimal all = BigDecimal.ZERO;
if(loanSolutions.getActualDiscount() != null){
all = all.add(loanSolutions.getActualDiscount());
}
if(loanSolutionsOtherpolicy != null && loanSolutionsOtherpolicy.getOtherActualDiscount() != null){
all = all.add(loanSolutionsOtherpolicy.getOtherActualDiscount());
}
scmVehRebateDto.setCalculationStandard(all.toString());
scmVehRebateDto.setPalceGenDate(DateUtil.format(new Date(), "yyyy-MM"));
scmVehRebateDto.setCalculationModeKey("002");
scmVehRebateDto.setCalculationModeValue("固定金额");
@ -2394,34 +2408,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
} else {
//无差额
//推送单车返利管理
ScmVehRebateDto scmVehRebateDto = new ScmVehRebateDto();
List<ScmVehRebateVehDto> scmVehRebateVehDtos = new ArrayList<>();
ScmVehRebateVehDto scmVehRebateVehDto = new ScmVehRebateVehDto();
scmVehRebateDto.setCreateBySid(confirmation.getCreateBySid());
scmVehRebateDto.setRebateTypeKey("029");
scmVehRebateDto.setRebateTypeValue("金融贴息");
scmVehRebateDto.setRebateName("金融贴息");
scmVehRebateDto.setCalculationStandard(loanSolutions.getActualDiscount().add(loanSolutionsOtherpolicy.getOtherActualDiscount()).toString());
scmVehRebateDto.setPalceGenDate(DateUtil.format(new Date(), "yyyy-MM"));
scmVehRebateDto.setCalculationModeKey("002");
scmVehRebateDto.setCalculationModeValue("固定金额");
scmVehRebateDto.setOrgPath(confirmation.getOrgSidPath());
scmVehRebateVehDto.setState("2");
scmVehRebateVehDto.setBrandSid(baseVehicle.getCarBrandSid());
scmVehRebateVehDto.setBrandName(baseVehicle.getCarBrandName());
scmVehRebateVehDto.setVehModelSid(baseVehicle.getModelSid());
scmVehRebateVehDto.setVehModelName(baseVehicle.getModelName());
scmVehRebateVehDto.setVehSid(baseVehicle.getSid());
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());
scmVehRebateVehDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid());
scmVehRebateVehDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName());
scmVehRebateVehDtos.add(scmVehRebateVehDto);
scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos);
scmVehRebateFeign.save(scmVehRebateDto);
}
}

Write Preview
Loading…
Cancel
Save