刷新好友

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

 package com.gic.haoban.manage.service.task.friend;
 
-import cn.hutool.crypto.SecureUtil;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.clerk.api.service.PowerService;
 import com.gic.commons.util.GICMQClientUtil;
-import com.gic.haoban.manage.api.dto.*;
+import com.gic.haoban.manage.api.dto.ClerkMainStoreRelatedDTO;
+import com.gic.haoban.manage.api.dto.DealParamMqDTO;
+import com.gic.haoban.manage.api.dto.ExternalUserDTO;
+import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
+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.ClerkMainStoreRelatedApiService;
 import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService;
-import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.service.entity.TabHaobanPreDealLog;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated;
 import com.gic.haoban.manage.service.exception.WxApiLimitException;
-import com.gic.haoban.manage.service.service.*;
+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.service.WxEnterpriseService;
 import com.gic.haoban.manage.service.task.BaseSyncOperation;
 import com.gic.member.api.dto.MemberDTO;
 import com.gic.member.api.service.MemberOpenCardBusinessService;
 import com.gic.mq.sdk.GicMQClient;
 import com.gic.redis.data.util.RedisUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
+import cn.hutool.crypto.SecureUtil;
 
 /**
  * 导购和客户好友关系
@@ -51,8 +60,6 @@ public class FriendSyncNewOperation implements BaseSyncOperation {
     @Autowired
     private ClerkMainStoreRelatedApiService clerkMainStoreRelatedApiService;
     @Autowired
-    private StaffApiService staffApiService;
-    @Autowired
     private StaffClerkRelationService staffClerkRelationService;
     @Autowired
     private ClerkService clerkService;
@@ -163,21 +170,17 @@ public class FriendSyncNewOperation implements BaseSyncOperation {
 
     private String dealMerge(ExternalUserDTO externalUserDTO, TabHaobanPreDealLog dataPre) {
         String wxEnterpriseId = dataPre.getWxEnterpriseId();
-        String wxUserId = dataPre.getpDataId();
-
+        String wxUserId = dataPre.getDataId().split("###")[1] ;
         if (externalUserDTO.getFriendType() == 2) {
             return "不是微信好友，是企业微信好友:" + externalUserDTO.getFriendType();
         }
         //staff信息
-        StaffDTO staff = staffApiService.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId);
-        if (staff == null) {
-            return "成员不存在";
-        }
-        ClerkMainStoreRelatedDTO mainStore = clerkMainStoreRelatedApiService.getWxEnterpriseIdAndStaffId(wxEnterpriseId, staff.getStaffId());
+        String staffId = dataPre.getpDataId() ;
+        ClerkMainStoreRelatedDTO mainStore = clerkMainStoreRelatedApiService.getWxEnterpriseIdAndStaffId(wxEnterpriseId, staffId);
         if (mainStore == null) {
             return "主门店不存在";
         }
-        StaffClerkRelationDTO staffClerkRelationDTO = staffClerkRelationService.getOneBindByStoreId(staff.getStaffId(), mainStore.getStoreId());
+        StaffClerkRelationDTO staffClerkRelationDTO = staffClerkRelationService.getOneBindByStoreId(staffId, mainStore.getStoreId());
         if (staffClerkRelationDTO == null) {
             return "未绑定导购";
         }
@@ -187,7 +190,7 @@ public class FriendSyncNewOperation implements BaseSyncOperation {
         externalUserDTO.setEnterpriseId(staffClerkRelationDTO.getEnterpriseId());
         externalUserDTO.setStoreId(mainStore.getStoreId());
         externalUserDTO.setClerkId(staffClerkRelationDTO.getClerkId());
-        externalUserDTO.setWxUserId(staff.getWxUserId());
+        externalUserDTO.setWxUserId(wxUserId);
         externalUserDTO.setStaffId(staffClerkRelationDTO.getStaffId());
 
         TabHaobanWxEnterpriseRelated wxEnterpriseRelated = wxEnterpriseRelatedService.getByEnterpriseId(staffClerkRelationDTO.getWxEnterpriseId(), staffClerkRelationDTO.getEnterpriseId());