From 659d77e0a35b9ab29b2ef9f40f04cfebc3d42585 Mon Sep 17 00:00:00 2001
From: liangqitao <12345678>
Date: Mon, 13 Dec 2021 19:32:48 +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

---
 .../jero/company/common/PayCompanyManagementCommon.java  | 4 ++++
 .../jero/company/common/PayContactsManagementCommon.java | 6 ++++++
 .../controller/PayContactsManagementController.java      | 3 ++-
 .../com/jero/company/entity/PayCompanyManagement.java    | 6 ++++++
 .../com/jero/company/entity/PayContactsManagement.java   | 5 +++++
 .../service/impl/PayCompanyManagementServiceImpl.java    | 9 ++++++---
 .../service/impl/PayContactsManagementServiceImpl.java   | 3 ++-
 7 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayCompanyManagementCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayCompanyManagementCommon.java
index 4f9c7955..4c8edb2c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayCompanyManagementCommon.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayCompanyManagementCommon.java
@@ -29,5 +29,9 @@ public class PayCompanyManagementCommon {
      * 企业角色1:普通企业、2：会员企业
      */
     public final static String ROLE_CODE2 = "2";
+    /**
+     * 是否需要同步会员系统 1：为是，其他为否
+     */
+    public final static String FLAG_STATUS = "1";
 
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayContactsManagementCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayContactsManagementCommon.java
index a011333e..f69d3b5e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayContactsManagementCommon.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayContactsManagementCommon.java
@@ -17,4 +17,10 @@ public class PayContactsManagementCommon {
      * 企业用户角色1:企业联系人、2：企业管理员
      */
     public final static String ROLE_CODE2 = "2";
+    /**
+     * 是否需要同步会员系统 1：为是，其他为否
+     */
+    public final static String FLAG_STATUS = "1";
+
+
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
index 02f01e26..2e23c4eb 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
@@ -250,7 +250,8 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 			return Result.error("联系人不存在！");
 		}
 		// 企业管理员变更需要同步会员项目
-		if(Objects.equals(payContactsManagement.getRoleCode(),PayContactsManagementCommon.ROLE_CODE2)){
+		if(Objects.equals(payContactsManagement.getRoleCode(),PayContactsManagementCommon.ROLE_CODE2)
+				&& StringUtils.isBlank(PayContactsManagementCommon.FLAG_STATUS)){
 			// 调用会员项目接口
 			MemberInfo memberInfo = new MemberInfo();
 			memberInfo.setMemberId(payContactsManagementOld.getMemberId());
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java
index 158da1e0..d8483a33 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java
@@ -3,6 +3,7 @@ package com.jero.company.entity;
 import java.io.Serializable;
 import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jero.common.aspect.annotation.Dict;
@@ -128,4 +129,9 @@ public class PayCompanyManagement implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
+    /**
+     * 是否需要同步会员系统 1：为是，其他为否
+     */
+	@TableField(exist = false)
+	private String flagStatus;
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java
index 7d99e6db..2e5008e4 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java
@@ -139,4 +139,9 @@ public class PayContactsManagement implements Serializable {
     @ApiModelProperty(value = "审核状态（1：通过，2：待审核）")
     @TableField(exist = false)
     private Integer status;
+    /**
+     * 是否需要同步会员系统 1：为是，其他为否
+     */
+    @TableField(exist = false)
+    private String flagStatus;
 }
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 632770d8..706c3e81 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
@@ -247,7 +247,8 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
             throw new JeroBootException("企业名称不可修改!");
         }
         // 会员企业编辑同步会员系统
-        if(Objects.equals(payCompanyManagementOld.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE2)){
+        if(Objects.equals(payCompanyManagementOld.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE2)
+            && StringUtils.isBlank(PayCompanyManagementCommon.FLAG_STATUS)){
             // 调用会员项目接口
             MemberInfo memberInfo = new MemberInfo();
             memberInfo.setMemberId(payCompanyManagementOld.getMemberId());
@@ -320,7 +321,8 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
             throw new JeroBootException("企业不存在!");
         }
         // 会员企业编辑同步会员系统
-        if(Objects.equals(payCompanyManagementOld.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE2)){
+        if(Objects.equals(payCompanyManagementOld.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE2)
+                && StringUtils.isBlank(PayCompanyManagementCommon.FLAG_STATUS)){
             // 调用会员项目接口
             MemberInfo memberInfo = new MemberInfo();
             memberInfo.setMemberId(payCompanyManagementOld.getMemberId());
@@ -420,7 +422,8 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
 //        if (!StringUtils.isBlank(payContactsManagement.getEmail())){
 //            payContactsManagement.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail()));
 //        }
-
+        payCompanyManagement.setFlagStatus(PayCompanyManagementCommon.FLAG_STATUS);
+        payContactsManagement.setFlagStatus(PayContactsManagementCommon.FLAG_STATUS);
         payCompanyManagement.setRoleCode(PayCompanyManagementCommon.ROLE_CODE2);
         payContactsManagement.setRoleCode(PayContactsManagementCommon.ROLE_CODE2);
         // 新增
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java
index 2739b081..4bc2b360 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java
@@ -128,7 +128,8 @@ public class PayContactsManagementServiceImpl extends ServiceImpl<PayContactsMan
             throw new JeroBootException("手机号不可修改！");
         }
         // 企业管理员变更需要同步会员项目
-        if(Objects.equals(payContactsManagement.getRoleCode(),PayContactsManagementCommon.ROLE_CODE2)){
+        if(Objects.equals(payContactsManagement.getRoleCode(),PayContactsManagementCommon.ROLE_CODE2)
+                && StringUtils.isBlank(PayContactsManagementCommon.FLAG_STATUS)){
             // 调用会员项目接口
             MemberInfo memberInfo = new MemberInfo();
             memberInfo.setMemberId(payContactsManagementOld.getMemberId());