加好友整理

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

@@ -59,8 +59,6 @@ public interface MemberUnionidRelatedApiService {
      */
     List<MemberStoreDTO> listByExTernalUseridAndWxUserId(String externalUserid, String staffId, String storeId);
 
-    void cleanByCid(String cid);
-
     /**
      * 群发助手发送企业微信消息
      *
@@ -231,28 +229,6 @@ public interface MemberUnionidRelatedApiService {
 
 
     /**
-     * 根据id查询
-     *
-     * @param memberUnionidRelatedId 成员unionid相关id
-     * @return {@link MemberUnionidRelatedDTO }
-     * @author mozhu
-     * @date 2022-03-11 17:02:45
-     */
-    MemberUnionidRelatedDTO getById(String memberUnionidRelatedId);
-
-
-    /**
-     * 更新对外联系人id
-     *
-     * @param selfExternalUserid     自外部用户标识
-     * @param memberUnionidRelatedId 成员unionid相关id
-     * @author mozhu
-     * @date 2022-03-11 16:59:24
-     */
-    void updateSelfExternalUseridById(String selfExternalUserid, String memberUnionidRelatedId);
-
-
-    /**
      * 事件订阅test
      *
      * @param param 参数

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

@@ -11,12 +11,9 @@ public interface MemberUnionidRelatedMapper {
 
     MemberUnionidRelated selectByPrimaryKey(String memberUnionidRelatedId);
 
-    int updateByPrimaryKeySelective(MemberUnionidRelated record);
-
-    int cleanByCid(@Param("cid") String cid);
-
     MemberUnionidRelated getByUnionId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffId") String staffId, @Param("unionid") String unionid);
-
+    
+    // 删除好友
     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);
@@ -33,9 +30,6 @@ public interface MemberUnionidRelatedMapper {
      */
     MemberUnionidRelated getBySelfExternalUserId(@Param("staffId") String staffId, @Param("wxEnterpriseId") String wxEnterpriseId, @Param("selfExternalUserId") String selfExternalUserId);
 
-    List<MemberUnionidRelated> listBySelfExternalUserId(@Param("staffId") String staffId, @Param("wxEnterpriseId") String wxEnterpriseId, @Param("selfExternalUserId") String selfExternalUserId);
-
-    
     List<MemberUnionidRelated> listByWxEnterpriseIdAndExternalUserId(@Param("wxEnterpriseId") String wxEnterpriseId , @Param("list")List<String> externalUserIdList);
 
 }
\ No newline at end of file

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

