fix

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

@@ -257,7 +257,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		//新增导购和外部联系人关系
 		dto.setMemberUnionidRelatedId(memberUnionId);
 		insertExternalClerkRelated(dto);
-		
+		//解锁
+		String key = "external" + dto.getWxEnterpriseId() + "_"+ dto.getWxUserId() + "_" + dto.getExternalName() + "_" + dto.getAddCreateTime();
+		RedisUtil.unlock(key);
 		return memberUnionId;
 	}
 	
@@ -312,15 +314,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		}
 		
 		TabHaobanExternalClerkRelated exsitDTO = externalClerkRelatedService.getByParams(wxUserId, wxEnterpriseId,name,createTime);
-		try {
-			if(exsitDTO == null){
-				RedisUtil.lock(wxUserId+wxEnterpriseId+name+createTime, 2L);
-				exsitDTO = externalClerkRelatedService.getByParams(wxUserId, wxEnterpriseId,name,createTime);
-			}
-		} catch (Exception e) {
-		}finally {
-			RedisUtil.unlock(wxUserId+wxEnterpriseId+name+createTime);
-		}
 		if(exsitDTO == null){
 			TabHaobanExternalClerkRelated related = new TabHaobanExternalClerkRelated();
 			related.setAddCreateTime(createTime);
@@ -419,8 +412,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		String name = pojo.getName();
 		String createTime  = pojo.getAddCreateTime();
 		
+		//加锁
 		String key = "external" + wxEnterpriseId + "_"+ userId + "_" + name + "_" + createTime;
-		RedisUtil.lock(key,2l);
+		RedisUtil.lock(key,3l);
 		dto.setWxEnterpriseId(wxEnterpriseId);
 		
 		dto.setExternalName(name);