From 049188502c261e4eb2db6ceb9d6fc9fce545ac69 Mon Sep 17 00:00:00 2001
From: liangqitao <12345678>
Date: Wed, 22 Dec 2021 09:21:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E4=B8=8E=E6=9D=A5=E6=AC=BE?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E3=80=81=E7=94=A8=E6=88=B7=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayCompanyManagementServiceImpl.java | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

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 cad3f35a..aa64a140 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
@@ -248,20 +248,6 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
             throw new JeroBootException("企业名称不可修改!");
         }
 
-        // 会员企业编辑同步会员系统
-        if(Objects.equals(payCompanyManagementOld.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE2)){
-            // 调用会员项目接口
-            MemberInfo memberInfo = new MemberInfo();
-            memberInfo.setCompanyName(payCompanyManagement.getCompanyName());
-            memberInfo.setId(payCompanyManagementOld.getMemberId());
-            memberInfo.setTaxNo(payCompanyManagement.getDutyCode());
-            memberInfo.setDepositBank(payCompanyManagement.getOpeningBank());
-            memberInfo.setBankAccount(payCompanyManagement.getBankAccount());
-            memberInfo.setInvoiceAddress(payCompanyManagement.getCompanyAddress());
-            memberInfo.setInvoicePhone(payCompanyManagement.getCompanyPhone());
-            AuthenticationUtils.post("/memberInfo/memberInfo/incomingEdit","",memberInfo);
-        }
-
         payCompanyManagement.setStatus(status);
         payCompanyManagement.setDataSource(payCompanyManagementOld.getDataSource());
         try {
@@ -284,6 +270,20 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
                 throw new JeroBootException("公司电话加密异常！");
             }
         }
+
+        // 会员企业编辑同步会员系统
+        if(Objects.equals(payCompanyManagementOld.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE2)){
+            // 调用会员项目接口
+            MemberInfo memberInfo = new MemberInfo();
+            memberInfo.setCompanyName(payCompanyManagement.getCompanyName());
+            memberInfo.setId(payCompanyManagementOld.getMemberId());
+            memberInfo.setTaxNo(payCompanyManagement.getDutyCode());
+            memberInfo.setDepositBank(payCompanyManagement.getOpeningBank());
+            memberInfo.setBankAccount(payCompanyManagement.getBankAccount());
+            memberInfo.setInvoiceAddress(payCompanyManagement.getCompanyAddress());
+            memberInfo.setInvoicePhone(payCompanyManagement.getCompanyPhone());
+            AuthenticationUtils.post("/memberInfo/memberInfo/incomingEdit","",memberInfo);
+        }
         // 如果该企业状态为通过，更新时间戳
         if(Objects.equals(payCompanyManagementOld.getStatus(),PayCompanyManagementCommon.STATUS1)){
             payCompanyManagement.setEditTime(new Date());
@@ -403,17 +403,6 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
                 throw new JeroBootException("公司电话加密异常！");
             }
         }
-        // 财务人员，直接批量变更状态
-        if(sysUser.getRoleCode().contains(RoleCommon.CWRY)){
-            payCompanyManagementOld.setCompanyName(payCompanyManagement.getCompanyName());
-            // 批量变更企业名称
-            updateBatchData(payCompanyManagement);
-        }else{
-            // 如果该企业状态为通过，更新时间戳
-            if(Objects.equals(payCompanyManagementOld.getStatus(),PayCompanyManagementCommon.STATUS1)){
-                payCompanyManagement.setEditTime(new Date());
-            }
-        }
         // 会员企业编辑同步会员系统
         if(Objects.equals(payCompanyManagementOld.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE2)){
             if(!Objects.equals(payCompanyManagementOld.getCompanyName(),payCompanyManagement.getCompanyName())){
@@ -430,6 +419,17 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
             memberInfo.setInvoicePhone(payCompanyManagement.getCompanyPhone());
             AuthenticationUtils.post("/memberInfo/memberInfo/incomingEdit","",memberInfo);
         }
+        // 财务人员，直接批量变更状态
+        if(sysUser.getRoleCode().contains(RoleCommon.CWRY)){
+            payCompanyManagementOld.setCompanyName(payCompanyManagement.getCompanyName());
+            // 批量变更企业名称
+            updateBatchData(payCompanyManagement);
+        }else{
+            // 如果该企业状态为通过，更新时间戳
+            if(Objects.equals(payCompanyManagementOld.getStatus(),PayCompanyManagementCommon.STATUS1)){
+                payCompanyManagement.setEditTime(new Date());
+            }
+        }
         payCompanyManagementService.updateById(payCompanyManagement);
 
     }