金融认款申请移动端完善详情接口

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

@@ -4104,6 +4104,20 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 return rb.setMsg("认款总额与收款金额不符");
             }
         }
+        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())) {
+                            return rb.setMsg("您的认款顺序与公司认款规则不一致");
+                        }
+                    }
+                }
+            }
+        }
         //汇款确认书保存
         List<String> payConfirmFiles = dto.getPayConfirmFiles();
         if (payConfirmFiles.size() > 0) {
@@ -4132,18 +4146,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         String finalSid = sid;
         String finalUseOrgSid = finCollectionConfirmation.getUseOrgSid();
         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())) {
-                            return rb.setMsg("您的认款顺序与公司认款规则不一致");
-                        }
-                    }
-                }
-            }
             //已选
             FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed();
             // BeanUtil.copyProperties(v, finSelectedReceivablesDetailed, "sid");