Merge remote-tracking branch 'origin/developer' into developer

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

@@ -803,7 +803,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 	public List<String> listExterialList(String wxEnterpriseId, String wxUserId) {
 		log.info("【获取第三方应用好友】wxEnterpriseId={},wxUserId={}",wxEnterpriseId,wxUserId);
 		WxEnterpriseDTO enterprise = wxEnterpriseService.selectById(wxEnterpriseId);
-		String wxRes = qywxUserApiService.listExternalUserid(enterprise.getCorpid(), "wwb3ef71aa8c6d9c06", wxUserId);
+//		String wxRes = qywxUserApiService.listExternalUserid(enterprise.getCorpid(), "wwb3ef71aa8c6d9c06", wxUserId);
+		String wxRes = qywxUserApiService.listExternalUserid(enterprise.getCorpid(), config.getWxSuiteid(), wxUserId);
 		List<String> list = new ArrayList<>();
 		log.info("【查询第三方应用】res={}",wxRes);
 		if(StringUtils.isBlank(wxRes)){
@@ -846,7 +847,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 			log.info("企业不存在");
 			return null;
 		}
-		String uJ = qywxUserApiService.getExternalUseridInfo(wxEnterprise.getCorpid(), "wwb3ef71aa8c6d9c06", externalUserId);
+//		String uJ = qywxUserApiService.getExternalUseridInfo(wxEnterprise.getCorpid(), "wwb3ef71aa8c6d9c06", externalUserId);
+		String uJ = qywxUserApiService.getExternalUseridInfo(wxEnterprise.getCorpid(), config.getWxSuiteid(), externalUserId);
 		if(StringUtils.isBlank(uJ)){
 			log.info("好友不存在");
 			return null;

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

@@ -146,7 +146,7 @@ public class FriendMergeSyncOperation implements BaseSyncOperation{
            }
 			checkDepartmentTask(taskId);		
 		}
-		
+//		
 	}
 
 	@Override

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

@@ -35,6 +35,7 @@ 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.mq.sdk.GicMQClient;
+import com.gic.redis.data.util.RedisUtil;
 
 @Service
 public class FriendSyncOperation implements BaseSyncOperation {

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

@@ -475,7 +475,7 @@ public class WxEnterpriseController extends WebBaseController{
 			listRet.forEach(secretSettingVO -> {
 				if ((!StringUtils.isEmpty(secretSettingVO.getEnterpriseId()))&&(!secretSettingVO.getEnterpriseId().equals("-1"))) {
 					EnterpriseDTO enterpriseDTO = enterpriseService.getEnterpriseById(secretSettingVO.getEnterpriseId());
-					secretSettingVO.setEnterpriseName(enterpriseDTO.getBrandName());
+					secretSettingVO.setEnterpriseName(enterpriseDTO == null?"":enterpriseDTO.getBrandName());
 				}
 			});
 		}
@@ -536,7 +536,7 @@ public class WxEnterpriseController extends WebBaseController{
 		if(StringUtils.isEmpty(taskId)){
 			return resultResponse(HaoBanErrCode.ERR_100021);
 		}
-		dealSyncOperationApiService.dealWxFriendClerk(taskId, wxEnterpriseId);
+//		dealSyncOperationApiService.dealWxFriendClerk(taskId, wxEnterpriseId);
 		RedisUtil.setCache(dayKey, dayCount+1);
 		RedisUtil.setCache(monthKey, monthCount+1);
 		RedisUtil.setCache(dateKey, DateUtil.dateToStr(new Date(),DateUtil.FORMAT_DATETIME_19));
@@ -573,8 +573,13 @@ public class WxEnterpriseController extends WebBaseController{
     public HaobanResponse getFreshOnOff(){
     	LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
-		String dateKey = "haoban_fresh-wx-friend-enterprise" + wxEnterpriseId;
-    	return resultResponse(HaoBanErrCode.ERR_1,RedisUtil.getCache(dateKey) != null);
+		String dateKey = "haoban_fresh-wx-friend-enterprise";
+		Object value = RedisUtil.getCache(dateKey);
+		if(value != null){
+			String valueStr = value.toString();
+			return resultResponse(HaoBanErrCode.ERR_1,valueStr.contains(wxEnterpriseId));
+		}
+    	return resultResponse(HaoBanErrCode.ERR_1,false);
     }
 
 }