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

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

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

@@ -10,9 +10,11 @@ import com.gic.commons.util.UniqueIdUtils;
 import com.gic.content.api.service.ContentProducerApiService;
 import com.gic.haoban.app.customer.service.api.service.InnerApiService;
 import com.gic.haoban.common.utils.StringUtil;
+import com.gic.haoban.manage.api.dto.CommonMQDTO;
 import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
 import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
+import com.gic.haoban.manage.api.service.HaobanCommonMQApiService;
 import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
 import com.gic.haoban.manage.api.service.hm.HmQrcodeApiService;
 import com.gic.haoban.manage.service.config.Config;
@@ -78,6 +80,8 @@ public class StaffServiceImpl implements StaffService {
     private StaffClerkRelationApiService staffClerkRelationApiService ;
     @Autowired
     private StaffDepartmentRelatedService staffDepartmentRelatedService ;
+    @Autowired
+    private HaobanCommonMQApiService haobanCommonMQApiService ;
 
     @Override
     public TabHaobanStaff selectById(String id) {
@@ -113,6 +117,12 @@ public class StaffServiceImpl implements StaffService {
             return staff.getStaffId() ;
         }
         mapper.insertSelective(tab);
+        CommonMQDTO mq = new CommonMQDTO() ;
+        mq.setType(11) ;
+        Map<String,String> map = new HashMap<>() ;
+        map.put("staffId",tab.getStaffId()) ;
+        mq.setParams(map);
+        this.haobanCommonMQApiService.putCommonDelayMessage(mq, 10);
         RedisUtil.unlock(lockKey);
         return tab.getStaffId();
     }

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

@@ -12,6 +12,7 @@ import com.gic.commons.util.StringUtil;
 import com.gic.haoban.manage.api.dto.MemberUnionidWechatAccountQDTO;
 import com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService;
 import com.gic.haoban.manage.service.service.chat.GroupChatPlanService;
+import com.gic.haoban.manage.service.service.chat.GroupChatService;
 import com.gic.haoban.manage.service.service.moment.QwMomentPlanAttendService;
 import com.gic.haoban.manage.service.service.moment.QwMomentPlanService;
 import com.gic.haoban.manage.service.service.role.HaobanMenuService;
@@ -67,6 +68,8 @@ public class HaobanCommonMQApiServiceImpl implements HaobanCommonMQApiService {
     private QwMomentPlanService qwMomentPlanService ;
     @Autowired
     private QwMomentPlanAttendService qwMomentPlanAttendService;
+    @Autowired
+    private GroupChatService groupChatService ;
 
     @Override
     public void putCommonMessage(CommonMQDTO dto) {
@@ -180,6 +183,10 @@ public class HaobanCommonMQApiServiceImpl implements HaobanCommonMQApiService {
             Long planId10 = Long.valueOf(map.get("planId")) ;
             this.qwMomentPlanService.getQwData(planId10);
             break;
+        case 11 :
+            String staffId11 = map.get("staffId") ;
+            this.groupChatService.initStaffGroupChat(staffId11);
+            break;
         default:
             break;
         }

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

@@ -177,7 +177,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     private QywxErrorLogService qywxErrorLogService ;
     @Autowired
     private MemberTagService memberTagService ;
-    
+
     GicMQClient instance = GICMQClientUtil.getClientInstance();
 
     @Override
@@ -781,7 +781,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         // 如果gic会员上没标签,不同步
         List<MemberTagDTO> memberTags = memberTagService.listMemberClerkManualTag(enterpriseId, memberId);
         if (CollectionUtils.isNotEmpty(memberTags)) {
-            this.pushTagSync(memberId, wxEnterpriseId, enterpriseId,null);
+            this.pushTagSync(memberId, wxEnterpriseId, enterpriseId,null,dto.isFlush());
         }else {
             log.info("gic会员上无标签，不同步企微侧标签");
         }
@@ -1238,7 +1238,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
@@ -1592,7 +1592,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("不同步标签");
             }
@@ -1625,7 +1625,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);
@@ -1647,7 +1647,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);
         }
@@ -1656,8 +1660,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) {

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

@@ -747,7 +747,7 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
      * @return
      */
     private Map<String, Set<String>> getExternalTagMap(String externalUseridInfo, String wxEnterpriseId) {
-        logger.info("externalUseridInfo:{}", externalUseridInfo);
+        // logger.info("externalUseridInfo:{}", externalUseridInfo);
         Map<String, Set<String>> ret = new HashMap<>();
         JSONObject jsonObject = JSONObject.parseObject(externalUseridInfo);