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

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

zhanglei
dimengzhe 4 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
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 35
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  2. 21
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java

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

@ -2205,6 +2205,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
creditResult.setResultDetails(collectionDetailDtoListOne); creditResult.setResultDetails(collectionDetailDtoListOne);
creditResult.setRemarks("放款差额"); creditResult.setRemarks("放款差额");
creditResultService.pushOtherReceivableBill(creditResult); creditResultService.pushOtherReceivableBill(creditResult);
BigDecimal all = BigDecimal.ZERO;
if(loanSolutions.getActualDiscount() != null){
all = all.add(loanSolutions.getActualDiscount());
}
if(loanSolutionsOtherpolicy != null && loanSolutionsOtherpolicy.getOtherActualDiscount() != null){
all = all.add(loanSolutionsOtherpolicy.getOtherActualDiscount());
}
if(all.compareTo(BigDecimal.ZERO) > 0){
//推送单车返利管理 //推送单车返利管理
ScmVehRebateDto scmVehRebateDto = new ScmVehRebateDto(); ScmVehRebateDto scmVehRebateDto = new ScmVehRebateDto();
List<ScmVehRebateVehDto> scmVehRebateVehDtos = new ArrayList<>(); List<ScmVehRebateVehDto> scmVehRebateVehDtos = new ArrayList<>();
@ -2213,13 +2221,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
scmVehRebateDto.setRebateTypeKey("029"); scmVehRebateDto.setRebateTypeKey("029");
scmVehRebateDto.setRebateTypeValue("金融贴息"); scmVehRebateDto.setRebateTypeValue("金融贴息");
scmVehRebateDto.setRebateName("金融贴息"); scmVehRebateDto.setRebateName("金融贴息");
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.setCalculationStandard(all.toString());
scmVehRebateDto.setPalceGenDate(DateUtil.format(new Date(), "yyyy-MM")); scmVehRebateDto.setPalceGenDate(DateUtil.format(new Date(), "yyyy-MM"));
scmVehRebateDto.setCalculationModeKey("002"); scmVehRebateDto.setCalculationModeKey("002");
@ -2247,6 +2248,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
scmVehRebateVehDtos.add(scmVehRebateVehDto); scmVehRebateVehDtos.add(scmVehRebateVehDto);
scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos); scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos);
scmVehRebateFeign.save(scmVehRebateDto); scmVehRebateFeign.save(scmVehRebateDto);
}
finUncollectedReceivablesDetailed.setReveivableMoney(finSelectedReceivablesDetailed.getSubscriptionMoney().toString()); finUncollectedReceivablesDetailed.setReveivableMoney(finSelectedReceivablesDetailed.getSubscriptionMoney().toString());
finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed); finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
} }
@ -2374,6 +2377,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
creditResult.setResultDetails(collectionDetailDtoListOne); creditResult.setResultDetails(collectionDetailDtoListOne);
creditResult.setRemarks("放款差额"); creditResult.setRemarks("放款差额");
creditResultService.pushOtherReceivableBill(creditResult); creditResultService.pushOtherReceivableBill(creditResult);
BigDecimal all = BigDecimal.ZERO;
if(loanSolutions.getActualDiscount() != null){
all = all.add(loanSolutions.getActualDiscount());
}
if(loanSolutionsOtherpolicy != null && loanSolutionsOtherpolicy.getOtherActualDiscount() != null){
all = all.add(loanSolutionsOtherpolicy.getOtherActualDiscount());
}
if(all.compareTo(BigDecimal.ZERO)>0){
//推送单车返利管理 //推送单车返利管理
ScmVehRebateDto scmVehRebateDto = new ScmVehRebateDto(); ScmVehRebateDto scmVehRebateDto = new ScmVehRebateDto();
List<ScmVehRebateVehDto> scmVehRebateVehDtos = new ArrayList<>(); List<ScmVehRebateVehDto> scmVehRebateVehDtos = new ArrayList<>();
@ -2382,13 +2393,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
scmVehRebateDto.setRebateTypeKey("029"); scmVehRebateDto.setRebateTypeKey("029");
scmVehRebateDto.setRebateTypeValue("金融贴息"); scmVehRebateDto.setRebateTypeValue("金融贴息");
scmVehRebateDto.setRebateName("金融贴息"); scmVehRebateDto.setRebateName("金融贴息");
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.setCalculationStandard(all.toString());
scmVehRebateDto.setPalceGenDate(DateUtil.format(new Date(), "yyyy-MM")); scmVehRebateDto.setPalceGenDate(DateUtil.format(new Date(), "yyyy-MM"));
scmVehRebateDto.setCalculationModeKey("002"); scmVehRebateDto.setCalculationModeKey("002");
@ -2416,6 +2421,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
scmVehRebateVehDtos.add(scmVehRebateVehDto); scmVehRebateVehDtos.add(scmVehRebateVehDto);
scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos); scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos);
scmVehRebateFeign.save(scmVehRebateDto); scmVehRebateFeign.save(scmVehRebateDto);
}
finUncollectedReceivablesDetailed.setReveivableMoney(finSelectedReceivablesDetailed.getSubscriptionMoney().toString()); finUncollectedReceivablesDetailed.setReveivableMoney(finSelectedReceivablesDetailed.getSubscriptionMoney().toString());
finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed); finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
} }

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

