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

修改

master
ligaode 4 weeks ago
parent
56603019ae
commit
cb6e8ca3f6
1 changed files with 26 additions and 24 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. 50
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

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

@ -6222,36 +6222,38 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
for (AppFinSelectedReceivablesDetailedRskDto v : finSelectedReceivablesDetailedDtos) { for (AppFinSelectedReceivablesDetailedRskDto v : finSelectedReceivablesDetailedDtos) {
String loanContractNo = v.getLoanContractNo(); String loanContractNo = v.getLoanContractNo();
String vinNo = v.getVin(); String vinNo = v.getVin();
List<AppFinUncollectedReceivablesDetailedRskVo> ruleList = finUncollectedReceivablesDetailedJRService.getRskPaymentDetailsListForRule(loanContractNo, vinNo, finCollectionConfirmation.getUseOrgSid(), finCollectionConfirmation.getPurchaseSystemSid()); if (!v.getProjectName().equals("远程控制费")){
if (!ruleList.isEmpty()) { List<AppFinUncollectedReceivablesDetailedRskVo> ruleList = finUncollectedReceivablesDetailedJRService.getRskPaymentDetailsListForRule(loanContractNo, vinNo, finCollectionConfirmation.getUseOrgSid(), finCollectionConfirmation.getPurchaseSystemSid());
for (AppFinUncollectedReceivablesDetailedRskVo r : ruleList) { if (!ruleList.isEmpty()) {
if (r.getProjectName().equals("月还") || r.getProjectName().equals("资方逾期利息")) { for (AppFinUncollectedReceivablesDetailedRskVo r : ruleList) {
if (Integer.valueOf(r.getPeriod()) < Integer.valueOf(v.getPeriod())) { if (r.getProjectName().equals("月还") || r.getProjectName().equals("资方逾期利息")) {
List<AppFinSelectedReceivablesDetailedRskDto> collect = finSelectedReceivablesDetailedDtos.stream().filter(new Predicate<AppFinSelectedReceivablesDetailedRskDto>() { if (Integer.valueOf(r.getPeriod()) < Integer.valueOf(v.getPeriod())) {
@Override List<AppFinSelectedReceivablesDetailedRskDto> collect = finSelectedReceivablesDetailedDtos.stream().filter(new Predicate<AppFinSelectedReceivablesDetailedRskDto>() {
public boolean test(AppFinSelectedReceivablesDetailedRskDto d) { @Override
if (d.getPeriod().equals(r.getPeriod()) && d.getLoanContractNo().equals(r.getLoanContractNo()) && d.getVin().equals(r.getVin())) { public boolean test(AppFinSelectedReceivablesDetailedRskDto d) {
return true; if (d.getPeriod().equals(r.getPeriod()) && d.getLoanContractNo().equals(r.getLoanContractNo()) && d.getVin().equals(r.getVin())) {
return true;
}
return false;
} }
return false; }).collect(Collectors.toList());
if (collect.isEmpty()) {
return rb.setMsg("您的认款顺序与公司认款规则不一致");
} }
}).collect(Collectors.toList());
if (collect.isEmpty()) {
return rb.setMsg("您的认款顺序与公司认款规则不一致1");
} }
} }
} }
} }
} for (AppFinSelectedReceivablesDetailedRskDto f : finSelectedReceivablesDetailedDtos) {
for (AppFinSelectedReceivablesDetailedRskDto f : finSelectedReceivablesDetailedDtos) { if (v.getProjectName().equals("月还") || v.getProjectName().equals("资方逾期利息")) {
if (v.getProjectName().equals("月还") || v.getProjectName().equals("资方逾期利息")) { if (v.getVin().equals(f.getVin()) && v.getLoanContractNo().equals(f.getLoanContractNo())) {
if (v.getVin().equals(f.getVin()) && v.getLoanContractNo().equals(f.getLoanContractNo())) { if (f.getProjectName().equals("月还") || f.getProjectName().equals("资方逾期利息")) {
if (f.getProjectName().equals("月还") || f.getProjectName().equals("资方逾期利息")) { if (Integer.valueOf(f.getPeriod()) > Integer.valueOf(v.getPeriod())) {
if (Integer.valueOf(f.getPeriod()) > Integer.valueOf(v.getPeriod())) { BigDecimal noReceivable = v.getNoReceivable();
BigDecimal noReceivable = v.getNoReceivable(); BigDecimal confirmMoney = v.getConfirmMoney();
BigDecimal confirmMoney = v.getConfirmMoney(); if (confirmMoney.compareTo(noReceivable) < 0) {
if (confirmMoney.compareTo(noReceivable) < 0) { return rb.setMsg("您的认款顺序与公司认款规则不一致");
return rb.setMsg("您的认款顺序与公司认款规则不一致2"); }
} }
} }
} }

Write Preview
Loading…
Cancel
Save