wxUserId调整

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/WxEnterpriseQwDTO.java

@@ -24,6 +24,10 @@ public class WxEnterpriseQwDTO implements Serializable {
         return this.wxSecurityType == 2 || this.wxSecurityType == 3;
     }
     
+    public boolean needOpenUserIdDk() {
+        return this.wxSecurityType == 2 || this.wxSecurityType == 4 ;
+    }
+    
     public String getSelfCorpid() {
         return selfCorpid;
     }

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

@@ -16,6 +16,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.commons.util.GICMQClientUtil;
 import com.gic.haoban.manage.api.dto.DealParamMqDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
 import com.gic.haoban.manage.api.enums.PreDealStatusEnum;
 import com.gic.haoban.manage.api.enums.PreDealTypeEnum;
 import com.gic.haoban.manage.api.enums.SyncTaskStatusEnum;
@@ -26,6 +27,7 @@ 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.task.BaseSyncOperation;
 import com.gic.mq.sdk.GicMQClient;
 import com.gic.redis.data.util.RedisUtil;
@@ -45,6 +47,8 @@ public class FriendClerkSyncNewOperation implements BaseSyncOperation {
     private SyncTaskService syncTaskService;
     @Autowired
     private StaffService staffService ;
+    @Autowired
+    private WxEnterpriseService wxEnterpriseService ;
 
     private static final String FRIEND_LOCK = "haoban_fresh_wx_friend_lock_";
 
@@ -57,11 +61,16 @@ public class FriendClerkSyncNewOperation implements BaseSyncOperation {
         boolean dealFlag = true;
         try {
             String wxEnterpriseId = dataPre.getWxEnterpriseId();
-            String wxUserId = dataPre.getDataId();
-            TabHaobanStaff staff = this.staffService.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId) ;
+            String wxUserId_ = dataPre.getDataId();
+            TabHaobanStaff staff = this.staffService.selectByUserIdAndEnterpriseId(wxUserId_, wxEnterpriseId) ;
             //
+            WxEnterpriseQwDTO qwDTO =  this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
             //获取所有外部联系人的外部联系人ids
-            List<String> selfUserIdList = memberUnionidRelatedApiService.listSelfExterialList(wxEnterpriseId, wxUserId);
+            String dkWxUserId = staff.getWxUserId() ;
+            if(qwDTO.needOpenUserIdDk()) {
+                dkWxUserId = staff.getWxOpenId() ;
+            }
+            List<String> selfUserIdList = memberUnionidRelatedApiService.listSelfExterialList(wxEnterpriseId, dkWxUserId);
             logger.info("selfUserIdList={}", JSONObject.toJSONString(selfUserIdList));
             if (CollectionUtils.isEmpty(selfUserIdList)) {
                 logger.info("自建应用调用第三方接口进入重试");
@@ -76,7 +85,11 @@ public class FriendClerkSyncNewOperation implements BaseSyncOperation {
                 return;
             }
             //第三方服务商的外部联系人
-            List<String> userIdList = memberUnionidRelatedApiService.listExterialList(wxEnterpriseId, wxUserId);
+            String wxUserId3th = staff.getWxUserId() ;
+            if(qwDTO.needOpenUserId3th()) {
+                wxUserId3th = staff.getWxOpenId() ;
+            }
+            List<String> userIdList = memberUnionidRelatedApiService.listExterialList(wxEnterpriseId, wxUserId3th);
             if (CollectionUtils.isEmpty(selfUserIdList)) {
                 dealFlag = tryAgainToMq(dataPre);
                 reason = "重试次数过多";
@@ -90,7 +103,7 @@ public class FriendClerkSyncNewOperation implements BaseSyncOperation {
                 return;
             }
             //清理外部联系人
-            memberUnionidRelatedApiService.cleanNoExsitFriendNew(wxEnterpriseId, wxUserId, userIdList);
+            memberUnionidRelatedApiService.cleanNoExsitFriendNew(wxEnterpriseId, wxUserId3th, userIdList);
             //写入外部联系人的处理队列
             List<TabHaobanPreDealLog> dealLogList = selfUserIdList.stream().map(externalUserId -> {
                 TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog();