From 84c886649d595fa1f234ff3e59f012ff41d49393 Mon Sep 17 00:00:00 2001
From: baozhipeng <961815525@qq.com>
Date: Sat, 12 Feb 2022 14:47:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=BC=81=E4=B8=9A=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E5=92=8C=E4=BF=A1=E7=94=A8=E4=BB=A3=E7=A0=81=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayCompanyManagementServiceImpl.java | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java
index aa64a140..03e4569d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java
@@ -467,9 +467,13 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
         if(Objects.isNull(payCompanyManagement) || Objects.isNull(payContactsManagement)){
             throw new JeroBootException("数据为空！");
         }
+        //校验企业名称和信用代码是否匹配
+        checkCompanyNameDutyCode(payCompanyManagement);
+
         payCompanyManagement.setPostalCode(null);
         LambdaQueryWrapper<PayCompanyManagement> queryPayCompanyManagement = new LambdaQueryWrapper<>();
         queryPayCompanyManagement.eq(PayCompanyManagement::getCompanyName,payCompanyManagement.getCompanyName());
+        queryPayCompanyManagement.eq(PayCompanyManagement::getDutyCode,payCompanyManagement.getDutyCode());
         queryPayCompanyManagement.last("limit 1");
         List<PayCompanyManagement> listPayCompanyManagement = payCompanyManagementService.list(queryPayCompanyManagement);
         String phone = PasswordUtil.encrypt(payContactsManagement.getPhone());
@@ -524,6 +528,31 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
         }
     }
 
+    /**
+     * 校验企业名称和信用代码是否匹配
+     * @param payCompanyManagement
+     */
+    private void checkCompanyNameDutyCode(PayCompanyManagement payCompanyManagement){
+        LambdaQueryWrapper<PayCompanyManagement> checkPayCompanyManagement = new LambdaQueryWrapper<>();
+        checkPayCompanyManagement.eq(PayCompanyManagement::getCompanyName,payCompanyManagement.getCompanyName())
+                .or()
+                .eq(PayCompanyManagement::getDutyCode,payCompanyManagement.getDutyCode());
+        List<PayCompanyManagement> list = payCompanyManagementService.list(checkPayCompanyManagement);
+
+        if(list != null && list.size()>1){
+            //一组名称、代码应该最多匹配到一个企业
+            throw new JeroBootException("企业名称和信用代码在已有数据中不匹配");
+        }
+
+        if(list != null && list.size()==1){
+            PayCompanyManagement oldCompany = list.get(0);
+            if(!payCompanyManagement.getCompanyName().equals(oldCompany.getCompanyName())
+            ||!payCompanyManagement.getDutyCode().equals(oldCompany.getDutyCode())){
+                throw new JeroBootException("企业名称和信用代码在已有数据中不匹配");
+            }
+        }
+    }
+
     /**
     * @Description 批量更新数据
     * @Author  lqt