Merge branch 'feature/xgh/20250609' into 'master'

加好友：gic会员上无标签，不同步企微侧标签

See merge request !3022

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

@@ -11,6 +11,8 @@ import com.gic.haoban.manage.service.pojo.GicNewMemberBO;
 import com.gic.haoban.manage.service.service.*;
 import com.gic.haoban.manage.service.util.EventUtils;
 import com.gic.haoban.manage.service.util.HBQwMonitorUtils;
+import com.gic.member.api.dto.*;
+import com.gic.member.api.service.*;
 import com.gic.member.ext.api.enums.growth.GrowthRuleEnum;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -84,15 +86,6 @@ import com.gic.haoban.manage.service.service.chat.GroupChatService;
 import com.gic.haoban.manage.service.service.hm.HmLinkService;
 import com.gic.haoban.manage.service.service.hm.WxUserAddLogService;
 import com.gic.haoban.manage.service.util.EmojiFilterUtil;
-import com.gic.member.api.dto.MemberDTO;
-import com.gic.member.api.dto.MemberSimpleDetailDTO;
-import com.gic.member.api.dto.MemberSourceDetailDTO;
-import com.gic.member.api.dto.MemberSourceShowDTO;
-import com.gic.member.api.dto.QywxMemberQDTO;
-import com.gic.member.api.service.MemberApiService;
-import com.gic.member.api.service.MemberEntranceApiService;
-import com.gic.member.api.service.MemberService;
-import com.gic.member.api.service.MemberStoreService;
 import com.gic.member.tag.api.dto.outapi.MemberTagSingleDTO;
 import com.gic.member.tag.api.service.MemberTagOpenApiService;
 import com.gic.mq.sdk.GicMQClient;
@@ -182,6 +175,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     private ClerkMainStoreRelatedApiService  clerkMainStoreRelatedApiService ;
     @Autowired
     private QywxErrorLogService qywxErrorLogService ;
+    @Autowired
+    private MemberTagService memberTagService ;
     
     GicMQClient instance = GICMQClientUtil.getClientInstance();
 
@@ -783,7 +778,13 @@ 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);
+        // 如果gic会员上没标签,不同步
+        List<MemberTagDTO> memberTags = memberTagService.listMemberClerkManualTag(enterpriseId, memberId);
+        if (CollectionUtils.isNotEmpty(memberTags)) {
+            this.pushTagSync(memberId, wxEnterpriseId, enterpriseId,null);
+        }else {
+            log.info("gic会员上无标签，不同步企微侧标签");
+        }
         //回调给会员，更新是否为企微好友
         log.info("通知会员 合并会员后更新为企微好友,memberId:{}", memberId);
 //        this.memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 1);