修改

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

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