From a55c03f427d6be46b2f6718ba88f64bde2e33c20 Mon Sep 17 00:00:00 2001
From: liangqitao <12345678>
Date: Mon, 13 Dec 2021 19:25:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A7=92=E8=89=B2=E4=BD=93?=
 =?UTF-8?q?=E7=B3=BB=EF=BC=9A=E5=8C=85=E5=90=AB=E4=BC=81=E4=B8=9A=E8=81=94?=
 =?UTF-8?q?=E7=B3=BB=E4=BA=BA=E3=80=81=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/company/entity/MemberInfo.java   |  3 --
 .../impl/PayCompanyManagementServiceImpl.java | 43 ++++++++++++++++---
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/MemberInfo.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/MemberInfo.java
index d27d1673..f0b25aff 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/MemberInfo.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/MemberInfo.java
@@ -25,9 +25,6 @@ public class MemberInfo implements Serializable {
     /**真实姓名*/
     @ApiModelProperty(value = "真实姓名")
     private String realname;
-	/**单位全称*/
-    @ApiModelProperty(value = "单位全称")
-    private String companyName;
 	/**联系人*/
     @ApiModelProperty(value = "联系人")
     private String liaisonMan;
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 b6d2b52b..632770d8 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
@@ -12,9 +12,12 @@ import com.jero.common.enums.ManagementMessageEnums;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.service.SendMessageService;
 import com.jero.common.system.vo.LoginUser;
+import com.jero.common.util.AuthenticationUtils;
 import com.jero.common.util.PasswordUtil;
 import com.jero.common.util.ValidUtil;
 import com.jero.company.common.PayCompanyManagementCommon;
+import com.jero.company.common.PayContactsManagementCommon;
+import com.jero.company.entity.MemberInfo;
 import com.jero.company.entity.PayCompanyAndContactsManagement;
 import com.jero.company.entity.PayCompanyManagement;
 import com.jero.company.entity.PayContactsManagement;
@@ -240,13 +243,21 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
         if(Objects.isNull(payCompanyManagementOld)){
             throw new JeroBootException("企业不存在!");
         }
-        // 会员企业编辑同步会员系统
-        if(Objects.equals(payCompanyManagementOld.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE2)){
-            // todo 同步会员系统
-        }
         if(!Objects.equals(payCompanyManagementOld.getCompanyName(),payCompanyManagement.getCompanyName())){
             throw new JeroBootException("企业名称不可修改!");
         }
+        // 会员企业编辑同步会员系统
+        if(Objects.equals(payCompanyManagementOld.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE2)){
+            // 调用会员项目接口
+            MemberInfo memberInfo = new MemberInfo();
+            memberInfo.setMemberId(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(payCompanyManagementOld.getStatus());
         payCompanyManagement.setDataSource(payCompanyManagementOld.getDataSource());
         try {
@@ -310,7 +321,15 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
         }
         // 会员企业编辑同步会员系统
         if(Objects.equals(payCompanyManagementOld.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE2)){
-            // todo 同步会员系统
+            // 调用会员项目接口
+            MemberInfo memberInfo = new MemberInfo();
+            memberInfo.setMemberId(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);
         }
         try {
             // 编辑保存企业前再次校验企业名称是否存在
@@ -402,6 +421,8 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
 //            payContactsManagement.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail()));
 //        }
 
+        payCompanyManagement.setRoleCode(PayCompanyManagementCommon.ROLE_CODE2);
+        payContactsManagement.setRoleCode(PayContactsManagementCommon.ROLE_CODE2);
         // 新增
         if(CollectionUtils.isEmpty(listPayCompanyManagement)){
             // 新增，如果存在用户，返回异常
@@ -417,6 +438,18 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
                 if(!Objects.equals(listPayContactsManagement.get(0).getCompanyId(),listPayCompanyManagement.get(0).getId())){
                     throw new JeroBootException("此用户已在其他企业下");
                 }else{
+                    LambdaQueryWrapper<PayContactsManagement> queryPayContactsManagementNew = new LambdaQueryWrapper<>();
+                    queryPayContactsManagementNew.eq(PayContactsManagement::getCompanyId,listPayCompanyManagement.get(0).getId());
+                    queryPayContactsManagementNew.eq(PayContactsManagement::getRoleCode,PayCompanyManagementCommon.ROLE_CODE2);
+                    List<PayContactsManagement> listPayContactsManagementNew = payContactsManagementService.list(queryPayContactsManagementNew);
+                    // 已经存在会员用户，变更会员用户
+                    if(!CollectionUtils.isEmpty(listPayContactsManagementNew)
+                        && !Objects.equals(listPayContactsManagementNew.get(0).getPhone(),PasswordUtil.encrypt(payCompanyManagement.getCompanyPhone()))){
+                        LambdaUpdateWrapper<PayContactsManagement> updatePayContactsManagement = new LambdaUpdateWrapper<>();
+                        updatePayContactsManagement.eq(PayContactsManagement::getId,listPayContactsManagementNew.get(0).getId());
+                        updatePayContactsManagement.set(PayContactsManagement::getRoleCode,PayContactsManagementCommon.ROLE_CODE1);
+                        payContactsManagementService.update(updatePayContactsManagement);
+                    }
                     payContactsManagement.setCompanyId(listPayCompanyManagement.get(0).getId());
                     payContactsManagement.setId(listPayContactsManagement.get(0).getId());
                     payContactsManagementService.contactsEdit(payContactsManagement);