Merge branch 'feature/login-token' into developer

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

@@ -4,14 +4,17 @@ 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.dto.WxEnterpriseDTO;
 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.api.service.WxEnterpriseApiService;
+import com.gic.haoban.manage.service.dao.mapper.WxApplicationMapper;
 import com.gic.haoban.manage.service.entity.TabHaobanPreDealLog;
 import com.gic.haoban.manage.service.entity.TabHaobanSyncTask;
+import com.gic.haoban.manage.service.entity.TabHaobanWxApplication;
 import com.gic.haoban.manage.service.service.PreDealService;
 import com.gic.haoban.manage.service.service.SyncTaskService;
 import com.gic.redis.data.util.RedisUtil;
@@ -38,10 +41,8 @@ public class QywxClerkSyncOperation implements BaseSyncOperation {
 
     @Autowired
     private PreDealService preDealService;
-
     @Autowired
     private SyncTaskService syncTaskService;
-
     @Autowired
     private StaffApiService staffApiService;
     @Autowired
@@ -49,7 +50,9 @@ public class QywxClerkSyncOperation implements BaseSyncOperation {
     @Autowired
     private QywxUserApiService qywxUserApiService;
     @Autowired
-    private Config config;
+    private WxEnterpriseApiService wxEnterpriseApiService;
+    @Autowired
+    private WxApplicationMapper wxApplicationMapper;
 
     @Override
     public void dealSingleByMq(DealParamMqDTO dealParamMqDTO, TabHaobanPreDealLog dataPre) {
@@ -75,8 +78,6 @@ public class QywxClerkSyncOperation implements BaseSyncOperation {
                 dealSuccess(dealParamMqDTO.getTaskId(), dealParamMqDTO.getData(), dataPre.getEnterpriseId(), dataPre.getWxEnterpriseId());
             }
         }
-
-
     }
 
     @Override
@@ -123,13 +124,15 @@ public class QywxClerkSyncOperation implements BaseSyncOperation {
                 syncTaskService.updateTaskStatus(taskId, SyncTaskStatusEnum.compute.getVal());
                 dealSyncOperationApiService.unlockTask(wxEnterpriseId);
                 dealSyncOperationApiService.cleanDiffrence(wxEnterpriseId, taskId);
-                String corpid = config.getCorpid();
-                logger.info("同步通讯录完成，corpid：{}", corpid);
+                WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseApiService.getOne(wxEnterpriseId);
+                String corpid = wxEnterpriseDTO.getCorpid();
+                TabHaobanWxApplication tabHaobanWxApplication = wxApplicationMapper.selectByCorpId(corpid);
+                logger.info("同步通讯录完成，批量处理wx_user_id，corpid：{}", corpid);
                 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()));
+                    List<QywxNewUseridDTO> qywxNewUseridDTOS = qywxUserApiService.useridToOpenuserid(corpid, tabHaobanWxApplication.getSiteId(), staffDTOS.stream().map(StaffDTO::getWxUserId).collect(Collectors.toList()));
                     if (CollectionUtils.isNotEmpty(qywxNewUseridDTOS)) {
                         for (QywxNewUseridDTO qywxNewUseridDTO : qywxNewUseridDTOS) {
                             staffApiService.updateOpenUserIdsByUserId(wxEnterpriseId, qywxNewUseridDTO.getUserid(), qywxNewUseridDTO.getOpen_userid());