传入staffid

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 , String wxUserId);
+	void delMemberUnionidRelated(MemberUnionidRelatedDTO dto , String staffId);
 
 	/**
 	 * 删除外部联系人关系

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

@@ -42,9 +42,7 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService
 	}
 
 	@Override
-	public void delMemberUnionidRelated(MemberUnionidRelatedDTO dto , String wxUserId) {
-	    TabHaobanStaff staff =  this.staffMapper.selectByUserIdAndEnterpriseId(dto.getWxEnterpriseId(), wxUserId) ;
-	    String staffId = staff.getStaffId() ;
+	public void delMemberUnionidRelated(MemberUnionidRelatedDTO dto , String staffId) {
 		mapper.deleteByUnionidAndUserId(dto.getExternalUserid(),staffId);
 	}
 

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

 package com.gic.haoban.manage.service.service.out.impl;
 
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.convert.Convert;
-import cn.hutool.crypto.SecureUtil;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.redisson.api.RRateLimiter;
+import org.redisson.api.RateIntervalUnit;
+import org.redisson.api.RateType;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -28,7 +47,19 @@ import com.gic.haoban.app.customer.service.api.service.CustomerApiService;
 import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.base.api.common.errCode.HaoBanErrCodeCommon;
 import com.gic.haoban.manage.api.constants.Manage3Constants;
-import com.gic.haoban.manage.api.dto.*;
+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.MaterialDTO;
+import com.gic.haoban.manage.api.dto.MemberStoreDTO;
+import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
+import com.gic.haoban.manage.api.dto.MemberUnionidWechatAccountQDTO;
+import com.gic.haoban.manage.api.dto.QwFrientNoticeDTO;
+import com.gic.haoban.manage.api.dto.QywxErrorLogDTO;
+import com.gic.haoban.manage.api.dto.SecretSettingDTO;
+import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
 import com.gic.haoban.manage.api.dto.hm.HmClerkRelationDTO;
 import com.gic.haoban.manage.api.dto.hm.HmQrcodeDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.WxUserAddLogQDTO;
@@ -43,9 +74,17 @@ 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;
-import com.gic.haoban.manage.service.entity.*;
+import com.gic.haoban.manage.service.entity.MemberUnionidRelated;
+import com.gic.haoban.manage.service.entity.TabHaobanClerkMainStoreRelated;
+import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
+import com.gic.haoban.manage.service.entity.TabHaobanStaff;
+import com.gic.haoban.manage.service.entity.TabHaobanWxApplication;
+import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
+import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated;
+import com.gic.haoban.manage.service.entity.TabMiniprogramSetting;
 import com.gic.haoban.manage.service.exception.WxApiLimitException;
 import com.gic.haoban.manage.service.pojo.DealQywxExternalUserPojo;
 import com.gic.haoban.manage.service.pojo.ExternalUserPojo;
@@ -55,7 +94,17 @@ import com.gic.haoban.manage.service.pojo.bo.hm.KeyDataLinkBO;
 import com.gic.haoban.manage.service.pojo.bo.welcome.WelcomeDetailBO;
 import com.gic.haoban.manage.service.pojo.bo.welcome.WelcomeMediaBO;
 import com.gic.haoban.manage.service.pojo.bo.welcome.WelcomeReferBO;
-import com.gic.haoban.manage.service.service.*;
+import com.gic.haoban.manage.service.service.ClerkMainStoreRelatedService;
+import com.gic.haoban.manage.service.service.ExternalClerkRelatedService;
+import com.gic.haoban.manage.service.service.KeyDataService;
+import com.gic.haoban.manage.service.service.MemberUnionRelatedService;
+import com.gic.haoban.manage.service.service.MiniprogramSettingService;
+import com.gic.haoban.manage.service.service.SecretSettingService;
+import com.gic.haoban.manage.service.service.StaffClerkRelationService;
+import com.gic.haoban.manage.service.service.StaffService;
+import com.gic.haoban.manage.service.service.WelcomeService;
+import com.gic.haoban.manage.service.service.WxEnterpriseRelatedService;
+import com.gic.haoban.manage.service.service.WxEnterpriseService;
 import com.gic.haoban.manage.service.service.hm.HmLinkService;
 import com.gic.haoban.manage.service.service.hm.WxUserAddLogService;
 import com.gic.haoban.manage.service.util.CommonUtil;
@@ -69,25 +118,28 @@ import com.gic.member.tag.api.dto.outapi.MemberTagSingleDTO;
 import com.gic.member.tag.api.service.MemberTagOpenApiService;
 import com.gic.mq.sdk.GicMQClient;
 import com.gic.redis.data.util.RedisUtil;
-import com.gic.wechat.api.dto.qywx.*;
-import com.gic.wechat.api.dto.qywx.welcome.*;
+import com.gic.wechat.api.dto.qywx.QywxExternalMessageDTO;
+import com.gic.wechat.api.dto.qywx.QywxImageMaterialDTO;
+import com.gic.wechat.api.dto.qywx.QywxLinkMaterialDTO;
+import com.gic.wechat.api.dto.qywx.QywxMessageMaterialDTO;
+import com.gic.wechat.api.dto.qywx.QywxMiniprogramMaterialDTO;
+import com.gic.wechat.api.dto.qywx.QywxVideoMaterialDTO;
+import com.gic.wechat.api.dto.qywx.UnionidToExternalUseridDTO;
+import com.gic.wechat.api.dto.qywx.welcome.QywxExternalMessageBaseDTO;
+import com.gic.wechat.api.dto.qywx.welcome.QywxFileExternalBaseDTO;
+import com.gic.wechat.api.dto.qywx.welcome.QywxImageExternalBaseDTO;
+import com.gic.wechat.api.dto.qywx.welcome.QywxLinkExternalBaseDTO;
+import com.gic.wechat.api.dto.qywx.welcome.QywxMiniprogramExternalBaseDTO;
+import com.gic.wechat.api.dto.qywx.welcome.QywxVideoExternalBaseDTO;
+import com.gic.wechat.api.dto.qywx.welcome.QywxWelcomeMsgDTO;
 import com.gic.wechat.api.enums.QywxMediaTypeEnum;
 import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import com.google.common.collect.Sets;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.redisson.api.RRateLimiter;
-import org.redisson.api.RateIntervalUnit;
-import org.redisson.api.RateType;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.crypto.SecureUtil;
 
 @Service
 public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedApiService {
@@ -167,6 +219,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     private MemberService memberService;
     @Autowired
     private HmClerkRelationApiService hmClerkRelationApiService;
+    @Autowired
+    private StaffMapper staffMapper ;
+    
 
     @Override
     public void dealQywxExternalUser(String params) {
@@ -286,6 +341,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 
     @Override
     public String addMemberUnionidRelatedNew(MemberUnionidRelatedDTO dto, String wxUserId) {
+        TabHaobanStaff staff =  this.staffMapper.selectByUserIdAndEnterpriseId(dto.getWxEnterpriseId(), wxUserId) ;
+        String staffId = staff.getStaffId() ;
+        dto.setStaffId(staffId);
         //解析组装信息
         dto = getMemberUnionidRelatedDTONew(dto,wxUserId);
         if (null == dto) {
@@ -1044,12 +1102,18 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
      * @param dto
      */
     private void delMemberUnionidRelatedProcess(MemberUnionidRelatedDTO dto , String wxUserId) {
+        TabHaobanStaff staff =  this.staffMapper.selectByUserIdAndEnterpriseId(dto.getWxEnterpriseId(), wxUserId) ;
+        String staffId = staff.getStaffId() ;
+        dto.setStaffId(staffId);
         externalClerkRelatedService.delByUserIdAndExternalUserId(dto , wxUserId);
-        memberUnionRelatedService.delMemberUnionidRelated(dto , wxUserId);
+        memberUnionRelatedService.delMemberUnionidRelated(dto , staffId);
     }
 
     private void editMemberUnionidRelatedProcess(MemberUnionidRelatedDTO dto, String wxUserId) {
         log.info("修改标签/会员信息回调：{}", JSONObject.toJSONString(dto));
+        TabHaobanStaff staff =  this.staffMapper.selectByUserIdAndEnterpriseId(dto.getWxEnterpriseId(), wxUserId) ;
+        String staffId = staff.getStaffId() ;
+        dto.setStaffId(staffId);
         TabHaobanWxEnterprise wxEnterprise = wxEnterpriseService.getEnterpriseBycorpId(dto.getCorpid());
         if (null == wxEnterprise) {
             return;