Merge branch 'feature/xgh/bug/0317' into 'master'

Feature/xgh/bug/0317

See merge request !2642

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanExternalClerkRelatedMapper.java

@@ -33,6 +33,7 @@ public interface TabHaobanExternalClerkRelatedMapper {
 
     int delByStoreIds(@Param("storeIds") Collection<String> storeIds);
 
+    List<TabHaobanExternalClerkRelated> listByStaffId(@Param("staffId") String staffId) ;
     void cleanStaffRelated(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffIds") List<String> staffIds);
     List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserId(@Param("externalUserid") String externalUserid,
                                                                         @Param("staffId") String staffId,

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

@@ -998,12 +998,19 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
             logger.info("企微通讯录成员成功:{}", taskId);
             String key = "haoban_sync_clerk_task_" + taskId;
             RedisUtil.lock(key, 3L);
+            String cacheId = "haoban_sync_clerk_task_cache_"+taskId ;
+            if(null != RedisUtil.getCache(cacheId)) {
+                logger.info("进行中,未完成{}", cacheId);
+                return false ;
+            }
+            RedisUtil.setCache(cacheId,1 , 15*60L) ;
             TabHaobanSyncTask syncTask = syncTaskService.getSyncTask(taskId);
             String wxEnterpriseId = syncTask.getWxEnterpriseId();
             this.unlockTask(wxEnterpriseId) ;
             this.cleanDiffrence(wxEnterpriseId, taskId);
             logger.info("同步通讯录完成");
             String conectkey = "get_follow_user_list:"+wxEnterpriseId ;
+            RedisUtil.delCache(cacheId) ;
             RedisUtil.delCache(conectkey) ;
             RedisUtil.unlock(key);
         }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/friend/FriendClerkSyncNewOperation.java

@@ -9,13 +9,11 @@ import com.gic.haoban.manage.api.enums.PreDealStatusEnum;
 import com.gic.haoban.manage.api.enums.PreDealTypeEnum;
 import com.gic.haoban.manage.api.enums.SyncTaskStatusEnum;
 import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService;
+import com.gic.haoban.manage.service.dao.mapper.TabHaobanExternalClerkRelatedMapper;
+import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
 import com.gic.haoban.manage.service.entity.TabHaobanPreDealLog;
 import com.gic.haoban.manage.service.entity.TabHaobanStaff;
-import com.gic.haoban.manage.service.entity.TabHaobanSyncTask;
-import com.gic.haoban.manage.service.service.PreDealService;
-import com.gic.haoban.manage.service.service.StaffService;
-import com.gic.haoban.manage.service.service.SyncTaskService;
-import com.gic.haoban.manage.service.service.WxEnterpriseService;
+import com.gic.haoban.manage.service.service.*;
 import com.gic.haoban.manage.service.task.BaseSyncOperation;
 import com.gic.mq.sdk.GicMQClient;
 import com.gic.redis.data.util.RedisUtil;
@@ -25,10 +23,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -49,6 +44,12 @@ public class FriendClerkSyncNewOperation implements BaseSyncOperation {
     private StaffService staffService ;
     @Autowired
     private WxEnterpriseService wxEnterpriseService ;
+    @Autowired
+    private TabHaobanExternalClerkRelatedMapper tabHaobanExternalClerkRelatedMapper ;
+    @Autowired
+    private ExternalClerkRelatedService externalClerkRelatedService ;
+    @Autowired
+    private StaffClerkRelationService staffClerkRelationService ;
 
     private static final String TRY_AGAIN = "haoban_fresh_wx_friend_again_";
 
@@ -83,6 +84,13 @@ public class FriendClerkSyncNewOperation implements BaseSyncOperation {
             if (CollectionUtils.isEmpty(selfUserIdList)) {
                 dealFlag = false;
                 reason = "无外部联系人";
+                List<TabHaobanExternalClerkRelated> memberList = this.tabHaobanExternalClerkRelatedMapper.listByStaffId(staffId) ;
+                if(CollectionUtils.isNotEmpty(memberList)) {
+                    this.externalClerkRelatedService.cleanStaffRelated(wxEnterpriseId, Arrays.asList(staffId));
+                    for(TabHaobanExternalClerkRelated item : memberList) {
+                        this.staffClerkRelationService.delMemberQywxFlag(item.getEnterpriseId(),Arrays.asList(item.getMemberId())) ;
+                    }
+                }
                 return;
             }
             String wxUserId3th = staff.getWxUserId() ;

haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml

@@ -294,6 +294,10 @@
         and status_flag in(1,3,4)
     </update>
 
+    <select id="listByStaffId" resultMap="BaseResultMap">
+        select <include refid="Base_Column_List"/>  from tab_haoban_external_clerk_related where staff_id=#{staffId}  and status_flag = 1
+    </select>
+
     <update id="cleanStaffRelated" parameterType="com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated">
         update tab_haoban_external_clerk_related
         set