fix：wx_open_user_id修改

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

@@ -16,12 +16,16 @@ import com.gic.haoban.manage.api.dto.*;
 import com.gic.haoban.manage.api.enums.*;
 import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
 import com.gic.haoban.manage.api.service.DepartmentApiService;
+import com.gic.haoban.manage.api.service.StaffApiService;
+import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.entity.*;
 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;
+import com.gic.wechat.api.dto.qywx.QywxNewUseridDTO;
 import com.gic.wechat.api.service.qywx.QywxDepartmentApiService;
+import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
@@ -88,6 +92,12 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
 
     @Autowired
     private ClerkMainStoreRelatedService clerkMainStoreRelatedService;
+    @Autowired
+    private QywxUserApiService qywxUserApiService;
+    @Autowired
+    private Config config;
+    @Autowired
+    private StaffApiService staffApiService;
 
     private static final String LOCK_KEY = "sync_wx_lock_";
 
@@ -463,18 +473,33 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
             return syncCheckDTO;
         }
 
+
         int totalCount = preDealService.countByTaskId(taskId, -1, -1);
         int groupErrCount = preDealService.countByTaskId(taskId, PreDealTypeEnum.group.getVal(), PreDealStatusEnum.exception.getVal());
         int storeErrCount = preDealService.countByTaskId(taskId, PreDealTypeEnum.store.getVal(), PreDealStatusEnum.exception.getVal());
         int clerkErrCount = preDealService.countByTaskId(taskId, PreDealTypeEnum.clerk.getVal(), PreDealStatusEnum.exception.getVal());
         int preCount = preDealService.countByTaskId(taskId, -1, PreDealStatusEnum.pre.getVal());
 
-
         syncCheckDTO.setTotalDeal(totalCount);
         syncCheckDTO.setGroupErrCount(groupErrCount);
         syncCheckDTO.setStoreErrCount(storeErrCount);
         syncCheckDTO.setStaffErrCount(clerkErrCount);
         syncCheckDTO.setHasDeal(totalCount - preCount);
+        //拉取结束后
+        if (syncCheckDTO.getSyncStatus() == 4) {
+            String corpid = config.getCorpid();
+            if (corpid.length() > 20) {
+                //批量处理wx_user_id to wx_open_user_id
+                List<StaffDTO> staffDTOS = staffApiService.listUserIdByWxEnterpriseId(wxEnterpriseId);
+                logger.info("useridToOpenuserid请求：corpid：{}", corpid);
+                List<QywxNewUseridDTO> qywxNewUseridDTOS = qywxUserApiService.useridToOpenuserid(corpid, config.getWxSuiteid(), staffDTOS.stream().map(StaffDTO::getWxUserId).collect(Collectors.toList()));
+                if (CollectionUtils.isNotEmpty(qywxNewUseridDTOS)) {
+                    for (QywxNewUseridDTO qywxNewUseridDTO : qywxNewUseridDTOS) {
+                        staffService.updateOpenUserIdsByUserId(wxEnterpriseId, qywxNewUseridDTO.getUserid(), qywxNewUseridDTO.getOpen_userid());
+                    }
+                }
+            }
+        }
         return syncCheckDTO;
     }
 

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

@@ -3,30 +3,21 @@ package com.gic.haoban.manage.service.task;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.manage.api.dto.DealParamMqDTO;
-import com.gic.haoban.manage.api.dto.StaffDTO;
 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.DealSyncOperationApiService;
 import com.gic.haoban.manage.api.service.StaffApiService;
-import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.entity.TabHaobanPreDealLog;
 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.redis.data.util.RedisUtil;
-import com.gic.wechat.api.dto.qywx.QywxNewUseridDTO;
-import com.gic.wechat.api.service.qywx.QywxUserApiService;
-import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 /**
  * Created 2020/4/13.
  *
@@ -47,12 +38,6 @@ public class QywxClerkSyncOperation implements BaseSyncOperation {
 
     @Autowired
     private DealSyncOperationApiService dealSyncOperationApiService;
-    @Autowired
-    private QywxUserApiService qywxUserApiService;
-    @Autowired
-    private Config config;
-    @Autowired
-    private StaffService staffService;
 
     @Override
     public void dealSingleByMq(DealParamMqDTO dealParamMqDTO, TabHaobanPreDealLog dataPre) {
@@ -126,18 +111,6 @@ public class QywxClerkSyncOperation implements BaseSyncOperation {
                 syncTaskService.updateTaskStatus(taskId, SyncTaskStatusEnum.compute.getVal());
                 dealSyncOperationApiService.unlockTask(wxEnterpriseId);
                 dealSyncOperationApiService.cleanDiffrence(wxEnterpriseId, taskId);
-                String corpid = config.getCorpid();
-                if (corpid.length() > 20) {
-                    //批量处理wx_user_id to wx_open_user_id
-                    List<StaffDTO> staffDTOS = staffApiService.listUserIdByWxEnterpriseId(wxEnterpriseId);
-                    logger.info("useridToOpenuserid请求：corpid：{}", corpid);
-                    List<QywxNewUseridDTO> qywxNewUseridDTOS = qywxUserApiService.useridToOpenuserid(corpid, config.getWxSuiteid(), staffDTOS.stream().map(StaffDTO::getWxUserId).collect(Collectors.toList()));
-                    if (CollectionUtils.isNotEmpty(qywxNewUseridDTOS)) {
-                        for (QywxNewUseridDTO qywxNewUseridDTO : qywxNewUseridDTOS) {
-                            staffService.updateOpenUserIdsByUserId(wxEnterpriseId, qywxNewUseridDTO.getUserid(), qywxNewUseridDTO.getOpen_userid());
-                        }
-                    }
-                }
             }
         }
         RedisUtil.unlock(key);