unionid表优化

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/MemberUnionidRelatedMapper.java

@@ -11,13 +11,6 @@ public interface MemberUnionidRelatedMapper {
 
     MemberUnionidRelated selectByPrimaryKey(String memberUnionidRelatedId);
 
-    // 删除好友
-    void deleteByUnionidAndUserId(@Param("externalUserid") String externalUserid, @Param("staffId") String staffId);
-
-    void delMemberUnionidRelatedBatch(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("externalUserids") List<String> externalUserid, @Param("staffId") String staffId);
-
-    void cleanStaffRelated(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffIds") List<String> staffIds);
-
     /**
      * 根据应用内的外部联系人获取信息
      *

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

 package com.gic.haoban.manage.service.service;
 
-import java.util.List;
-
 import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
 
 public interface MemberUnionRelatedService {
 	
 	String addMemberUnionidRelated(MemberUnionidRelatedDTO dto);
 	
-	void delMemberUnionidRelated(MemberUnionidRelatedDTO dto , String staffId);
-
-	/**
-	 * 删除外部联系人关系
-	 *
-	 * @param wxEnterpriseId
-	 * @param wxUserId
-	 * @param externalUserids
-	 */
-	void delMemberUnionidRelatedBatch(String wxEnterpriseId, String staffId, List<String> externalUserids);
-
-	void cleanStaffRelated(String wxEnterpriseId, List<String> staffIds);
-
 	/**
 	 * 根据应用内的外部联系人id 获取信息
 	 *

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

@@ -30,24 +30,6 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService
 	}
 
 	@Override
-	public void delMemberUnionidRelated(MemberUnionidRelatedDTO dto , String staffId) {
-		mapper.deleteByUnionidAndUserId(dto.getExternalUserid(),staffId);
-	}
-
-	@Override
-	public void delMemberUnionidRelatedBatch(String wxEnterpriseId, String staffId, List<String> externalUserids) {
-		mapper.delMemberUnionidRelatedBatch(wxEnterpriseId, externalUserids, staffId);
-	}
-
-	@Override
-	public void cleanStaffRelated(String wxEnterpriseId, List<String> staffIds) {
-		if(staffIds == null || staffIds.isEmpty()){
-			return;
-		}
-		mapper.cleanStaffRelated(wxEnterpriseId,staffIds);
-	}
-
-	@Override
 	public MemberUnionidRelatedDTO getByWxUserIdAndSelfExternalUserId(String staffId, String wxEnterpriseId, String selfExternalUserId) {
 		MemberUnionidRelated unionidRelated = mapper.getBySelfExternalUserId(staffId,wxEnterpriseId, selfExternalUserId);
 		return EntityUtil.changeEntityNew(MemberUnionidRelatedDTO.class, unionidRelated);

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

@@ -493,14 +493,12 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             log.info("加好友失败,商户未关联好办企业,wxEnterpriseId={},enterpriseId={}", wxEnterpriseId, enterpriseId);
             return;
         }
-        // 如果是非活码 且不在同一开放平台,unionid无效
-        if(StringUtils.isNotBlank(unionid) && !isHmUnionid && wxEnterpriseRelated.getMemberOpenCardFlag()==1) {
-            unionid = null ;
-        }
         String memberId = null;
         boolean addByWelcome = this.getAddByWelcomeFlag(wxEnterpriseRelated) ;
         log.info("是否通过欢迎语加好友={},wxEnterpriseId:{},enterpriseId={},unionid={}",addByWelcome,wxEnterpriseId,enterpriseId,unionid);
         if(addByWelcome) {
+            unionid = null ;
+            dto.setUnionid(unionid);
             this.addFriendByWelcome(dto, staffClerkRelationDTO,qwDTO);
         }else {
             dto.setUnionid(unionid);
@@ -635,7 +633,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             qdto.setNick(name);
             qdto.setPhotoUrl(avatar);
             qdto.setQrcodeParam(qrcodeParam);
-            qdto.setUnionId(unionId+"123");
+            qdto.setUnionId(unionId);
             qdto.setUserId(externalUserid);
             qdto.setSence(2);
             com.gic.api.base.commons.ServiceResponse<MemberSimpleDetailDTO> resp = this.memberEntranceApiService.enterpriseWechatByFriendEntrance(qdto);
@@ -1200,7 +1198,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         String staffId = staff.getStaffId();
         dto.setStaffId(staffId);
         externalClerkRelatedService.delByUserIdAndExternalUserId(dto);
-        memberUnionRelatedService.delMemberUnionidRelated(dto, staffId);
     }
 
     private void editMemberUnionidRelatedProcess(MemberUnionidRelatedDTO dto, String wxUserId) {
@@ -1658,7 +1655,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         String name = StringUtils.isBlank(dto.getName()) ? "--" : dto.getName();
         String createTime = dto.getAddCreateTime();
         String externalUserId = dto.getExternalUserId();
-        String enterpriseId = dto.getEnterpriseId();
         String staffId = dto.getStaffId();
         String avatar = dto.getAvatar();
         MemberUnionidRelatedDTO exsitDTO = memberUnionRelatedService.getByWxUserIdAndSelfExternalUserId(staffId, wxEnterpriseId, dto.getSelfExternalUserId());
@@ -1668,7 +1664,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             exsitDTO.setAvatar(avatar);
             exsitDTO.setSelfExternalUserid(dto.getSelfExternalUserId());
             exsitDTO.setAddCreateTime(createTime);
-            exsitDTO.setEnterpriseId(enterpriseId);
             exsitDTO.setExternalName(name);
             exsitDTO.setExternalUserid(externalUserId);
             exsitDTO.setWxEnterpriseId(wxEnterpriseId);
@@ -1698,7 +1693,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         //删除成员与union的关联关系
         List<String> khList = new ArrayList<String>(delExternalUserIds);
         log.info("需要删除外部联系人staffId={} , khList={}", staffId, JSON.toJSONString(khList));
-        memberUnionRelatedService.delMemberUnionidRelatedBatch(wxEnterpriseId, staffId, khList);
         //删除导购和外部联系人关系
         externalClerkRelatedService.delByUserIdAndExternalUserIdBatch(wxEnterpriseId, staffId, khList);
     }