fix

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

@@ -265,8 +265,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		String createTime = dto.getAddCreateTime();
 		String externalUserId = dto.getExternalUserid();
 		String avatar = dto.getAvatar();
-		if(StringUtils.isAnyBlank(wxUserId,wxEnterpriseId,name,createTime)){
-			log.info("【新增外部联系人】wxUserId={},wxEnterpriseId={},name={},createTime={},avatar={}",wxUserId,wxEnterpriseId,name,createTime,avatar);
+		String unionId = dto.getUnionid();
+		if(StringUtils.isAnyBlank(wxUserId,wxEnterpriseId,name,createTime,unionId)){
+			log.info("【新增外部联系人】wxUserId={},wxEnterpriseId={},name={},createTime={},avatar={},unionId={}",wxUserId,wxEnterpriseId,name,createTime,avatar,unionId);
 			return;
 		}
 		TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId);
@@ -274,7 +275,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 			return;
 		}
 		String staffId = staff.getStaffId();
-		String unionId = dto.getUnionid();
 		
 		MemberDTO member = null;
 		TabHaobanClerkMainStoreRelated r = clerkMainStoreRelatedService.selectByWxEnterpriseIdAndStoreId(staffId,wxEnterpriseId);
@@ -290,14 +290,12 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 			return;
 		}
 		//新增导购和外部联系人关系
-		if(StringUtils.isNotBlank(unionId)){
-			String clerkCode = staffClerkRelationDTO.getClerkCode();
-			ClerkDTO clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(), clerkCode);
-			log.info("【新增外部联系人】clerkCode={},unionid:{}",clerkCode,unionId);
-			if(clerk != null && StringUtils.isNotBlank(clerk.getQrcodeParam())&&StringUtils.isNotBlank(unionId)){
-				log.info("【新增外部联系人会员】enterpriseId={},unionId={},name={},avatar={},QrcodeParam={}",staffClerkRelationDTO.getEnterpriseId(),unionId,name,avatar,clerk.getQrcodeParam());
-				 member = memberOpenCardBusinessService.getMemberByQywxChannelParam(staffClerkRelationDTO.getEnterpriseId(),unionId,"",name,avatar,clerk.getQrcodeParam());
-			}
+		String clerkCode = staffClerkRelationDTO.getClerkCode();
+		ClerkDTO clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(), clerkCode);
+		log.info("【新增外部联系人】clerkCode={},unionid:{}",clerkCode,unionId);
+		if(clerk != null && StringUtils.isNotBlank(clerk.getQrcodeParam())&&StringUtils.isNotBlank(unionId)){
+			log.info("【新增外部联系人会员】enterpriseId={},unionId={},name={},avatar={},QrcodeParam={}",staffClerkRelationDTO.getEnterpriseId(),unionId,name,avatar,clerk.getQrcodeParam());
+			 member = memberOpenCardBusinessService.getMemberByQywxChannelParam(staffClerkRelationDTO.getEnterpriseId(),unionId,"",name,avatar,clerk.getQrcodeParam());
 		}
 		
 		TabHaobanExternalClerkRelated exsitDTO = externalClerkRelatedService.getByParams(wxUserId, wxEnterpriseId,name,createTime);
@@ -356,6 +354,10 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 			exsitDTO.setExternalUserid(dto.getExternalUserid());
 			memberUnionRelatedService.update(exsitDTO);
 			uuid = exsitDTO.getMemberUnionidRelatedId();
+			
+			MemberUnionidRelatedDTO fullDTO = memberUnionRelatedService.getByParams(wxUserId, wxEnterpriseId,name,createTime);
+			dto.setExternalUserid(fullDTO.getExternalUserid());
+			dto.setUnionid(fullDTO.getUnionid());
 		}
 		return uuid;
 		
@@ -506,7 +508,12 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 			dto.setSelfExternalUserid(selfExternalUserId);
 			uuid = memberUnionRelatedService.addMemberUnionidRelated(dto);
 		}else{
-			return "";
+			exsitDTO.setExternalUserid(externalUserId);
+			exsitDTO.setUnionid(unionId);
+			//更新对外联系人id
+			exsitDTO.setSelfExternalUserid(selfExternalUserId);
+			memberUnionRelatedService.update(exsitDTO);
+			//return "";
 		}
 		
 		//新增门店和导购的关联关系
@@ -590,6 +597,25 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 	public void freshWxFrend(String wxEnterpriseId, String wxUserId,String storeId) {
 		log.info("【刷下好友】wxUserId={}",wxUserId);
 		WxEnterpriseDTO enterprise = wxEnterpriseService.selectById(wxEnterpriseId);
+		
+		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());
+		JSONArray externalArr = JSON.parseArray(wxRes);
+		for (String externalUserId : externalUserIdList) {
+			if(!externalArr.contains(externalUserId)){
+				//删除成员和外部联系人关系
+				MemberUnionidRelatedDTO dto = new MemberUnionidRelatedDTO();
+				dto.setExternalUserid(externalUserId);
+				dto.setWxUserId(wxUserId);
+				memberUnionRelatedService.delMemberUnionidRelated(dto);
+				//删除导购和外部联系人关系
+				externalClerkRelatedService.delByUserIdAndExternalUserId(dto);
+			}
+		}
+		
+		
         SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.CONTACT_CUSTOMER.getVal());
         if (null == secretSetting||secretSetting.getCheckFlag()==0) {
             log.info("没有配置客户联系secret:{}",wxEnterpriseId);
@@ -604,16 +630,10 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		if(jsonArr.size() == 0) {
 			return;
 		}
-		List<MemberUnionidRelatedDTO> list = this.getByWxUserIdAndWxEnterpriseId(wxUserId, wxEnterpriseId);
-		List<String> externalUserIdList = list.stream().map(student->student.getSelfExternalUserid())
-				   .collect(Collectors.toList());
+		
+		
 		for (Object object : jsonArr) {
-			if(externalUserIdList.contains(object.toString())){
-				continue;
-			}else{
-				//String string = qywxUserApiService.getCorpSelfExternalUseridInfo(enterprise.getCorpid(), enterprise.getWxSecretKey(), object.toString());
-				this.add(wxEnterpriseId, object.toString(), wxUserId,storeId);
-			}
+			this.add(wxEnterpriseId, object.toString(), wxUserId,storeId);
 		}
 		
 	}