删除MemberUnionidRelatedDTO的wxUserId

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/MemberUnionidRelatedDTO.java

@@ -25,8 +25,6 @@ public class MemberUnionidRelatedDTO implements Serializable{
 
     private String externalUserid;
 
-    private String wxUserId;
-    
     private String selfExternalUserid;
     
     private String externalName;
@@ -111,14 +109,6 @@ public class MemberUnionidRelatedDTO implements Serializable{
         this.externalUserid = externalUserid == null ? null : externalUserid.trim();
     }
 
-    public String getWxUserId() {
-        return wxUserId;
-    }
-
-    public void setWxUserId(String wxUserId) {
-        this.wxUserId = wxUserId == null ? null : wxUserId.trim();
-    }
-
     public Date getCreateTime() {
         return createTime;
     }

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

 package com.gic.haoban.manage.api.service;
 
+import java.util.List;
+
 import com.gic.api.base.commons.JSONResponse;
-import com.gic.api.base.commons.Page;
-import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.ServiceResponse;
-import com.gic.haoban.manage.api.dto.*;
-
-import java.util.Date;
-import java.util.List;
+import com.gic.haoban.manage.api.dto.ExternalClerkRelatedDTO;
+import com.gic.haoban.manage.api.dto.ExternalUserDTO;
+import com.gic.haoban.manage.api.dto.FriendStoreInfoDTO;
+import com.gic.haoban.manage.api.dto.MemberStoreDTO;
+import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
+import com.gic.haoban.manage.api.dto.QwFrientNoticeDTO;
 
 public interface MemberUnionidRelatedApiService {
 
@@ -26,21 +28,21 @@ public interface MemberUnionidRelatedApiService {
      * @param dto
      * @return
      */
-    String addMemberUnionidRelated(MemberUnionidRelatedDTO dto);
+    String addMemberUnionidRelated(QwFrientNoticeDTO dto);
 
     /**
      * 外部联系人删除（删好友）
      *
      * @param dto
      */
-    void delMemberUnionidRelated(MemberUnionidRelatedDTO dto);
+    void delMemberUnionidRelated(QwFrientNoticeDTO dto);
 
     /**
      * 外部联系人新增（修改好友）
      *
      * @param dto
      */
-    void editMemberUnionidRelated(MemberUnionidRelatedDTO dto);
+    void editMemberUnionidRelated(QwFrientNoticeDTO dto);
 
     /**
      * 处理外部联系人异步
@@ -119,7 +121,7 @@ public interface MemberUnionidRelatedApiService {
      * @author mozhu
      * @date 2021-12-13 17:12:39
      */
-    String addMemberUnionidRelatedNew(MemberUnionidRelatedDTO dto);
+    String addMemberUnionidRelatedNew(MemberUnionidRelatedDTO dto, String wxUserId);
 
     /**
      * 客户列表-自建

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

 package com.gic.haoban.manage.service.pojo;
 
-import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
-
 import java.io.Serializable;
 
+import com.gic.haoban.manage.api.dto.QwFrientNoticeDTO;
+
 /**
  * Created 2021/4/2.
  *
@@ -37,7 +37,7 @@ public class DealQywxExternalUserPojo implements Serializable {
     }
 
     private int type;
-    private MemberUnionidRelatedDTO data;
+    private QwFrientNoticeDTO data;
 
     public int getType() {
         return type;
@@ -47,11 +47,11 @@ public class DealQywxExternalUserPojo implements Serializable {
         this.type = type;
     }
 
-    public MemberUnionidRelatedDTO getData() {
+    public QwFrientNoticeDTO getData() {
         return data;
     }
 
-    public void setData(MemberUnionidRelatedDTO data) {
+    public void setData(QwFrientNoticeDTO data) {
         this.data = data;
     }
 }

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);
+	void delByUserIdAndExternalUserId(MemberUnionidRelatedDTO dto , String wxUserId);
 
 	/**
 	 * 删除会员与导购的关联关系

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

@@ -14,7 +14,7 @@ public interface MemberUnionRelatedService {
 	
 	String addMemberUnionidRelated(MemberUnionidRelatedDTO dto);
 	
-	void delMemberUnionidRelated(MemberUnionidRelatedDTO dto);
+	void delMemberUnionidRelated(MemberUnionidRelatedDTO dto , String wxUserId);
 
 	/**
 	 * 删除外部联系人关系

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

@@ -69,14 +69,13 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
     }
 
     @Override
-    public void delByUserIdAndExternalUserId(MemberUnionidRelatedDTO dto) {
+    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;
         }
         String staffId = dto.getStaffId() ;
-        String wxUserId = dto.getWxUserId();
         String externalUserid = dto.getExternalUserid();
         List<TabHaobanExternalClerkRelated> tabHaobanExternalClerkRelatedList = mapper.listByExTernalUseridAndWxUserId(externalUserid, staffId, 2);
         if (CollectionUtils.isEmpty(tabHaobanExternalClerkRelatedList)) {
@@ -111,7 +110,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
             }
         } else {
             //删除后 每次回调会员
-            List<TabHaobanExternalClerkRelated> relatedList = mapper.listByExTernalUseridAndWxUserId(dto.getExternalUserid(), dto.getWxUserId(), 2);
+            List<TabHaobanExternalClerkRelated> relatedList = mapper.listByExTernalUseridAndWxUserId(dto.getExternalUserid(), wxUserId, 2);
             for (TabHaobanExternalClerkRelated externalClerkRelated : relatedList) {
                 String memberId = externalClerkRelated.getMemberId();
                 logger.info("通知会员 删除会员后更新为非企微好友时间 memberId:{}", memberId);

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

 package com.gic.haoban.manage.service.service.impl;
 
+import java.util.Date;
+import java.util.List;
+
+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.dao.mapper.StaffMapper;
 import com.gic.haoban.manage.service.entity.MemberUnionidRelated;
+import com.gic.haoban.manage.service.entity.TabHaobanStaff;
 import com.gic.haoban.manage.service.service.MemberUnionRelatedService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.List;
 
 @Service
 public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService {
 
 	@Autowired
 	private MemberUnionidRelatedMapper mapper;
+	@Autowired
+	private StaffMapper staffMapper ;
 	
 	@Override
 	public MemberUnionidRelatedDTO getByWxUserIdAndUnionId(String wxEnterpriseId, String staffId, String unionid) {
@@ -37,8 +42,9 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService
 	}
 
 	@Override
-	public void delMemberUnionidRelated(MemberUnionidRelatedDTO dto) {
-	    String staffId = null ;
+	public void delMemberUnionidRelated(MemberUnionidRelatedDTO dto , String wxUserId) {
+	    TabHaobanStaff staff =  this.staffMapper.selectByUserIdAndEnterpriseId(dto.getExternalUserid() , wxUserId) ;
+	    String staffId = staff.getStaffId() ;
 		mapper.deleteByUnionidAndUserId(dto.getExternalUserid(),staffId);
 	}
 

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

@@ -172,12 +172,14 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     public void dealQywxExternalUser(String params) {
         log.info("处理外部联系人回调：{}", params);
         DealQywxExternalUserPojo externalUserPojo = JSONObject.parseObject(params, DealQywxExternalUserPojo.class);
+        QwFrientNoticeDTO dto = externalUserPojo.getData() ;
+        MemberUnionidRelatedDTO inDTO = EntityUtil.changeEntityByJSON(MemberUnionidRelatedDTO.class,dto) ;
         if (externalUserPojo.getType() == DealQywxExternalUserPojo.DealType.del.getType()) {
-            this.delMemberUnionidRelatedProcess(externalUserPojo.getData());
+            this.delMemberUnionidRelatedProcess(inDTO , dto.getWxUserId());
         } else if (externalUserPojo.getType() == DealQywxExternalUserPojo.DealType.add.getType()) {
-            this.addMemberUnionidRelatedNew(externalUserPojo.getData());
+            this.addMemberUnionidRelatedNew(inDTO , dto.getWxUserId());
         } else if (externalUserPojo.getType() == DealQywxExternalUserPojo.DealType.edit.getType()) {
-            this.editMemberUnionidRelatedProcess(externalUserPojo.getData());
+            this.editMemberUnionidRelatedProcess(inDTO , dto.getWxUserId());
         }
     }
 
@@ -267,7 +269,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     }
 
     @Override
-    public String addMemberUnionidRelated(MemberUnionidRelatedDTO dto) {
+    public String addMemberUnionidRelated(QwFrientNoticeDTO dto) {
         DealQywxExternalUserPojo dealQywxExternalUserPojo = new DealQywxExternalUserPojo();
         dealQywxExternalUserPojo.setType(DealQywxExternalUserPojo.DealType.add.getType());
         dealQywxExternalUserPojo.setData(dto);
@@ -283,14 +285,14 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 
 
     @Override
-    public String addMemberUnionidRelatedNew(MemberUnionidRelatedDTO dto) {
+    public String addMemberUnionidRelatedNew(MemberUnionidRelatedDTO dto, String wxUserId) {
         //解析组装信息
-        dto = getMemberUnionidRelatedDTONew(dto);
+        dto = getMemberUnionidRelatedDTONew(dto,wxUserId);
         if (null == dto) {
             log.info("没处理完成-等下一次处理");
             return null;
         }
-        insertExternalClerkRelatedNew(dto);
+        insertExternalClerkRelatedNew(dto,wxUserId);
         return dto.getMemberUnionidRelatedId();
     }
 
@@ -299,9 +301,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
      *
      * @param dto
      */
-    private void insertExternalClerkRelatedNew(MemberUnionidRelatedDTO dto) {
+    private void insertExternalClerkRelatedNew(MemberUnionidRelatedDTO dto, String wxUserId) {
         log.info("新增外部联系人，创建关联关系：{}", JSON.toJSONString(dto));
-        String wxUserId = dto.getWxUserId();
         String wxEnterpriseId = dto.getWxEnterpriseId();
         String name = dto.getExternalName();
         String createTime = dto.getAddCreateTime();
@@ -318,7 +319,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         }
         TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId);
         if (staff == null) {
-            log.info("staff不存在：{},{}", dto.getUnionid(), dto.getWxUserId());
+            log.info("staff不存在：{},{}", dto.getUnionid(), wxUserId);
             return;
         }
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
@@ -330,7 +331,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         String staffName = staff.getStaffName();
         String staffWxUserId = staff.getWxUserId();
         log.info("新增外部联系人,staffWxUserId={},staffId={}", staffWxUserId,staffId);
-        dto.setWxUserId(staffWxUserId);
         StaffClerkRelationDTO staffClerkRelationDTO = null;
         //活码处理 "DT" "HM"
         WxUserAddLogQDTO wxUserAddLogQDTO = new WxUserAddLogQDTO();
@@ -430,7 +430,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         if (StringUtils.isNotBlank(unionid)) {
             log.info("有unionid处理：wxEnterpriseId:{}，unionid：{}", wxEnterpriseId, unionid);
             dto.setUnionid(unionid);
-            memberId = addExternalClerkRelated(dto, staffId, staffClerkRelationDTO, wxEnterpriseRelated, isHmUnionid, mobile);
+            memberId = addExternalClerkRelated(dto, staffId, staffClerkRelationDTO, wxEnterpriseRelated, isHmUnionid, mobile , wxUserId);
         } else {
             log.info("发送欢迎语逻辑：wxEnterpriseId:{}", wxEnterpriseId);
             addFriendByWelcome(dto, staffClerkRelationDTO);
@@ -484,8 +484,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
      * @param wxEnterpriseRelated
      */
     private String addExternalClerkRelated(MemberUnionidRelatedDTO dto, String staffId, StaffClerkRelationDTO staffClerkRelationDTO,
-                                           TabHaobanWxEnterpriseRelated wxEnterpriseRelated, boolean isHmUnionid, String mobile) {
-        String wxUserId = dto.getWxUserId();
+                                           TabHaobanWxEnterpriseRelated wxEnterpriseRelated, boolean isHmUnionid, String mobile, String wxUserId) {
         String wxEnterpriseId = dto.getWxEnterpriseId();
         String name = dto.getExternalName();
         String createTime = dto.getAddCreateTime();
@@ -886,7 +885,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
      * @param dto
      * @return
      */
-    public MemberUnionidRelatedDTO getMemberUnionidRelatedDTONew(MemberUnionidRelatedDTO dto) {
+    public MemberUnionidRelatedDTO getMemberUnionidRelatedDTONew(MemberUnionidRelatedDTO dto, String wxUserId) {
         log.info("【新增外部联系人回调】dto={}", JSON.toJSONString(dto));
         String corpId = dto.getCorpid();
         TabHaobanWxApplication tabHaobanWxApplication = wxApplicationMapper.selectByCorpId(corpId, null);
@@ -895,15 +894,13 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             return null;
         }
         String wxEnterpriseId = tabHaobanWxApplication.getWxEnterpriseId();
-        //校验friend
-        String userId = dto.getWxUserId();
         String suiteid = dto.getSuiteid();
         String externalUserid = dto.getExternalUserid();
         ExternalUserDTO externalUserDTO;
         if (SELF_APP.equals(suiteid)) {
-            externalUserDTO = this.getCorpSelfExternalUseridInfo(wxEnterpriseId, userId, externalUserid);
+            externalUserDTO = this.getCorpSelfExternalUseridInfo(wxEnterpriseId, wxUserId, externalUserid);
         } else {
-            externalUserDTO = this.getExternalUseridInfo(wxEnterpriseId, userId, externalUserid);
+            externalUserDTO = this.getExternalUseridInfo(wxEnterpriseId, wxUserId, externalUserid);
         }
         checkQywxSettingApiService.saveFriendCallback(wxEnterpriseId, externalUserDTO, dto);
         if (externalUserDTO == null) {
@@ -1014,7 +1011,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     }
 
     @Override
-    public void delMemberUnionidRelated(MemberUnionidRelatedDTO dto) {
+    public void delMemberUnionidRelated(QwFrientNoticeDTO dto) {
         DealQywxExternalUserPojo dealQywxExternalUserPojo = new DealQywxExternalUserPojo();
         dealQywxExternalUserPojo.setType(DealQywxExternalUserPojo.DealType.del.getType());
         dealQywxExternalUserPojo.setData(dto);
@@ -1028,7 +1025,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     }
 
     @Override
-    public void editMemberUnionidRelated(MemberUnionidRelatedDTO dto) {
+    public void editMemberUnionidRelated(QwFrientNoticeDTO dto) {
         DealQywxExternalUserPojo dealQywxExternalUserPojo = new DealQywxExternalUserPojo();
         dealQywxExternalUserPojo.setType(DealQywxExternalUserPojo.DealType.edit.getType());
         dealQywxExternalUserPojo.setData(dto);
@@ -1046,12 +1043,12 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
      *
      * @param dto
      */
-    private void delMemberUnionidRelatedProcess(MemberUnionidRelatedDTO dto) {
-        externalClerkRelatedService.delByUserIdAndExternalUserId(dto);
-        memberUnionRelatedService.delMemberUnionidRelated(dto);
+    private void delMemberUnionidRelatedProcess(MemberUnionidRelatedDTO dto , String wxUserId) {
+        externalClerkRelatedService.delByUserIdAndExternalUserId(dto , wxUserId);
+        memberUnionRelatedService.delMemberUnionidRelated(dto , wxUserId);
     }
 
-    private void editMemberUnionidRelatedProcess(MemberUnionidRelatedDTO dto) {
+    private void editMemberUnionidRelatedProcess(MemberUnionidRelatedDTO dto, String wxUserId) {
         log.info("修改标签/会员信息回调：{}", JSONObject.toJSONString(dto));
         TabHaobanWxEnterprise wxEnterprise = wxEnterpriseService.getEnterpriseBycorpId(dto.getCorpid());
         if (null == wxEnterprise) {