@@ -20,7 +20,7 @@ public interface TabHaobanExternalClerkRelatedMapper {
     TabHaobanExternalClerkRelated selectByClerkIdAndExternalUserId(@Param("clerkId") String clerkId,
                                                                    @Param("externalUserId") String externalUserId);
 
-    int delByUserIdAndExternalUserId(TabHaobanExternalClerkRelated record);
+    int delByUserIdAndExternalUserId(@Param("externalUserId") String externalUserId , @Param("staffId") String staffId);
 
     void delByUserIdAndExternalUserIdBatch(@Param("staffId") String staffId,
                                            @Param("wxEnterpriseId") String wxEnterpriseId,

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

@@ -38,16 +38,6 @@ public interface WxEnterpriseMapper {
     TabHaobanWxEnterprise getEnterpriseBycorpId(@Param("corpId") String corpId, @Param("statusFlag") Integer statusFlag);
 
     /**
-     * 获取公司by企业名称
-     *
-     * @param corpName 公司名称
-     * @return {@link TabHaobanWxEnterprise }
-     * @author mozhu
-     * @date 2021-12-20 20:09:52
-     */
-    TabHaobanWxEnterprise getEnterpriseByCorpName(@Param("corpName") String corpName);
-
-    /**
      * 更新是否转化外部联系人
      *
      * @param externalFlag   外部标志

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

@@ -15,7 +15,7 @@ public interface ExternalClerkRelatedService {
 	 * 删除好友
 	 * @param dto
 	 */
-	void delByUserIdAndExternalUserId(MemberUnionidRelatedDTO dto , String wxUserId);
+	void delByUserIdAndExternalUserId(MemberUnionidRelatedDTO dto);
 
 	/**
 	 * 删除会员与导购的关联关系

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

 package com.gic.haoban.manage.service.service;
 
-import com.gic.api.base.commons.Page;
-import com.gic.haoban.base.api.common.BasePageInfo;
-import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
-import com.gic.haoban.manage.service.entity.MemberUnionidRelated;
-import com.github.pagehelper.PageInfo;
-
 import java.util.List;
 
+import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
+
 public interface MemberUnionRelatedService {
 
 	MemberUnionidRelatedDTO getByWxUserIdAndUnionId(String wxEnterpriseId, String staffId, String unionid);
@@ -25,11 +21,6 @@ public interface MemberUnionRelatedService {
 	 */
 	void delMemberUnionidRelatedBatch(String wxEnterpriseId, String staffId, List<String> externalUserids);
 
-	void update(MemberUnionidRelatedDTO exsitDTO);
-
-	void clean(String cid);
-
-
 	void cleanStaffRelated(String wxEnterpriseId, List<String> staffIds);
 
 	/**
@@ -54,14 +45,4 @@ public interface MemberUnionRelatedService {
 	 */
 	MemberUnionidRelatedDTO getBySelfExternalUserId(String wxEnterpriseId, String selfExternalUserId);
 
-	/**
-	 * 根据应用内的外部联系人id 获取信息
-	 *
-	 * @param wxUserId
-	 * @param wxEnterpriseId
-	 * @param selfExternalUserId
-	 * @return
-	 */
-	List<MemberUnionidRelatedDTO> listBySelfExternalUserId(String staffId, String wxEnterpriseId, String selfExternalUserId);
-
 }

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

@@ -38,16 +38,6 @@ public interface WxEnterpriseService {
 	int unbind(String wxEnterpriseId);
 
 	/**
-	 * 得到企业bycorp名称
-	 *
-	 * @param corpName 公司名称
-	 * @return {@link TabHaobanWxEnterprise }
-	 * @author mozhu
-	 * @date 2021-12-20 20:09:21
-	 */
-	TabHaobanWxEnterprise getEnterpriseByCorpName(String corpName);
-
-	/**
 	 * 所有企业微信
 	 *
 	 * @return

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

@@ -65,10 +65,6 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
     @Autowired
     private MemberApiService memberApiService;
     @Autowired
-    private StaffMapper staffMapper;
-    @Autowired
-    private TabHaobanStaffClerkRelationMapper staffClerkRelationMapper;
-    @Autowired
     private WxUserAddLogService wxUserAddLogService;
     @Autowired
     private StoreService storeService;
@@ -105,34 +101,22 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
     }
 
     @Override
-    public void delByUserIdAndExternalUserId(MemberUnionidRelatedDTO dto, String wxUserId) {
-        int count = mapper.delByUserIdAndExternalUserId(EntityUtil.changeEntityByJSON(TabHaobanExternalClerkRelated.class, dto));
-        if (count <= 0) {
-            logger.error("无需删除的好友数据：{}", JSON.toJSONString(dto));
-            return;
-        }
+    public void delByUserIdAndExternalUserId(MemberUnionidRelatedDTO dto) {
         String staffId = dto.getStaffId();
         String externalUserid = dto.getExternalUserid();
-        List<TabHaobanExternalClerkRelated> tabHaobanExternalClerkRelatedList = mapper.listByExTernalUseridAndWxUserId(externalUserid, staffId, 2);
-        if (CollectionUtils.isEmpty(tabHaobanExternalClerkRelatedList)) {
-            logger.info("无解除的好友关系：externalUserid:{},wxUserId:{}", externalUserid, wxUserId);
-            return;
-        }
-        TabHaobanExternalClerkRelated related = tabHaobanExternalClerkRelatedList.get(0);
-        String wxEnterpriseId = related.getWxEnterpriseId();
-        TabHaobanStaff tabHaobanStaff = staffMapper.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId);
-        if (null == tabHaobanStaff) {
-            logger.error("找不到员工:wxUserId:{}", wxUserId);
+        int count = mapper.delByUserIdAndExternalUserId(externalUserid,staffId);
+        if (count <= 0) {
+            logger.error("无需删除的好友数据：{}", JSON.toJSONString(dto));
             return;
         }
-
-        staffId = tabHaobanStaff.getStaffId();
-        List<TabHaobanStaffClerkRelation> tabHaobanStaffClerkRelations = staffClerkRelationMapper.lisByStaffId(wxEnterpriseId, staffId, null);
-        if (CollectionUtils.isEmpty(tabHaobanStaffClerkRelations)) {
-            logger.error("找不到员工导购关联关系:staffId:{}，wxEnterpriseId：{}", staffId, wxEnterpriseId);
+        String wxEnterpriseId = dto.getWxEnterpriseId() ;
+        List<TabHaobanExternalClerkRelated> deleteRelatedList = mapper.listByExTernalUseridAndWxUserId(externalUserid, staffId, 2);
+        if (CollectionUtils.isEmpty(deleteRelatedList)) {
+            logger.info("无解除的好友关系：externalUserid:{},staffId:{}", externalUserid,staffId);
             return;
         }
-        String enterpriseId = tabHaobanStaffClerkRelations.get(0).getEnterpriseId();
+        TabHaobanExternalClerkRelated related = deleteRelatedList.get(0);
+        String enterpriseId = related.getEnterpriseId() ;
         //该企微该会员所有关联关系解除后通知会员
         List<TabHaobanExternalClerkRelated> list = mapper.listByExternalUseridAndWxEnterpriseId(dto.getExternalUserid(), wxEnterpriseId, Arrays.asList("1", "3", "4"));
         if (CollectionUtils.isEmpty(list)) {
@@ -146,14 +130,12 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
             }
         } else {
             //删除后 每次回调会员
-            List<TabHaobanExternalClerkRelated> relatedList = mapper.listByExTernalUseridAndWxUserId(dto.getExternalUserid(), wxUserId, 2);
-            for (TabHaobanExternalClerkRelated externalClerkRelated : relatedList) {
+            for (TabHaobanExternalClerkRelated externalClerkRelated : deleteRelatedList) {
                 String memberId = externalClerkRelated.getMemberId();
                 logger.info("通知会员 删除会员后更新为非企微好友时间 memberId:{}", memberId);
                 memberApiService.updateMemberQywxEveryOccasion(enterpriseId, memberId, 1, new Date());
             }
         }
-
         //添加日志
         WxUserAddLogQDTO wxUserAddLogQDTO = new WxUserAddLogQDTO();
         wxUserAddLogQDTO.setWxEnterpriseId(wxEnterpriseId);
@@ -165,7 +147,6 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
         wxUserAddLogQDTO.setStaffId(related.getStaffId());
         wxUserAddLogQDTO.setClerkId(related.getClerkId());
         wxUserAddLogService.save(wxUserAddLogQDTO);
-
         //定制
         addDelFriendEvent(related.getUnionid(), related.getClerkId(), wxEnterpriseId, enterpriseId, related.getMemberId(), related.getStoreId(), 0);
     }

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

@@ -7,14 +7,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.gic.commons.util.EntityUtil;
-import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.common.utils.StringUtil;
 import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
 import com.gic.haoban.manage.service.dao.mapper.MemberUnionidRelatedMapper;
 import com.gic.haoban.manage.service.entity.MemberUnionidRelated;
 import com.gic.haoban.manage.service.service.MemberUnionRelatedService;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 
 @Service
 public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService {
@@ -48,17 +45,6 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService
 	}
 
 	@Override
-	public void update(MemberUnionidRelatedDTO exsitDTO) {
-        exsitDTO.setUpdateTime(new Date());
-        mapper.updateByPrimaryKeySelective(EntityUtil.changeEntityByJSON(MemberUnionidRelated.class, exsitDTO));
-	}
-
-	@Override
-	public void clean(String cid) {
-		mapper.cleanByCid(cid);
-	}
-
-	@Override
 	public void cleanStaffRelated(String wxEnterpriseId, List<String> staffIds) {
 		if(staffIds == null || staffIds.isEmpty()){
 			return;
@@ -77,10 +63,4 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService
 		MemberUnionidRelated unionidRelated = mapper.getBySelfExternalUserId(null,wxEnterpriseId, selfExternalUserId);
 		return EntityUtil.changeEntityNew(MemberUnionidRelatedDTO.class, unionidRelated);
 	}
-
-	@Override
-	public List<MemberUnionidRelatedDTO> listBySelfExternalUserId(String staffId, String wxEnterpriseId, String selfExternalUserId) {
-		List<MemberUnionidRelated> retList = mapper.listBySelfExternalUserId(staffId, wxEnterpriseId, selfExternalUserId);
-		return EntityUtil.changeEntityListNew(MemberUnionidRelatedDTO.class, retList);
-	}
 }

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

@@ -65,6 +65,9 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
     @Override
     public WxEnterpriseQwDTO getQwInfo(String wxEnterpriseId) {
         TabHaobanWxEnterprise wxEnterprise = this.mapper.selectByPrimaryKey(wxEnterpriseId) ;
+        if(null == wxEnterprise) {
+            return null ;
+        }
         WxEnterpriseQwDTO qw = new WxEnterpriseQwDTO();
         qw.setWxEnterpriseId(wxEnterpriseId);
         if(null != wxEnterprise.getWxSecurityType()) {
@@ -124,14 +127,6 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
     }
 
     @Override
-    public TabHaobanWxEnterprise getEnterpriseByCorpName(String corpName) {
-        if (StringUtils.isBlank(corpName)) {
-            return null;
-        }
-        return this.mapper.getEnterpriseByCorpName(corpName);
-    }
-
-    @Override
     public List<TabHaobanWxEnterprise> listAll() {
         return mapper.listAll();
     }

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

@@ -215,22 +215,12 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
         externalClerkRelated.setStatusFlag(1);
         tabHaobanExternalClerkRelatedMapper.updateByPrimaryKeySelective(externalClerkRelated);
 
-        //更新unionid
-        MemberUnionidRelated memberUnionidRelated = memberUnionidRelatedMapper.selectByPrimaryKey(externalClerkRelated.getMemberUnionidRelatedId());
-        if (memberUnionidRelated != null) {
-            memberUnionidRelated.setMemberId(memberId);
-            memberUnionidRelated.setUnionid(unionid);
-            memberUnionidRelated.setEnterpriseId(enterpriseId);
-            memberUnionidRelated.setUpdateTime(new Date());
-            memberUnionidRelatedMapper.updateByPrimaryKeySelective(memberUnionidRelated);
-        }
         String wxEnterpriseId = externalClerkRelated.getWxEnterpriseId();
         //同步标签
         pushTagSync(memberId, wxEnterpriseId, enterpriseId);
         //回调给会员，更新是否为企微好友
         log.info("通知会员 合并会员后更新为企微好友,memberId:{}", memberId);
         memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 1);
-
         //定制
         addDelFriendEvent(unionid, externalClerkRelated.getClerkId(), wxEnterpriseId, enterpriseId, memberId, externalClerkRelated.getStoreId(), 1);
         //日志

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

@@ -42,7 +42,6 @@ import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService;
 import com.gic.haoban.manage.api.service.hm.HmClerkRelationApiService;
 import com.gic.haoban.manage.api.service.hm.HmQrcodeApiService;
 import com.gic.haoban.manage.service.config.Config;
-import com.gic.haoban.manage.service.dao.mapper.MemberUnionidRelatedMapper;
 import com.gic.haoban.manage.service.dao.mapper.StaffMapper;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanExternalClerkRelatedMapper;
 import com.gic.haoban.manage.service.dao.mapper.WxApplicationMapper;
@@ -115,8 +114,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     @Autowired
     private ClerkService clerkService;
     @Autowired
-    private MemberUnionidRelatedMapper memberUnionidRelatedMapper;
-    @Autowired
     private ClerkMainStoreRelatedService clerkMainStoreRelatedService;
     @Autowired
     private StoreService storeService;
@@ -338,50 +335,50 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 
     @Override
     public String addMemberUnionidRelatedNew(MemberUnionidRelatedDTO dto, String wxUserId) {
-        //解析组装信息
+        String corpId = dto.getCorpid();
+        TabHaobanWxEnterprise wxEnterprise = this.wxEnterpriseService.getEnterpriseBycorpId(corpId) ;
+        if (wxEnterprise == null) {
+            log.info("企业不存在,corpid={}", corpId);
+            return null;
+        }
+        String wxEnterpriseId = wxEnterprise.getWxEnterpriseId() ;
+        TabHaobanStaff staff = this.staffMapper.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId) ;
+        if(null == staff) {
+            log.info("staff不存在,wxEnterpriseId={},wxUserid={}", wxEnterpriseId , wxUserId);
+            return null ;
+        }
+        dto.setWxEnterpriseId(wxEnterpriseId);
+        dto.setStaffId(staff.getStaffId());
+        // 新增unionid表
         dto = getMemberUnionidRelatedDTONew(dto, wxUserId);
         if (null == dto) {
-            log.info("没处理完成-等下一次处理");
+            log.info("需待开发和第三方都收到");
             return null;
         }
-        insertExternalClerkRelatedNew(dto, wxUserId);
+        this.insertExternalClerkRelatedNew(dto, wxUserId,staff.getStaffName());
         return dto.getMemberUnionidRelatedId();
     }
 
-    /**
-     * 创建关联关系
-     *
-     * @param dto
-     */
-    private void insertExternalClerkRelatedNew(MemberUnionidRelatedDTO dto, String wxUserId) {
-        log.info("新增外部联系人，创建关联关系：{}", JSON.toJSONString(dto));
+    private void insertExternalClerkRelatedNew(MemberUnionidRelatedDTO dto, String wxUserId , String staffName) {
+        log.info("新增外部联系人开始处理好友表={},wxUserId={}", JSON.toJSONString(dto),wxUserId);
         String wxEnterpriseId = dto.getWxEnterpriseId();
         String name = dto.getExternalName();
         String createTime = dto.getAddCreateTime();
         String externalUserId = dto.getExternalUserid();
-        String unionid = dto.getUnionid();
-        String state = dto.getState();
-        boolean isHmUnionid = false;
-        String mobile = "";
-        log.info("新增外部联系人,wxEnterpriseId:{}", wxEnterpriseId);
         if (StringUtils.isAnyBlank(wxUserId, wxEnterpriseId, name, createTime, externalUserId)) {
-            log.error("新增外部联系人，缺少必须字段：wxUserId:{},wxEnterpriseId:{},name:{},createTime:{},externalUserId:{}", wxUserId, wxEnterpriseId, name, createTime, externalUserId);
-            //checkQywxSettingApiService.saveFriendCallback(wxEnterpriseId,null,  dto);
-            return;
-        }
-        TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId);
-        if (staff == null) {
-            log.info("staff不存在：{},{}", dto.getUnionid(), wxUserId);
+            log.error("新增外部联系人,缺少必须字段：wxUserId:{},wxEnterpriseId:{},name:{},createTime:{},externalUserId:{}", wxUserId, wxEnterpriseId, name, createTime, externalUserId);
             return;
         }
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
         if (qwDTO == null) {
-            log.info("未查询到企业：wxEnterpriseId:{}", wxEnterpriseId);
+            log.info("企业不存在,wxEnterpriseId={}", wxEnterpriseId);
             return;
         }
-        String staffId = staff.getStaffId();
-        String staffName = staff.getStaffName();
-        log.info("新增外部联系人,staffId={}", staffId);
+        String unionid = dto.getUnionid();
+        String state = dto.getState();
+        boolean isHmUnionid = false;
+        String mobile = "";
+        String staffId = dto.getStaffId();
         StaffClerkRelationDTO staffClerkRelationDTO = null;
         //活码处理 "DT" "HM"
         WxUserAddLogQDTO wxUserAddLogQDTO = new WxUserAddLogQDTO();
@@ -466,8 +463,10 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             }
             staffClerkRelationDTO = staffClerkRelationService.getOneBindByStoreId(staffId, mainStoreRelated.getStoreId());
         }
+        
+        
         if (staffClerkRelationDTO == null) {
-            log.info("【新增外部联系人】导购和clerk关联为空");
+            log.info("【新增外部联系人】无关联导购");
             return;
         }
         String enterpriseId = staffClerkRelationDTO.getEnterpriseId();
@@ -509,10 +508,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 
     /**
      * 设置活码标签
-     *
-     * @param staffClerkRelationDTO
-     * @param memberLabelId
-     * @param memberId
      */
     private void setMemberTag(StaffClerkRelationDTO staffClerkRelationDTO, String memberLabelId, String memberId) {
         log.info("会员打标签,memberLabelId:{},memberId:{}", memberLabelId, memberId);
@@ -631,14 +626,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             exsitDTO.setStatusFlag(1);
             externalClerkRelatedService.update(exsitDTO);
         }
-        MemberUnionidRelatedDTO memberUnionidRelatedDTO = new MemberUnionidRelatedDTO();
-        memberUnionidRelatedDTO.setMemberUnionidRelatedId(memberUnionidRelatedId);
-        memberUnionidRelatedDTO.setEnterpriseId(enterpriseId);
-        memberUnionidRelatedDTO.setStaffId(staffId);
-        memberUnionidRelatedDTO.setUnionid(unionId);
-        memberUnionidRelatedDTO.setMemberId(memberId);
-        memberUnionRelatedService.update(memberUnionidRelatedDTO);
-
         sendWelcome(dto, qwDTO, enterpriseId, staffId, clerkId);
         //同步好友标签
         pushTagSync(memberId, wxEnterpriseId, enterpriseId);
@@ -773,11 +760,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             exsitDTO.setStatusFlag(4);
             externalClerkRelatedService.update(exsitDTO);
         }
-        MemberUnionidRelatedDTO memberUnionidRelatedDTO = new MemberUnionidRelatedDTO();
-        memberUnionidRelatedDTO.setMemberUnionidRelatedId(memberUnionidRelatedId);
-        memberUnionidRelatedDTO.setEnterpriseId(enterpriseId);
-        memberUnionidRelatedDTO.setStaffId(staffId);
-        memberUnionRelatedService.update(memberUnionidRelatedDTO);
     }
 
     /**
@@ -1028,15 +1010,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
      * @param dto
      * @return
      */