@ -421,6 +421,14 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
creditResult.setResultDetails(collectionDetailDtoListOne); creditResult.setResultDetails(collectionDetailDtoListOne);
creditResult.setRemarks("放款差额"); creditResult.setRemarks("放款差额");
finKingDeeFeign.pushOtherReceivableBill(creditResult); finKingDeeFeign.pushOtherReceivableBill(creditResult);
BigDecimal all = BigDecimal.ZERO;
if (loanDiffDetails.getRealityDiscount() != null) {
all = all.add(loanDiffDetails.getRealityDiscount());
}
if (loanDiffDetails.getRealityOtherDiscount() != null) {
all = all.add(loanDiffDetails.getRealityOtherDiscount());
}
if (all.compareTo(BigDecimal.ZERO) > 0) {
//推送单车返利管理 //推送单车返利管理
ScmVehRebateDto scmVehRebateDto = new ScmVehRebateDto(); ScmVehRebateDto scmVehRebateDto = new ScmVehRebateDto();
List<ScmVehRebateVehDto> scmVehRebateVehDtos = new ArrayList<>(); List<ScmVehRebateVehDto> scmVehRebateVehDtos = new ArrayList<>();
@ -429,13 +437,6 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
scmVehRebateDto.setRebateTypeKey("029"); scmVehRebateDto.setRebateTypeKey("029");
scmVehRebateDto.setRebateTypeValue("金融贴息"); scmVehRebateDto.setRebateTypeValue("金融贴息");
scmVehRebateDto.setRebateName("金融贴息"); scmVehRebateDto.setRebateName("金融贴息");
BigDecimal all = BigDecimal.ZERO;
if(loanDiffDetails.getRealityDiscount() != null){
all = all.add(loanDiffDetails.getRealityDiscount());
}
if(loanDiffDetails.getRealityOtherDiscount() != null){
all = all.add(loanDiffDetails.getRealityOtherDiscount());
}
scmVehRebateDto.setCalculationStandard(all.toString()); scmVehRebateDto.setCalculationStandard(all.toString());
scmVehRebateDto.setPalceGenDate(DateUtil.format(new Date(), "yyyy-MM")); scmVehRebateDto.setPalceGenDate(DateUtil.format(new Date(), "yyyy-MM"));
scmVehRebateDto.setCalculationModeKey("002"); scmVehRebateDto.setCalculationModeKey("002");
@ -451,10 +452,10 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
scmVehRebateVehDto.setManufactorSettlementPrice(baseVehicle.getCostPrice().toString()); scmVehRebateVehDto.setManufactorSettlementPrice(baseVehicle.getCostPrice().toString());
scmVehRebateVehDto.setFreight(baseVehicle.getFreight().toString()); scmVehRebateVehDto.setFreight(baseVehicle.getFreight().toString());
BigDecimal ll = BigDecimal.ZERO; BigDecimal ll = BigDecimal.ZERO;
if(loanDiffDetails.getRealityDiscount() != null){ if (loanDiffDetails.getRealityDiscount() != null) {
ll = ll.add(loanDiffDetails.getRealityDiscount()); ll = ll.add(loanDiffDetails.getRealityDiscount());
} }
if(loanDiffDetails.getRealityOtherDiscount() != null){ if (loanDiffDetails.getRealityOtherDiscount() != null) {
ll = ll.add(loanDiffDetails.getRealityOtherDiscount()); ll = ll.add(loanDiffDetails.getRealityOtherDiscount());
} }
scmVehRebateVehDto.setEstimateRebate(ll.toString()); scmVehRebateVehDto.setEstimateRebate(ll.toString());
@ -463,6 +464,8 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
scmVehRebateVehDtos.add(scmVehRebateVehDto); scmVehRebateVehDtos.add(scmVehRebateVehDto);
scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos); scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos);
scmVehRebateFeign.save(scmVehRebateDto); scmVehRebateFeign.save(scmVehRebateDto);
}
int updateCount = baseMapper.selectByBusVnS(loanDiffDetails.getBusVinSid(), loanDiffDetails.getRealityLoan().toString()); int updateCount = baseMapper.selectByBusVnS(loanDiffDetails.getBusVinSid(), loanDiffDetails.getRealityLoan().toString());
} }
} }

Write Preview
Loading…
Cancel
Save