标签拆分加好友通知的

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

@@ -783,7 +783,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         this.saveExternalClerk(memberId, staffId, dto, staffClerkRelationDTO , 1 , 0);
         // this.sendWelcome(dto, qwDTO, enterpriseId, staffId, clerkId,memberId);
         //同步好友标签
-        this.pushTagSync(memberId, wxEnterpriseId, enterpriseId,null);
+        this.pushTagSync(memberId, wxEnterpriseId, enterpriseId,null,dto.isFlush());
         //回调给会员，更新是否为企微好友
         log.info("通知会员 合并会员后更新为企微好友,memberId:{}", memberId);
 //        this.memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 1);
@@ -1237,7 +1237,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             return;
         }
         pushTagSync(dto.getExternalUserid(), wxUserId
-                , GicQywxSyncTypeEnum.FRIEND_TAG_SYNC.getType(), QywxSyncTaskTypeEnum.MEMBER_SYNC.getType(), wxEnterprise.getWxEnterpriseId(), null,null);
+                , GicQywxSyncTypeEnum.FRIEND_TAG_SYNC.getType(), QywxSyncTaskTypeEnum.MEMBER_SYNC.getType(), wxEnterprise.getWxEnterpriseId(), null,null , true);
     }
 
     @Override
@@ -1591,7 +1591,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         this.saveExternalClerk(memberId, staffId, unionDTO, staffClerkRelation, statusFlag , 1);
         if(StringUtils.isNotBlank(memberId)) {
             if(null == RedisUtil.getCache("zhuan_self")) {
-                this.pushTagSync(memberId, wxEnterpriseId, enterpriseId,dto.getExternalUseridInfo());
+                this.pushTagSync(memberId, wxEnterpriseId, enterpriseId,dto.getExternalUseridInfo() , true);
             }else {
                 log.info("不同步标签");
             }
@@ -1624,7 +1624,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     /**
      * 同步
      */
-    private void pushTagSync(String dataId, String taskId, int syncType, int taskType, String wxEnterpriseId, String enterpriseId,String externalUseridInfo) {
+    private void pushTagSync(String dataId, String taskId, int syncType, int taskType, String wxEnterpriseId, String enterpriseId,String externalUseridInfo ,boolean flushFlag) {
         QywxTagSyncInfoPojo pojo = new QywxTagSyncInfoPojo();
         pojo.setDataId(dataId);
         pojo.setTaskId(taskId);
@@ -1646,7 +1646,11 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
                 delay = 90 ;
                 log.info("美邦延迟处理");
             }
-            clientInstance.sendMessage("qywxTagSyncDeal", JSONObject.toJSONString(pojo),delay);
+            String mqName = "qywxTagSyncDeal" ;
+            if(!flushFlag) {
+                mqName = "qywxTagSyncDealAddFriend" ;
+            }
+            clientInstance.sendMessage(mqName, JSONObject.toJSONString(pojo),delay);
         } catch (Exception e) {
             log.info("异常：{}", e);
         }
@@ -1655,8 +1659,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     /**
      * 同步
      */
-    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 void pushTagSync(String memberId, String wxEnterpriseId, String enterpriseId , String externalUseridInfo , boolean flushFlag) {
+        this.pushTagSync(memberId, "-1", GicQywxSyncTypeEnum.SINGLE_WXENT_MEMNER_SYNC.getType(), QywxSyncTaskTypeEnum.MEMBER_SYNC.getType(), wxEnterpriseId, enterpriseId,externalUseridInfo , flushFlag);
     }
 
     private String saveMemberUnionTable(ExternalUserDTO dto) {