-    public MemberUnionidRelatedDTO getMemberUnionidRelatedDTONew(MemberUnionidRelatedDTO dto, String wxUserId) {
+    private MemberUnionidRelatedDTO getMemberUnionidRelatedDTONew(MemberUnionidRelatedDTO dto, String wxUserId) {
         log.info("【新增外部联系人回调】dto={},wxUserId={}", JSON.toJSONString(dto), wxUserId);
-        String corpId = dto.getCorpid();
-        TabHaobanWxApplication tabHaobanWxApplication = wxApplicationMapper.selectByCorpId(corpId, null);
-        if (tabHaobanWxApplication == null) {
-            log.info("查询tab_haoban_wx_application为空：{}", corpId);
-            return null;
-        }
-        String wxEnterpriseId = tabHaobanWxApplication.getWxEnterpriseId();
+        String wxEnterpriseId = dto.getWxEnterpriseId() ;
         String suiteid = dto.getSuiteid();
         String externalUserid = dto.getExternalUserid();
         ExternalUserDTO externalUserDTO;
@@ -1047,58 +1023,49 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         }
         checkQywxSettingApiService.saveFriendCallback(wxEnterpriseId, externalUserDTO, dto);
         if (externalUserDTO == null) {
-            log.info("【新增外部联系人回调】失败,查询好友信息失败");
+            log.info("【新增外部联系人回调】失败,查询好友失败,externalUserid={}",externalUserid);
             return null;
         }
         dto.setWxEnterpriseId(wxEnterpriseId);
         dto.setExternalName(EmojiFilterUtil.removeAllEmoji(externalUserDTO.getName()));
         dto.setAddCreateTime(externalUserDTO.getAddCreateTime());
-        dto.setAvatar(externalUserDTO.getAvatar());
-        if (SELF_APP.equals(suiteid)) {
+        if(StringUtils.isNotEmpty(externalUserDTO.getAvatar())) {
+            dto.setAvatar(externalUserDTO.getAvatar());
+        }
+        if(StringUtils.isNoneBlank(externalUserDTO.getUnionId())) {
             dto.setUnionid(externalUserDTO.getUnionId());
+        }
+        if (SELF_APP.equals(suiteid)) {
             dto.setSelfExternalUserid(externalUserDTO.getExternalUserId());
+            // 待开发回调过来的外部联系人id设置null
             dto.setExternalUserid(null);
-            dto.setAvatar(externalUserDTO.getAvatar());
         } else {
             dto.setExternalUserid(externalUserDTO.getExternalUserId());
         }
-
         String key = "external" + dto.getWxEnterpriseId() + "_" + dto.getExternalName() + "_" + dto.getAddCreateTime();
         String lockKey = key + "-lock";
         RedisUtil.lock(lockKey, 10L);
-
-        MemberUnionidRelatedDTO midRelatedDto = RedisUtil.getCache(key, MemberUnionidRelatedDTO.class);
-        if (midRelatedDto == null) {
+        MemberUnionidRelatedDTO cacheDTO = RedisUtil.getCache(key, MemberUnionidRelatedDTO.class);
+        if (cacheDTO == null) {
             log.info("redis缓存中无该好友数据,插入数据：{}", JSON.toJSONString(dto));
-            String memberUnionidRelatedId = memberUnionRelatedService.addMemberUnionidRelated(dto);
-            dto.setMemberUnionidRelatedId(memberUnionidRelatedId);
             RedisUtil.setCache(key, dto, 180L);
             RedisUtil.unlock(lockKey);
             return null;
         }
-
-        dto.setUnionid(StringUtils.isBlank(dto.getUnionid()) ? midRelatedDto.getUnionid() : dto.getUnionid());
-        dto.setExternalUserid(StringUtils.isBlank(dto.getExternalUserid()) ? midRelatedDto.getExternalUserid() : externalUserid);
-        dto.setSelfExternalUserid(StringUtils.isBlank(dto.getSelfExternalUserid()) ? midRelatedDto.getSelfExternalUserid() : dto.getSelfExternalUserid());
-        dto.setAvatar(StringUtils.isBlank(dto.getAvatar()) ? midRelatedDto.getAvatar() : dto.getAvatar());
-        dto.setMemberUnionidRelatedId(midRelatedDto.getMemberUnionidRelatedId());
+        
+        dto.setUnionid(StringUtils.isBlank(dto.getUnionid()) ? cacheDTO.getUnionid() : dto.getUnionid());
+        dto.setAvatar(StringUtils.isBlank(dto.getAvatar()) ? cacheDTO.getAvatar() : dto.getAvatar());
+        dto.setExternalUserid(StringUtils.isBlank(dto.getExternalUserid()) ? cacheDTO.getExternalUserid() : externalUserid);
+        dto.setSelfExternalUserid(StringUtils.isBlank(dto.getSelfExternalUserid()) ? cacheDTO.getSelfExternalUserid() : dto.getSelfExternalUserid());
 
         if (StringUtils.isAnyBlank(dto.getExternalUserid(), dto.getSelfExternalUserid())) {
-            log.error("加好友异常、请检查配置是否正常(如：检查客户联系回调、老好办助手回调、代开发回调（是否配置多个回调、企微权限是否正常、密钥是否正确）、好办权限等)，wxEnterpriseId：{}", wxEnterpriseId);
+            log.error("加好友异常,只有一个外部联系人id,wxEnterpriseId：{}", wxEnterpriseId, dto.getExternalUserid());
             return null;
         }
-
+        
         log.info("好办和好办助手均已回调：{}", JSON.toJSONString(dto));
-        List<MemberUnionidRelatedDTO> relatedDTOS = memberUnionRelatedService.listBySelfExternalUserId(dto.getStaffId(), dto.getWxEnterpriseId(), dto.getSelfExternalUserid());
-        //老的关联需要删除
-        if (CollectionUtils.isNotEmpty(relatedDTOS)) {
-            relatedDTOS.stream().filter(mid -> (!mid.getMemberUnionidRelatedId().equals(midRelatedDto.getMemberUnionidRelatedId())))
-                    .forEach(mid -> {
-                        mid.setStatusFlag(0);
-                        memberUnionRelatedService.update(mid);
-                    });
-        }
-        memberUnionRelatedService.update(dto);
+        String memberUnionidRelatedId = memberUnionRelatedService.addMemberUnionidRelated(dto);
+        dto.setMemberUnionidRelatedId(memberUnionidRelatedId);
         RedisUtil.unlock(lockKey);
         RedisUtil.delCache(key);
         return dto;
@@ -1198,7 +1165,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         TabHaobanStaff staff = this.staffMapper.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId);
         String staffId = staff.getStaffId();
         dto.setStaffId(staffId);
-        externalClerkRelatedService.delByUserIdAndExternalUserId(dto, wxUserId);
+        externalClerkRelatedService.delByUserIdAndExternalUserId(dto);
         memberUnionRelatedService.delMemberUnionidRelated(dto, staffId);
     }
 
@@ -1222,18 +1189,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         return externalClerkRelatedService.getByMemberId(staffId, memberId);
     }
 
