Merge branch 'feature/xgh/202506迭代' into 'developer'

标签日志

See merge request !3028

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

@@ -88,7 +88,7 @@ public interface QywxTagApiService {
 
 
     /**
-     * 同步企业微信导入gic的会员标签
+     * 企业微信打标-gic侧的处理
      *
      * @param wxEnterpriseId
      * @param externalUserId

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

@@ -2084,7 +2084,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         qdto.setSence(sence);
         String memberId = null;
         com.gic.api.base.commons.ServiceResponse<MemberSimpleDetailDTO> resp = this.memberEntranceApiService.enterpriseWechatByFriendEntrance(qdto);
-        log.info("刷新好友,创建member,resp={},param={}",JSON.toJSON(resp),JSON.toJSONString(qdto));
+        log.info("获取创建member,resp={},param={}",JSON.toJSON(resp),JSON.toJSONString(qdto));
         if(resp.isSuccess()) {
             MemberSimpleDetailDTO member = resp.getResult() ;
             memberId = member.getMemberId() ;

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

@@ -482,6 +482,9 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
         return this.syncFriendTagToQywxByExternalUserId(wxEnterpriseId,enterpriseId,externalUserId,tagItemIds,null);
     }
 
+    /**
+     * 加好友、刷新好友时,会以gic侧的标签为准。新增或删除企微侧的客户标签。此外部联系人加的每个staff下都会处理
+     */
     @Override
     public ServiceResponse syncFriendTagToQywxByExternalUserId(String wxEnterpriseId, String enterpriseId, String externalUserId, List<String> tagItemIds, String externalUserInfo) {
         logger.info("同步gic标签到企业微信：externalUserId={},{},{}", externalUserId, JSONObject.toJSONString(tagItemIds),externalUserInfo);
@@ -710,7 +713,7 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
             Sets.SetView<String> entMemberNeedSetQywxKeys = Sets.intersection(staffHasSetTagKeys, entQywxSyncTagKeys);
             Set<String> saveTagIds = entMemberNeedSetQywxKeys.stream().map(qywxKey -> syncTagFormatPojo.getQywxToGicTagItemIdMap().get(qywxKey)).collect(Collectors.toSet());
             saveTagIds.addAll(noSyncTagItemIds);
-            logger.info("会员需要打的企微标签：{}", JSONObject.toJSONString(entMemberNeedSetQywxKeys));
+            logger.info("企微标签：{},所有标签={}", JSONObject.toJSONString(entMemberNeedSetQywxKeys),JSONObject.toJSONString(saveTagIds));
             //更新标签 会自动同步
             if (CollectionUtils.isEmpty(saveTagIds)) {
                 saveMemberTags(new HashSet<>(), clerkRelated.getEnterpriseId(), memberId, clerkRelated.getClerkId());