FIX

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MemberUnionidRelatedApiService.java

@@ -46,7 +46,7 @@ public interface MemberUnionidRelatedApiService {
 
 	void mqFreshWxFrend(String res);
 	
-	void cleanNoExsitFriend(String wxEnterpriseId,String wxUserId);
+	void cleanNoExsitFriend(String wxEnterpriseId,String wxUserId,String resWes);
 	
 	List<String> listSelfExterialList(String wxEnterpriseId,String wxUserId);
 

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

@@ -744,11 +744,11 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		return EntityUtil.changeEntityListByJSON(MemberUnionidRelatedDTO.class, memberUnionidRelatedMapper.getByWxUserIdListAndWxEnterpriseId(userIdList,wxEnterpriseId));
 	}
 	@Override
-	public void cleanNoExsitFriend(String wxEnterpriseId, String wxUserId) {
+	public void cleanNoExsitFriend(String wxEnterpriseId, String wxUserId, String wxRes) {
 		log.info("【清除不存在的好友】wxEnterpriseId={},wxUserId={}",wxEnterpriseId,wxUserId);
 		WxEnterpriseDTO enterprise = wxEnterpriseService.selectById(wxEnterpriseId);
 		
-		String wxRes = qywxUserApiService.listExternalUserid(enterprise.getCorpid(), config.getWxSuiteid(), wxUserId);
+		//String wxRes = qywxUserApiService.listExternalUserid(enterprise.getCorpid(), config.getWxSuiteid(), wxUserId);
 		List<MemberUnionidRelatedDTO> list = this.getByWxUserIdAndWxEnterpriseId(wxUserId, wxEnterpriseId);
 		List<String> externalUserIdList = list.stream().map(external->external.getExternalUserid())
 				   .collect(Collectors.toList());
@@ -772,27 +772,32 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 	}
 	@Override
 	public List<String> listSelfExterialList(String wxEnterpriseId, String wxUserId) {
-		log.info("【查询自建应用好友】wxEnterpriseId={},wxUserId={}",wxEnterpriseId,wxUserId);
-		WxEnterpriseDTO enterprise = wxEnterpriseService.selectById(wxEnterpriseId);
-		List<String> list = new ArrayList<>();
-		SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.CONTACT_CUSTOMER.getVal());
-        if (null == secretSetting||secretSetting.getCheckFlag()==0) {
-            log.info("没有配置客户联系secret:{}",wxEnterpriseId);
-            return list;
-        }
-        String res = qywxUserApiService.listSelfExternalUserid(enterprise.getCorpid(), secretSetting.getSecretVal(), wxUserId);
-		log.info("【查询自建应用】res={}",res);
-		if(StringUtils.isBlank(res)){
-			return list;
-		}
-		JSONArray jsonArr = JSON.parseArray(res);
-		if(jsonArr.size() == 0) {
+		try {
+			log.info("【查询自建应用好友】wxEnterpriseId={},wxUserId={}",wxEnterpriseId,wxUserId);
+			WxEnterpriseDTO enterprise = wxEnterpriseService.selectById(wxEnterpriseId);
+			List<String> list = new ArrayList<>();
+			SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.CONTACT_CUSTOMER.getVal());
+	        if (null == secretSetting||secretSetting.getCheckFlag()==0) {
+	            log.info("没有配置客户联系secret:{}",wxEnterpriseId);
+	            return list;
+	        }
+	        String res = qywxUserApiService.listSelfExternalUserid(enterprise.getCorpid(), secretSetting.getSecretVal(), wxUserId);
+			log.info("【查询自建应用】res={}",res);
+			if(StringUtils.isBlank(res)){
+				return list;
+			}
+			JSONArray jsonArr = JSON.parseArray(res);
+			if(jsonArr.size() == 0) {
+				return list;
+			}
+			for (Object object : jsonArr) {
+				list.add(object.toString());
+			}
 			return list;
+		} catch (Exception e) {
+			log.info("错误={}",e);
 		}
-		for (Object object : jsonArr) {
-			list.add(object.toString());
-		}
-		return list;
+		return null;
 	}
 	@Override
 	public List<String> listExterialList(String wxEnterpriseId, String wxUserId) {

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

@@ -47,10 +47,10 @@ public class FriendClerkSyncOperation implements BaseSyncOperation {
 		try {
 			String wxEnterpriseId = dataPre.getWxEnterpriseId();
 			String wxUserId = dataPre.getDataId();
-			memberUnionidRelatedApiService.cleanNoExsitFriend(wxEnterpriseId, wxUserId);
 			List<String> selfUserIdList = memberUnionidRelatedApiService.listSelfExterialList(wxEnterpriseId, wxUserId);
 			logger.info("selfUserIdList={}",selfUserIdList.size());
 			List<String> userIdList = memberUnionidRelatedApiService.listExterialList(wxEnterpriseId, wxUserId);
+			memberUnionidRelatedApiService.cleanNoExsitFriend(wxEnterpriseId, wxUserId,JSON.toJSONString(userIdList));
 			logger.info("userIdList={}",userIdList.size());
 			if(CollectionUtils.isNotEmpty(selfUserIdList)){
 				List<TabHaobanPreDealLog> dealLogList = selfUserIdList.stream().map(dto -> {