Merge branch 'feature-2022_03_02' into developer

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

@@ -16,15 +16,12 @@ 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.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;
@@ -91,12 +88,6 @@ 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_";
 

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

@@ -1350,11 +1350,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         WxEnterpriseDTO enterprise = wxEnterpriseService.selectById(wxEnterpriseId);
         String corpid = enterprise.getCorpid();
         String userId = "";
-        if (wxUserId.length() > 20) {
-            TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId);
-            if (staff != null) {
-                userId = staff.getWxOpenUseId();
-            }
+        TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId);
+        if (staff != null && StringUtils.isNotBlank(staff.getWxOpenUseId())) {
+            userId = staff.getWxOpenUseId();
         } else {
             userId = wxUserId;
         }
@@ -1362,7 +1360,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         String wxRes = qywxUserApiService.listExternalUserid(corpid, config.getWxSuiteid(), userId);
         List<String> list = new ArrayList<>();
         log.info("【查询第三方应用】res={}", wxRes);
-        if (wxRes != null && "1".equals(wxRes)) {
+        if ("1".equals(wxRes)) {
             log.info("代表需要重试");
             return null;
         }

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

 package com.gic.haoban.manage.service.task.tag;
 
-import cn.hutool.crypto.SecureUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.clerk.api.service.PowerService;
-import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.GICMQClientUtil;
 import com.gic.haoban.app.customer.dto.SearchComputeDTO;
 import com.gic.haoban.app.customer.dto.SearchDataDTO;
 import com.gic.haoban.base.api.common.BasePageInfo;
-import com.gic.haoban.base.api.common.Constant;
-import com.gic.haoban.manage.api.dto.*;
+import com.gic.haoban.manage.api.dto.DealParamMqDTO;
 import com.gic.haoban.manage.api.enums.PreDealStatusEnum;
 import com.gic.haoban.manage.api.enums.PreDealTypeEnum;
-import com.gic.haoban.manage.api.enums.SecretTypeEnum;
 import com.gic.haoban.manage.api.enums.SyncTaskStatusEnum;
 import com.gic.haoban.manage.api.service.ClerkMainStoreRelatedApiService;
 import com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService;
 import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService;
 import com.gic.haoban.manage.api.service.StaffApiService;
-import com.gic.haoban.manage.service.entity.TabHaobanDepartment;
 import com.gic.haoban.manage.service.entity.TabHaobanPreDealLog;
 import com.gic.haoban.manage.service.entity.TabHaobanSyncTask;
-import com.gic.haoban.manage.service.exception.WxApiLimitException;
 import com.gic.haoban.manage.service.service.PreDealService;
 import com.gic.haoban.manage.service.service.StaffClerkRelationService;
 import com.gic.haoban.manage.service.service.SyncTaskService;
 import com.gic.haoban.manage.service.service.WxEnterpriseRelatedService;
 import com.gic.haoban.manage.service.task.BaseSyncOperation;
-import com.gic.haoban.manage.service.task.friend.FriendClerkSyncNewOperation;
-import com.gic.haoban.manage.service.task.friend.FriendSyncNewOperation;
-import com.gic.haoban.manage.service.util.EmojiFilterUtil;
-import com.gic.member.api.dto.MemberTagDTO;
 import com.gic.member.api.service.MemberOpenCardBusinessService;
 import com.gic.member.api.service.MemberTagService;
 import com.gic.member.tag.api.service.MemberTagApiService;
@@ -44,7 +33,6 @@ import com.gic.search.engine.api.constant.OperateEnum;
 import com.gic.search.engine.api.dto.ESResponseQueryBatch;
 import com.gic.search.engine.api.dto.dynamic.DynamicSearchDTO;
 import com.gic.search.engine.api.service.dynamic.ESDataDynamicOperationApiService;
-import com.gic.wechat.api.dto.qywx.UserDTO;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java

@@ -31,7 +31,6 @@ import com.gic.haoban.manage.web.vo.EnterpriseDetailVO;
 import com.gic.haoban.manage.web.vo.EnterpriseSearchVO;
 import com.gic.haoban.manage.web.vo.SecretSettingVO;
 import com.gic.haoban.manage.web.vo.StoreVo;
-import com.gic.quartz.api.dto.QuartzTaskDTO;
 import com.gic.redis.data.util.RedisUtil;
 import com.gic.wechat.api.dto.qywx.UserDTO;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
@@ -559,15 +558,6 @@ public class WxEnterpriseController extends WebBaseController {
         return resultResponse(HaoBanErrCode.ERR_1);
     }
 
-    private QuartzTaskDTO buildQuartzTaskDTO(String id) {
-        QuartzTaskDTO taskDTO = new QuartzTaskDTO();
-        taskDTO.setReferId(id);
-        taskDTO.setTaskMethod("quartWxFriendClerk");
-        taskDTO.setTaskService("com.gic.haoban.manage.api.service.DealSyncOperationApiService");
-        return taskDTO;
-    }
-
-
     /**
      * 获取企业微信好友刷新时间
      *