Merge branch 'feature/xgh/0704上线' into 'master'

Feature/xgh/0704上线

See merge request !2023

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/ExternalUserDTO.java

@@ -42,6 +42,16 @@ public class ExternalUserDTO implements Serializable{
 	// 是否刷新好友
 	private boolean isFlush = false ;
 
+	private String externalUseridInfo ;
+
+	public String getExternalUseridInfo() {
+		return externalUseridInfo;
+	}
+
+	public void setExternalUseridInfo(String externalUseridInfo) {
+		this.externalUseridInfo = externalUseridInfo;
+	}
+
 	public boolean isFlush() {
 		return isFlush;
 	}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/QywxTagApiService.java

@@ -90,7 +90,7 @@ public interface QywxTagApiService {
      * @param externalUserId
      * @return
      */
-    public ServiceResponse syncQywxTagToGicByExternalUserId(String wxEnterpriseId, String externalUserId, String wxUserId);
+    public ServiceResponse syncQywxTagToGicByExternalUserId(String wxEnterpriseId, String externalUserId, String wxUserId , String externalUserInfo);
 
     /**
      * 更改状态

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/QywxTagSyncInfoPojo.java

@@ -43,6 +43,16 @@ public class QywxTagSyncInfoPojo implements Serializable {
      */
     private String enterpriseId;
 
+    private String externalUseridInfo ;
+
+    public String getExternalUseridInfo() {
+        return externalUseridInfo;
+    }
+
+    public void setExternalUseridInfo(String externalUseridInfo) {
+        this.externalUseridInfo = externalUseridInfo;
+    }
+
     public String getWxEnterpriseId() {
         return wxEnterpriseId;
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java

@@ -759,7 +759,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         this.saveExternalClerk(memberId, staffId, dto, staffClerkRelationDTO , 1);
         // this.sendWelcome(dto, qwDTO, enterpriseId, staffId, clerkId,memberId);
         //同步好友标签
-        this.pushTagSync(memberId, wxEnterpriseId, enterpriseId);
+        this.pushTagSync(memberId, wxEnterpriseId, enterpriseId,null);
         //回调给会员，更新是否为企微好友
         log.info("通知会员 合并会员后更新为企微好友,memberId:{}", memberId);
 //        this.memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 1);
@@ -1187,7 +1187,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             return;
         }
         pushTagSync(dto.getExternalUserid(), wxUserId
-                , GicQywxSyncTypeEnum.FRIEND_TAG_SYNC.getType(), QywxSyncTaskTypeEnum.MEMBER_SYNC.getType(), wxEnterprise.getWxEnterpriseId(), null);
+                , GicQywxSyncTypeEnum.FRIEND_TAG_SYNC.getType(), QywxSyncTaskTypeEnum.MEMBER_SYNC.getType(), wxEnterprise.getWxEnterpriseId(), null,null);
     }
 
     @Override
@@ -1385,7 +1385,11 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             throw new WxApiLimitException("getCorpSelfExternalUseridInfo接口调用被限制");
         }
         ExternalUserPojo pojo = getExternalUserPojo(unionIdJson, wxUserId, wxEnterpriseId);
-        return EntityUtil.changeEntityByJSON(ExternalUserDTO.class, pojo);
+        ExternalUserDTO dto = EntityUtil.changeEntityByJSON(ExternalUserDTO.class, pojo);
+        if(qwDTO.isSelf()) {
+            dto.setExternalUseridInfo(unionIdJson);
+        }
+        return dto ;
     }
 
     @Override
@@ -1530,7 +1534,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         this.saveExternalClerk(memberId, staffId, unionDTO, staffClerkRelation, statusFlag);
         if(StringUtils.isNotBlank(memberId)) {
             if(null == RedisUtil.getCache("zhuan_self")) {
-                this.pushTagSync(memberId, wxEnterpriseId, enterpriseId);
+                this.pushTagSync(memberId, wxEnterpriseId, enterpriseId,dto.getExternalUseridInfo());
             }else {
                 log.info("不同步标签");
             }
@@ -1563,7 +1567,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     /**
      * 同步
      */
-    private void pushTagSync(String dataId, String taskId, int syncType, int taskType, String wxEnterpriseId, String enterpriseId) {
+    private void pushTagSync(String dataId, String taskId, int syncType, int taskType, String wxEnterpriseId, String enterpriseId,String externalUseridInfo) {
         QywxTagSyncInfoPojo pojo = new QywxTagSyncInfoPojo();
         pojo.setDataId(dataId);
         pojo.setTaskId(taskId);
@@ -1572,6 +1576,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         pojo.setSyncType(syncType);
         pojo.setWxEnterpriseId(wxEnterpriseId);
         pojo.setEnterpriseId(enterpriseId);
+        pojo.setExternalUseridInfo(externalUseridInfo);
         GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
         try {
             int delay = 0 ;
@@ -1593,8 +1598,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     /**
      * 同步
      */
-    private void pushTagSync(String memberId, String wxEnterpriseId, String enterpriseId) {
-        this.pushTagSync(memberId, "-1", GicQywxSyncTypeEnum.SINGLE_WXENT_MEMNER_SYNC.getType(), QywxSyncTaskTypeEnum.MEMBER_SYNC.getType(), wxEnterpriseId, enterpriseId);
+    private void pushTagSync(String memberId, String wxEnterpriseId, String enterpriseId , String externalUseridInfo) {
+        this.pushTagSync(memberId, "-1", GicQywxSyncTypeEnum.SINGLE_WXENT_MEMNER_SYNC.getType(), QywxSyncTaskTypeEnum.MEMBER_SYNC.getType(), wxEnterpriseId, enterpriseId,externalUseridInfo);
     }
 
     private String saveMemberUnionTable(ExternalUserDTO dto) {

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/QywxTagApiServiceImpl.java

@@ -606,7 +606,7 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
 
 
     @Override
-    public ServiceResponse syncQywxTagToGicByExternalUserId(String wxEnterpriseId, String externalUserId, String wxUserId) {
+    public ServiceResponse syncQywxTagToGicByExternalUserId(String wxEnterpriseId, String externalUserId, String wxUserId , String externalUserInfo) {
         //刷新标签的时候不允许同步
         ServiceResponse resp = new ServiceResponse();
         //所有以及关联同步的标签
@@ -622,11 +622,15 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
         //查询外部联系人
         String externalUseridInfo = null ;
-        if(qwDTO.isSelf()) {
-            externalUseridInfo = this.qywxUserApiService.getCorpSelfExternalUseridInfo(qwDTO.getDkCorpid(), qwDTO.getSelfSecret(), externalUserId,qwDTO.getUrlHost()) ;
+        if(null != externalUserInfo) {
+            externalUseridInfo =  externalUserInfo ;
         }else {
+            if (qwDTO.isSelf()) {
+                externalUseridInfo = this.qywxUserApiService.getCorpSelfExternalUseridInfo(qwDTO.getDkCorpid(), qwDTO.getSelfSecret(), externalUserId, qwDTO.getUrlHost());
+            } else {
                 externalUseridInfo = this.qywxUserApiService.getExternalUseridInfo(qwDTO.getThirdCorpid(), config.getWxSuiteid(), externalUserId);
             }
+        }
         if (StringUtils.isBlank(externalUseridInfo)) {
             logger.info("好友不存在");
             resp.setCode(2);