-    @Override
-    public void cleanByCid(String cid) {
-        if (StringUtils.isNotBlank(cid)) {
-            TabHaobanWxEnterprise wxEnterprise = wxEnterpriseService.getEnterpriseBycorpId(cid);
-            if (null != wxEnterprise) {
-                memberUnionRelatedService.clean(wxEnterprise.getWxEnterpriseId());
-            }
-        } else {
-            memberUnionRelatedService.clean(null);
-        }
-    }
-
     /**
      * 老的单个素材群发的api
      *
@@ -1636,19 +1591,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             exsitDTO.setMemberId(memberId);
             exsitDTO.setEnterpriseId(enterpriseId);
             uuid = memberUnionRelatedService.addMemberUnionidRelated(exsitDTO);
-        } else {
-            uuid = exsitDTO.getMemberUnionidRelatedId();
-            exsitDTO.setAvatar(avatar);
-            exsitDTO.setExternalUserid(externalUserId);
-            exsitDTO.setUnionid(unionId);
-            exsitDTO.setAddCreateTime(createTime);
-            exsitDTO.setExternalName(name);
-            exsitDTO.setSelfExternalUserid(dto.getSelfExternalUserId());
-            exsitDTO.setMemberId(memberId);
-            exsitDTO.setEnterpriseId(enterpriseId);
-            exsitDTO.setStaffId(staffId);
-            memberUnionRelatedService.update(exsitDTO);
-        }
+        } 
         String relationKey = SecureUtil.md5(staffId + externalUserId);
         List<TabHaobanExternalClerkRelated> clerkRelateds = externalClerkRelatedService.listByExTernalUseridAndWxUserIdAllStatus(wxEnterpriseId, externalUserId, staffId);
         if (CollectionUtils.isEmpty(clerkRelateds)) {
@@ -1758,16 +1701,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             exsitDTO.setWxEnterpriseId(wxEnterpriseId);
             exsitDTO.setStaffId(staffId);
             uuid = memberUnionRelatedService.addMemberUnionidRelated(exsitDTO);
-        } else {
-            uuid = exsitDTO.getMemberUnionidRelatedId();
-            exsitDTO.setAvatar(avatar);
-            exsitDTO.setExternalUserid(externalUserId);
-            exsitDTO.setAddCreateTime(createTime);
-            exsitDTO.setSelfExternalUserid(dto.getSelfExternalUserId());
-            exsitDTO.setExternalName(name);
-            exsitDTO.setEnterpriseId(enterpriseId);
-            exsitDTO.setStaffId(staffId);
-            memberUnionRelatedService.update(exsitDTO);
         }
 
         List<TabHaobanExternalClerkRelated> clerkRelateds = externalClerkRelatedService.listByExTernalUseridAndWxUserIdAllStatus(wxEnterpriseId, externalUserId, staffId);
@@ -2000,24 +1933,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     }
 
     @Override
-    public void updateSelfExternalUseridById(String selfExternalUserid, String memberUnionidRelatedId) {
-        MemberUnionidRelatedDTO relatedDTO = new MemberUnionidRelatedDTO();
-        relatedDTO.setMemberUnionidRelatedId(memberUnionidRelatedId);
-        relatedDTO.setSelfExternalUserid(selfExternalUserid);
-        memberUnionRelatedService.update(relatedDTO);
-    }
-
-    @Override
-    public MemberUnionidRelatedDTO getById(String memberUnionidRelatedId) {
-        MemberUnionidRelated memberUnionidRelated = memberUnionidRelatedMapper.selectByPrimaryKey(memberUnionidRelatedId);
-        return EntityUtil.changeEntityNew(MemberUnionidRelatedDTO.class, memberUnionidRelated);
-    }
-
-    @Override
     public void addDelFriendEventTest(String param) {
         log.info("addDelFriendEventTest：{}", param);
     }
-
     /**
      * 获取客户详情列表
      *

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

@@ -169,24 +169,25 @@ public class QwFriendApiServiceImpl implements QwFriendApiService {
         }
         return ServiceResponse.failure("9999", "企微未查询到数据");
     }
-
+    
+    // 2010 不需要处理的
     // 判断企业是否能用企微
     private ServiceResponse<WxEnterpriseQwDTO> checkAndGetCorpid(String enterpriseId) {
         WxEnterpriseRelationBO enterpriseRelation = this.wxEnterpriseRelatedService.getHeadEnterprise(enterpriseId);
         if (null == enterpriseRelation) {
             // 非总部或不存在
-            return ServiceResponse.failure("9999", "请确认商户是否有效且是总部");
+            return ServiceResponse.failure("2010", "请确认商户是否有效且是总部");
         }
         Integer code = this.enterpriseUseForbidService.selectPermissionStatus(enterpriseId,
                 EnterpriseServiceEnum.HAO_BAN.getRightMenuCode());
         log.info("好办是否到期停用={},{}", enterpriseId, code);
         if (code != 0 && code != 1) {
-            return ServiceResponse.failure("9999", "商户已停用");
+            return ServiceResponse.failure("2010", "商户已停用");
         }
         int memberOpenCardlag = enterpriseRelation.getMemberOpenCardFlag();
         if (memberOpenCardlag != 0) {
             // 不在同一开放平台
-            return ServiceResponse.failure("9999", "不在同一开放平台");
+            return ServiceResponse.failure("2010", "不在同一开放平台");
         }
         String wxEnterpriseId = enterpriseRelation.getWxEnterpriseId();
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);

haoban-manage3-service/src/main/resources/mapper/MemberUnionidRelatedMapper.xml

@@ -39,58 +39,6 @@
                 #{enterpriseId})
     </insert>
     
-    <update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated">
-        update tab_haoban_member_unionid_related
-        <set>
-            <if test="memberId != null">
-                member_id = #{memberId,jdbcType=VARCHAR},
-            </if>
-            <if test="unionid != null">
-                unionid = #{unionid,jdbcType=VARCHAR},
-            </if>
-            <if test="wxEnterpriseId != null">
-                wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
-            </if>
-            <if test="enterpriseId != null">
-                enterprise_id = #{enterpriseId,jdbcType=VARCHAR},
-            </if>
-            <if test="statusFlag != null">
-                status_flag = #{statusFlag,jdbcType=INTEGER},
-            </if>
-            <if test="externalUserid != null">
-                external_userid = #{externalUserid,jdbcType=VARCHAR},
-            </if>
-            <if test="staffId != null">
-                staff_id = #{staffId,jdbcType=VARCHAR},
-            </if>
-            <if test="addCreateTime != null">
-                add_create_time = #{addCreateTime,jdbcType=VARCHAR},
-            </if>
-            <if test="selfExternalUserid != null">
-                self_external_userid = #{selfExternalUserid,jdbcType=VARCHAR},
-            </if>
-            <if test="externalName != null">
-                external_name = #{externalName,jdbcType=VARCHAR},
-            </if>
-            <if test="createTime != null">
-                create_time = #{createTime,jdbcType=TIMESTAMP},
-            </if>
-            update_time = now()
-        </set>
-        where member_unionid_related_id = #{memberUnionidRelatedId,jdbcType=VARCHAR}
-    </update>
-
-    <update id="cleanByCid">
-        update tab_haoban_member_unionid_related
-        set
-        status_flag = 0,
-        update_time=now()
-        where member_id is null
-        <if test="cid !=null">
-            and wx_enterprise_id = #{cid}
-        </if>
-    </update>
-
     <select id="getByUnionId" resultMap="BaseResultMap" parameterType="java.lang.String">
         select
         <include refid="Base_Column_List"/>
@@ -148,16 +96,6 @@
         order by create_time desc limit 1
     </select>
 
-    <select id="listBySelfExternalUserId" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>
-        from tab_haoban_member_unionid_related
-        where wx_enterprise_id = #{wxEnterpriseId}
-        and status_flag = 1
-        and staff_id = #{staffId}
-        and self_external_userid = #{selfExternalUserId}
-    </select>
-
     <select id="listByWxEnterpriseIdAndExternalUserId" resultMap="BaseResultMap">
     	select
            external_userid,  self_external_userid from tab_haoban_member_unionid_related

haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml

@@ -211,11 +211,11 @@
         and status_flag = 1
     </select>
 
-    <update id="delByUserIdAndExternalUserId" parameterType="com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated" >
+    <update id="delByUserIdAndExternalUserId">
         update tab_haoban_external_clerk_related
         set status_flag = 2,
             update_time = now()
-        where external_user_id = #{externalUserId,jdbcType=VARCHAR}
+        where external_user_id = #{externalUserId}
           and staff_id = #{staffId}
           and status_flag in (1, 3, 4)
     </update>

haoban-manage3-service/src/main/resources/mapper/WxEnterpriseMapper.xml

@@ -473,15 +473,6 @@
         order by create_time desc limit 1
     </select>
 
-    <select id="getEnterpriseByCorpName" resultMap="BaseResultMap" parameterType="java.lang.String">
-        select
-        <include refid="Base_Column_List"/>
-        from tab_haoban_wx_enterprise
-        where corp_name = #{corpName} and status_flag = 1
-        order by create_time desc limit 1
-    </select>
-
-
     <update id="updateExternalFlagById">
         update tab_haoban_wx_enterprise
         set external_flag = #{externalFlag},

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/TestController.java

@@ -96,11 +96,6 @@ public class TestController extends WebBaseController {
         }
     }
 
-    @RequestMapping("/clean-out")
-    public HaobanResponse cleanMessage(String cid) {
-        memberUnionidRelatedApiService.cleanByCid(cid);
-        return resultResponse(HaoBanErrCode.ERR_1);
-    }
 
     @RequestMapping("/test-dubbo")
     public HaobanResponse dubbo(@RequestParam(defaultValue = "2000") Integer n, @RequestParam(defaultValue = "100") String t) {

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java

@@ -611,18 +611,8 @@ public class WxEnterpriseInfoController extends WebBaseController {
         if (externalUserDTO == null) {
             logger.info("请先添加好友，企业微信未查询到该好友,externalUserid:{}", externalUserid);
             return resultResponse(HaoBanErrCode.ERR_11126);
-        } else {
-            //是否需修复数据
-            String unionId = externalUserDTO.getUnionId();
-            ExternalClerkRelatedDTO externalClerkRelatedDTO = externalClerkRelatedApiService.getByWxEnterpriseIdAndUnionId(wxEnterpriseId, staffId, unionId);
-            if (externalClerkRelatedDTO != null) {
-                String memberUnionidRelatedId = externalClerkRelatedDTO.getMemberUnionidRelatedId();
-                MemberUnionidRelatedDTO memberUnionidRelatedDTO = memberUnionidRelatedApiService.getById(memberUnionidRelatedId);
-                if (memberUnionidRelatedDTO != null && StringUtils.isBlank(memberUnionidRelatedDTO.getSelfExternalUserid())) {
-                    memberUnionidRelatedApiService.updateSelfExternalUseridById(externalUserid, memberUnionidRelatedId);
-                }
-            }
-        }
+        } 
+        
         MemberUnionidRelatedDTO memberUnionidRelatedDTO = memberUnionidRelatedApiService.getBySelfExternalUserId(wxEnterpriseId, externalUserid);
         if (null == memberUnionidRelatedDTO) {
             logger.info("请刷新好友，wxEnterpriseId:{},传入的externalUserid：{},wxUserId:{}", wxEnterpriseId, externalUserid, wxUserId);