fix

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

@@ -145,73 +145,42 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 				}
 
 				 //member = memberService.getMemberByUnionid(unionId, tabHaobanWxEnterpriseRelated.getEnterpriseId());
-//				 if(member != null){
-//					 break;
-//				 }
-				if(member != null){
-					dto.setMemberId(member.getMemberId());
-				}
-				dto.setSelfExternalUserid(dto.getExternalUserid());
-				dto.setUnionid(unionId);
-				
-				dto.setExternalName(name);
-				dto.setAddCreateTime(createTime);
-				if(StringUtils.isBlank(unionId)){
-					return "";
-				}
-				
-				dto.setWxEnterpriseId(wxEnterprise.getWxEnterpriseId());
-				dto.setSuiteid(wxEnterprise.getWxSecretKey());
-				
-				MemberUnionidRelatedDTO exsitDTO = memberUnionRelatedService.getByParams(dto.getWxUserId(), tabHaobanWxEnterpriseRelated.getEnterpriseId(),name,createTime);
-				String uuid = "";
-				if(exsitDTO == null){
-					uuid = memberUnionRelatedService.addMemberUnionidRelated(dto);
-				}else{
-					//如果是自建更新uuid
-					if(SELF_APP.equals(suiteid)){
-						exsitDTO.setUnionid(unionId);
-						exsitDTO.setMemberId(dto.getMemberId());
-					}else{
-						//更新对外联系人id
-						exsitDTO.setExternalUserid(dto.getExternalUserid());
-					}
-					memberUnionRelatedService.update(exsitDTO);
-					uuid = exsitDTO.getMemberUnionidRelatedId();
-				}
+				 if(member != null){
+					 break;
+				 }
+			}
+			if(member != null){
+				dto.setMemberId(member.getMemberId());
 			}
-//			if(member != null){
-//				dto.setMemberId(member.getMemberId());
-//			}
-//			dto.setSelfExternalUserid(dto.getExternalUserid());
-//			dto.setUnionid(unionId);
+			dto.setSelfExternalUserid(dto.getExternalUserid());
+			dto.setUnionid(unionId);
+		}
+		
+		dto.setExternalName(name);
+		dto.setAddCreateTime(createTime);
+		if(StringUtils.isBlank(unionId)){
+			return "";
 		}
 		
-//		dto.setExternalName(name);
-//		dto.setAddCreateTime(createTime);
-//		if(StringUtils.isBlank(unionId)){
-//			return "";
-//		}
-//		
-//		dto.setWxEnterpriseId(wxEnterprise.getWxEnterpriseId());
-//		dto.setSuiteid(wxEnterprise.getWxSecretKey());
-//		
-//		MemberUnionidRelatedDTO exsitDTO = memberUnionRelatedService.getByParams(dto.getWxUserId(), wxEnterprise.getWxEnterpriseId(),name,createTime);
-//		String uuid = "";
-//		if(exsitDTO == null){
-//			uuid = memberUnionRelatedService.addMemberUnionidRelated(dto);
-//		}else{
-//			//如果是自建更新uuid
-//			if(SELF_APP.equals(suiteid)){
-//				exsitDTO.setUnionid(unionId);
-//				exsitDTO.setMemberId(dto.getMemberId());
-//			}else{
-//				//更新对外联系人id
-//				exsitDTO.setExternalUserid(dto.getExternalUserid());
-//			}
-//			memberUnionRelatedService.update(exsitDTO);
-//			uuid = exsitDTO.getMemberUnionidRelatedId();
-//		}
+		dto.setWxEnterpriseId(wxEnterprise.getWxEnterpriseId());
+		dto.setSuiteid(wxEnterprise.getWxSecretKey());
+		
+		MemberUnionidRelatedDTO exsitDTO = memberUnionRelatedService.getByParams(dto.getWxUserId(), wxEnterprise.getWxEnterpriseId(),name,createTime);
+		String uuid = "";
+		if(exsitDTO == null){
+			uuid = memberUnionRelatedService.addMemberUnionidRelated(dto);
+		}else{
+			//如果是自建更新uuid
+			if(SELF_APP.equals(suiteid)){
+				exsitDTO.setUnionid(unionId);
+				exsitDTO.setMemberId(dto.getMemberId());
+			}else{
+				//更新对外联系人id
+				exsitDTO.setExternalUserid(dto.getExternalUserid());
+			}
+			memberUnionRelatedService.update(exsitDTO);
+			uuid = exsitDTO.getMemberUnionidRelatedId();
+		}
 		return "";
 	}
 	@Override