|
@ -6222,6 +6222,7 @@ 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(); |
|
|
|
|
|
if (!v.getProjectName().equals("远程控制费")){ |
|
|
List<AppFinUncollectedReceivablesDetailedRskVo> ruleList = finUncollectedReceivablesDetailedJRService.getRskPaymentDetailsListForRule(loanContractNo, vinNo, finCollectionConfirmation.getUseOrgSid(), finCollectionConfirmation.getPurchaseSystemSid()); |
|
|
List<AppFinUncollectedReceivablesDetailedRskVo> ruleList = finUncollectedReceivablesDetailedJRService.getRskPaymentDetailsListForRule(loanContractNo, vinNo, finCollectionConfirmation.getUseOrgSid(), finCollectionConfirmation.getPurchaseSystemSid()); |
|
|
if (!ruleList.isEmpty()) { |
|
|
if (!ruleList.isEmpty()) { |
|
|
for (AppFinUncollectedReceivablesDetailedRskVo r : ruleList) { |
|
|
for (AppFinUncollectedReceivablesDetailedRskVo r : ruleList) { |
|
@ -6237,7 +6238,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
} |
|
|
} |
|
|
}).collect(Collectors.toList()); |
|
|
}).collect(Collectors.toList()); |
|
|
if (collect.isEmpty()) { |
|
|
if (collect.isEmpty()) { |
|
|
return rb.setMsg("您的认款顺序与公司认款规则不一致1"); |
|
|
return rb.setMsg("您的认款顺序与公司认款规则不一致"); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
@ -6251,7 +6252,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
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("您的认款顺序与公司认款规则不一致2"); |
|
|
return rb.setMsg("您的认款顺序与公司认款规则不一致"); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|