From e2a82496a8cd906056eed6f8bcceb6152643575b Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Wed, 20 Dec 2023 11:23:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=91=E8=9E=8D=E8=AE=A4=E6=AC=BE=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=AE=8C=E5=96=84=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinCollectionConfirmationService.java     | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
index 700e52e527..23ad816641 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
+++ b/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");