fix

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

@@ -319,6 +319,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		
 		String staffId = staff.getStaffId();
 		
+		TabHaobanExternalClerkRelated tab = null;
 		//新增导购和外部联系人关系
 		if(SELF_APP.equals(suiteid)){
 			TabHaobanClerkMainStoreRelated r = clerkMainStoreRelatedService.selectByWxEnterpriseIdAndStoreId(staffId,wxEnterpriseId);
@@ -326,15 +327,22 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 				log.info("【新增外部联系人】主门店为空");
 				return "";
 			}
-			insertExternalClerkRelatedSelf(pojo, wxEnterpriseId, staffId, uuid, userId, dto.getExternalUserid(),r.getStoreId());
+			tab =  getExternalClerkRelatedSelf(pojo, wxEnterpriseId, staffId, uuid, userId, dto.getExternalUserid(),r.getStoreId());
 		}else{
-			insertExternalClerkRelated(pojo, wxEnterpriseId, staffId, uuid, userId, dto.getExternalUserid());
+			tab = getExternalClerkRelated(pojo, wxEnterpriseId, staffId, uuid, userId, dto.getExternalUserid());
+		}
+		if(tab != null){
+			if(StringUtils.isBlank(tab.getExternalClerkRelatedId())){
+				externalClerkRelatedService.insert(tab);
+			}else{
+				externalClerkRelatedService.update(tab);
+			}
 		}
 		return uuid;
 	}
 	
 	
-	private void insertExternalClerkRelated(ExternalUserPojo pojo, String wxEnterpriseId, String staffId, String memberUnionidRelatedId,
+	private TabHaobanExternalClerkRelated getExternalClerkRelated(ExternalUserPojo pojo, String wxEnterpriseId, String staffId, String memberUnionidRelatedId,
 			String userId, String externalUserid) {
 		String unionId = pojo.getUnionId();
 		String name = pojo.getName();
@@ -350,26 +358,28 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 			related.setUnionid(unionId);
 			related.setWxEnterpriseId(wxEnterpriseId);
 			related.setWxUserId(userId);
-			externalClerkRelatedService.insert(related);
+			//externalClerkRelatedService.insert(related);
+			return related;
 		}else{
 			exsitDTO.setExternalUserId(externalUserid);
-			externalClerkRelatedService.update(exsitDTO);
+			//externalClerkRelatedService.update(exsitDTO);
+			return exsitDTO;
 		}
 	}
-	private void insertExternalClerkRelatedSelf(ExternalUserPojo pojo,String wxEnterpriseId,String staffId,String memberUnionidRelatedId,String userId,String externalUserId,String storeId){
+	private TabHaobanExternalClerkRelated getExternalClerkRelatedSelf(ExternalUserPojo pojo,String wxEnterpriseId,String staffId,String memberUnionidRelatedId,String userId,String externalUserId,String storeId){
 		MemberDTO member = null;
 		StoreDTO mainStore = null;
 		mainStore = storeService.getStore(storeId);
 		if(mainStore == null){
 			log.info("【新增外部联系人】门店为空");
-			return;
+			return null;
 		}
 		
 		
 		StaffClerkRelationDTO staffClerkRelationDTO = staffClerkRelationService.getOneBindByStoreId(staffId,storeId);
 		if(staffClerkRelationDTO == null){
 			log.info("【新增外币联系人】导购和clerk关联为空");
-			return;
+			return null;
 		}
 		
 		String unionId = pojo.getUnionId();
@@ -402,7 +412,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 			if(member != null){
 				related.setMemberId(member.getMemberId());
 			}
-			externalClerkRelatedService.insert(related);
+			//externalClerkRelatedService.insert(related);
+			return related;
 
 		}else{
 			if(member != null){
@@ -412,7 +423,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 			exsitDTO.setStoreId(storeId);
 			exsitDTO.setEnterpriseId(staffClerkRelationDTO.getEnterpriseId());
 			exsitDTO.setClerkId(staffClerkRelationDTO.getClerkId());
-			externalClerkRelatedService.update(exsitDTO);
+			//externalClerkRelatedService.update(exsitDTO);
+			return exsitDTO;
 		}
 	}
 	
@@ -508,8 +520,14 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		
 		//新增门店和导购的关联关系
 		String staffId = staff.getStaffId();
-		insertExternalClerkRelatedSelf(pojo, wxEnterpriseId, staffId, uuid, userId, dto.getExternalUserid(),storeId);
-		
+		TabHaobanExternalClerkRelated tab = getExternalClerkRelatedSelf(pojo, wxEnterpriseId, staffId, uuid, userId, dto.getExternalUserid(),storeId);
+		if(tab != null){
+			if(StringUtils.isBlank(tab.getExternalClerkRelatedId())){
+				externalClerkRelatedService.insert(tab);
+			}else{
+				externalClerkRelatedService.update(tab);
+			}
+		}
 		return uuid;
 	}