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

修改推送单车返利条件为金额大于0

master
dimengzhe 2 months ago
parent
d641059737
commit
d2495fea6c
2 changed files with 114 additions and 104 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. 143
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  2. 75
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java

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

@ -2205,14 +2205,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
creditResult.setResultDetails(collectionDetailDtoListOne);
creditResult.setRemarks("放款差额");
creditResultService.pushOtherReceivableBill(creditResult);
//推送单车返利管理
ScmVehRebateDto scmVehRebateDto = new ScmVehRebateDto();
List<ScmVehRebateVehDto> scmVehRebateVehDtos = new ArrayList<>();
ScmVehRebateVehDto scmVehRebateVehDto = new ScmVehRebateVehDto();
scmVehRebateDto.setCreateBySid(confirmation.getCreateBySid());
scmVehRebateDto.setRebateTypeKey("029");
scmVehRebateDto.setRebateTypeValue("金融贴息");
scmVehRebateDto.setRebateName("金融贴息");
BigDecimal all = BigDecimal.ZERO;
if(loanSolutions.getActualDiscount() != null){
all = all.add(loanSolutions.getActualDiscount());
@ -2220,33 +2212,44 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
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("固定金额");
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());
BigDecimal ll = BigDecimal.ZERO;
if(loanSolutions.getActualDiscount() != null){
ll = ll.add(loanSolutions.getActualDiscount());
}
if(loanSolutionsOtherpolicy != null && loanSolutionsOtherpolicy.getOtherActualDiscount() != null){
ll = ll.add(loanSolutionsOtherpolicy.getOtherActualDiscount());
if(all.compareTo(BigDecimal.ZERO) > 0){
//推送单车返利管理
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(all.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());
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);
scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos);
scmVehRebateFeign.save(scmVehRebateDto);
}
scmVehRebateVehDto.setEstimateRebate(ll.toString());
scmVehRebateVehDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid());
scmVehRebateVehDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName());
scmVehRebateVehDtos.add(scmVehRebateVehDto);
scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos);
scmVehRebateFeign.save(scmVehRebateDto);
finUncollectedReceivablesDetailed.setReveivableMoney(finSelectedReceivablesDetailed.getSubscriptionMoney().toString());
finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
}
@ -2374,14 +2377,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
creditResult.setResultDetails(collectionDetailDtoListOne);
creditResult.setRemarks("放款差额");
creditResultService.pushOtherReceivableBill(creditResult);
//推送单车返利管理
ScmVehRebateDto scmVehRebateDto = new ScmVehRebateDto();
List<ScmVehRebateVehDto> scmVehRebateVehDtos = new ArrayList<>();
ScmVehRebateVehDto scmVehRebateVehDto = new ScmVehRebateVehDto();
scmVehRebateDto.setCreateBySid(confirmation.getCreateBySid());
scmVehRebateDto.setRebateTypeKey("029");
scmVehRebateDto.setRebateTypeValue("金融贴息");
scmVehRebateDto.setRebateName("金融贴息");
BigDecimal all = BigDecimal.ZERO;
if(loanSolutions.getActualDiscount() != null){
all = all.add(loanSolutions.getActualDiscount());
@ -2389,33 +2384,45 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
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("固定金额");
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());
BigDecimal ll = BigDecimal.ZERO;
if(loanSolutions.getActualDiscount() != null){
ll = ll.add(loanSolutions.getActualDiscount());
}
if(loanSolutionsOtherpolicy != null && loanSolutionsOtherpolicy.getOtherActualDiscount() != null){
ll = ll.add(loanSolutionsOtherpolicy.getOtherActualDiscount());
if(all.compareTo(BigDecimal.ZERO)>0){
//推送单车返利管理
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(all.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());
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);
scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos);
scmVehRebateFeign.save(scmVehRebateDto);
}
scmVehRebateVehDto.setEstimateRebate(ll.toString());
scmVehRebateVehDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid());
scmVehRebateVehDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName());
scmVehRebateVehDtos.add(scmVehRebateVehDto);
scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos);
scmVehRebateFeign.save(scmVehRebateDto);
finUncollectedReceivablesDetailed.setReveivableMoney(finSelectedReceivablesDetailed.getSubscriptionMoney().toString());
finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
}

75
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java
View File

@ -421,48 +421,51 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
creditResult.setResultDetails(collectionDetailDtoListOne);
creditResult.setRemarks("放款差额");
finKingDeeFeign.pushOtherReceivableBill(creditResult);
//推送单车返利管理
ScmVehRebateDto scmVehRebateDto = new ScmVehRebateDto();
List<ScmVehRebateVehDto> scmVehRebateVehDtos = new ArrayList<>();
ScmVehRebateVehDto scmVehRebateVehDto = new ScmVehRebateVehDto();
scmVehRebateDto.setCreateBySid(loanDiff.getCreateBySid());
scmVehRebateDto.setRebateTypeKey("029");
scmVehRebateDto.setRebateTypeValue("金融贴息");
scmVehRebateDto.setRebateName("金融贴息");
BigDecimal all = BigDecimal.ZERO;
if(loanDiffDetails.getRealityDiscount() != null){
if (loanDiffDetails.getRealityDiscount() != null) {
all = all.add(loanDiffDetails.getRealityDiscount());
}
if(loanDiffDetails.getRealityOtherDiscount() != null){
if (loanDiffDetails.getRealityOtherDiscount() != null) {
all = all.add(loanDiffDetails.getRealityOtherDiscount());
}
scmVehRebateDto.setCalculationStandard(all.toString());
scmVehRebateDto.setPalceGenDate(DateUtil.format(new Date(), "yyyy-MM"));
scmVehRebateDto.setCalculationModeKey("002");
scmVehRebateDto.setCalculationModeValue("固定金额");
scmVehRebateDto.setOrgPath(loanDiff.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());
BigDecimal ll = BigDecimal.ZERO;
if(loanDiffDetails.getRealityDiscount() != null){
ll = ll.add(loanDiffDetails.getRealityDiscount());
}
if(loanDiffDetails.getRealityOtherDiscount() != null){
ll = ll.add(loanDiffDetails.getRealityOtherDiscount());
if (all.compareTo(BigDecimal.ZERO) > 0) {
//推送单车返利管理
ScmVehRebateDto scmVehRebateDto = new ScmVehRebateDto();
List<ScmVehRebateVehDto> scmVehRebateVehDtos = new ArrayList<>();
ScmVehRebateVehDto scmVehRebateVehDto = new ScmVehRebateVehDto();
scmVehRebateDto.setCreateBySid(loanDiff.getCreateBySid());
scmVehRebateDto.setRebateTypeKey("029");
scmVehRebateDto.setRebateTypeValue("金融贴息");
scmVehRebateDto.setRebateName("金融贴息");
scmVehRebateDto.setCalculationStandard(all.toString());
scmVehRebateDto.setPalceGenDate(DateUtil.format(new Date(), "yyyy-MM"));
scmVehRebateDto.setCalculationModeKey("002");
scmVehRebateDto.setCalculationModeValue("固定金额");
scmVehRebateDto.setOrgPath(loanDiff.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());
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);
scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos);
scmVehRebateFeign.save(scmVehRebateDto);
}
scmVehRebateVehDto.setEstimateRebate(ll.toString());
scmVehRebateVehDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid());
scmVehRebateVehDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName());
scmVehRebateVehDtos.add(scmVehRebateVehDto);
scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos);
scmVehRebateFeign.save(scmVehRebateDto);
int updateCount = baseMapper.selectByBusVnS(loanDiffDetails.getBusVinSid(), loanDiffDetails.getRealityLoan().toString());
}
}

Write Preview
Loading…
Cancel
Save