Merge branch 'feature/五月需求迭代'

# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffClerkRelationServiceImpl.java
#	haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml
#	haoban-manage3-service/src/test/java/GroupMessageServiceTest.java
#	haoban-manage3-service/src/test/java/NotityTest.java

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

@@ -13,8 +13,18 @@ public class MemberStoreDTO implements Serializable {
 	 */
 	private Integer hasRight;
 	private static final long serialVersionUID = 1L;
+	
+	private String errmsg ;
+	
+	public String getErrmsg() {
+        return errmsg;
+    }
+
+    public void setErrmsg(String errmsg) {
+        this.errmsg = errmsg;
+    }
 
-	public Integer getHasRight() {
+    public Integer getHasRight() {
 		return hasRight;
 	}
 

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

@@ -127,6 +127,18 @@ public class StaffDTO implements Serializable {
      * 企微激活码
      */
     private String activeCode;
+    /**
+     * gic品牌名称
+     */
+    private List<String> enterpriseNameList;
+
+    public List<String> getEnterpriseNameList() {
+        return enterpriseNameList;
+    }
+
+    public void setEnterpriseNameList(List<String> enterpriseNameList) {
+        this.enterpriseNameList = enterpriseNameList;
+    }
 
     public String getActiveCode() {
         return activeCode;

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

+package com.gic.haoban.manage.api.dto;
+
+import com.gic.haoban.base.api.common.BasePageInfo;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @description: 列表查询VO
+ * @Author: wenhua
+ * @Date: 2023/5/17 10:45
+ */
+public class StaffListDTO implements Serializable {
+    /**
+     * 部门id
+     */
+    private String departmentId;
+    /**
+     * 激活状态 - 后期删除
+     */
+    private Integer activeFlag;
+    /**
+     * 关联状态
+     */
+    private Integer relationFlag;
+    /**
+     * 关键字
+     */
+    private String keyWord;
+    /**
+     * 许可状态  0 未激活，1 正常有效，2 即将过期，3 已过期，可多传，按‘,’隔开
+     */
+    private String permitState;
+    /**
+     * 其他占用许可页面标志，传1返回该页面数据
+     */
+    private Integer occupy;
+    /**
+     * 排序字段  不传默认create_time
+     */
+    private String sortField = "create_time";
+    /**
+     * 排序类型  不传默认desc
+     */
+    private String sortType = "desc";
+    /**
+     * 所属商户id
+     */
+    private String enterpriseIdParam;
+    /**
+     * 分页参数
+     */
+    private BasePageInfo pageInfo;
+
+    /**
+     * 企业微信id
+     */
+    private String WxEnterpriseId;
+    /**
+     * 部门id数组
+     */
+    private List<String> departmentIds;
+
+    public List<String> getDepartmentIds() {
+        return departmentIds;
+    }
+
+    public void setDepartmentIds(List<String> departmentIds) {
+        this.departmentIds = departmentIds;
+    }
+
+    public String getWxEnterpriseId() {
+        return WxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        WxEnterpriseId = wxEnterpriseId;
+    }
+
+    public String getDepartmentId() {
+        return departmentId;
+    }
+
+    public void setDepartmentId(String departmentId) {
+        this.departmentId = departmentId;
+    }
+
+    public Integer getActiveFlag() {
+        return activeFlag;
+    }
+
+    public void setActiveFlag(Integer activeFlag) {
+        this.activeFlag = activeFlag;
+    }
+
+    public Integer getRelationFlag() {
+        return relationFlag;
+    }
+
+    public void setRelationFlag(Integer relationFlag) {
+        this.relationFlag = relationFlag;
+    }
+
+    public String getKeyWord() {
+        return keyWord;
+    }
+
+    public void setKeyWord(String keyWord) {
+        this.keyWord = keyWord;
+    }
+
+    public String getPermitState() {
+        return permitState;
+    }
+
+    public void setPermitState(String permitState) {
+        this.permitState = permitState;
+    }
+
+    public Integer getOccupy() {
+        return occupy;
+    }
+
+    public void setOccupy(Integer occupy) {
+        this.occupy = occupy;
+    }
+
+    public String getSortField() {
+        return sortField;
+    }
+
+    public void setSortField(String sortField) {
+        this.sortField = sortField;
+    }
+
+    public String getSortType() {
+        return sortType;
+    }
+
+    public void setSortType(String sortType) {
+        this.sortType = sortType;
+    }
+
+    public String getEnterpriseIdParam() {
+        return enterpriseIdParam;
+    }
+
+    public void setEnterpriseIdParam(String enterpriseIdParam) {
+        this.enterpriseIdParam = enterpriseIdParam;
+    }
+
+    public BasePageInfo getPageInfo() {
+        return pageInfo;
+    }
+
+    public void setPageInfo(BasePageInfo pageInfo) {
+        this.pageInfo = pageInfo;
+    }
+}

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

 package com.gic.haoban.manage.api.dto;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 
 import java.io.Serializable;
 import java.util.List;
@@ -93,7 +94,12 @@ public class TransferActiveCodeDTO implements Serializable {
             log.append("失败明细：");
             for (int i=1;i<=this.failedList.size();i++){
                 Map<String, String> stringMap = this.failedList.get(i - 1);
-                log.append(i+".（转移成员："+stringMap.get("handoverStaffName")+"，接收成员："+stringMap.get("takeoverStaffName")+"，失败原因错误码："+stringMap.get("errorCode")+"）；");
+                String errorMessage = stringMap.get("errorMessage");
+                if (StrUtil.isNotBlank(errorMessage)){
+                    log.append(i+".（转移成员："+stringMap.get("handoverStaffName")+"，接收成员："+stringMap.get("takeoverStaffName")+"，失败原因："+errorMessage+"）；");
+                }else {
+                    log.append(i+".（转移成员："+stringMap.get("handoverStaffName")+"，接收成员："+stringMap.get("takeoverStaffName")+"，失败原因错误码："+stringMap.get("errorCode")+"）；");
+                }
             }
             //去掉末尾分号
             String substring = log.substring(0, log.toString().length() - 1);

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

@@ -64,12 +64,12 @@ public class WxEnterpriseQwDTO implements Serializable {
     public void setSelfSecret(String selfSecret) {
         this.selfSecret = selfSecret;
     }
-
+
     // 好办小程序应用id
     private String agentId;
     // 好办小程序名称
     private String agentName;
-
+
 
     // 第三方使用的加密的userid
     public boolean needOpenUserId3th() {

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

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class WxEnterpriseRelatedDTO implements Serializable {
+    private String wxEnterpriseRelatedId;
+
+    private String wxEnterpriseId;
+
+    private String enterpriseId;
+    
+    private String enterpriseName;
+
+    private String version;
+
+    private Integer statusFlag;
+
+    private Date createTime;
+
+    private Date updateTime;
+    
+    private String staffId;
+    
+    private String staffName;
+
+    private Integer wxEnterpriseType;
+
+    private Integer memberOpenCardFlag;
+
+    private Integer rangeType;
+
+    private Integer clerkEditFlag;
+
+    public Integer getClerkEditFlag() {
+        return clerkEditFlag;
+    }
+
+    public void setClerkEditFlag(Integer clerkEditFlag) {
+        this.clerkEditFlag = clerkEditFlag;
+    }
+
+    private static final long serialVersionUID = 1L;
+
+    public Integer getRangeType() {
+        return rangeType;
+    }
+
+    public void setRangeType(Integer rangeType) {
+        this.rangeType = rangeType;
+    }
+
+    public Integer getWxEnterpriseType() {
+        return wxEnterpriseType;
+    }
+
+    public void setWxEnterpriseType(Integer wxEnterpriseType) {
+        this.wxEnterpriseType = wxEnterpriseType;
+    }
+
+    public Integer getMemberOpenCardFlag() {
+        return memberOpenCardFlag;
+    }
+
+    public void setMemberOpenCardFlag(Integer memberOpenCardFlag) {
+        this.memberOpenCardFlag = memberOpenCardFlag;
+    }
+
+    public String getWxEnterpriseRelatedId() {
+        return wxEnterpriseRelatedId;
+    }
+
+    public void setWxEnterpriseRelatedId(String wxEnterpriseRelatedId) {
+        this.wxEnterpriseRelatedId = wxEnterpriseRelatedId == null ? null : wxEnterpriseRelatedId.trim();
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId == null ? null : wxEnterpriseId.trim();
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId == null ? null : enterpriseId.trim();
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version == null ? null : version.trim();
+    }
+
+    public Integer getStatusFlag() {
+        return statusFlag;
+    }
+
+    public void setStatusFlag(Integer statusFlag) {
+        this.statusFlag = statusFlag;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+	public String getStaffId() {
+		return staffId;
+	}
+
+	public void setStaffId(String staffId) {
+		this.staffId = staffId;
+	}
+
+	public String getStaffName() {
+		return staffName;
+	}
+
+	public void setStaffName(String staffName) {
+		this.staffName = staffName;
+	}
+
+    public String getEnterpriseName() {
+        return enterpriseName;
+    }
+
+    public void setEnterpriseName(String enterpriseName) {
+        this.enterpriseName = enterpriseName;
+    }
+}
\ No newline at end of file

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

+package com.gic.haoban.manage.api.dto.hm;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class HmBatchCountDTO implements Serializable{
+    
+    /**
+    * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
+    */
+    private static final long serialVersionUID = 4873701412965622239L;
+    private int taskStatus ;
+    private String taskId ;
+    private int totalCount ;
+    private int successCount ;
+    private int failount ;
+    private List<HmBatchModifyResultDTO> failList ;
+    
+    public int getTaskStatus() {
+        return taskStatus;
+    }
+    public void setTaskStatus(int taskStatus) {
+        this.taskStatus = taskStatus;
+    }
+    public String getTaskId() {
+        return taskId;
+    }
+    public int getTotalCount() {
+        return totalCount;
+    }
+    public int getSuccessCount() {
+        return successCount;
+    }
+    public int getFailount() {
+        return failount;
+    }
+    public List<HmBatchModifyResultDTO> getFailList() {
+        return failList;
+    }
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+    public void setTotalCount(int totalCount) {
+        this.totalCount = totalCount;
+    }
+    public void setSuccessCount(int successCount) {
+        this.successCount = successCount;
+    }
+    public void setFailount(int failount) {
+        this.failount = failount;
+    }
+    public void setFailList(List<HmBatchModifyResultDTO> failList) {
+        this.failList = failList;
+    }
+}
\ No newline at end of file

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

+package com.gic.haoban.manage.api.dto.hm;
+
+import java.io.Serializable;
+
+public class HmBatchModifyResultDTO implements Serializable{
+
+    /**
+    * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
+    */
+    private static final long serialVersionUID = 5984478063344522210L;
+    private Long hmid;
+    private String hmCode ;
+    private String hmName;
+    private int errcode;
+    private String message;
+    
+    
+    public HmBatchModifyResultDTO(Long hmid, int errcode, String message) {
+        super();
+        this.hmid = hmid;
+        this.errcode = errcode;
+        this.message = message;
+    }
+
+    public String getHmCode() {
+        return hmCode;
+    }
+
+
+    public void setHmCode(String hmCode) {
+        this.hmCode = hmCode;
+    }
+
+
+    public Long getHmid() {
+        return hmid;
+    }
+
+    public String getHmName() {
+        return hmName;
+    }
+
+    public int getErrcode() {
+        return errcode;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setHmid(Long hmid) {
+        this.hmid = hmid;
+    }
+
+    public void setHmName(String hmName) {
+        this.hmName = hmName;
+    }
+
+    public void setErrcode(int errcode) {
+        this.errcode = errcode;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/hm/HmBatchModifyQDTO.java

+package com.gic.haoban.manage.api.dto.qdto.hm;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 
+* @ClassName: HmBatchModifyQO
+* @Description: 活码批量修改成员
+* @author xugh
+* @date 2023年5月15日 上午10:25:42
+*
+ */
+public class HmBatchModifyQDTO implements Serializable {
+
+    /**
+    * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
+    */
+    private static final long serialVersionUID = 551906331625487555L;
+
+    private String wxEnterpriseId;
+    private String enterpriseId ;
+    private String optClerkId;
+    private String optName;
+    private List<Long> hmIdList;
+    // 1新增 2删除
+    private int optType;
+    private List<String> clerkIdList;
+    // 1 继续执行更新 2不废弃活码
+    private int updateType;
+    
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public int getUpdateType() {
+        return updateType;
+    }
+
+    public void setUpdateType(int updateType) {
+        this.updateType = updateType;
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public String getOptName() {
+        return optName;
+    }
+
+    public List<Long> getHmIdList() {
+        return hmIdList;
+    }
+
+    public int getOptType() {
+        return optType;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId;
+    }
+
+    public void setOptName(String optName) {
+        this.optName = optName;
+    }
+
+    public void setHmIdList(List<Long> hmIdList) {
+        this.hmIdList = hmIdList;
+    }
+
+    public void setOptType(int optType) {
+        this.optType = optType;
+    }
+
+    public List<String> getClerkIdList() {
+        return clerkIdList;
+    }
+
+    public void setClerkIdList(List<String> clerkIdList) {
+        this.clerkIdList = clerkIdList;
+    }
+
+    public String getOptClerkId() {
+        return optClerkId;
+    }
+
+    public void setOptClerkId(String optClerkId) {
+        this.optClerkId = optClerkId;
+    }
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/PreDealTypeEnum.java

@@ -13,7 +13,8 @@ public enum PreDealTypeEnum {
     friend(8, "第三方好友"),
     friend_merge(9, "好友数据合并"),
     tag(10, "标签"),
-    tag_member(11, "会员标签");
+    tag_member(11, "会员标签"),
+    modify_hm(20,"批量修改活码") ;
     private int val;
     private String name;
 

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/SyncTaskStatusEnum.java

@@ -16,7 +16,9 @@ public enum SyncTaskStatusEnum {
     friend_sync(9),
     merge_friend_sync(10),
     tag(10),
-    member_tag(10);
+    member_tag(10) ,
+    modify_hm(21) ;
+    
 
     private int val;
 

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/SyncTaskTypeEnum.java

@@ -8,7 +8,8 @@ public enum SyncTaskTypeEnum {
     FRIEND_SINGLE(4, "单个成员刷新好友"),
     FRIEND_STORE(5, "刷新门店好友"),
     MEMBER_TAG(6, "企业微信标签刷新"),
-    FRIEND_WX_ENTEPRISE(10, "企业好友初始化");
+    FRIEND_WX_ENTEPRISE(10, "企业好友初始化"),
+    BATCH_MODIFY_HM(20, "企微多人活码增加/剔除关联账号");
     private int type;
     private String taskName;
 

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

@@ -53,11 +53,22 @@ public interface MemberUnionidRelatedApiService {
      * 查看是否可以跳转会员详情的会员列表
      *
      * @param externalUserid
-     * @param wxUserId
      * @param storeId
      * @return
      */
     List<MemberStoreDTO> listByExTernalUseridAndWxUserId(String externalUserid, String staffId, String storeId);
+    
+    /**
+     * 
+    * @Title: getMemberIdForDetail
+    * @Description: 好办打开会员详情-返回memberId
+    * @author xugh
+    * @param externalUserid
+    * @param staffId
+    * @return
+    * @throws
+     */
+    com.gic.api.base.commons.ServiceResponse<MemberStoreDTO> getMemberIdForDetail(String externalUserid, String staffId, String enterpriseId);
 
     /**
      * 创建企业群发, 支出素材批量发送
@@ -76,9 +87,6 @@ public interface MemberUnionidRelatedApiService {
      * 创建企业群发, 支出素材批量发送
      *
      * @param wxEnterpriseId : 微信企业id
-     * @param staffId         : 用户id
-     * @param extendUserList : 发送的用户id
-     * @param materialIdList : 素材id列表
      * @return : 返回群发执行结果
      */
     JSONResponse share(String wxEnterpriseId, List<String> clerkIdList, String message , List<ContentMaterialDTO> imgList);

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

@@ -19,9 +19,7 @@ public interface StaffApiService {
 
     List<StaffDepartmentRelatedDTO> listStaffDepartmentByStaffId(String staffId);
 
-    Page<StaffDTO> pageStaff(List<String> departmentId, Integer activeFlag,
-                             String keyword, BasePageInfo pageInfo, Integer relationFlag, String wxEnterpriseId , String permitState,
-                             Integer occupy);
+    Page<StaffDTO> pageStaff(StaffListDTO staffListDTO);
 
     /**
      * 保存微信成员
@@ -337,4 +335,11 @@ public interface StaffApiService {
      * @return
      */
     com.gic.api.base.commons.ServiceResponse<Boolean> autoActivateCallBack(String params) ;
+
+    /**
+     * 查询企业微信对应的所有商户品牌信息
+     * @param wxEnterpriseId 企业微信id
+     * @return
+     */
+    com.gic.api.base.commons.ServiceResponse<List<WxEnterpriseRelatedDTO>> getWxEnterpriseRelatedList(String wxEnterpriseId);
 }

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

@@ -65,4 +65,13 @@ public interface GroupChatPlanApiService {
     public ServiceResponse<Void> del(String clerkId, String clerkName, Long planId);
 
     public ServiceResponse<Void> stop(String clerkId, String clerkName, Long planId);
+
+    /**
+     * 查询社群群发待发送总数
+     * @param enterpriseId gic企业id
+     * @param clerkId 导购id
+     * @param storeId 门店id
+     * @return
+     */
+    public ServiceResponse<Integer> getTotalCount(String enterpriseId,String clerkId,String storeId);
 }

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

 package com.gic.haoban.manage.api.service.hm;
 
+import java.util.List;
+
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
+import com.gic.haoban.manage.api.dto.hm.HmBatchCountDTO;
+import com.gic.haoban.manage.api.dto.hm.HmBatchModifyResultDTO;
 import com.gic.haoban.manage.api.dto.hm.HmQrcodeDTO;
 import com.gic.haoban.manage.api.dto.hm.HmQrcodeStoreDTO;
+import com.gic.haoban.manage.api.dto.qdto.hm.HmBatchModifyQDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeListQDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeQDTO;
 
-import java.util.List;
-
 /**
  * @author mozhu
  * @date 2022/7/5 09:33
@@ -55,6 +58,17 @@ public interface HmQrcodeApiService {
      * @date 2022-07-05 10:59:06
      */
     ServiceResponse update(HmQrcodeQDTO hmQrcodeQDTO);
+    
+    /**
+     * 
+    * @Title: batchModifyHm
+    * @Description: 批量更新多人活码
+    * @author xugh
+    * @param qdto
+    * @return
+    * @throws
+     */
+    public ServiceResponse batchUpdateHm(HmQrcodeQDTO qdto) ;
 
     /**
      * 查询详情
@@ -178,5 +192,9 @@ public interface HmQrcodeApiService {
     ServiceResponse<List<String>> listHasQrcodeClerk(String enterpriseId, List<String> clerkIdList);
     
     ServiceResponse<String> getClerkQrcode(String enterpriseId , String clerkId) ;
+    
+    ServiceResponse<List<HmBatchModifyResultDTO>> batchModify(HmBatchModifyQDTO qdto) ;
+    
+    ServiceResponse<HmBatchCountDTO> getModifyResult(String wxEnterpriseId , String taskId) ;
 
 }

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

 package com.gic.haoban.manage.service.dao.mapper;
 
-import com.gic.haoban.manage.api.dto.SyncCheckDTO;
 import com.gic.haoban.manage.service.entity.TabHaobanPreDealLog;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -115,6 +114,10 @@ public interface PreDealLogMapper {
      * @return
      */
     public List<TabHaobanPreDealLog> listRebuildDepartByTaskId(@Param("taskId") String taskId);
+    
+    public List<TabHaobanPreDealLog> listAllByTaskId(@Param("taskId") String taskId);
+    
+    
 
     /**
      * 统计重试任务数量

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

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.service.dao.mapper;
 
 import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.service.entity.TabHaobanStaff;
+import com.gic.haoban.manage.service.pojo.bo.StaffListBO;
 import com.github.pagehelper.Page;
 import org.apache.ibatis.annotations.Param;
 
@@ -37,13 +38,7 @@ public interface StaffMapper {
     
     List<TabHaobanStaff> listLikeName(@Param("staffName") String staffName, @Param("wxEnterpriseId") String wxEnterpriseId);
 
-    Page<TabHaobanStaff> pageStaff(@Param("staffIds") List<String> staffIds,
-                             @Param("activeFlag") Integer activeFlag,
-                             @Param("keyword") String keyword,
-                             @Param("departmentIds") List<String> departmentIds,
-                             @Param("wxEnterpriseId") String wxEnterpriseId,
-                             @Param("relationFlag") Integer relationFlag,@Param("permitState")String permitState,
-                             @Param("occupy")Integer occupy);
+    Page<TabHaobanStaff> pageStaff(StaffListBO staffListBO);
 
     List<TabHaobanStaff> listByPhoneNumber(@Param("phoneNumber") String phoneNumber);
 

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

@@ -37,4 +37,6 @@ public interface SyncTaskMapper {
     List<TabHaobanSyncTask> listPageByWxEid(String wxEnterpriseId);
 
 	List<TabHaobanSyncTask> listTaskByType(@Param("taskType")int taskType);
+
+    TabHaobanSyncTask getSyncNewestTask(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("taskType")int taskType);   
 }
\ No newline at end of file

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

@@ -121,4 +121,14 @@ public interface TabHaobanStaffClerkRelationMapper {
     List<StaffClerkRelationDTO> listByStoreIds(@Param("wxEnterpriseId") String wxEnterpriseId,@Param("storeIds") List<String> storeIds);
 
     List<String> listAllClerkIdsByEnterpriseId(@Param("enterpriseId") String enterpriseId);
+
+    /**
+     * 根据staffId查询gic品牌id
+     * @param wxEnterpriseId 企业微信id
+     * @param staffIdList 成员id数组
+     * @return
+     */
+    List<StaffClerkRelationDTO> listByWxEnterpriseIdAndStaffId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffIdList") Set<String> staffIdList);
+
+    List<String> listAllStaffIdByEnterpriseId(@Param("enterpriseId") String enterpriseId,@Param("wxEnterpriseId") String wxEnterpriseId);
 }
\ No newline at end of file

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

@@ -44,4 +44,13 @@ public interface GroupChatPlanOwnerLogMapper {
     public List<GroupChatPlanOwnerLogDTO> listOwnerLogPageForWxa(GroupChatPlanSearchQDTO qdto);
 
     public GroupChatPlanOwnerLogDTO getOwnerInfo(@Param("planId")Long planId, @Param("staffId")String staffId, @Param("clerkId")String clerkId, @Param("wxEnterpriseId")String wxEnterpriseId);
+
+    /**
+     * 查询社群群发待发送总数
+     * @param enterpriseId gic企业id
+     * @param clerkId 导购id
+     * @param storeId 门店id
+     * @return
+     */
+    Integer getTotalCount(@Param("enterpriseId")String enterpriseId,@Param("clerkId")String clerkId,@Param("storeId")String storeId);
 }
\ No newline at end of file

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

@@ -86,6 +86,8 @@ public interface TabHaobanHmClerkRelationMapper {
      * @date 2022-07-13 17:04:38
      */
     List<TabHaobanHmClerkRelation> getHmClerkByHmId(@Param("hmId") Long hmId);
+    
+    List<TabHaobanHmClerkRelation> listHmClerkByHmIdList(@Param("hmIdList") List<Long> hmIdList) ;
 
     /**
      * 根据hmid 获取导购信息

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

@@ -23,6 +23,10 @@ public interface TabHaobanHmQrcodeMapper {
      * @return 实例对象
      */
     TabHaobanHmQrcode queryById(@Param("hmId") Long hmId);
+    
+    List<TabHaobanHmQrcode> queryByIdList(@Param("hmIds") List<Long> hmIds);
+    
+    
 
     /**
      * 新增数据

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

+package com.gic.haoban.manage.service.errorcode;
+
+/**
+ * Created by fudh on 2018/3/4.
+ */
+public enum QywxErrCode {
+
+    ERR_701017("701017","帐号30天内迁移过"),
+    ;
+
+    private String code;
+    private String msg;
+
+    QywxErrCode(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public static QywxErrCode getValue(String code) {
+        for (QywxErrCode sec : QywxErrCode.values()) {
+            if (code.equals(sec.getCode())) {
+                return sec;
+            }
+        }
+        return null;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+}

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

+package com.gic.haoban.manage.service.pojo.bo;
+
+import com.gic.haoban.base.api.common.BasePageInfo;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @description: 列表查询VO
+ * @Author: wenhua
+ * @Date: 2023/5/17 10:45
+ */
+public class StaffListBO implements Serializable {
+    /**
+     * 部门id
+     */
+    private String departmentId;
+    /**
+     * 激活状态 - 后期删除
+     */
+    private Integer activeFlag;
+    /**
+     * 关联状态
+     */
+    private Integer relationFlag;
+    /**
+     * 关键字
+     */
+    private String keyWord;
+    /**
+     * 许可状态  0 未激活，1 正常有效，2 即将过期，3 已过期，可多传，按‘,’隔开
+     */
+    private String permitState;
+    /**
+     * 其他占用许可页面标志，传1返回该页面数据
+     */
+    private Integer occupy;
+    /**
+     * 排序字段  不传默认create_time
+     */
+    private String sortField = "create_time";
+    /**
+     * 排序类型  不传默认desc
+     */
+    private String sortType = "desc";
+    /**
+     * 所属商户id
+     */
+    private String enterpriseIdParam;
+    /**
+     * 分页参数
+     */
+    private BasePageInfo pageInfo;
+
+    /**
+     * 企业微信id
+     */
+    private String WxEnterpriseId;
+    /**
+     * 部门id数组
+     */
+    private List<String> departmentIds;
+    /**
+     * 关联成员id数组
+     */
+    private List<String> staffIds;
+
+    public List<String> getStaffIds() {
+        return staffIds;
+    }
+
+    public void setStaffIds(List<String> staffIds) {
+        this.staffIds = staffIds;
+    }
+
+    public List<String> getDepartmentIds() {
+        return departmentIds;
+    }
+
+    public void setDepartmentIds(List<String> departmentIds) {
+        this.departmentIds = departmentIds;
+    }
+
+    public String getWxEnterpriseId() {
+        return WxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        WxEnterpriseId = wxEnterpriseId;
+    }
+
+    public String getDepartmentId() {
+        return departmentId;
+    }
+
+    public void setDepartmentId(String departmentId) {
+        this.departmentId = departmentId;
+    }
+
+    public Integer getActiveFlag() {
+        return activeFlag;
+    }
+
+    public void setActiveFlag(Integer activeFlag) {
+        this.activeFlag = activeFlag;
+    }
+
+    public Integer getRelationFlag() {
+        return relationFlag;
+    }
+
+    public void setRelationFlag(Integer relationFlag) {
+        this.relationFlag = relationFlag;
+    }
+
+    public String getKeyWord() {
+        return keyWord;
+    }
+
+    public void setKeyWord(String keyWord) {
+        this.keyWord = keyWord;
+    }
+
+    public String getPermitState() {
+        return permitState;
+    }
+
+    public void setPermitState(String permitState) {
+        this.permitState = permitState;
+    }
+
+    public Integer getOccupy() {
+        return occupy;
+    }
+
+    public void setOccupy(Integer occupy) {
+        this.occupy = occupy;
+    }
+
+    public String getSortField() {
+        return sortField;
+    }
+
+    public void setSortField(String sortField) {
+        this.sortField = sortField;
+    }
+
+    public String getSortType() {
+        return sortType;
+    }
+
+    public void setSortType(String sortType) {
+        this.sortType = sortType;
+    }
+
+    public String getEnterpriseIdParam() {
+        return enterpriseIdParam;
+    }
+
+    public void setEnterpriseIdParam(String enterpriseIdParam) {
+        this.enterpriseIdParam = enterpriseIdParam;
+    }
+
+    public BasePageInfo getPageInfo() {
+        return pageInfo;
+    }
+
+    public void setPageInfo(BasePageInfo pageInfo) {
+        this.pageInfo = pageInfo;
+    }
+}

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

@@ -177,4 +177,19 @@ public interface StaffClerkRelationService {
      * @return
      */
     List<String> listAllClerkIdsByEnterpriseId(String enterpriseId);
+
+    /**
+     * 根据staffId查询gic品牌id
+     * @param wxEnterpriseId 企业微信id
+     * @param staffIdList 成员id数组
+     * @return
+     */
+    List<StaffClerkRelationDTO> listByWxEnterpriseIdAndStaffId(String wxEnterpriseId, Set<String> staffIdList);
+
+    /**
+     * 获取企业下所有关联成员id
+     * @param enterpriseId
+     * @return
+     */
+    List<String> listAllStaffIdByEnterpriseId(String enterpriseId,String wxEnterpriseId);
 }

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

@@ -7,6 +7,7 @@ import java.util.List;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.service.entity.TabHaobanStaff;
+import com.gic.haoban.manage.service.pojo.bo.StaffListBO;
 import com.github.pagehelper.Page;
 
 public interface StaffService {
@@ -17,9 +18,7 @@ public interface StaffService {
 
     String add(TabHaobanStaff tab);
 
-    Page<TabHaobanStaff> pageStaff(List<String> staffIds, Integer activeFlag,
-                                   String keyword, List<String> departmentIds, String wxEnterpriseId, Integer relationFlag,String permitState,
-                                   Integer occupy);
+    Page<TabHaobanStaff> pageStaff(StaffListBO staffListBO);
 
     void updateByPrimaryKey(TabHaobanStaff tab);
 

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

@@ -36,6 +36,9 @@ public interface SyncTaskService {
      * @return
      */
     public TabHaobanSyncTask getSyncTask(String taskId);
+    
+    
+    public TabHaobanSyncTask getSyncNewestTask(String wxEnterpriseId , int taskType);
 
     /**
      * 获取任务列表

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

@@ -35,4 +35,13 @@ public interface GroupChatPlanOwnerLogService {
 
     public GroupChatPlanOwnerLogDTO getOwnerInfo(Long planId, String staffId, String clerkId, String wxEnterpriseId);
 
+    /**
+     * 查询社群群发待发送总数
+     * @param enterpriseId gic企业id
+     * @param clerkId 导购id
+     * @param storeId 门店id
+     * @return
+     */
+    Integer getTotalCount(String enterpriseId,String clerkId,String storeId);
+
 }
\ No newline at end of file

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

@@ -255,4 +255,9 @@ public class GroupChatPlanOwnerLogServiceImpl implements GroupChatPlanOwnerLogSe
         return dto;
     }
 
+    @Override
+    public Integer getTotalCount(String enterpriseId, String clerkId, String storeId) {
+        return groupChatPlanOwnerLogMapper.getTotalCount(enterpriseId,clerkId,storeId);
+    }
+
 }
\ No newline at end of file

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

@@ -2,6 +2,9 @@ package com.gic.haoban.manage.service.service.hm;
 
 import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.haoban.manage.api.dto.hm.HmBatchModifyResultDTO;
+import com.gic.haoban.manage.api.dto.qdto.hm.HmBatchModifyQDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmClerkRelationQDTO;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmClerkRelationBO;
 
@@ -142,5 +145,7 @@ public interface HmClerkRelationService {
     * @throws
      */
     void updateByClerkChangeStore(String enterpriseId,String oldClerkId,String newClerkId) ;
+        
+    ServiceResponse<List<HmBatchModifyResultDTO>> batchModify(HmBatchModifyQDTO qdto);
 
 }

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

 package com.gic.haoban.manage.service.service.hm;
 
-import com.gic.api.base.commons.Page;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeListQDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeQDTO;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmQrcodeBO;
@@ -9,7 +8,6 @@ import com.gic.haoban.manage.service.pojo.bo.hm.HmQrcodeGroupNumBO;
 
 import java.util.List;
 
-import org.apache.ibatis.annotations.Param;
 
 
 /**

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

 package com.gic.haoban.manage.service.service.hm.impl;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
+import com.gic.api.base.commons.ServiceResponse;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
+import com.gic.commons.util.GICMQClientUtil;
+import com.gic.commons.util.ToolUtil;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.PageUtil;
+import com.gic.haoban.manage.api.dto.DealParamMqDTO;
+import com.gic.haoban.manage.api.dto.hm.HmBatchModifyResultDTO;
+import com.gic.haoban.manage.api.dto.qdto.hm.HmBatchModifyQDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmClerkRelationQDTO;
+import com.gic.haoban.manage.api.enums.PreDealTypeEnum;
+import com.gic.haoban.manage.api.enums.SyncTaskStatusEnum;
+import com.gic.haoban.manage.api.enums.SyncTaskTypeEnum;
 import com.gic.haoban.manage.service.dao.mapper.hm.TabHaobanHmClerkRelationMapper;
+import com.gic.haoban.manage.service.dao.mapper.hm.TabHaobanHmQrcodeMapper;
+import com.gic.haoban.manage.service.entity.TabHaobanPreDealLog;
+import com.gic.haoban.manage.service.entity.TabHaobanSyncTask;
 import com.gic.haoban.manage.service.entity.hm.TabHaobanHmClerkRelation;
+import com.gic.haoban.manage.service.entity.hm.TabHaobanHmQrcode;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmClerkRelationBO;
+import com.gic.haoban.manage.service.service.PreDealService;
+import com.gic.haoban.manage.service.service.SyncTaskService;
 import com.gic.haoban.manage.service.service.hm.HmClerkRelationService;
+import com.gic.haoban.manage.service.task.hm.QwHmOperation;
+import com.gic.mq.sdk.GicMQClient;
+import com.gic.redis.data.util.RedisUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 
@@ -31,12 +61,19 @@ import com.github.pagehelper.PageInfo;
 @Service
 public class HmClerkRelationServiceImpl implements HmClerkRelationService {
 
+    private static final Logger log = LoggerFactory.getLogger(HmClerkRelationService.class);
     @Autowired
     private TabHaobanHmClerkRelationMapper tabHaobanHmClerkRelationMapper;
     @Autowired
+    private TabHaobanHmQrcodeMapper hmQrcodeMapper;
+    @Autowired
     private ClerkService clerkService ;
     @Autowired
     private StoreService storeService ;
+    @Autowired
+    private SyncTaskService syncTaskService;
+    @Autowired
+    private PreDealService preDealService;
 
 
     @Override
@@ -112,4 +149,173 @@ public class HmClerkRelationServiceImpl implements HmClerkRelationService {
         String storeName = newStore.getStoreName() ;
         this.tabHaobanHmClerkRelationMapper.updateByClerkChangeStore(enterpriseId,newClerkId,clerkCode,clerkName,storeId, storeCode,storeName, oldClerkId) ;
     }
+    
+    @Override
+    public ServiceResponse<List<HmBatchModifyResultDTO>> batchModify(HmBatchModifyQDTO qdto) {
+        String wxEnterpriseId = qdto.getWxEnterpriseId() ;
+        String enterpriseId = qdto.getEnterpriseId() ;
+        String cacheKey = QwHmOperation.hmCachKey+wxEnterpriseId+enterpriseId ;
+        if(null != RedisUtil.getCache(cacheKey)) {
+            return ServiceResponse.failure("9999", "已有任务在执行,请稍后在处理") ;
+        }
+        int maxCount = 3 ;
+        List<Long> hmIdList = qdto.getHmIdList() ;
+        List<TabHaobanHmClerkRelation> list = this.tabHaobanHmClerkRelationMapper.listHmClerkByHmIdList(hmIdList) ;
+        log.info("查询活码关联导购数={},活码数={}",list.size(),hmIdList.size());
+        Map<Long,List<TabHaobanHmClerkRelation>> map = list.stream().collect(Collectors.groupingBy(TabHaobanHmClerkRelation::getHmId));
+        Map<Long , Set<String>> modifyMap = new HashMap<>();
+        List<HmBatchModifyResultDTO> errList = new ArrayList<>() ;
+        for(Long hmId : hmIdList) {
+            List<TabHaobanHmClerkRelation> staffRelationList =  map.get(hmId) ;
+            if (CollectionUtils.isEmpty(staffRelationList)) {
+                log.info("活码无关联导购={}",hmId);
+                HmBatchModifyResultDTO err = new HmBatchModifyResultDTO(hmId,3,"无关联导购") ;
+                errList.add(err) ;
+                continue;
+            }
+            Set<String> clerkIdSet = staffRelationList.stream().map(o->o.getClerkId()).collect(Collectors.toSet()) ;
+            if(CollectionUtils.isNotEmpty(staffRelationList)) {
+                Set<String> clerkIdSetBak = new HashSet<>();
+                clerkIdSetBak.addAll(clerkIdSet) ;
+                List<String> modifyIdList = qdto.getClerkIdList();
+                // add
+                if(qdto.getOptType()==1) {
+                    clerkIdSetBak.addAll(modifyIdList) ;
+                    if(clerkIdSetBak.size()>maxCount) {
+                        HmBatchModifyResultDTO err = new HmBatchModifyResultDTO(hmId,1,"超出多人活码成员数上限,最多支持添加100个成员") ;
+                        errList.add(err) ;
+                    }
+                }
+                // 减
+                if(qdto.getOptType()==2) {
+                    clerkIdSetBak.removeAll(modifyIdList);
+                    if(clerkIdSetBak.size()<=0) {
+                        HmBatchModifyResultDTO err = new HmBatchModifyResultDTO(hmId,2,"成员数为0") ;
+                        errList.add(err) ;
+                    }
+                }
+                log.info("hm={},修改前={},修改后={}",hmId,clerkIdSet.size(),clerkIdSetBak.size());
+                //  1 继续执行更新 2不废弃活码
+                if(qdto.getUpdateType()==2 && clerkIdSetBak.size()==0) {
+                    log.info("无人活码={}",hmId);
+                    continue ;
+                }
+                if(qdto.getOptType()==1 && clerkIdSetBak.size()>maxCount) {
+                    log.info("超人数活码={}",hmId);
+                    continue ;
+                }
+                if(clerkIdSetBak.size() != clerkIdSet.size()) {
+                    modifyMap.put(hmId, clerkIdSetBak) ;
+                }
+            }
+        }
+        log.info("异常的活码={}",JSONObject.toJSONString(errList));
+        if(CollectionUtils.isNotEmpty(errList) && qdto.getUpdateType()==0) {
+            List<Long> hmidList = errList.stream().map(o->o.getHmid()).collect(Collectors.toList()) ;
+            List<TabHaobanHmQrcode> qrcodeList =  this.hmQrcodeMapper.queryByIdList(hmidList) ;
+            Map<Long,TabHaobanHmQrcode> qrcodeMap = qrcodeList.stream().collect(Collectors.toMap(TabHaobanHmQrcode::getHmId, o->o)) ;
+            errList.forEach(o->{
+                if(null != qrcodeMap.get(o.getHmid())) {
+                    o.setHmCode(qrcodeMap.get(o.getHmid()).getHmCode());
+                    o.setHmName(qrcodeMap.get(o.getHmid()).getName());
+                }
+            });
+            return ServiceResponse.success(errList) ;
+        }
+        if(modifyMap.size()==0) {
+            return ServiceResponse.failure("9999", "没有需要处理的活码") ;
+        }
+        String lockKey = cacheKey+"lock";
+        if(RedisUtil.isLocked(lockKey) || null != RedisUtil.getCache(cacheKey)) {
+            return ServiceResponse.failure("9999", "已有任务在执行,请稍后在处理") ;
+        }
+        RedisUtil.lock(lockKey, 2L);
+        if(null != RedisUtil.getCache(cacheKey)) {
+            return ServiceResponse.failure("9999", "已有任务在执行,请稍后在处理") ;
+        }
+        RedisUtil.setCache(cacheKey,"1") ;
+        RedisUtil.unlock(lockKey);
+        String clerkId = qdto.getOptClerkId() ;
+        String name = qdto.getOptName() ;
+        String taskName = "批量修改多人活码";
+        String taskId = this.createModifyHmTask(wxEnterpriseId, taskName, clerkId,
+                name, SyncTaskTypeEnum.BATCH_MODIFY_HM.getType());
+        if (StringUtils.isBlank(taskId)) {
+            RedisUtil.delCache(cacheKey) ;
+            return ServiceResponse.failure("9999", "创建任务失败") ;
+        }
+        if(CollectionUtils.isNotEmpty(errList)) {
+            List<TabHaobanPreDealLog> dealLogList = new ArrayList<>() ;
+            for(HmBatchModifyResultDTO err : errList) {
+                if(err.getErrcode()==1 || err.getErrcode()==3) {
+                    Long hmid = err.getHmid() ;
+                    TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog();
+                    dealLog.setEnterpriseId(enterpriseId);
+                    dealLog.setWxEnterpriseId(wxEnterpriseId);
+                    dealLog.setTaskId(taskId);
+                    dealLog.setDataId(hmid+"") ;
+                    dealLog.setpDataId(hmid+"");
+                    dealLog.setDataContent(null);
+                    dealLog.setDataType(PreDealTypeEnum.modify_hm.getVal());
+                    dealLog.setStatusFlag(3);
+                    dealLog.setReason(err.getMessage());
+                    dealLogList.add(dealLog) ;
+                }
+            }
+            if(CollectionUtils.isNotEmpty(dealLogList)) {
+                this.preDealService.insert(dealLogList);
+            }
+        }
+
+        log.info("总任务数={},taskid={}",modifyMap.size(),taskId);
+        List<TabHaobanPreDealLog> dealLogList = modifyMap.keySet().stream().map(hmid -> {
+            TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog();
+            dealLog.setEnterpriseId(enterpriseId);
+            dealLog.setWxEnterpriseId(wxEnterpriseId);
+            dealLog.setTaskId(taskId);
+            dealLog.setDataId(hmid+"") ;
+            dealLog.setpDataId(hmid+"");
+            dealLog.setDataContent(JSON.toJSONString(modifyMap.get(hmid)));
+            dealLog.setDataType(PreDealTypeEnum.modify_hm.getVal());
+            dealLog.setStatusFlag(0);
+            return dealLog;
+        }).collect(Collectors.toList());
+        this.preDealService.insert(dealLogList);
+        this.sendToMq(taskId, dealLogList.stream().map(o->o.getDataId()).collect(Collectors.toSet()), SyncTaskStatusEnum.modify_hm);
+        ServiceResponse resp = ServiceResponse.success() ;
+        resp.setMessage(taskId);
+        return resp ;
+    }
+
+    private void sendToMq(String taskId, Set<String> dealList, SyncTaskStatusEnum syncTaskStatusEnum) {
+        //预处理分组任务
+        syncTaskService.updateTaskStatus(taskId, syncTaskStatusEnum.getVal());
+        List<String> listRet = dealList.stream().map(relationId -> {
+            DealParamMqDTO dealParamMqDTO = new DealParamMqDTO();
+            dealParamMqDTO.setTaskId(taskId);
+            dealParamMqDTO.setData(relationId);
+            dealParamMqDTO.setType(syncTaskStatusEnum.getVal());
+            return JSONObject.toJSONString(dealParamMqDTO);
+        }).collect(Collectors.toList());
+
+        GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
+        try {
+            clientInstance.sendBatchMessages("departmentSyncDealMq", listRet, 1);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public String createModifyHmTask(String wxEnterpriseId, String taskName, String staffId, String staffName, int syncTaskType) {
+        TabHaobanSyncTask tabHaobanSyncTask = new TabHaobanSyncTask();
+        tabHaobanSyncTask.setAddUser(staffId);
+        tabHaobanSyncTask.setTaskName(SyncTaskTypeEnum.getTaskName(syncTaskType));
+        tabHaobanSyncTask.setTaskDesc(staffName);
+        tabHaobanSyncTask.setWxEnterpriseId(wxEnterpriseId);
+        tabHaobanSyncTask.setStatusFlag(SyncTaskStatusEnum.init.getVal());
+        tabHaobanSyncTask.setTaskId(ToolUtil.randomUUID());
+        tabHaobanSyncTask.setTaskType(syncTaskType);
+        syncTaskService.createTask(tabHaobanSyncTask);
+        return tabHaobanSyncTask.getTaskId();
+    }
 }

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

-package com.gic.haoban.manage.service.service.impl;
-
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.gic.api.base.dto.SubscribeMessageDTO;
-import com.gic.clerk.api.dto.ClerkDTO;
-import com.gic.clerk.api.service.ClerkService;
-import com.gic.commons.util.GICMQClientUtil;
-import com.gic.commons.util.UniqueIdUtils;
-import com.gic.dubbo.entity.ProviderLocalTag;
-import com.gic.enterprise.api.dto.StoreDTO;
-import com.gic.enterprise.api.service.StoreService;
-import com.gic.haoban.common.utils.DingUtils;
-import com.gic.haoban.common.utils.EntityUtil;
-import com.gic.haoban.common.utils.StringUtil;
-import com.gic.haoban.manage.api.dto.ExternalClerkRelatedDTO;
-import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
-import com.gic.haoban.manage.api.dto.SecretSettingDTO;
-import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
-import com.gic.haoban.manage.api.dto.qdto.hm.WxUserAddLogQDTO;
-import com.gic.haoban.manage.api.enums.SecretTypeEnum;
-import com.gic.haoban.manage.service.config.Config;
-import com.gic.haoban.manage.service.dao.mapper.*;
-import com.gic.haoban.manage.service.entity.*;
-import com.gic.haoban.manage.service.service.ExternalClerkRelatedService;
-import com.gic.haoban.manage.service.service.SecretSettingService;
-import com.gic.haoban.manage.service.service.WxEnterpriseService;
-import com.gic.haoban.manage.service.service.hm.WxUserAddLogService;
-import com.gic.member.api.dto.MemberDTO;
-import com.gic.member.api.dto.MemberSourceDetailDTO;
-import com.gic.member.api.dto.MemberSourceShowDTO;
-import com.gic.member.api.service.MemberApiService;
-import com.gic.member.api.service.MemberEntranceApiService;
-import com.gic.member.api.service.MemberService;
-import com.gic.mq.sdk.GicMQClient;
-import com.gic.redis.data.util.RedisUtil;
-import com.gic.search.engine.api.dto.ESResponseQuerySingle;
-import com.gic.search.engine.api.dto.dynamic.DynamicSearchDTO;
-import com.gic.search.engine.api.service.dynamic.ESDataDynamicOperationApiService;
-import com.gic.wechat.api.dto.qywx.QywxNewExternalUseridDTO;
-import com.gic.wechat.api.service.qywx.QywxUserApiService;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static org.slf4j.LoggerFactory.getLogger;
-
-@Service
-public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedService {
-
-    private static final Logger logger = getLogger(ExternalClerkRelatedServiceImpl.class);
-
-    @Autowired
-    private TabHaobanExternalClerkRelatedMapper mapper;
-    @Autowired
-    private ESDataDynamicOperationApiService esDataDynamicOperationApiService;
-    @Autowired
-    private MemberService memberService;
-    @Autowired
-    private MemberApiService memberApiService;
-    @Autowired
-    private WxUserAddLogService wxUserAddLogService;
-    @Autowired
-    private StoreService storeService;
-    @Autowired
-    private ClerkService clerkService;
-    @Autowired
-    private MemberEntranceApiService memberEntranceApiService;
-    @Autowired
-    private Config config;
-    @Autowired
-    private WxEnterpriseService wxEnterpriseService;
-    @Autowired
-    private MemberUnionidRelatedMapper memberUnionidRelatedMapper;
-    @Autowired
-    private QywxUserApiService qywxUserApiService;
-    @Autowired
-    private TabHaobanRepairExternalUserMapper tabHaobanRepairExternalUserMapper;
-    @Autowired
-    private SecretSettingService secretSettingService;
-
-    @Override
-    public void insert(TabHaobanExternalClerkRelated related) {
-        String clerkId = related.getClerkId();
-        String externalUserId = related.getExternalUserId();
-        TabHaobanExternalClerkRelated tab = mapper.selectByClerkIdAndExternalUserId(clerkId, externalUserId);
-        if (tab == null) {
-            String uuId = StringUtil.randomUUID();
-            related.setStatusFlag(related.getStatusFlag() != null ? related.getStatusFlag() : 1);
-            related.setExternalClerkRelatedId(uuId);
-            related.setCreateTime(new Date());
-            related.setUpdateTime(new Date());
-            mapper.insertSelective(related);
-        }
-    }
-
-    @Override
-    public void delByUserIdAndExternalUserId(MemberUnionidRelatedDTO dto) {
-        String staffId = dto.getStaffId();
-        String externalUserid = dto.getExternalUserid();
-        int count = mapper.delByUserIdAndExternalUserId(externalUserid,staffId);
-        if (count <= 0) {
-            logger.error("无需删除的好友数据：{}", JSON.toJSONString(dto));
-            return;
-        }
-        String wxEnterpriseId = dto.getWxEnterpriseId() ;
-        List<TabHaobanExternalClerkRelated> deleteRelatedList = mapper.listByExTernalUseridAndWxUserId(externalUserid, staffId, 2);
-        if (CollectionUtils.isEmpty(deleteRelatedList)) {
-            logger.info("无解除的好友关系：externalUserid:{},staffId:{}", externalUserid,staffId);
-            return;
-        }
-        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)) {
-            //删除的好友关系
-            List<TabHaobanExternalClerkRelated> haobanExternalClerkRelatedList = mapper.listByExternalUseridAndWxEnterpriseId(dto.getExternalUserid(), wxEnterpriseId, Collections.singletonList("2"));
-            for (TabHaobanExternalClerkRelated externalClerkRelated : haobanExternalClerkRelatedList) {
-                String memberId = externalClerkRelated.getMemberId();
-                logger.info("通知会员 删除会员后更新为非企微好友 memberId:{}", memberId);
-                memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 0);
-                memberApiService.updateMemberQywxEveryOccasion(enterpriseId, memberId, 0, new Date());
-            }
-        } else {
-            //删除后 每次回调会员
-            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);
-        wxUserAddLogQDTO.setEnterpriseId(enterpriseId);
-        wxUserAddLogQDTO.setMemberId(related.getMemberId());
-        wxUserAddLogQDTO.setUnionid(related.getUnionid());
-        wxUserAddLogQDTO.setDelFlag(true);
-        wxUserAddLogQDTO.setExternalUserid(related.getExternalUserId());
-        wxUserAddLogQDTO.setStaffId(related.getStaffId());
-        wxUserAddLogQDTO.setClerkId(related.getClerkId());
-        wxUserAddLogService.save(wxUserAddLogQDTO);
-        //定制
-        addDelFriendEvent(related.getUnionid(), related.getClerkId(), wxEnterpriseId, enterpriseId, related.getMemberId(), related.getStoreId(), 0);
-    }
-
-    /**
-     * 欧泊莱定制需求
-     *
-     * @param unionId
-     * @param clerkId
-     * @param enterpriseId
-     * @param memberId
-     * @param storeId
-     */
-    private void addDelFriendEvent(String unionId, String clerkId, String wxEnterpriseId, String enterpriseId, String memberId, String storeId, Integer changeType) {
-        String addDelFriendEvent = config.getAddDelFriendEvent();
-        if (!addDelFriendEvent.contains(wxEnterpriseId)) {
-            logger.info("非定制，无需广播通知");
-            return;
-        }
-
-        if (StringUtils.isBlank(memberId)) {
-            logger.info("会员不存在:{}", memberId);
-            return;
-        }
-        logger.info("欧泊莱定制：推送会员,memberId:{},changeType:{}", memberId, changeType);
-        //欧泊莱定制需求
-        ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
-        StoreDTO storeDTO = storeService.getStore(storeId);
-        MemberDTO member = memberService.getMember(memberId);
-        if (member == null) {
-            logger.info("会员不存在:{}", memberId);
-            return;
-        }
-        GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
-        try {
-            JSONObject msgBody = new JSONObject();
-            msgBody.put("cardNo", member.getCardNum());
-            msgBody.put("enterpriseId", enterpriseId);
-            msgBody.put("unionid", unionId);
-            if (storeDTO != null) {
-                msgBody.put("storeName", storeDTO.getStoreName());
-                msgBody.put("storeCode", storeDTO.getStoreCode());
-            }
-            if (clerkDTO != null) {
-                msgBody.put("clerkName", clerkDTO.getClerkName());
-                msgBody.put("clerkCode", clerkDTO.getClerkCode());
-            }
-            msgBody.put("changeType", changeType);
-            if (changeType == 0) {
-                msgBody.put("delUserContact", 0);
-                msgBody.put("delCreateTime", new Date());
-            } else {
-                msgBody.put("addCreateTime", "");
-            }
-            //获取渠道
-            List<String> list = new ArrayList<>();
-            MemberSourceShowDTO memberSourceShowDTO = memberEntranceApiService.getMemberSourceByMemberId(enterpriseId, memberId);
-            if (memberSourceShowDTO != null && CollectionUtils.isNotEmpty(memberSourceShowDTO.getMemberSourceList())) {
-                for (MemberSourceDetailDTO memberSourceDetailDTO : memberSourceShowDTO.getMemberSourceList()) {
-                    if (null != memberSourceDetailDTO.getHighlight() && memberSourceDetailDTO.getHighlight() == 1) {
-                        list.add(memberSourceDetailDTO.getParentSourceCode());
-                    }
-                }
-            }
-            SubscribeMessageDTO subscribeMessageDTO = new SubscribeMessageDTO();
-            subscribeMessageDTO.setEvent("addDelFriendEvent");
-            subscribeMessageDTO.setTopic("member");
-            subscribeMessageDTO.setEnterpriseId(enterpriseId);
-            subscribeMessageDTO.setMemberId(memberId);
-            subscribeMessageDTO.setMemberChannels(list);
-            subscribeMessageDTO.setMsgBody(msgBody.toJSONString());
-            clientInstance.sendMessage("dealQywxExternalUserEvent", JSONObject.toJSONString(subscribeMessageDTO));
-        } catch (Exception e) {
-            logger.info("加好友事件订阅通知：{}", e.getMessage(), e);
-        }
-    }
-
-    @Override
-    public void delByUserIdAndExternalUserIdBatch(String wxEnterpriseId, String staffId, List<String> externalUserids) {
-        mapper.delByUserIdAndExternalUserIdBatch(staffId, wxEnterpriseId, externalUserids);
-    }
-
-    @Override
-    public void delByStoreIdAndStaffId(String storeId, String staffId) {
-        mapper.delByStoreIdAndStaffId(storeId, staffId);
-    }
-
-    @Override
-    public void delByStoreIds(Collection<String> storeIds) {
-        mapper.delByStoreIds(storeIds);
-    }
-
-    @Override
-    public void cleanStaffRelated(String wxEnterpriseId, List<String> staffIds) {
-        if (staffIds != null && !staffIds.isEmpty()) {
-            mapper.cleanStaffRelated(wxEnterpriseId, staffIds);
-        }
-    }
-
-    @Override
-    public void update(TabHaobanExternalClerkRelated exsitDTO) {
-        exsitDTO.setUpdateTime(new Date());
-        mapper.updateByPrimaryKeySelective(exsitDTO);
-
-    }
-
-    @Override
-    public List<TabHaobanExternalClerkRelated> listByExternalUseridAndWxUserId(String externalUserid, String staffId) {
-        return mapper.listByExTernalUseridAndWxUserId(externalUserid, staffId, 1);
-    }
-
-    @Override
-    public List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserIdAllStatus(String wxEnterpriseId, String externalUserid, String staffId) {
-        return mapper.listByExTernalUseridAndWxUserIdAllStatus(wxEnterpriseId, externalUserid, staffId);
-    }
-
-    @Override
-    public ExternalClerkRelatedDTO getByMemberId(String staffId, String memberId) {
-        return EntityUtil.changeEntityByJSON(ExternalClerkRelatedDTO.class, mapper.getByMemberId(staffId, memberId));
-    }
-
-    @Override
-    public List<TabHaobanExternalClerkRelated> listExternalByUnionId(String enterpriseId, String unionId) {
-        return mapper.listExternalByUnionId(enterpriseId, unionId);
-    }
-
-    @Override
-    public List<TabHaobanExternalClerkRelated> listExternalByExternalUserid(String wxEnterpriseId, String externalUserid) {
-        return mapper.listByExternalUserId(wxEnterpriseId, externalUserid);
-    }
-
-    @Override
-    public String checkAndUpdateMemberByUnonId(String enterpriseId, String memberId, String unionId) {
-        String returnFields = "id";
-        try {
-            JSONObject searchJson = new JSONObject();
-            searchJson.put("id", memberId);
-            DynamicSearchDTO search = new DynamicSearchDTO();
-            search.setSearchJson(searchJson);
-            search.setEnterpriseId(enterpriseId);
-            search.setColumnCategoryCode("member");
-            if (StringUtils.isNotBlank(returnFields)) {
-                search.setReturnFileds(returnFields);
-            }
-            ESResponseQuerySingle single = esDataDynamicOperationApiService.queryDataSingle(search);
-            JSONObject res = single.getRes();
-            logger.info("返回数据：{}", JSONObject.toJSONString(res));
-            if (res != null && res.size() > 0) {
-                return memberId;
-            }
-            MemberDTO memberDTO = memberService.getMemberByUnionid(unionId, enterpriseId);
-            if (null == memberDTO || memberDTO.getMemberId() == null) {
-                logger.info("会员不存在：{}", unionId);
-                return null;
-            }
-            //更新会员id
-            mapper.updateMemberIdByMemberId(memberDTO.getMemberId(), memberId, enterpriseId);
-            return memberDTO.getMemberId();
-        } catch (Exception e) {
-            logger.info("从搜索引擎中搜索会员数据异常, memberId : {}", memberId);
-        }
-        return null;
-    }
-
-    @Override
-    public void repairExternalUserId(String wxEnterpriseIds) {
-        logger.info("外部联系人检查,wxEnterpriseIds={}", wxEnterpriseIds);
-        DingUtils.send("外部联系人修复消息,企业=" + wxEnterpriseIds + ",tranceid=" + ProviderLocalTag.tag.get().traceId, false);
-        if (StringUtils.isEmpty(wxEnterpriseIds)) {
-            return;
-        }
-        Object cache = RedisUtil.getCache("repairExternalUserId");
-        String[] arr = wxEnterpriseIds.split(",");
-        for (int i = 0; i < arr.length; i++) {
-            String wxEnterpriseId = arr[i];
-            if (StringUtils.isEmpty(wxEnterpriseId)) {
-                continue;
-            }
-            int type = 0 ;
-            if(wxEnterpriseId.endsWith("_")) {
-                wxEnterpriseId = wxEnterpriseId.substring(0,wxEnterpriseId.length()-1) ;
-                type = 1 ;
-            }
-            WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
-            if (null == qwDTO) {
-                logger.info("外部联系人检查,企业不存在,wxEnterpriseId={}", wxEnterpriseId);
-                continue;
-            }
-            SecretSettingDTO secret = this.secretSettingService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.CUSTOMIZED_APP.getVal());
-            int pageSize = 800;
-            int pageNum = 0;
-            while (true) {
-                List<TabHaobanExternalClerkRelated> list = this.mapper.listPageByWxenterpriseId(wxEnterpriseId, pageNum * pageSize, pageSize,type);
-                if (CollectionUtils.isEmpty(list)) {
-                    logger.info("{}完成",wxEnterpriseId);
-                    break;
-                }
-                pageNum++;
-                Set<String> externalUserIdSet = list.stream().map(dto -> dto.getExternalUserId()).collect(Collectors.toSet());
-                Map<String,Date> dateMap = list.stream().collect(Collectors.toMap(TabHaobanExternalClerkRelated::getExternalUserId, TabHaobanExternalClerkRelated::getCreateTime,(k1,k2)->k1)) ;
-                List<String> externalUserIdList = new ArrayList<>();
-                externalUserIdList.addAll(externalUserIdSet);
-                List<MemberUnionidRelated> unionidlist = this.memberUnionidRelatedMapper.listByWxEnterpriseIdAndExternalUserId(wxEnterpriseId, externalUserIdList);
-                Map<String, String> map = unionidlist.stream().filter(dto -> StringUtils.isNotBlank(dto.getExternalUserid()) && StringUtils.isNotBlank(dto.getSelfExternalUserid()))
-                        .collect(Collectors.toMap(MemberUnionidRelated::getExternalUserid, MemberUnionidRelated::getSelfExternalUserid, (k1, k2) -> k1));
-                logger.info("外部联系人检查,第{}次,好友数={},unionid表数={},{}", pageNum, externalUserIdList.size(), unionidlist.size(),wxEnterpriseId);
-                List<String> delList = new ArrayList<>();
-                Set<String> checkSet = unionidlist.stream().map(dto -> dto.getExternalUserid()).collect(Collectors.toSet());
-                List<String> checkList = new ArrayList<>();
-                checkList.addAll(checkSet);
-                for (String item : externalUserIdList) {
-                    if (!checkList.contains(item)) {
-                        delList.add(item);
-                    }
-                }
-                logger.info("外部联系人检查,unionid表不存在记录的数量={},待检查数={}", delList.size(), checkList.size());
-                List<String> notExistQwList = new ArrayList<>();
-                List<TabHaobanRepairExternalUser> errorList = new ArrayList<>();
-                if (CollectionUtils.isNotEmpty(checkList)) {
-                    List<String> qwList = new ArrayList<>();
-                    List<QywxNewExternalUseridDTO> newExternalUseridList = null;
-                    if (null != cache) {
-                        newExternalUseridList = this.qywxUserApiService.getNewExternalUseridByList(qwDTO.getThirdCorpid(), config.getWxSuiteid(), checkList);
-                    } else {
-                        newExternalUseridList = this.qywxUserApiService.getSelfNewExternalUseridByList(qwDTO.getDkCorpid(), secret.getSecretVal(), checkList);
-                    }
-                    if (null != newExternalUseridList) {
-                        logger.info("外部联系人检查,查询企微数={},返回数={}", checkList.size(), newExternalUseridList.size());
-                        for (QywxNewExternalUseridDTO qywxNewExternalUseridDTO : newExternalUseridList) {
-                            String new_external_userid = qywxNewExternalUseridDTO.getNew_external_userid();
-                            String external_userid = qywxNewExternalUseridDTO.getExternal_userid();
-                            qwList.add(external_userid);
-                            if (new_external_userid.equals(external_userid)) {
-                                continue;
-                            } else {
-                                logger.info("外部联系人检查,数据异常={}", new_external_userid, external_userid);
-                                TabHaobanRepairExternalUser user = new TabHaobanRepairExternalUser();
-                                user.setId(UniqueIdUtils.uniqueLong());
-                                user.setUserId(external_userid);
-                                user.setWxEnterpriseId(wxEnterpriseId);
-                                user.setStatusFlag(111);
-                                user.setRemark(new_external_userid);
-                                if(null != dateMap.get(external_userid)) {
-                                    user.setUpdateTime(dateMap.get(external_userid));
-                                }
-                                errorList.add(user);
-                            }
-                        }
-                        if (checkList.size() != newExternalUseridList.size()) {
-                            for (String item : checkList) {
-                                if (!qwList.contains(item)) {
-                                    notExistQwList.add(item);
-                                }
-                            }
-                        }
-                    } else {
-                        logger.info("外部联系人检查,调用企业异常");
-                    }
-                    // 通过外部联系人查询不到
-                    if (CollectionUtils.isNotEmpty(notExistQwList)) {
-                        // 需要用自建的查询的
-                        List<String> selfList = new ArrayList<>();
-                        List<TabHaobanRepairExternalUser> addList = new ArrayList<>();
-                        for (String item : notExistQwList) {
-                            TabHaobanRepairExternalUser user = new TabHaobanRepairExternalUser();
-                            user.setId(UniqueIdUtils.uniqueLong());
-                            user.setUserId(item);
-                            if (StringUtils.isNotBlank(map.get(item)) && !map.get(item).equals(item)) {
-                                selfList.add(map.get(item));
-                            }
-                            user.setSelfUserId(map.get(item));
-                            user.setWxEnterpriseId(wxEnterpriseId);
-                            user.setStatusFlag(11);
-                            user.setRemark("外部联系人ID错误");
-                            if(StringUtils.isBlank(user.getSelfUserId())) {
-                                user.setStatusFlag(12);
-                                user.setRemark("unionid表记录存在,但代开联系人id NULL");
-                            }
-                            if(null != dateMap.get(item)) {
-                                user.setUpdateTime(dateMap.get(item));
-                            }
-                            addList.add(user);
-                        }
-
-                        if (CollectionUtils.isNotEmpty(selfList)) {
-                            newExternalUseridList = null;
-                            if (null != cache) {
-                                newExternalUseridList = this.qywxUserApiService.getNewExternalUseridByList(qwDTO.getThirdCorpid(), config.getWxSuiteid(), selfList);
-                            } else {
-                                newExternalUseridList = this.qywxUserApiService.getSelfNewExternalUseridByList(qwDTO.getDkCorpid(), secret.getSecretVal(), selfList);
-                            }
-                            Map<String, String> selfMap = new HashMap<>();
-                            if (null != newExternalUseridList) {
-                                selfMap = newExternalUseridList.stream().collect(Collectors.toMap(QywxNewExternalUseridDTO::getExternal_userid, QywxNewExternalUseridDTO::getNew_external_userid, (k1, k2) -> k1));
-                            }
-                            for (TabHaobanRepairExternalUser item : addList) {
-                                item.setNewUserId(selfMap.get(item.getSelfUserId()));
-                            }
-                        }
-                        this.tabHaobanRepairExternalUserMapper.batchInsert(addList);
-                    }
-                    // unionid表不存在的记录
-                    if (CollectionUtils.isNotEmpty(delList)) {
-                        List<TabHaobanRepairExternalUser> addList = new ArrayList<>();
-                        for (String item : delList) {
-                            TabHaobanRepairExternalUser user = new TabHaobanRepairExternalUser();
-                            user.setId(UniqueIdUtils.uniqueLong());
-                            user.setUserId(item);
-                            user.setWxEnterpriseId(wxEnterpriseId);
-                            user.setStatusFlag(1);
-                            user.setRemark("无unionid表记录");
-                            if(null != dateMap.get(item)) {
-                                user.setUpdateTime(dateMap.get(item));
-                            }
-                            addList.add(user);
-                        }
-                        this.tabHaobanRepairExternalUserMapper.batchInsert(addList);
-                    }
-
-                    // 错误的ID
-                    if (CollectionUtils.isNotEmpty(errorList)) {
-                        this.tabHaobanRepairExternalUserMapper.batchInsert(errorList);
-                    }
-                }
-            }
-        }
-    }
-
-    @Override
-    public List<String> getByStoreIdAndStaffId(String storeId, String staffId) {
-        return mapper.getByStoreIdAndStaffId(storeId, staffId);
-    }
-
-    @Override
-    public int getCountByMemberId(String memberId) {
-        return mapper.getCountByMemberId(memberId);
-    }
-    
-    @Override
-    public void updateClerkInfo(String staffId, String oldClerkId, String newClerkId) {
-        ClerkDTO clerk = this.clerkService.getclerkById(newClerkId);
-        this.mapper.updateClerkInfo(staffId,oldClerkId , newClerkId , clerk.getStoreId());
-    }
-
-    /**
-     * 外部联系人
-     *
-     * @param staffId
-     * @return
-     */
-    @Override
-    public List<String> queryExternalRelatedWithStaffId(String staffId) {
-        return this.mapper.queryExternalUserIdWithStaffId(staffId);
-    }
-
-    /***
-     * 查询会员与导购的关系
-     * @param staffId
-     * @param memberIds
-     * @return
-     */
-    @Override
-    public List<TabHaobanExternalClerkRelated> queryClerkMemberRelations(String staffId, List<String> memberIds) {
-        if (StringUtils.isBlank(staffId)) {
-            logger.info("查询导购与会员的关系，staffId不存在 {}", staffId);
-            return Collections.emptyList();
-        }
-        if (CollectionUtils.isEmpty(memberIds)) {
-            logger.info("查询导购与会员的关系，会员id数组为空 {}", staffId);
-            return Collections.emptyList();
-        }
-        return this.mapper.queryClerkMemberRelations(staffId, memberIds);
-    }
-}
+package com.gic.haoban.manage.service.service.impl;
+
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.gic.api.base.dto.SubscribeMessageDTO;
+import com.gic.clerk.api.dto.ClerkDTO;
+import com.gic.clerk.api.service.ClerkService;
+import com.gic.commons.util.GICMQClientUtil;
+import com.gic.commons.util.UniqueIdUtils;
+import com.gic.dubbo.entity.ProviderLocalTag;
+import com.gic.enterprise.api.dto.StoreDTO;
+import com.gic.enterprise.api.service.StoreService;
+import com.gic.haoban.common.utils.DingUtils;
+import com.gic.haoban.common.utils.EntityUtil;
+import com.gic.haoban.common.utils.StringUtil;
+import com.gic.haoban.manage.api.dto.ExternalClerkRelatedDTO;
+import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
+import com.gic.haoban.manage.api.dto.SecretSettingDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
+import com.gic.haoban.manage.api.dto.qdto.hm.WxUserAddLogQDTO;
+import com.gic.haoban.manage.api.enums.SecretTypeEnum;
+import com.gic.haoban.manage.service.config.Config;
+import com.gic.haoban.manage.service.dao.mapper.*;
+import com.gic.haoban.manage.service.entity.*;
+import com.gic.haoban.manage.service.service.ExternalClerkRelatedService;
+import com.gic.haoban.manage.service.service.SecretSettingService;
+import com.gic.haoban.manage.service.service.WxEnterpriseService;
+import com.gic.haoban.manage.service.service.hm.WxUserAddLogService;
+import com.gic.member.api.dto.MemberDTO;
+import com.gic.member.api.dto.MemberSourceDetailDTO;
+import com.gic.member.api.dto.MemberSourceShowDTO;
+import com.gic.member.api.service.MemberApiService;
+import com.gic.member.api.service.MemberEntranceApiService;
+import com.gic.member.api.service.MemberService;
+import com.gic.mq.sdk.GicMQClient;
+import com.gic.redis.data.util.RedisUtil;
+import com.gic.search.engine.api.dto.ESResponseQuerySingle;
+import com.gic.search.engine.api.dto.dynamic.DynamicSearchDTO;
+import com.gic.search.engine.api.service.dynamic.ESDataDynamicOperationApiService;
+import com.gic.wechat.api.dto.qywx.QywxNewExternalUseridDTO;
+import com.gic.wechat.api.service.qywx.QywxUserApiService;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+@Service
+public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedService {
+
+    private static final Logger logger = getLogger(ExternalClerkRelatedServiceImpl.class);
+
+    @Autowired
+    private TabHaobanExternalClerkRelatedMapper mapper;
+    @Autowired
+    private ESDataDynamicOperationApiService esDataDynamicOperationApiService;
+    @Autowired
+    private MemberService memberService;
+    @Autowired
+    private MemberApiService memberApiService;
+    @Autowired
+    private WxUserAddLogService wxUserAddLogService;
+    @Autowired
+    private StoreService storeService;
+    @Autowired
+    private ClerkService clerkService;
+    @Autowired
+    private MemberEntranceApiService memberEntranceApiService;
+    @Autowired
+    private Config config;
+    @Autowired
+    private WxEnterpriseService wxEnterpriseService;
+    @Autowired
+    private MemberUnionidRelatedMapper memberUnionidRelatedMapper;
+    @Autowired
+    private QywxUserApiService qywxUserApiService;
+    @Autowired
+    private TabHaobanRepairExternalUserMapper tabHaobanRepairExternalUserMapper;
+    @Autowired
+    private SecretSettingService secretSettingService;
+
+    @Override
+    public void insert(TabHaobanExternalClerkRelated related) {
+        String clerkId = related.getClerkId();
+        String externalUserId = related.getExternalUserId();
+        TabHaobanExternalClerkRelated tab = mapper.selectByClerkIdAndExternalUserId(clerkId, externalUserId);
+        if (tab == null) {
+            String uuId = StringUtil.randomUUID();
+            related.setStatusFlag(related.getStatusFlag() != null ? related.getStatusFlag() : 1);
+            related.setExternalClerkRelatedId(uuId);
+            related.setCreateTime(new Date());
+            related.setUpdateTime(new Date());
+            mapper.insertSelective(related);
+        }
+    }
+
+    @Override
+    public void delByUserIdAndExternalUserId(MemberUnionidRelatedDTO dto) {
+        String staffId = dto.getStaffId();
+        String externalUserid = dto.getExternalUserid();
+        int count = mapper.delByUserIdAndExternalUserId(externalUserid,staffId);
+        if (count <= 0) {
+            logger.error("无需删除的好友数据：{}", JSON.toJSONString(dto));
+            return;
+        }
+        String wxEnterpriseId = dto.getWxEnterpriseId() ;
+        List<TabHaobanExternalClerkRelated> deleteRelatedList = mapper.listByExTernalUseridAndWxUserId(externalUserid, staffId, 2);
+        if (CollectionUtils.isEmpty(deleteRelatedList)) {
+            logger.info("无解除的好友关系：externalUserid:{},staffId:{}", externalUserid,staffId);
+            return;
+        }
+        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)) {
+            //删除的好友关系
+            List<TabHaobanExternalClerkRelated> haobanExternalClerkRelatedList = mapper.listByExternalUseridAndWxEnterpriseId(dto.getExternalUserid(), wxEnterpriseId, Collections.singletonList("2"));
+            for (TabHaobanExternalClerkRelated externalClerkRelated : haobanExternalClerkRelatedList) {
+                String memberId = externalClerkRelated.getMemberId();
+                logger.info("通知会员 删除会员后更新为非企微好友 memberId:{}", memberId);
+                memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 0);
+                memberApiService.updateMemberQywxEveryOccasion(enterpriseId, memberId, 0, new Date());
+            }
+        } else {
+            //删除后 每次回调会员
+            /*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);
+        wxUserAddLogQDTO.setEnterpriseId(enterpriseId);
+        wxUserAddLogQDTO.setMemberId(related.getMemberId());
+        wxUserAddLogQDTO.setUnionid(related.getUnionid());
+        wxUserAddLogQDTO.setDelFlag(true);
+        wxUserAddLogQDTO.setExternalUserid(related.getExternalUserId());
+        wxUserAddLogQDTO.setStaffId(related.getStaffId());
+        wxUserAddLogQDTO.setClerkId(related.getClerkId());
+        wxUserAddLogService.save(wxUserAddLogQDTO);
+        //定制
+        addDelFriendEvent(related.getUnionid(), related.getClerkId(), wxEnterpriseId, enterpriseId, related.getMemberId(), related.getStoreId(), 0);
+    }
+
+    /**
+     * 欧泊莱定制需求
+     *
+     * @param unionId
+     * @param clerkId
+     * @param enterpriseId
+     * @param memberId
+     * @param storeId
+     */
+    private void addDelFriendEvent(String unionId, String clerkId, String wxEnterpriseId, String enterpriseId, String memberId, String storeId, Integer changeType) {
+        String addDelFriendEvent = config.getAddDelFriendEvent();
+        if (!addDelFriendEvent.contains(wxEnterpriseId)) {
+            logger.info("非定制，无需广播通知");
+            return;
+        }
+
+        if (StringUtils.isBlank(memberId)) {
+            logger.info("会员不存在:{}", memberId);
+            return;
+        }
+        logger.info("欧泊莱定制：推送会员,memberId:{},changeType:{}", memberId, changeType);
+        //欧泊莱定制需求
+        ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
+        StoreDTO storeDTO = storeService.getStore(storeId);
+        MemberDTO member = memberService.getMember(memberId);
+        if (member == null) {
+            logger.info("会员不存在:{}", memberId);
+            return;
+        }
+        GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
+        try {
+            JSONObject msgBody = new JSONObject();
+            msgBody.put("cardNo", member.getCardNum());
+            msgBody.put("enterpriseId", enterpriseId);
+            msgBody.put("unionid", unionId);
+            if (storeDTO != null) {
+                msgBody.put("storeName", storeDTO.getStoreName());
+                msgBody.put("storeCode", storeDTO.getStoreCode());
+            }
+            if (clerkDTO != null) {
+                msgBody.put("clerkName", clerkDTO.getClerkName());
+                msgBody.put("clerkCode", clerkDTO.getClerkCode());
+            }
+            msgBody.put("changeType", changeType);
+            if (changeType == 0) {
+                msgBody.put("delUserContact", 0);
+                msgBody.put("delCreateTime", new Date());
+            } else {
+                msgBody.put("addCreateTime", "");
+            }
+            //获取渠道
+            List<String> list = new ArrayList<>();
+            MemberSourceShowDTO memberSourceShowDTO = memberEntranceApiService.getMemberSourceByMemberId(enterpriseId, memberId);
+            if (memberSourceShowDTO != null && CollectionUtils.isNotEmpty(memberSourceShowDTO.getMemberSourceList())) {
+                for (MemberSourceDetailDTO memberSourceDetailDTO : memberSourceShowDTO.getMemberSourceList()) {
+                    if (null != memberSourceDetailDTO.getHighlight() && memberSourceDetailDTO.getHighlight() == 1) {
+                        list.add(memberSourceDetailDTO.getParentSourceCode());
+                    }
+                }
+            }
+            SubscribeMessageDTO subscribeMessageDTO = new SubscribeMessageDTO();
+            subscribeMessageDTO.setEvent("addDelFriendEvent");
+            subscribeMessageDTO.setTopic("member");
+            subscribeMessageDTO.setEnterpriseId(enterpriseId);
+            subscribeMessageDTO.setMemberId(memberId);
+            subscribeMessageDTO.setMemberChannels(list);
+            subscribeMessageDTO.setMsgBody(msgBody.toJSONString());
+            clientInstance.sendMessage("dealQywxExternalUserEvent", JSONObject.toJSONString(subscribeMessageDTO));
+        } catch (Exception e) {
+            logger.info("加好友事件订阅通知：{}", e.getMessage(), e);
+        }
+    }
+
+    @Override
+    public void delByUserIdAndExternalUserIdBatch(String wxEnterpriseId, String staffId, List<String> externalUserids) {
+        mapper.delByUserIdAndExternalUserIdBatch(staffId, wxEnterpriseId, externalUserids);
+    }
+
+    @Override
+    public void delByStoreIdAndStaffId(String storeId, String staffId) {
+        mapper.delByStoreIdAndStaffId(storeId, staffId);
+    }
+
+    @Override
+    public void delByStoreIds(Collection<String> storeIds) {
+        mapper.delByStoreIds(storeIds);
+    }
+
+    @Override
+    public void cleanStaffRelated(String wxEnterpriseId, List<String> staffIds) {
+        if (staffIds != null && !staffIds.isEmpty()) {
+            mapper.cleanStaffRelated(wxEnterpriseId, staffIds);
+        }
+    }
+
+    @Override
+    public void update(TabHaobanExternalClerkRelated exsitDTO) {
+        exsitDTO.setUpdateTime(new Date());
+        mapper.updateByPrimaryKeySelective(exsitDTO);
+
+    }
+
+    @Override
+    public List<TabHaobanExternalClerkRelated> listByExternalUseridAndWxUserId(String externalUserid, String staffId) {
+        return mapper.listByExTernalUseridAndWxUserId(externalUserid, staffId, 1);
+    }
+
+    @Override
+    public List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserIdAllStatus(String wxEnterpriseId, String externalUserid, String staffId) {
+        return mapper.listByExTernalUseridAndWxUserIdAllStatus(wxEnterpriseId, externalUserid, staffId);
+    }
+
+    @Override
+    public ExternalClerkRelatedDTO getByMemberId(String staffId, String memberId) {
+        return EntityUtil.changeEntityByJSON(ExternalClerkRelatedDTO.class, mapper.getByMemberId(staffId, memberId));
+    }
+
+    @Override
+    public List<TabHaobanExternalClerkRelated> listExternalByUnionId(String enterpriseId, String unionId) {
+        return mapper.listExternalByUnionId(enterpriseId, unionId);
+    }
+
+    @Override
+    public List<TabHaobanExternalClerkRelated> listExternalByExternalUserid(String wxEnterpriseId, String externalUserid) {
+        return mapper.listByExternalUserId(wxEnterpriseId, externalUserid);
+    }
+
+    @Override
+    public String checkAndUpdateMemberByUnonId(String enterpriseId, String memberId, String unionId) {
+        String returnFields = "id";
+        try {
+            JSONObject searchJson = new JSONObject();
+            searchJson.put("id", memberId);
+            DynamicSearchDTO search = new DynamicSearchDTO();
+            search.setSearchJson(searchJson);
+            search.setEnterpriseId(enterpriseId);
+            search.setColumnCategoryCode("member");
+            if (StringUtils.isNotBlank(returnFields)) {
+                search.setReturnFileds(returnFields);
+            }
+            ESResponseQuerySingle single = esDataDynamicOperationApiService.queryDataSingle(search);
+            JSONObject res = single.getRes();
+            logger.info("返回数据：{}", JSONObject.toJSONString(res));
+            if (res != null && res.size() > 0) {
+                return memberId;
+            }
+            MemberDTO memberDTO = memberService.getMemberByUnionid(unionId, enterpriseId);
+            if (null == memberDTO || memberDTO.getMemberId() == null) {
+                logger.info("会员不存在：{}", unionId);
+                return null;
+            }
+            //更新会员id
+            mapper.updateMemberIdByMemberId(memberDTO.getMemberId(), memberId, enterpriseId);
+            return memberDTO.getMemberId();
+        } catch (Exception e) {
+            logger.info("从搜索引擎中搜索会员数据异常, memberId : {}", memberId);
+        }
+        return null;
+    }
+
+    @Override
+    public void repairExternalUserId(String wxEnterpriseIds) {
+        logger.info("外部联系人检查,wxEnterpriseIds={}", wxEnterpriseIds);
+        DingUtils.send("外部联系人修复消息,企业=" + wxEnterpriseIds + ",tranceid=" + ProviderLocalTag.tag.get().traceId, false);
+        if (StringUtils.isEmpty(wxEnterpriseIds)) {
+            return;
+        }
+        Object cache = RedisUtil.getCache("repairExternalUserId");
+        String[] arr = wxEnterpriseIds.split(",");
+        for (int i = 0; i < arr.length; i++) {
+            String wxEnterpriseId = arr[i];
+            if (StringUtils.isEmpty(wxEnterpriseId)) {
+                continue;
+            }
+            int type = 0 ;
+            if(wxEnterpriseId.endsWith("_")) {
+                wxEnterpriseId = wxEnterpriseId.substring(0,wxEnterpriseId.length()-1) ;
+                type = 1 ;
+            }
+            WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
+            if (null == qwDTO) {
+                logger.info("外部联系人检查,企业不存在,wxEnterpriseId={}", wxEnterpriseId);
+                continue;
+            }
+            SecretSettingDTO secret = this.secretSettingService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.CUSTOMIZED_APP.getVal());
+            int pageSize = 800;
+            int pageNum = 0;
+            while (true) {
+                List<TabHaobanExternalClerkRelated> list = this.mapper.listPageByWxenterpriseId(wxEnterpriseId, pageNum * pageSize, pageSize,type);
+                if (CollectionUtils.isEmpty(list)) {
+                    logger.info("{}完成",wxEnterpriseId);
+                    break;
+                }
+                pageNum++;
+                Set<String> externalUserIdSet = list.stream().map(dto -> dto.getExternalUserId()).collect(Collectors.toSet());
+                Map<String,Date> dateMap = list.stream().collect(Collectors.toMap(TabHaobanExternalClerkRelated::getExternalUserId, TabHaobanExternalClerkRelated::getCreateTime,(k1,k2)->k1)) ;
+                List<String> externalUserIdList = new ArrayList<>();
+                externalUserIdList.addAll(externalUserIdSet);
+                List<MemberUnionidRelated> unionidlist = this.memberUnionidRelatedMapper.listByWxEnterpriseIdAndExternalUserId(wxEnterpriseId, externalUserIdList);
+                Map<String, String> map = unionidlist.stream().filter(dto -> StringUtils.isNotBlank(dto.getExternalUserid()) && StringUtils.isNotBlank(dto.getSelfExternalUserid()))
+                        .collect(Collectors.toMap(MemberUnionidRelated::getExternalUserid, MemberUnionidRelated::getSelfExternalUserid, (k1, k2) -> k1));
+                logger.info("外部联系人检查,第{}次,好友数={},unionid表数={},{}", pageNum, externalUserIdList.size(), unionidlist.size(),wxEnterpriseId);
+                List<String> delList = new ArrayList<>();
+                Set<String> checkSet = unionidlist.stream().map(dto -> dto.getExternalUserid()).collect(Collectors.toSet());
+                List<String> checkList = new ArrayList<>();
+                checkList.addAll(checkSet);
+                for (String item : externalUserIdList) {
+                    if (!checkList.contains(item)) {
+                        delList.add(item);
+                    }
+                }
+                logger.info("外部联系人检查,unionid表不存在记录的数量={},待检查数={}", delList.size(), checkList.size());
+                List<String> notExistQwList = new ArrayList<>();
+                List<TabHaobanRepairExternalUser> errorList = new ArrayList<>();
+                if (CollectionUtils.isNotEmpty(checkList)) {
+                    List<String> qwList = new ArrayList<>();
+                    List<QywxNewExternalUseridDTO> newExternalUseridList = null;
+                    if (null != cache) {
+                        newExternalUseridList = this.qywxUserApiService.getNewExternalUseridByList(qwDTO.getThirdCorpid(), config.getWxSuiteid(), checkList);
+                    } else {
+                        newExternalUseridList = this.qywxUserApiService.getSelfNewExternalUseridByList(qwDTO.getDkCorpid(), secret.getSecretVal(), checkList);
+                    }
+                    if (null != newExternalUseridList) {
+                        logger.info("外部联系人检查,查询企微数={},返回数={}", checkList.size(), newExternalUseridList.size());
+                        for (QywxNewExternalUseridDTO qywxNewExternalUseridDTO : newExternalUseridList) {
+                            String new_external_userid = qywxNewExternalUseridDTO.getNew_external_userid();
+                            String external_userid = qywxNewExternalUseridDTO.getExternal_userid();
+                            qwList.add(external_userid);
+                            if (new_external_userid.equals(external_userid)) {
+                                continue;
+                            } else {
+                                logger.info("外部联系人检查,数据异常={}", new_external_userid, external_userid);
+                                TabHaobanRepairExternalUser user = new TabHaobanRepairExternalUser();
+                                user.setId(UniqueIdUtils.uniqueLong());
+                                user.setUserId(external_userid);
+                                user.setWxEnterpriseId(wxEnterpriseId);
+                                user.setStatusFlag(111);
+                                user.setRemark(new_external_userid);
+                                if(null != dateMap.get(external_userid)) {
+                                    user.setUpdateTime(dateMap.get(external_userid));
+                                }
+                                errorList.add(user);
+                            }
+                        }
+                        if (checkList.size() != newExternalUseridList.size()) {
+                            for (String item : checkList) {
+                                if (!qwList.contains(item)) {
+                                    notExistQwList.add(item);
+                                }
+                            }
+                        }
+                    } else {
+                        logger.info("外部联系人检查,调用企业异常");
+                    }
+                    // 通过外部联系人查询不到
+                    if (CollectionUtils.isNotEmpty(notExistQwList)) {
+                        // 需要用自建的查询的
+                        List<String> selfList = new ArrayList<>();
+                        List<TabHaobanRepairExternalUser> addList = new ArrayList<>();
+                        for (String item : notExistQwList) {
+                            TabHaobanRepairExternalUser user = new TabHaobanRepairExternalUser();
+                            user.setId(UniqueIdUtils.uniqueLong());
+                            user.setUserId(item);
+                            if (StringUtils.isNotBlank(map.get(item)) && !map.get(item).equals(item)) {
+                                selfList.add(map.get(item));
+                            }
+                            user.setSelfUserId(map.get(item));
+                            user.setWxEnterpriseId(wxEnterpriseId);
+                            user.setStatusFlag(11);
+                            user.setRemark("外部联系人ID错误");
+                            if(StringUtils.isBlank(user.getSelfUserId())) {
+                                user.setStatusFlag(12);
+                                user.setRemark("unionid表记录存在,但代开联系人id NULL");
+                            }
+                            if(null != dateMap.get(item)) {
+                                user.setUpdateTime(dateMap.get(item));
+                            }
+                            addList.add(user);
+                        }
+
+                        if (CollectionUtils.isNotEmpty(selfList)) {
+                            newExternalUseridList = null;
+                            if (null != cache) {
+                                newExternalUseridList = this.qywxUserApiService.getNewExternalUseridByList(qwDTO.getThirdCorpid(), config.getWxSuiteid(), selfList);
+                            } else {
+                                newExternalUseridList = this.qywxUserApiService.getSelfNewExternalUseridByList(qwDTO.getDkCorpid(), secret.getSecretVal(), selfList);
+                            }
+                            Map<String, String> selfMap = new HashMap<>();
+                            if (null != newExternalUseridList) {
+                                selfMap = newExternalUseridList.stream().collect(Collectors.toMap(QywxNewExternalUseridDTO::getExternal_userid, QywxNewExternalUseridDTO::getNew_external_userid, (k1, k2) -> k1));
+                            }
+                            for (TabHaobanRepairExternalUser item : addList) {
+                                item.setNewUserId(selfMap.get(item.getSelfUserId()));
+                            }
+                        }
+                        this.tabHaobanRepairExternalUserMapper.batchInsert(addList);
+                    }
+                    // unionid表不存在的记录
+                    if (CollectionUtils.isNotEmpty(delList)) {
+                        List<TabHaobanRepairExternalUser> addList = new ArrayList<>();
+                        for (String item : delList) {
+                            TabHaobanRepairExternalUser user = new TabHaobanRepairExternalUser();
+                            user.setId(UniqueIdUtils.uniqueLong());
+                            user.setUserId(item);
+                            user.setWxEnterpriseId(wxEnterpriseId);
+                            user.setStatusFlag(1);
+                            user.setRemark("无unionid表记录");
+                            if(null != dateMap.get(item)) {
+                                user.setUpdateTime(dateMap.get(item));
+                            }
+                            addList.add(user);
+                        }
+                        this.tabHaobanRepairExternalUserMapper.batchInsert(addList);
+                    }
+
+                    // 错误的ID
+                    if (CollectionUtils.isNotEmpty(errorList)) {
+                        this.tabHaobanRepairExternalUserMapper.batchInsert(errorList);
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    public List<String> getByStoreIdAndStaffId(String storeId, String staffId) {
+        return mapper.getByStoreIdAndStaffId(storeId, staffId);
+    }
+
+    @Override
+    public int getCountByMemberId(String memberId) {
+        return mapper.getCountByMemberId(memberId);
+    }
+    
+    @Override
+    public void updateClerkInfo(String staffId, String oldClerkId, String newClerkId) {
+        ClerkDTO clerk = this.clerkService.getclerkById(newClerkId);
+        this.mapper.updateClerkInfo(staffId,oldClerkId , newClerkId , clerk.getStoreId());
+    }
+
+    /**
+     * 外部联系人
+     *
+     * @param staffId
+     * @return
+     */
+    @Override
+    public List<String> queryExternalRelatedWithStaffId(String staffId) {
+        return this.mapper.queryExternalUserIdWithStaffId(staffId);
+    }
+
+    /***
+     * 查询会员与导购的关系
+     * @param staffId
+     * @param memberIds
+     * @return
+     */
+    @Override
+    public List<TabHaobanExternalClerkRelated> queryClerkMemberRelations(String staffId, List<String> memberIds) {
+        if (StringUtils.isBlank(staffId)) {
+            logger.info("查询导购与会员的关系，staffId不存在 {}", staffId);
+            return Collections.emptyList();
+        }
+        if (CollectionUtils.isEmpty(memberIds)) {
+            logger.info("查询导购与会员的关系，会员id数组为空 {}", staffId);
+            return Collections.emptyList();
+        }
+        return this.mapper.queryClerkMemberRelations(staffId, memberIds);
+    }
+}

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

-package com.gic.haoban.manage.service.service.impl;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.alibaba.fastjson.JSON;
-import com.gic.api.base.commons.Page;
-import com.gic.clerk.api.dto.ClerkDTO;
-import com.gic.clerk.api.service.ClerkService;
-import com.gic.clerk.api.service.RightService;
-import com.gic.commons.util.EntityUtil;
-import com.gic.enterprise.api.dto.StoreDTO;
-import com.gic.enterprise.api.service.StoreService;
-import com.gic.haoban.base.api.common.BasePageInfo;
-import com.gic.haoban.common.utils.PageUtil;
-import com.gic.haoban.common.utils.StringUtil;
-import com.gic.haoban.manage.api.dto.CommonMQDTO;
-import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
-import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
-import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeQDTO;
-import com.gic.haoban.manage.api.enums.BindTypeEnum;
-import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
-import com.gic.haoban.manage.api.service.HaobanCommonMQApiService;
-import com.gic.haoban.manage.api.service.hm.HmClerkRelationApiService;
-import com.gic.haoban.manage.api.service.hm.HmQrcodeApiService;
-import com.gic.haoban.manage.service.dao.mapper.TabHaobanExternalClerkRelatedMapper;
-import com.gic.haoban.manage.service.dao.mapper.TabHaobanMemberClerkChatConfigMapper;
-import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
-import com.gic.haoban.manage.service.entity.MemberClerkChatConfig;
-import com.gic.haoban.manage.service.entity.TabHaobanClerkMainStoreRelated;
-import com.gic.haoban.manage.service.entity.TabHaobanStaff;
-import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation;
-import com.gic.haoban.manage.service.service.ClerkMainStoreRelatedService;
-import com.gic.haoban.manage.service.service.ExternalClerkRelatedService;
-import com.gic.haoban.manage.service.service.StaffClerkBindLogService;
-import com.gic.haoban.manage.service.service.StaffClerkRelationService;
-import com.gic.haoban.manage.service.service.StaffService;
-import com.gic.haoban.manage.service.service.WxEnterpriseService;
-import com.gic.member.api.service.MemberApiService;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-
-@Service
-public class StaffClerkRelationServiceImpl implements StaffClerkRelationService {
-
-    private static final Logger logger = LoggerFactory.getLogger(StaffClerkRelationService.class);
-
-    @Autowired
-    private TabHaobanStaffClerkRelationMapper mapper;
-
-    @Autowired
-    private StaffClerkBindLogService staffClerkBindLogService;
-
-    @Autowired
-    private ExternalClerkRelatedService externalClerkRelatedService;
-    @Autowired
-    private HaobanCommonMQApiService haobanCommonMQApiService ;
-    @Autowired
-    private ClerkMainStoreRelatedService clerkMainStoreRelatedService;
-    @Autowired
-    private TabHaobanExternalClerkRelatedMapper externalClerkRelatedMapper;
-    @Autowired
-    private TabHaobanMemberClerkChatConfigMapper memberClerkChatConfigMapper;
-    @Autowired
-    private StoreService storeService ;
-    @Autowired
-    private HmQrcodeApiService hmQrcodeApiService;
-    @Autowired
-    private StaffService staffService;
-    @Autowired
-    private HmClerkRelationApiService hmClerkRelationApiService;
-    @Autowired
-    private WxEnterpriseService wxEnterpriseService;
-    @Autowired
-    private MemberApiService memberApiService;
-    @Autowired
-    private ClerkService clerkService;
-    @Autowired
-    private RightService rightService;
-
-    @Override
-    public List<StaffClerkRelationDTO> listBindCode(String wxEnterpriseId, String enterpriseId, Set<String> clerkCodeList) {
-        return  this.filterDelClerkList(mapper.listBindCode(wxEnterpriseId, enterpriseId, clerkCodeList));
-    }
-
-    @Override
-    public List<StaffClerkRelationDTO> listBindCodeByStaffId(List<String> enterpriseIdList, String staffId) {
-        return  this.filterDelClerkList(mapper.listBindCodeByStaffId(enterpriseIdList, staffId));
-    }
-    
-    /*
-     *  导购进行解绑/换导购，更新好友和导购关联关系
-     */
-    @Override
-    public boolean delBind(String oldClerkId, String optStaffId, int channelCode, String newClerkId, String wxEnterpriseId) {
-        boolean changeClerkFlag = StringUtils.isNotEmpty(newClerkId) ;
-        logger.info("导购解绑/换导购={},oldClerkId={},optStaffId={}",changeClerkFlag,oldClerkId,optStaffId);
-        if(StringUtils.isNotEmpty(optStaffId) && "-1".equals(optStaffId)) {
-            TabHaobanStaff staff =  this.staffService.selectById(optStaffId) ;
-            if(null != staff) {
-                wxEnterpriseId = staff.getWxEnterpriseId() ;
-            }
-        }
-        // wxEnterpriseId非必传
-        StaffClerkRelationDTO clerkRelation = mapper.getOneByClerkId(oldClerkId, wxEnterpriseId);
-        if (null == clerkRelation) {
-            logger.info("老的绑定关联不存在,oldClerkId={}", oldClerkId);
-            return true;
-        }
-        // 如果是区经
-        if(clerkRelation.getManageFlag()==1) {
-            this.mapper.changeStatusByClerkId(oldClerkId, 0);
-            return true ;
-        }
-        wxEnterpriseId = clerkRelation.getWxEnterpriseId() ; 
-        String enterpriseId = clerkRelation.getEnterpriseId();
-        logger.info("当前删除换绑的商户={},{}",enterpriseId,wxEnterpriseId);
-        String staffId = clerkRelation.getStaffId() ;
-        String storeId = clerkRelation.getStoreId() ;
-        boolean needFlush = false ;
-        boolean delFlag = true ;
-        if(StringUtils.isEmpty(newClerkId)) {
-            // 成员关联的门店
-            List<StaffClerkRelationDTO> relationList = this.listByStaffId(wxEnterpriseId, staffId) ;
-            Set<String> set = relationList.stream().map(o->o.getEnterpriseId()).collect(Collectors.toSet()) ;
-            // 否关联的多个商户
-            boolean multipleFlag = set.size() > 1 ;
-            List<String> storeIdList = relationList.stream().filter(o->!storeId.equals(o.getStoreId()) && o.getEnterpriseId().equals(enterpriseId)).map(o->o.getStoreId()).collect(Collectors.toList()) ;
-            logger.info("成员{},关联门店数={},同商户下的门店={}",staffId,relationList.size(),JSON.toJSON(storeIdList));
-            if(CollectionUtils.isNotEmpty(storeIdList)) {
-                if(multipleFlag) {
-                    needFlush = true ;
-                    TabHaobanClerkMainStoreRelated currentMainStore = this.clerkMainStoreRelatedService.selectStaffMainStore(staffId, wxEnterpriseId);
-                    String mainStoreEnterpriseId = null ;
-                    if(null == currentMainStore) {
-                        mainStoreEnterpriseId = enterpriseId ;
-                    }else {
-                      String mainStoreId = currentMainStore.getStoreId() ;
-                      StoreDTO store = this.storeService.getStore(mainStoreId) ;  
-                      mainStoreEnterpriseId = store.getEnterpriseId() ;
-                    }
-                    logger.info("当前主门店商户和处理商户是否一致{},{}",mainStoreEnterpriseId,enterpriseId);
-                    if(mainStoreEnterpriseId.equals(enterpriseId)) {
-                        // 删除关联关系
-                        this.mapper.changeStatusByClerkId(oldClerkId, 0);
-                        delFlag = false ;
-                        TabHaobanClerkMainStoreRelated mainStoreRelation = this.clerkMainStoreRelatedService.getMainStoreByStaffId(staffId, wxEnterpriseId, storeIdList) ;
-                        String newStoreId = mainStoreRelation.getStoreId() ;
-                        StaffClerkRelationDTO mainClerk = this.getOneBindByStoreId(staffId, newStoreId) ;
-                        newClerkId = mainClerk.getClerkId() ;
-                        logger.info("查询到成员的主门店导购={},{}",staffId,newClerkId);
-                        needFlush = false ;
-                    }
-                }else {
-                    // 删除关联关系
-                    this.mapper.changeStatusByClerkId(oldClerkId, 0);
-                    delFlag = false ;
-                    TabHaobanClerkMainStoreRelated mainStore = this.clerkMainStoreRelatedService.getMainStoreByStaffId(staffId, wxEnterpriseId, storeIdList) ;
-                    String newStoreId = mainStore.getStoreId() ;
-                    StaffClerkRelationDTO mainClerk = this.getOneBindByStoreId(staffId, newStoreId) ;
-                    newClerkId = mainClerk.getClerkId() ;
-                    logger.info("查询到成员的主门店导购={},{}",staffId,newClerkId);
-                }
-            }
-        }
-        // 删除关联关系
-        if(delFlag) {
-            this.mapper.changeStatusByClerkId(oldClerkId, 0);
-        }
-       
-        if(StringUtils.isNotBlank(newClerkId)) {
-            List<String> memberIdList = this.externalClerkRelatedMapper.listByClerkId(staffId, oldClerkId) ;
-            this.externalClerkRelatedService.updateClerkInfo(staffId , oldClerkId , newClerkId) ;
-            if(CollectionUtils.isNotEmpty(memberIdList)) {
-                for(String memberId : memberIdList) {
-                    logger.info("会员={}",memberId);
-                    CommonMQDTO dto = new CommonMQDTO();
-                    dto.setType(3);
-                    Map<String,String> map = new HashMap<>() ;
-                    map.put("enterpriseId", enterpriseId) ;
-                    map.put("memberId", memberId) ;
-                    map.put("clerkId", newClerkId) ;
-                    dto.setParams(map);
-                    this.haobanCommonMQApiService.putCommonMessage(dto);
-                }
-            }
-        }else {
-            logger.info("成员删除所有关联导购={}",staffId);
-            List<String> memberIds = externalClerkRelatedService.getByStoreIdAndStaffId(storeId, staffId);
-            //删除 并设置主门店
-            clerkMainStoreRelatedService.delMainStore(staffId, storeId, wxEnterpriseId);
-            //推入日志
-            delMemberQywxFlag(enterpriseId, memberIds); 
-        }
-        if(needFlush) {
-            logger.info("解绑自动刷新好友,staffId={}",staffId);
-            this.clerkMainStoreRelatedService.reflushExternal(wxEnterpriseId, staffId); 
-        }
-        this.staffClerkBindLogService.pushToMq(staffId, optStaffId, BindTypeEnum.UNBIND.getVal(), channelCode, clerkRelation.getStaffClerkRelationId());
-        //废弃活码
-        this.hmClerkRelationApiService.delByClerkId(oldClerkId, enterpriseId, wxEnterpriseId, channelCode, null);
-        return true;
-    }
-
-
-    private void delMemberQywxFlag(String enterpriseId, List<String> memberIds) {
-        for (String memberId : memberIds) {
-            //解绑通知会员
-            int count = externalClerkRelatedService.getCountByMemberId(memberId);
-            if (count == 0) {
-                logger.info("通知会员 删除企微好友,该会员无任何好友关系，memberId:{}", memberId);
-                memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 0);
-                memberApiService.updateMemberQywxEveryOccasion(enterpriseId, memberId, 0, new Date());
-                continue;
-            }
-            logger.info("通知会员 删除企微好友 每次调用更新为非企微好友时间 memberId：{}", memberId);
-            memberApiService.updateMemberQywxEveryOccasion(enterpriseId, memberId, 1, new Date());
-        }
-    }
-
-    @Override
-    public boolean delBindByStoreIds(String wxEnterpriseId, Set<String> storeIds, String optStaffId, int channelCode) {
-        if (CollectionUtils.isEmpty(storeIds)) {
-            logger.info("没有传门店列表：{}", wxEnterpriseId);
-            return true;
-        }
-        List<String> storeIdList = new ArrayList<>();
-        storeIdList.addAll(storeIds) ;
-        List<StaffClerkRelationDTO> needUnbind = mapper.listByStoreIds(wxEnterpriseId, storeIdList);
-        if (CollectionUtils.isEmpty(needUnbind)) {
-            logger.info("没有门店绑定了需要解绑的：{}", wxEnterpriseId);
-            return true;
-        }
-
-        for (StaffClerkRelationDTO staffClerkRelation : needUnbind) {
-            String enterpriseId = staffClerkRelation.getEnterpriseId();
-            //删除好友通知会员
-            List<String> memberIds = externalClerkRelatedService.getByStoreIdAndStaffId(staffClerkRelation.getStoreId(), staffClerkRelation.getStaffId());
-            delMemberQywxFlag(enterpriseId, memberIds);
-        }
-
-        List<String> need = needUnbind.stream().map(tab -> tab.getStaffClerkRelationId()).collect(Collectors.toList());
-        //清除绑定
-        mapper.delByStoreIds(storeIds);
-        //删除主门店
-        clerkMainStoreRelatedService.delMainStoreByStoreIds(storeIds);
-        //放入队列
-        staffClerkBindLogService.pushToMqBatch(optStaffId, BindTypeEnum.UNBIND.getVal(), channelCode, need);
-        for (StaffClerkRelationDTO clerkRelation : needUnbind) {
-            //废弃活码
-            String enterpriseId = clerkRelation.getEnterpriseId();
-            hmClerkRelationApiService.delByClerkId(clerkRelation.getClerkId(), enterpriseId, wxEnterpriseId, channelCode);
-        }
-        return true;
-    }
-
-    @Override
-    public String bind(StaffClerkRelationDTO dto, String optStaffId, int channelCode) {
-        String staffId = dto.getStaffId();
-        TabHaobanStaff tabHaobanStaff = staffService.selectById(staffId);
-        if (tabHaobanStaff == null) {
-            logger.error("员工不存在:{}", staffId);
-            return "";
-        }
-        ClerkDTO clerkDTO = clerkService.getClerkByClerkId(dto.getClerkId());
-        if (clerkDTO != null) {
-            dto.setClerkType(clerkDTO.getClerkType());
-        }
-        String staffClerkRelationId = insert(dto);
-        if (StringUtils.isNotBlank(staffClerkRelationId)) {
-            String wxEnterpriseId = dto.getWxEnterpriseId();
-            Integer manageFlag = dto.getManageFlag();
-            String enterpriseId = dto.getEnterpriseId();
-            //导购和店长需要设置主门店
-            if (manageFlag != null && manageFlag == 1) {
-                //do nothing
-            } else {
-                logger.info("设置主门店并创建活码：manageFlag:{},staffId:{}", manageFlag, staffId);
-                TabHaobanClerkMainStoreRelated mainStore = clerkMainStoreRelatedService.getMainStoreByStaffId(staffId, wxEnterpriseId);
-                // 判断是主门店
-                if(null != mainStore && mainStore.getStoreId().equals(dto.getStoreId())) {
-                    this.clerkMainStoreRelatedService.reflushExternal(wxEnterpriseId, staffId);
-                }
-                //有活码权限的企业
-                HmQrcodeQDTO hmQrcodeQDTO = new HmQrcodeQDTO();
-                hmQrcodeQDTO.setHmType(1);
-                hmQrcodeQDTO.setWxEnterpriseId(wxEnterpriseId);
-                hmQrcodeQDTO.setEnterpriseId(enterpriseId);
-                hmQrcodeQDTO.setName(tabHaobanStaff.getStaffName());
-                hmQrcodeQDTO.setPassFlag(1);
-                hmQrcodeQDTO.setStoreId(dto.getStoreId());
-                hmQrcodeQDTO.setClerkIdList(Collections.singletonList(dto.getClerkId()));
-                hmQrcodeQDTO.setInvokingType(channelCode);
-                hmQrcodeApiService.add(hmQrcodeQDTO);
-            }
-            //推入日志
-            staffClerkBindLogService.pushToMq(staffId, optStaffId, BindTypeEnum.BIND.getVal(), channelCode, staffClerkRelationId);
-        }
-        return staffClerkRelationId;
-    }
-
-
-    @Override
-    public StaffClerkRelationDTO getBindByClerkId(String clerkId, String wxEnterpriseId) {
-        return this.filterDelClerk(mapper.getOneByClerkId(clerkId, wxEnterpriseId));
-    }
-
-    @Override
-    public StaffClerkRelationDTO getByCodeAndEnterpriseId(String clerkCode, String enterpriseId) {
-        return mapper.getByCodeAndEnterpriseId(clerkCode, enterpriseId);
-    }
-
-    @Override
-    public StaffClerkRelationDTO getStaffClerkRelationDTO(String clerkCode, String enterpriseId) {
-        return mapper.getStaffClerkRelationDTO(clerkCode, enterpriseId);
-    }
-
-
-    @Override
-    public String insert(StaffClerkRelationDTO staffClerkRelation) {
-        Integer manageFlag = staffClerkRelation.getManageFlag();
-        String uuid = StringUtil.randomUUID();
-        staffClerkRelation.setStaffClerkRelationId(uuid);
-        staffClerkRelation.setCreateTime(new Date());
-        staffClerkRelation.setUpdateTime(new Date());
-        staffClerkRelation.setStatusFlag(1);
-        staffClerkRelation.setOpenConcatFlag(1);
-        staffClerkRelation.setManageFlag(manageFlag == null ? 0 : manageFlag);
-        TabHaobanStaffClerkRelation relation = EntityUtil.changeEntityByJSON(TabHaobanStaffClerkRelation.class, staffClerkRelation);
-        mapper.insert(relation);
-        return uuid;
-    }
-
-    @Override
-    public int cleanStaffClerk(String wxEnterpriseId, List<String> delStaffIds) {
-        delStaffIds.forEach(staffId -> {
-            List<StaffClerkRelationDTO> relationDTOS = listBindCodeByStaffId(null, staffId);
-            if (CollectionUtils.isNotEmpty(relationDTOS)) {
-                relationDTOS.forEach(mid -> {
-                    staffClerkBindLogService.pushToMq(mid.getStaffId(), "-1", BindTypeEnum.UNBIND.getVal(), ChannelCodeEnum.WEIXIN_DEL.getCode(), mid.getStaffClerkRelationId());
-                });
-            }
-        });
-        int ret = mapper.cleanStaffDepart(wxEnterpriseId, delStaffIds);
-        externalClerkRelatedService.cleanStaffRelated(wxEnterpriseId, delStaffIds);
-        return ret;
-    }
-
-    @Override
-    public StaffClerkRelationDTO getOneBindByStoreId(String staffId, String storeId) {
-        StaffClerkRelationDTO dto = this.filterDelClerk(mapper.getOneByStoreIdAndStaffId(storeId,staffId));
-        return dto ;
-    }
-
-    @Override
-    public StaffClerkRelationDTO getByClerkId(String clerkId) {
-        return this.filterDelClerk(mapper.getOneByClerkId(clerkId, null));
-    }
-
-    @Override
-    public StaffClerkRelationDTO getByClerkId(String clerkId, String wxEnterpriseId) {
-        StaffClerkRelationDTO staffClerkRelation = mapper.getOneByClerkId(clerkId, wxEnterpriseId);
-        return EntityUtil.changeEntityNew(StaffClerkRelationDTO.class, staffClerkRelation);
-    }
-
-    @Override
-    public List<StaffClerkRelationDTO> listByClerkIds(List<String> clerkList) {
-        if (CollectionUtils.isEmpty(clerkList)) {
-            return Collections.EMPTY_LIST;
-        }
-        return mapper.listByClerkIds(clerkList, null);
-    }
-
-    @Override
-    public List<StaffClerkRelationDTO> listByStaffId(String wxEnterpriseId, String staffId) {
-        return EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class, mapper.lisByStaffId(wxEnterpriseId, staffId, null));
-    }
-
-    @Override
-    public List<StaffClerkRelationDTO> listByStaffId(String wxEnterpriseId, String staffId, List<String> storeIdList) {
-        return EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class, mapper.lisByStaffId(wxEnterpriseId, staffId, storeIdList));
-    }
-
-    @Override
-    public void saveChatConfig(MemberClerkChatConfig memberClerkChatConfig) {
-        memberClerkChatConfig.setStatus(1);
-        memberClerkChatConfig.setCreateTime(new Date());
-        memberClerkChatConfig.setUpdateTime(new Date());
-        memberClerkChatConfigMapper.insert(memberClerkChatConfig);
-    }
-
-    @Override
-    public MemberClerkChatConfig getChatConfig(String staffId, String memberId) {
-        MemberClerkChatConfig chatConfig = memberClerkChatConfigMapper.getChatByMemberIdStaffId(memberId, staffId);
-        return chatConfig;
-    }
-
-    @Override
-    public List<String> listByWxEnterpriseId(String wxEnterpriseId) {
-        return mapper.listByWxEnterpriseId(wxEnterpriseId);
-    }
-
-    @Override
-    public Page<StaffClerkRelationDTO> pageByWxEnterpriseId(String wxEnterpriseId, BasePageInfo pageInfo) {
-        PageHelper.startPage(pageInfo);
-        List<StaffClerkRelationDTO> clerkBindList = mapper.pageByWxEnterpriseId(wxEnterpriseId);
-        Page<StaffClerkRelationDTO> retPage = PageUtil.changePageHelperToCurrentPage(new PageInfo<>(clerkBindList), StaffClerkRelationDTO.class);
-        return retPage;
-    }
-
-    @Override
-    public List<StaffClerkRelationDTO> listBindByStoreId(String wxEnterpriseId, String storeId) {
-        return mapper.listByStoreIds(wxEnterpriseId, Arrays.asList(storeId));
-    }
-
-    @Override
-    public List<StaffClerkRelationDTO> listBindStoreIdByEnterpriseId(String enterpriseId) {
-        List<StaffClerkRelationDTO> clerkRelations = mapper.listBindStoreIdByEnterpriseId(enterpriseId);
-        if (CollectionUtils.isEmpty(clerkRelations)) {
-            return new ArrayList<>();
-        }
-        return EntityUtil.changeEntityListNew(StaffClerkRelationDTO.class, clerkRelations);
-    }
-
-    @Override
-    public List<String> listRelationsStaffId(Set<String> staffIdList) {
-        return mapper.listRelationsStaffId(staffIdList);
-    }
-
-    @Override
-    public List<String> listWxUserIdByClerkIds(List<String> clerkList, String wxEnterpriseId) {
-        if (CollectionUtils.isEmpty(clerkList)) {
-            return null;
-        }
-        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
-        if (qwDTO.needOpenUserId3th()) {
-            return mapper.listWxUserIdByClerkIds(clerkList, wxEnterpriseId,2);
-        }
-        return mapper.listWxUserIdByClerkIds(clerkList, wxEnterpriseId,1);
-    }
-
-    @Override
-    public List<StaffClerkRelationDTO> listIdsByWxUserIds(List<String> wxUserIds, String wxEnterpriseId, String enterpriseId) {
-        if (CollectionUtils.isEmpty(wxUserIds)) {
-            return null;
-        }
-        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
-        if (qwDTO.needOpenUserId3th()) {
-            return mapper.listIdsByWxUserIds(wxUserIds, wxEnterpriseId, enterpriseId,2);
-        }
-        return mapper.listIdsByWxUserIds(wxUserIds, wxEnterpriseId, enterpriseId,1);
-    }
-
-    @Override
-    public List<StaffClerkRelationDTO> listIdsByNotInWxUserIds(List<String> wxUserIds, String wxEnterpriseId, String enterpriseId) {
-        if (CollectionUtils.isEmpty(wxUserIds)) {
-            return null;
-        }
-        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
-        if (qwDTO.needOpenUserId3th()) {
-            return mapper.listIdsByNotInWxOpenUserIds(wxUserIds, wxEnterpriseId, enterpriseId);
-        }
-        return mapper.listIdsByNotInWxUserIds(wxUserIds, wxEnterpriseId, enterpriseId);
-    }
-
-    @Override
-    public int updateOpenConcatFlagById(Integer openConcatFlag, String staffClerkRelationId) {
-        return mapper.updateOpenConcatFlagById(openConcatFlag, staffClerkRelationId);
-    }
-
-    @Override
-    public boolean getBindByStaffIdAndEnterpriseId(String enterpriseId, String staffId) {
-        return mapper.getBindByStaffIdAndEnterpriseId(enterpriseId, staffId) > 0;
-    }
-
-    @Override
-    public List<StaffClerkRelationDTO> listManageBindByStaffId(String staffId) {
-        return this.filterDelClerkList(mapper.listManageBindByStaffId(staffId));
-    }
-    
-    private List<StaffClerkRelationDTO> filterDelClerkList(List<StaffClerkRelationDTO> list) {
-        if(CollectionUtils.isEmpty(list)) {
-            return list ;
-        }
-        List<StaffClerkRelationDTO> retList = new ArrayList<>() ;
-        for(StaffClerkRelationDTO item : list) {
-            boolean delFlag = false ;
-            String clerkId = item.getClerkId() ;
-            ClerkDTO clerk = this.clerkService.getclerkById(clerkId) ;
-            if(null == clerk || clerk.getStatus() != 1) {
-                delFlag = true ;
-            }
-            if(!delFlag && null != clerk && clerk.getClerkType()<2 && StringUtils.isNotEmpty(clerk.getStoreId())) {
-                StoreDTO store = this.storeService.getStore(clerk.getStoreId()) ;
-                if(null == store || store.getStatus() == -3) {
-                    delFlag = true ;
-                }
-            }
-            if(delFlag) {
-                this.mapper.delByClerkId(clerkId);
-            }else {
-                retList.add(item) ;
-            }
-        }
-        return retList ;
-    }
-    
-    private StaffClerkRelationDTO filterDelClerk(StaffClerkRelationDTO dto) {
-        if(null == dto) {
-            return dto ;
-        }
-        String clerkId = dto.getClerkId() ;
-        ClerkDTO clerk = this.clerkService.getclerkById(clerkId) ;
-        boolean delFlag = false ;
-        if(null == clerk || clerk.getStatus() != 1) {
-            delFlag = true ;
-        }
-        if(!delFlag &&  null != clerk && clerk.getClerkType() <2 && StringUtils.isNotEmpty(clerk.getStoreId())) {
-            StoreDTO store = this.storeService.getStore(clerk.getStoreId()) ;
-            if(null == store || store.getStatus() == -3) {
-                delFlag = true ;
-            }
-        }
-        if(delFlag) {
-            this.mapper.delByClerkId(clerkId);
-            dto = null ;
-        }
-        return dto ;
-    }
-
-    /**
-     * 获取企业下所有关联关系
-     *
-     * @param enterpriseId
-     * @return
-     */
-    @Override
-    public List<String> listAllClerkIdsByEnterpriseId(String enterpriseId) {
-        return this.mapper.listAllClerkIdsByEnterpriseId(enterpriseId);
-    }
-}
+package com.gic.haoban.manage.service.service.impl;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.alibaba.fastjson.JSON;
+import com.gic.api.base.commons.Page;
+import com.gic.clerk.api.dto.ClerkDTO;
+import com.gic.clerk.api.service.ClerkService;
+import com.gic.clerk.api.service.RightService;
+import com.gic.commons.util.EntityUtil;
+import com.gic.enterprise.api.dto.StoreDTO;
+import com.gic.enterprise.api.service.StoreService;
+import com.gic.haoban.base.api.common.BasePageInfo;
+import com.gic.haoban.common.utils.PageUtil;
+import com.gic.haoban.common.utils.StringUtil;
+import com.gic.haoban.manage.api.dto.CommonMQDTO;
+import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
+import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeQDTO;
+import com.gic.haoban.manage.api.enums.BindTypeEnum;
+import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
+import com.gic.haoban.manage.api.service.HaobanCommonMQApiService;
+import com.gic.haoban.manage.api.service.hm.HmClerkRelationApiService;
+import com.gic.haoban.manage.api.service.hm.HmQrcodeApiService;
+import com.gic.haoban.manage.service.dao.mapper.TabHaobanExternalClerkRelatedMapper;
+import com.gic.haoban.manage.service.dao.mapper.TabHaobanMemberClerkChatConfigMapper;
+import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
+import com.gic.haoban.manage.service.entity.MemberClerkChatConfig;
+import com.gic.haoban.manage.service.entity.TabHaobanClerkMainStoreRelated;
+import com.gic.haoban.manage.service.entity.TabHaobanStaff;
+import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation;
+import com.gic.haoban.manage.service.service.ClerkMainStoreRelatedService;
+import com.gic.haoban.manage.service.service.ExternalClerkRelatedService;
+import com.gic.haoban.manage.service.service.StaffClerkBindLogService;
+import com.gic.haoban.manage.service.service.StaffClerkRelationService;
+import com.gic.haoban.manage.service.service.StaffService;
+import com.gic.haoban.manage.service.service.WxEnterpriseService;
+import com.gic.member.api.service.MemberApiService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+
+@Service
+public class StaffClerkRelationServiceImpl implements StaffClerkRelationService {
+
+    private static final Logger logger = LoggerFactory.getLogger(StaffClerkRelationService.class);
+
+    @Autowired
+    private TabHaobanStaffClerkRelationMapper mapper;
+
+    @Autowired
+    private StaffClerkBindLogService staffClerkBindLogService;
+
+    @Autowired
+    private ExternalClerkRelatedService externalClerkRelatedService;
+    @Autowired
+    private HaobanCommonMQApiService haobanCommonMQApiService ;
+    @Autowired
+    private ClerkMainStoreRelatedService clerkMainStoreRelatedService;
+    @Autowired
+    private TabHaobanExternalClerkRelatedMapper externalClerkRelatedMapper;
+    @Autowired
+    private TabHaobanMemberClerkChatConfigMapper memberClerkChatConfigMapper;
+    @Autowired
+    private StoreService storeService ;
+    @Autowired
+    private HmQrcodeApiService hmQrcodeApiService;
+    @Autowired
+    private StaffService staffService;
+    @Autowired
+    private HmClerkRelationApiService hmClerkRelationApiService;
+    @Autowired
+    private WxEnterpriseService wxEnterpriseService;
+    @Autowired
+    private MemberApiService memberApiService;
+    @Autowired
+    private ClerkService clerkService;
+    @Autowired
+    private RightService rightService;
+
+    @Override
+    public List<StaffClerkRelationDTO> listBindCode(String wxEnterpriseId, String enterpriseId, Set<String> clerkCodeList) {
+        return  this.filterDelClerkList(mapper.listBindCode(wxEnterpriseId, enterpriseId, clerkCodeList));
+    }
+
+    @Override
+    public List<StaffClerkRelationDTO> listBindCodeByStaffId(List<String> enterpriseIdList, String staffId) {
+        return  this.filterDelClerkList(mapper.listBindCodeByStaffId(enterpriseIdList, staffId));
+    }
+    
+    /*
+     *  导购进行解绑/换导购，更新好友和导购关联关系
+     */
+    @Override
+    public boolean delBind(String oldClerkId, String optStaffId, int channelCode, String newClerkId, String wxEnterpriseId) {
+        boolean changeClerkFlag = StringUtils.isNotEmpty(newClerkId) ;
+        logger.info("导购解绑/换导购={},oldClerkId={},optStaffId={}",changeClerkFlag,oldClerkId,optStaffId);
+        if(StringUtils.isNotEmpty(optStaffId) && "-1".equals(optStaffId)) {
+            TabHaobanStaff staff =  this.staffService.selectById(optStaffId) ;
+            if(null != staff) {
+                wxEnterpriseId = staff.getWxEnterpriseId() ;
+            }
+        }
+        // wxEnterpriseId非必传
+        StaffClerkRelationDTO clerkRelation = mapper.getOneByClerkId(oldClerkId, wxEnterpriseId);
+        if (null == clerkRelation) {
+            logger.info("老的绑定关联不存在,oldClerkId={}", oldClerkId);
+            return true;
+        }
+        // 如果是区经
+        if(clerkRelation.getManageFlag()==1) {
+            this.mapper.changeStatusByClerkId(oldClerkId, 0);
+            return true ;
+        }
+        wxEnterpriseId = clerkRelation.getWxEnterpriseId() ; 
+        String enterpriseId = clerkRelation.getEnterpriseId();
+        logger.info("当前删除换绑的商户={},{}",enterpriseId,wxEnterpriseId);
+        String staffId = clerkRelation.getStaffId() ;
+        String storeId = clerkRelation.getStoreId() ;
+        boolean needFlush = false ;
+        boolean delFlag = true ;
+        if(StringUtils.isEmpty(newClerkId)) {
+            // 成员关联的门店
+            List<StaffClerkRelationDTO> relationList = this.listByStaffId(wxEnterpriseId, staffId) ;
+            Set<String> set = relationList.stream().map(o->o.getEnterpriseId()).collect(Collectors.toSet()) ;
+            // 否关联的多个商户
+            boolean multipleFlag = set.size() > 1 ;
+            List<String> storeIdList = relationList.stream().filter(o->!storeId.equals(o.getStoreId()) && o.getEnterpriseId().equals(enterpriseId)).map(o->o.getStoreId()).collect(Collectors.toList()) ;
+            logger.info("成员{},关联门店数={},同商户下的门店={}",staffId,relationList.size(),JSON.toJSON(storeIdList));
+            if(CollectionUtils.isNotEmpty(storeIdList)) {
+                if(multipleFlag) {
+                    needFlush = true ;
+                    TabHaobanClerkMainStoreRelated currentMainStore = this.clerkMainStoreRelatedService.selectStaffMainStore(staffId, wxEnterpriseId);
+                    String mainStoreEnterpriseId = null ;
+                    if(null == currentMainStore) {
+                        mainStoreEnterpriseId = enterpriseId ;
+                    }else {
+                      String mainStoreId = currentMainStore.getStoreId() ;
+                      StoreDTO store = this.storeService.getStore(mainStoreId) ;  
+                      mainStoreEnterpriseId = store.getEnterpriseId() ;
+                    }
+                    logger.info("当前主门店商户和处理商户是否一致{},{}",mainStoreEnterpriseId,enterpriseId);
+                    if(mainStoreEnterpriseId.equals(enterpriseId)) {
+                        // 删除关联关系
+                        this.mapper.changeStatusByClerkId(oldClerkId, 0);
+                        delFlag = false ;
+                        TabHaobanClerkMainStoreRelated mainStoreRelation = this.clerkMainStoreRelatedService.getMainStoreByStaffId(staffId, wxEnterpriseId, storeIdList) ;
+                        String newStoreId = mainStoreRelation.getStoreId() ;
+                        StaffClerkRelationDTO mainClerk = this.getOneBindByStoreId(staffId, newStoreId) ;
+                        newClerkId = mainClerk.getClerkId() ;
+                        logger.info("查询到成员的主门店导购={},{}",staffId,newClerkId);
+                        needFlush = false ;
+                    }
+                }else {
+                    // 删除关联关系
+                    this.mapper.changeStatusByClerkId(oldClerkId, 0);
+                    delFlag = false ;
+                    TabHaobanClerkMainStoreRelated mainStore = this.clerkMainStoreRelatedService.getMainStoreByStaffId(staffId, wxEnterpriseId, storeIdList) ;
+                    String newStoreId = mainStore.getStoreId() ;
+                    StaffClerkRelationDTO mainClerk = this.getOneBindByStoreId(staffId, newStoreId) ;
+                    newClerkId = mainClerk.getClerkId() ;
+                    logger.info("查询到成员的主门店导购={},{}",staffId,newClerkId);
+                }
+            }
+        }
+        // 删除关联关系
+        if(delFlag) {
+            this.mapper.changeStatusByClerkId(oldClerkId, 0);
+        }
+       
+        if(StringUtils.isNotBlank(newClerkId)) {
+            List<String> memberIdList = this.externalClerkRelatedMapper.listByClerkId(staffId, oldClerkId) ;
+            this.externalClerkRelatedService.updateClerkInfo(staffId , oldClerkId , newClerkId) ;
+            if(CollectionUtils.isNotEmpty(memberIdList)) {
+                for(String memberId : memberIdList) {
+                    logger.info("会员={}",memberId);
+                    CommonMQDTO dto = new CommonMQDTO();
+                    dto.setType(3);
+                    Map<String,String> map = new HashMap<>() ;
+                    map.put("enterpriseId", enterpriseId) ;
+                    map.put("memberId", memberId) ;
+                    map.put("clerkId", newClerkId) ;
+                    dto.setParams(map);
+                    this.haobanCommonMQApiService.putCommonMessage(dto);
+                }
+            }
+        }else {
+            logger.info("成员删除所有关联导购={}",staffId);
+            List<String> memberIds = externalClerkRelatedService.getByStoreIdAndStaffId(storeId, staffId);
+            //删除 并设置主门店
+            clerkMainStoreRelatedService.delMainStore(staffId, storeId, wxEnterpriseId);
+            //推入日志
+            delMemberQywxFlag(enterpriseId, memberIds); 
+        }
+        if(needFlush) {
+            logger.info("解绑自动刷新好友,staffId={}",staffId);
+            this.clerkMainStoreRelatedService.reflushExternal(wxEnterpriseId, staffId); 
+        }
+        this.staffClerkBindLogService.pushToMq(staffId, optStaffId, BindTypeEnum.UNBIND.getVal(), channelCode, clerkRelation.getStaffClerkRelationId());
+        //废弃活码
+        this.hmClerkRelationApiService.delByClerkId(oldClerkId, enterpriseId, wxEnterpriseId, channelCode, null);
+        return true;
+    }
+
+
+    private void delMemberQywxFlag(String enterpriseId, List<String> memberIds) {
+        for (String memberId : memberIds) {
+            //解绑通知会员
+            int count = externalClerkRelatedService.getCountByMemberId(memberId);
+            if (count == 0) {
+                logger.info("通知会员 删除企微好友,该会员无任何好友关系，memberId:{}", memberId);
+                memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 0);
+                memberApiService.updateMemberQywxEveryOccasion(enterpriseId, memberId, 0, new Date());
+                continue;
+            }
+            //logger.info("通知会员 删除企微好友 每次调用更新为非企微好友时间 memberId：{}", memberId);
+            //memberApiService.updateMemberQywxEveryOccasion(enterpriseId, memberId, 1, new Date());
+        }
+    }
+
+    @Override
+    public boolean delBindByStoreIds(String wxEnterpriseId, Set<String> storeIds, String optStaffId, int channelCode) {
+        if (CollectionUtils.isEmpty(storeIds)) {
+            logger.info("没有传门店列表：{}", wxEnterpriseId);
+            return true;
+        }
+        List<String> storeIdList = new ArrayList<>();
+        storeIdList.addAll(storeIds) ;
+        List<StaffClerkRelationDTO> needUnbind = mapper.listByStoreIds(wxEnterpriseId, storeIdList);
+        if (CollectionUtils.isEmpty(needUnbind)) {
+            logger.info("没有门店绑定了需要解绑的：{}", wxEnterpriseId);
+            return true;
+        }
+
+        for (StaffClerkRelationDTO staffClerkRelation : needUnbind) {
+            String enterpriseId = staffClerkRelation.getEnterpriseId();
+            //删除好友通知会员
+            List<String> memberIds = externalClerkRelatedService.getByStoreIdAndStaffId(staffClerkRelation.getStoreId(), staffClerkRelation.getStaffId());
+            delMemberQywxFlag(enterpriseId, memberIds);
+        }
+
+        List<String> need = needUnbind.stream().map(tab -> tab.getStaffClerkRelationId()).collect(Collectors.toList());
+        //清除绑定
+        mapper.delByStoreIds(storeIds);
+        //删除主门店
+        clerkMainStoreRelatedService.delMainStoreByStoreIds(storeIds);
+        //放入队列
+        staffClerkBindLogService.pushToMqBatch(optStaffId, BindTypeEnum.UNBIND.getVal(), channelCode, need);
+        for (StaffClerkRelationDTO clerkRelation : needUnbind) {
+            //废弃活码
+            String enterpriseId = clerkRelation.getEnterpriseId();
+            hmClerkRelationApiService.delByClerkId(clerkRelation.getClerkId(), enterpriseId, wxEnterpriseId, channelCode);
+        }
+        return true;
+    }
+
+    @Override
+    public String bind(StaffClerkRelationDTO dto, String optStaffId, int channelCode) {
+        String staffId = dto.getStaffId();
+        TabHaobanStaff tabHaobanStaff = staffService.selectById(staffId);
+        if (tabHaobanStaff == null) {
+            logger.error("员工不存在:{}", staffId);
+            return "";
+        }
+        ClerkDTO clerkDTO = clerkService.getClerkByClerkId(dto.getClerkId());
+        if (clerkDTO != null) {
+            dto.setClerkType(clerkDTO.getClerkType());
+        }
+        String staffClerkRelationId = insert(dto);
+        if (StringUtils.isNotBlank(staffClerkRelationId)) {
+            String wxEnterpriseId = dto.getWxEnterpriseId();
+            Integer manageFlag = dto.getManageFlag();
+            String enterpriseId = dto.getEnterpriseId();
+            //导购和店长需要设置主门店
+            if (manageFlag != null && manageFlag == 1) {
+                //do nothing
+            } else {
+                logger.info("设置主门店并创建活码：manageFlag:{},staffId:{}", manageFlag, staffId);
+                TabHaobanClerkMainStoreRelated mainStore = clerkMainStoreRelatedService.getMainStoreByStaffId(staffId, wxEnterpriseId);
+                // 判断是主门店
+                if(null != mainStore && mainStore.getStoreId().equals(dto.getStoreId())) {
+                    this.clerkMainStoreRelatedService.reflushExternal(wxEnterpriseId, staffId);
+                }
+                //有活码权限的企业
+                HmQrcodeQDTO hmQrcodeQDTO = new HmQrcodeQDTO();
+                hmQrcodeQDTO.setHmType(1);
+                hmQrcodeQDTO.setWxEnterpriseId(wxEnterpriseId);
+                hmQrcodeQDTO.setEnterpriseId(enterpriseId);
+                hmQrcodeQDTO.setName(tabHaobanStaff.getStaffName());
+                hmQrcodeQDTO.setPassFlag(1);
+                hmQrcodeQDTO.setStoreId(dto.getStoreId());
+                hmQrcodeQDTO.setClerkIdList(Collections.singletonList(dto.getClerkId()));
+                hmQrcodeQDTO.setInvokingType(channelCode);
+                hmQrcodeApiService.add(hmQrcodeQDTO);
+            }
+            //推入日志
+            staffClerkBindLogService.pushToMq(staffId, optStaffId, BindTypeEnum.BIND.getVal(), channelCode, staffClerkRelationId);
+        }
+        return staffClerkRelationId;
+    }
+
+
+    @Override
+    public StaffClerkRelationDTO getBindByClerkId(String clerkId, String wxEnterpriseId) {
+        return this.filterDelClerk(mapper.getOneByClerkId(clerkId, wxEnterpriseId));
+    }
+
+    @Override
+    public StaffClerkRelationDTO getByCodeAndEnterpriseId(String clerkCode, String enterpriseId) {
+        return mapper.getByCodeAndEnterpriseId(clerkCode, enterpriseId);
+    }
+
+    @Override
+    public StaffClerkRelationDTO getStaffClerkRelationDTO(String clerkCode, String enterpriseId) {
+        return mapper.getStaffClerkRelationDTO(clerkCode, enterpriseId);
+    }
+
+
+    @Override
+    public String insert(StaffClerkRelationDTO staffClerkRelation) {
+        Integer manageFlag = staffClerkRelation.getManageFlag();
+        String uuid = StringUtil.randomUUID();
+        staffClerkRelation.setStaffClerkRelationId(uuid);
+        staffClerkRelation.setCreateTime(new Date());
+        staffClerkRelation.setUpdateTime(new Date());
+        staffClerkRelation.setStatusFlag(1);
+        staffClerkRelation.setOpenConcatFlag(1);
+        staffClerkRelation.setManageFlag(manageFlag == null ? 0 : manageFlag);
+        TabHaobanStaffClerkRelation relation = EntityUtil.changeEntityByJSON(TabHaobanStaffClerkRelation.class, staffClerkRelation);
+        mapper.insert(relation);
+        return uuid;
+    }
+
+    @Override
+    public int cleanStaffClerk(String wxEnterpriseId, List<String> delStaffIds) {
+        delStaffIds.forEach(staffId -> {
+            List<StaffClerkRelationDTO> relationDTOS = listBindCodeByStaffId(null, staffId);
+            if (CollectionUtils.isNotEmpty(relationDTOS)) {
+                relationDTOS.forEach(mid -> {
+                    staffClerkBindLogService.pushToMq(mid.getStaffId(), "-1", BindTypeEnum.UNBIND.getVal(), ChannelCodeEnum.WEIXIN_DEL.getCode(), mid.getStaffClerkRelationId());
+                });
+            }
+        });
+        int ret = mapper.cleanStaffDepart(wxEnterpriseId, delStaffIds);
+        externalClerkRelatedService.cleanStaffRelated(wxEnterpriseId, delStaffIds);
+        return ret;
+    }
+
+    @Override
+    public StaffClerkRelationDTO getOneBindByStoreId(String staffId, String storeId) {
+        StaffClerkRelationDTO dto = this.filterDelClerk(mapper.getOneByStoreIdAndStaffId(storeId,staffId));
+        return dto ;
+    }
+
+    @Override
+    public StaffClerkRelationDTO getByClerkId(String clerkId) {
+        return this.filterDelClerk(mapper.getOneByClerkId(clerkId, null));
+    }
+
+    @Override
+    public StaffClerkRelationDTO getByClerkId(String clerkId, String wxEnterpriseId) {
+        StaffClerkRelationDTO staffClerkRelation = mapper.getOneByClerkId(clerkId, wxEnterpriseId);
+        return EntityUtil.changeEntityNew(StaffClerkRelationDTO.class, staffClerkRelation);
+    }
+
+    @Override
+    public List<StaffClerkRelationDTO> listByClerkIds(List<String> clerkList) {
+        if (CollectionUtils.isEmpty(clerkList)) {
+            return Collections.EMPTY_LIST;
+        }
+        return mapper.listByClerkIds(clerkList, null);
+    }
+
+    @Override
+    public List<StaffClerkRelationDTO> listByStaffId(String wxEnterpriseId, String staffId) {
+        return EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class, mapper.lisByStaffId(wxEnterpriseId, staffId, null));
+    }
+
+    @Override
+    public List<StaffClerkRelationDTO> listByStaffId(String wxEnterpriseId, String staffId, List<String> storeIdList) {
+        return EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class, mapper.lisByStaffId(wxEnterpriseId, staffId, storeIdList));
+    }
+
+    @Override
+    public void saveChatConfig(MemberClerkChatConfig memberClerkChatConfig) {
+        memberClerkChatConfig.setStatus(1);
+        memberClerkChatConfig.setCreateTime(new Date());
+        memberClerkChatConfig.setUpdateTime(new Date());
+        memberClerkChatConfigMapper.insert(memberClerkChatConfig);
+    }
+
+    @Override
+    public MemberClerkChatConfig getChatConfig(String staffId, String memberId) {
+        MemberClerkChatConfig chatConfig = memberClerkChatConfigMapper.getChatByMemberIdStaffId(memberId, staffId);
+        return chatConfig;
+    }
+
+    @Override
+    public List<String> listByWxEnterpriseId(String wxEnterpriseId) {
+        return mapper.listByWxEnterpriseId(wxEnterpriseId);
+    }
+
+    @Override
+    public Page<StaffClerkRelationDTO> pageByWxEnterpriseId(String wxEnterpriseId, BasePageInfo pageInfo) {
+        PageHelper.startPage(pageInfo);
+        List<StaffClerkRelationDTO> clerkBindList = mapper.pageByWxEnterpriseId(wxEnterpriseId);
+        Page<StaffClerkRelationDTO> retPage = PageUtil.changePageHelperToCurrentPage(new PageInfo<>(clerkBindList), StaffClerkRelationDTO.class);
+        return retPage;
+    }
+
+    @Override
+    public List<StaffClerkRelationDTO> listBindByStoreId(String wxEnterpriseId, String storeId) {
+        return mapper.listByStoreIds(wxEnterpriseId, Arrays.asList(storeId));
+    }
+
+    @Override
+    public List<StaffClerkRelationDTO> listBindStoreIdByEnterpriseId(String enterpriseId) {
+        List<StaffClerkRelationDTO> clerkRelations = mapper.listBindStoreIdByEnterpriseId(enterpriseId);
+        if (CollectionUtils.isEmpty(clerkRelations)) {
+            return new ArrayList<>();
+        }
+        return EntityUtil.changeEntityListNew(StaffClerkRelationDTO.class, clerkRelations);
+    }
+
+    @Override
+    public List<String> listRelationsStaffId(Set<String> staffIdList) {
+        return mapper.listRelationsStaffId(staffIdList);
+    }
+
+    @Override
+    public List<String> listWxUserIdByClerkIds(List<String> clerkList, String wxEnterpriseId) {
+        if (CollectionUtils.isEmpty(clerkList)) {
+            return null;
+        }
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
+        if (qwDTO.needOpenUserId3th()) {
+            return mapper.listWxUserIdByClerkIds(clerkList, wxEnterpriseId,2);
+        }
+        return mapper.listWxUserIdByClerkIds(clerkList, wxEnterpriseId,1);
+    }
+
+    @Override
+    public List<StaffClerkRelationDTO> listIdsByWxUserIds(List<String> wxUserIds, String wxEnterpriseId, String enterpriseId) {
+        if (CollectionUtils.isEmpty(wxUserIds)) {
+            return null;
+        }
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
+        if (qwDTO.needOpenUserId3th()) {
+            return mapper.listIdsByWxUserIds(wxUserIds, wxEnterpriseId, enterpriseId,2);
+        }
+        return mapper.listIdsByWxUserIds(wxUserIds, wxEnterpriseId, enterpriseId,1);
+    }
+
+    @Override
+    public List<StaffClerkRelationDTO> listIdsByNotInWxUserIds(List<String> wxUserIds, String wxEnterpriseId, String enterpriseId) {
+        if (CollectionUtils.isEmpty(wxUserIds)) {
+            return null;
+        }
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
+        if (qwDTO.needOpenUserId3th()) {
+            return mapper.listIdsByNotInWxOpenUserIds(wxUserIds, wxEnterpriseId, enterpriseId);
+        }
+        return mapper.listIdsByNotInWxUserIds(wxUserIds, wxEnterpriseId, enterpriseId);
+    }
+
+    @Override
+    public int updateOpenConcatFlagById(Integer openConcatFlag, String staffClerkRelationId) {
+        return mapper.updateOpenConcatFlagById(openConcatFlag, staffClerkRelationId);
+    }
+
+    @Override
+    public boolean getBindByStaffIdAndEnterpriseId(String enterpriseId, String staffId) {
+        return mapper.getBindByStaffIdAndEnterpriseId(enterpriseId, staffId) > 0;
+    }
+
+    @Override
+    public List<StaffClerkRelationDTO> listManageBindByStaffId(String staffId) {
+        return this.filterDelClerkList(mapper.listManageBindByStaffId(staffId));
+    }
+    
+    private List<StaffClerkRelationDTO> filterDelClerkList(List<StaffClerkRelationDTO> list) {
+        if(CollectionUtils.isEmpty(list)) {
+            return list ;
+        }
+        List<StaffClerkRelationDTO> retList = new ArrayList<>() ;
+        for(StaffClerkRelationDTO item : list) {
+            boolean delFlag = false ;
+            String clerkId = item.getClerkId() ;
+            ClerkDTO clerk = this.clerkService.getclerkById(clerkId) ;
+            if(null == clerk || clerk.getStatus() != 1) {
+                delFlag = true ;
+            }
+            if(!delFlag && null != clerk && clerk.getClerkType()<2 && StringUtils.isNotEmpty(clerk.getStoreId())) {
+                StoreDTO store = this.storeService.getStore(clerk.getStoreId()) ;
+                if(null == store || store.getStatus() == -3) {
+                    delFlag = true ;
+                }
+            }
+            if(delFlag) {
+                this.mapper.delByClerkId(clerkId);
+            }else {
+                retList.add(item) ;
+            }
+        }
+        return retList ;
+    }
+    
+    private StaffClerkRelationDTO filterDelClerk(StaffClerkRelationDTO dto) {
+        if(null == dto) {
+            return dto ;
+        }
+        String clerkId = dto.getClerkId() ;
+        ClerkDTO clerk = this.clerkService.getclerkById(clerkId) ;
+        boolean delFlag = false ;
+        if(null == clerk || clerk.getStatus() != 1) {
+            delFlag = true ;
+        }
+        if(!delFlag &&  null != clerk && clerk.getClerkType() <2 && StringUtils.isNotEmpty(clerk.getStoreId())) {
+            StoreDTO store = this.storeService.getStore(clerk.getStoreId()) ;
+            if(null == store || store.getStatus() == -3) {
+                delFlag = true ;
+            }
+        }
+        if(delFlag) {
+            this.mapper.delByClerkId(clerkId);
+            dto = null ;
+        }
+        return dto ;
+    }
+
+    /**
+     * 获取企业下所有关联关系
+     *
+     * @param enterpriseId
+     * @return
+     */
+    @Override
+    public List<String> listAllClerkIdsByEnterpriseId(String enterpriseId) {
+        return this.mapper.listAllClerkIdsByEnterpriseId(enterpriseId);
+    }
+
+    @Override
+    public List<StaffClerkRelationDTO>listByWxEnterpriseIdAndStaffId(String wxEnterpriseId, Set<String> staffIdList) {
+        return this.mapper.listByWxEnterpriseIdAndStaffId(wxEnterpriseId,staffIdList);
+    }
+
+    @Override
+    public List<String> listAllStaffIdByEnterpriseId(String enterpriseId, String wxEnterpriseId) {
+        return this.mapper.listAllStaffIdByEnterpriseId(enterpriseId,wxEnterpriseId);
+    }
+}

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

@@ -4,6 +4,7 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
+import com.gic.haoban.manage.service.pojo.bo.StaffListBO;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -86,9 +87,18 @@ public class StaffServiceImpl implements StaffService {
     }
 
     @Override
-    public Page<TabHaobanStaff> pageStaff(List<String> staffIds, Integer activeFlag, String keyword,List<String> departmentIds,String wxEnterpriseId,Integer relationFlag,String permitState,
-            Integer occupy) {
-        return mapper.pageStaff(staffIds, activeFlag, keyword,departmentIds,wxEnterpriseId,relationFlag,permitState,occupy);
+    public Page<TabHaobanStaff> pageStaff(StaffListBO staffListBO) {
+        if (null == staffListBO){
+            return new Page<>();
+        }
+        String sortField = "a."+staffListBO.getSortField();
+        staffListBO.setSortField(sortField);
+        //业务需求：许可激活时间和过期时间增加升序和降序排序，时间为空的数据无论升序还是降序排序均排在最后
+        if("asc".equals(staffListBO.getSortType()) || "ASC".equals(staffListBO.getSortType())){
+            String s = "ISNULL("+sortField+"),"+sortField;
+            staffListBO.setSortField(s);
+        }
+        return mapper.pageStaff(staffListBO);
     }
 
     @Override

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

@@ -50,6 +50,11 @@ public class SyncTaskServiceImpl implements SyncTaskService {
     public TabHaobanSyncTask getSyncTask(String taskId) {
         return syncTaskMapper.selectByPrimaryKey(taskId);
     }
+    
+    @Override
+    public TabHaobanSyncTask getSyncNewestTask(String wxEnterpriseId, int taskType) {
+        return syncTaskMapper.getSyncNewestTask(wxEnterpriseId,taskType);
+    }
 
     @Override
     public Page<SyncTaskDTO> listTaskPage(String wxEnterpriseId, BasePageInfo pageInfo) {

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

@@ -465,4 +465,4 @@ public class WelcomeSendServiceImpl implements WelcomeSendService {
         }
         return null;
     }
-}
+}

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

@@ -125,7 +125,10 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
         } else if (dataType.equals(PreDealTypeEnum.tag_member.getVal())) {
             logger.info("11 会员标签处理标签项：{}", params);
             operationMap.get("friendMemberTagSyncOperation").dealSingleByMq(dealParamMqDTO, dataPre);
-        } else {
+        } else if(dataType.equals(PreDealTypeEnum.modify_hm.getVal())) {
+            logger.info("20 活码批量修改");
+            operationMap.get("qwHmOperation").dealSingleByMq(dealParamMqDTO, dataPre);
+        }else {
             logger.info("不是正常数据类型:{}", params);
         }
     }

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

@@ -34,6 +34,9 @@ import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.dao.mapper.StaffDepartmentRelatedMapper;
 import com.gic.haoban.manage.service.dao.mapper.StaffMapper;
 import com.gic.haoban.manage.service.entity.*;
+import com.gic.haoban.manage.service.errorcode.HaoBanErrCode;
+import com.gic.haoban.manage.service.errorcode.QywxErrCode;
+import com.gic.haoban.manage.service.pojo.bo.StaffListBO;
 import com.gic.haoban.manage.service.service.*;
 import com.gic.haoban.manage.service.service.chat.GroupChatService;
 import com.gic.haoban.manage.service.util.EmojiFilterUtil;
@@ -107,6 +110,8 @@ public class StaffApiServiceImpl implements StaffApiService {
     private QywxOrderApiService qywxOrderApiService;
     @Autowired
     private GroupChatService groupChatService;
+    @Autowired
+    private WxEnterpriseRelatedService wxEnterpriseRelatedService;
 
     @Override
     public StaffDTO selectById(String staffId) {
@@ -137,25 +142,72 @@ public class StaffApiServiceImpl implements StaffApiService {
     }
 
     @Override
-    public Page<StaffDTO> pageStaff(List<String> departmentIds, Integer activeFlag, String keyword, BasePageInfo pageInfo, Integer relationFlag, String wxEnterpriseId,String permitState,
-            Integer occupy) {
+    public Page<StaffDTO> pageStaff(StaffListDTO staffListDTO) {
+        if (null == staffListDTO){
+            return new Page<>();
+        }
+        logger.info("通讯录列表查询参数：{}",JSONObject.toJSONString(staffListDTO));
+        Integer relationFlag = staffListDTO.getRelationFlag();
+        String wxEnterpriseId = staffListDTO.getWxEnterpriseId();
+        BasePageInfo pageInfo = staffListDTO.getPageInfo();
+        String enterpriseIdParam = staffListDTO.getEnterpriseIdParam();
         List<String> staffIds = new ArrayList<>();
-        if (relationFlag != null) {
-            staffIds = staffClerkRelationService.listByWxEnterpriseId(wxEnterpriseId);
-            if (CollectionUtils.isEmpty(staffIds) && relationFlag == 1){
+        //查询所属品牌成员id
+        if(StrUtil.isNotBlank(enterpriseIdParam)){
+            //-1表示查询成员所属商户是无归属的
+            if ("-1".equals(enterpriseIdParam)){
+                staffIds = staffClerkRelationService.listByWxEnterpriseId(wxEnterpriseId);
+                relationFlag = 0;
+            }else {
+                staffIds = staffClerkRelationService.listAllStaffIdByEnterpriseId(enterpriseIdParam, wxEnterpriseId);
+                relationFlag = 1;
+            }
+            if (CollectionUtils.isEmpty(staffIds)){
                 return new Page<>();
             }
+        }else {
+            if (relationFlag != null) {
+                staffIds = staffClerkRelationService.listByWxEnterpriseId(wxEnterpriseId);
+                if (CollectionUtils.isEmpty(staffIds) && relationFlag == 1){
+                    return new Page<>();
+                }
+            }
         }
+        StaffListBO staffListBO = EntityUtil.changeEntityByJSON(StaffListBO.class, staffListDTO);
+        staffListBO.setStaffIds(staffIds);
+        staffListBO.setRelationFlag(relationFlag);
         PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize());
-        Page<StaffDTO> page = PageUtil.changePageHelperToCurrentPage(staffService.pageStaff(staffIds, activeFlag, keyword, departmentIds, wxEnterpriseId, relationFlag,permitState,occupy), StaffDTO.class);
+        Page<StaffDTO> page = PageUtil.changePageHelperToCurrentPage(staffService.pageStaff(staffListBO), StaffDTO.class);
         List<StaffDTO> staffDTOList = page.getResult();
         if (CollectionUtils.isEmpty(staffDTOList)) {
             return new Page<>();
         }
         Set<String> staffIdList = staffDTOList.stream().map(dto -> dto.getStaffId()).collect(Collectors.toSet());
         List<String> relationIdList = this.staffClerkRelationService.listRelationsStaffId(staffIdList);
+        //已关联的成员需要查询关联的品牌名称
+        List<TabHaobanWxEnterpriseRelated> list = wxEnterpriseRelatedService.getByWxEnterpriseId(wxEnterpriseId);
+        //解决空指针异常问题
+        Map<String, String> map = list.stream().collect(HashMap::new,(k, v) -> k.put(v.getEnterpriseId(), v.getEnterpriseName()), HashMap::putAll);
+        List<StaffClerkRelationDTO> relationDTOList = staffClerkRelationService.listByWxEnterpriseIdAndStaffId(wxEnterpriseId, staffIdList);
         staffDTOList.forEach(one -> {
-            one.setRelationFlag(relationIdList.contains(one.getStaffId()) ? 1 : 0);
+            if(relationIdList.contains(one.getStaffId())){
+                one.setRelationFlag(1);
+                //查询导购关联关系表，找到对应的商户名称
+                List<String> enterpriseNameList = new ArrayList<>(8);
+                for (StaffClerkRelationDTO dto : relationDTOList){
+                    if (dto.getStaffId().equals(one.getStaffId())){
+                        enterpriseNameList.add(map.get(dto.getEnterpriseId()));
+                    }
+                }
+                if (CollUtil.isNotEmpty(enterpriseNameList)){
+                    //对商户名称去重
+                    enterpriseNameList = enterpriseNameList.stream().distinct().collect(Collectors.toList());
+                    one.setEnterpriseNameList(enterpriseNameList);
+                }
+            }else {
+                one.setRelationFlag(0);
+            }
+
         });
         return page;
     }
@@ -1036,6 +1088,11 @@ public class StaffApiServiceImpl implements StaffApiService {
                     stringMap.put("handoverStaffName",handoverStaff.getStaffName());
                     stringMap.put("takeoverStaffName",takeOverStaff.getStaffName());
                     stringMap.put("errorCode",String.valueOf(dto.getErrcode()));
+                    QywxErrCode code = QywxErrCode.getValue(String.valueOf(dto.getErrcode()));
+                    logger.info("错误code码：{}",JSON.toJSONString(code));
+                    if (null != code){
+                        stringMap.put("errorMessage",code.getMsg());
+                    }
                     failedList.add(stringMap);
                 }
             }
@@ -1104,4 +1161,10 @@ public class StaffApiServiceImpl implements StaffApiService {
         }
         return com.gic.api.base.commons.ServiceResponse.success(true);
     }
+
+    @Override
+    public com.gic.api.base.commons.ServiceResponse<List<WxEnterpriseRelatedDTO>> getWxEnterpriseRelatedList(String wxEnterpriseId) {
+        List<TabHaobanWxEnterpriseRelated> list = wxEnterpriseRelatedService.getByWxEnterpriseId(wxEnterpriseId);
+        return com.gic.api.base.commons.ServiceResponse.success(com.gic.haoban.common.utils.EntityUtil.changeEntityListByJSON(WxEnterpriseRelatedDTO.class, list));
+    }
 }

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

@@ -148,6 +148,11 @@ public class GroupChatPlanApiServiceImpl implements GroupChatPlanApiService {
     }
 
     @Override
+    public ServiceResponse<Integer> getTotalCount(String enterpriseId, String clerkId, String storeId) {
+        return ServiceResponse.success(groupChatPlanOwnerLogService.getTotalCount(enterpriseId,clerkId,storeId));
+    }
+
+    @Override
     public ServiceResponse<Page<GroupChatPlanOwnerLogDTO>> listOwnerLogPageForWxa(GroupChatPlanSearchQDTO qdto,
             BasePageInfo basePageInfo) {
         Page<GroupChatPlanOwnerLogDTO> page = this.groupChatPlanOwnerLogService.listOwnerLogPageForWxa(qdto,

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

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -17,6 +18,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.esotericsoftware.minlog.Log;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
@@ -31,9 +33,12 @@ import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 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.HmBatchCountDTO;
+import com.gic.haoban.manage.api.dto.hm.HmBatchModifyResultDTO;
 import com.gic.haoban.manage.api.dto.hm.HmClerkDTO;
 import com.gic.haoban.manage.api.dto.hm.HmQrcodeDTO;
 import com.gic.haoban.manage.api.dto.hm.HmQrcodeStoreDTO;
+import com.gic.haoban.manage.api.dto.qdto.hm.HmBatchModifyQDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmClerkRelationQDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeListQDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeQDTO;
@@ -42,7 +47,12 @@ import com.gic.haoban.manage.api.enums.WelcomeRelationStatusEnum;
 import com.gic.haoban.manage.api.enums.hm.HmWelcomeReferType;
 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.PreDealLogMapper;
+import com.gic.haoban.manage.service.dao.mapper.hm.TabHaobanHmQrcodeMapper;
+import com.gic.haoban.manage.service.entity.TabHaobanPreDealLog;
 import com.gic.haoban.manage.service.entity.TabHaobanStaff;
+import com.gic.haoban.manage.service.entity.TabHaobanSyncTask;
+import com.gic.haoban.manage.service.entity.hm.TabHaobanHmQrcode;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmClerkRelationBO;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmGroupSettingBO;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmQrcodeBO;
@@ -51,6 +61,7 @@ import com.gic.haoban.manage.service.pojo.bo.hm.HmWelcomeRelationBO;
 import com.gic.haoban.manage.service.pojo.bo.welcome.WelcomeDetailBO;
 import com.gic.haoban.manage.service.service.StaffClerkRelationService;
 import com.gic.haoban.manage.service.service.StaffService;
+import com.gic.haoban.manage.service.service.SyncTaskService;
 import com.gic.haoban.manage.service.service.WelcomeService;
 import com.gic.haoban.manage.service.service.WxEnterpriseService;
 import com.gic.haoban.manage.service.service.hm.HmClerkRelationService;
@@ -112,6 +123,12 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
     private WelcomeService welcomeService;
     @Autowired
     private RightService rightService;
+    @Autowired
+    private SyncTaskService syncTaskService;
+    @Autowired
+    private PreDealLogMapper preDealLogMapper ;
+    @Autowired
+    private TabHaobanHmQrcodeMapper hmQrcodeMapper;
 
     @GicLogRecord(value = "新增员工活码-${#logContent}",
             category = GicLogRecordCategoryEnum.HUOMA,
@@ -367,6 +384,42 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
         }
         return ServiceResponse.success();
     }
+    
+    @Override
+    public ServiceResponse batchUpdateHm(HmQrcodeQDTO qdto) {
+        String wxEnterpriseId = qdto.getWxEnterpriseId();
+        Long hmId = qdto.getHmId();
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
+        List<String> inClerkIdList = qdto.getClerkIdList() ;
+        List<String> userIds = staffClerkRelationService.listWxUserIdByClerkIds(inClerkIdList, wxEnterpriseId);
+        if (CollectionUtils.isEmpty(userIds)) {
+            return ServiceResponse.failure(Convert.toStr(HaoBanErrCodeCommon.ERR_8.getCode()), "导购未关联好办");
+        }
+        qdto.setClerkIdList(inClerkIdList);
+        HmQrcodeBO hm = hmQrcodeService.queryById(hmId);
+        List<String> clerkIdList = this.setStoreClerk(qdto, wxEnterpriseId, hmId, hm.getHmType(), false);
+        if (CollectionUtils.isEmpty(clerkIdList)) {
+            return ServiceResponse.failure(Convert.toStr(HaoBanErrCodeCommon.ERR_8.getCode()), "该导购已经生成过活码或未关联过好办");
+        }
+        userIds = staffClerkRelationService.listWxUserIdByClerkIds(inClerkIdList, wxEnterpriseId);
+        //更新活码
+        QywxExternalcontactDTO qywxExternalcontactDTO = new QywxExternalcontactDTO();
+        qywxExternalcontactDTO.setType(hm.getHmType());
+        qywxExternalcontactDTO.setRemark(hm.getName());
+        qywxExternalcontactDTO.setSkipVerify(hm.getPassFlag() == 1);
+        qywxExternalcontactDTO.setState("HM" + hmId);
+        qywxExternalcontactDTO.setConfigId(hm.getWxConfigId());
+        qywxExternalcontactDTO.setUser(userIds);
+        QywxResponseDTO qywxResponseDTO = qywxUserApiService.updateContactWay(qwDTO.getThirdCorpid(), qwDTO.getSelf3thSecret(), qywxExternalcontactDTO,qwDTO.isSelf(),qwDTO.getUrlHost());
+        if (qywxResponseDTO.getErrcode() != 0) {
+            logger.error("更新企微活码失败");
+            GicLogRecordEvaluationContext.noWriteLog();
+            return ServiceResponse.failure(Convert.toStr(HaoBanErrCodeCommon.ERR_0.getCode()), qywxResponseDTO.getErrmsg());
+        }
+        return ServiceResponse.success();
+    }
+    
+    
 
     /**
      * 修改活码操作日志
@@ -908,4 +961,62 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
     public com.gic.api.base.commons.ServiceResponse<String> getClerkQrcode(String enterpriseId, String clerkId) {
         return ServiceResponse.success(hmQrcodeService.getClerkQrcode(enterpriseId, clerkId));
     }
+    
+    @Override
+    public ServiceResponse<List<HmBatchModifyResultDTO>> batchModify(HmBatchModifyQDTO qdto) {
+        logger.info("批量修改活码={}",JSON.toJSONString(qdto));
+        ServiceResponse<List<HmBatchModifyResultDTO>> resp = this.hmClerkRelationService.batchModify(qdto) ;
+        return resp;
+    }
+    
+    @Override
+    public ServiceResponse<HmBatchCountDTO> getModifyResult(String wxEnterpriseId, String taskId) {
+        TabHaobanSyncTask task = null  ;
+        if(StringUtils.isNotEmpty(taskId)) {
+            task = syncTaskService.getSyncTask(taskId);
+        }else {
+            task = this.syncTaskService.getSyncNewestTask(wxEnterpriseId, 20) ;
+        }
+        if(null == task) {
+            Log.info("无批量活码处理数据");
+            HmBatchCountDTO dto= new HmBatchCountDTO();
+            dto.setTaskStatus(4);
+            return ServiceResponse.success(dto);
+        }
+        taskId = task.getTaskId() ;
+        HmBatchCountDTO dto = new HmBatchCountDTO() ;
+        dto.setTaskStatus(task.getStatusFlag());
+        dto.setTaskId(task.getTaskId());
+        if(task.getStatusFlag() != 4) {
+            return ServiceResponse.success(dto) ;
+        }
+        List<TabHaobanPreDealLog> list = this.preDealLogMapper.listAllByTaskId(taskId) ;
+        dto.setTotalCount(list.size());
+        int successCount = 0 , failCount = 0 ;
+        List<HmBatchModifyResultDTO> failList = new ArrayList<>();
+        for(TabHaobanPreDealLog o : list) {
+            if(o.getStatusFlag()==2) {
+                successCount = successCount + 1 ;
+            }else {
+                failCount = failCount +1 ;
+                HmBatchModifyResultDTO err = new HmBatchModifyResultDTO(Long.valueOf(o.getDataId()), 3, o.getReason()) ;
+                failList.add(err) ;
+            }
+        }
+        dto.setSuccessCount(successCount);
+        dto.setFailount(failCount);
+        if(CollectionUtils.isNotEmpty(failList)) {
+            List<Long> hmidList = failList.stream().map(o->o.getHmid()).collect(Collectors.toList()) ;
+            List<TabHaobanHmQrcode> qrcodeList =  this.hmQrcodeMapper.queryByIdList(hmidList) ;
+            Map<Long,TabHaobanHmQrcode> qrcodeMap = qrcodeList.stream().collect(Collectors.toMap(TabHaobanHmQrcode::getHmId, o->o)) ;
+            failList.forEach(o->{
+                if(null != qrcodeMap.get(o.getHmid())) {
+                    o.setHmCode(qrcodeMap.get(o.getHmid()).getHmCode());
+                    o.setHmName(qrcodeMap.get(o.getHmid()).getName());
+                }
+            });
+        }
+        dto.setFailList(failList);
+        return ServiceResponse.success(dto);
+    }
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/hm/QwHmOperation.java

+package com.gic.haoban.manage.service.task.hm;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.haoban.manage.api.dto.DealParamMqDTO;
+import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeQDTO;
+import com.gic.haoban.manage.api.enums.PreDealTypeEnum;
+import com.gic.haoban.manage.api.enums.SyncTaskStatusEnum;
+import com.gic.haoban.manage.api.service.hm.HmQrcodeApiService;
+import com.gic.haoban.manage.service.entity.TabHaobanPreDealLog;
+import com.gic.haoban.manage.service.entity.TabHaobanSyncTask;
+import com.gic.haoban.manage.service.service.PreDealService;
+import com.gic.haoban.manage.service.service.SyncTaskService;
+import com.gic.haoban.manage.service.task.BaseSyncOperation;
+import com.gic.redis.data.util.RedisUtil;
+
+@Service
+public class QwHmOperation implements BaseSyncOperation {
+
+    private static final Logger logger = LoggerFactory.getLogger(QwHmOperation.class);
+    public static final String hmCachKey = "hm:batch:key" ;
+    @Autowired
+    private HmQrcodeApiService hmQrcodeApiService;
+    @Autowired
+    private PreDealService preDealService;
+    @Autowired
+    private SyncTaskService syncTaskService;
+
+    @Override
+    public void dealSingleByMq(DealParamMqDTO dealParamMqDTO, TabHaobanPreDealLog dataPre) {
+        String taskId = dealParamMqDTO.getTaskId();
+        String wxEnterpriseId = dataPre.getWxEnterpriseId();
+        String enterpriseId = dataPre.getEnterpriseId();
+        Long hmId = Long.valueOf(dataPre.getDataId());
+        try {
+            logger.info("开始处理活码={},{}",taskId,hmId);
+            String clerkIds = dataPre.getDataContent();
+            List<String> clerkIdList = JSONArray.parseArray(clerkIds, String.class);
+            // 删除
+            ServiceResponse resp = null ;
+            if (clerkIdList.size() == 0) {
+                resp = this.hmQrcodeApiService.delById(hmId, 1, null);
+            } else {
+                HmQrcodeQDTO qdto = new HmQrcodeQDTO();
+                qdto.setWxEnterpriseId(wxEnterpriseId);
+                qdto.setHmId(hmId);
+                qdto.setEnterpriseId(enterpriseId);
+                qdto.setClerkIdList(clerkIdList);
+                resp = this.hmQrcodeApiService.batchUpdateHm(qdto);
+            }
+            logger.info("批量修改活码={},{}",hmId,JSON.toJSONString(resp));
+            if(resp.isSuccess()) {
+                this.preDealService.updateStatusByDataId(taskId, dataPre.getDataId(), 2, null);
+            }else {
+                this.preDealService.updateStatusByDataId(taskId, dataPre.getDataId(), 3, resp.getMessage());
+            }
+        }catch(Exception e) {
+            logger.info("活码处理异常={},{}",hmId,e.getMessage());
+            this.preDealService.updateStatusByDataId(taskId, dataPre.getDataId(), 3, "执行异常");
+        }finally{
+            this.dealSuccess(taskId, dataPre.getDataId(), enterpriseId, wxEnterpriseId);
+        }
+    }
+
+    @Override
+    public void dealException(String taskId, String dataId, String enterpriseId, String reason) {
+    }
+
+    @Override
+    public void dealSuccess(String taskId, String dataId, String enterpriseId, String wxEnterpriseId) {
+        boolean b = preDealService.checkFriendTask(taskId, PreDealTypeEnum.modify_hm.getVal());
+        if (!b) {
+            return;
+        }
+        logger.info("批量修改活码完成={}", taskId);
+        TabHaobanSyncTask syncTask = syncTaskService.getSyncTask(taskId);
+        if (syncTask.getStatusFlag() == SyncTaskStatusEnum.compute.getVal()) {
+            RedisUtil.delCache(hmCachKey+wxEnterpriseId+enterpriseId) ;
+            return;
+        }
+        logger.info("批量修改活码完成,status={}", taskId);
+        RedisUtil.delCache(hmCachKey+wxEnterpriseId+enterpriseId) ;
+        this.syncTaskService.updateTaskStatus(taskId, SyncTaskStatusEnum.compute.getVal());
+    }
+
+    @Override
+    public void checkDepartmentTask(String taskId) {
+    }
+
+}

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

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gic.haoban.manage.service.dao.mapper.PreDealLogMapper">
-    <resultMap id="BaseResultMap" type="com.gic.haoban.manage.service.entity.TabHaobanPreDealLog">
-        <id column="id" jdbcType="INTEGER" property="id"/>
-        <result column="wx_enterprise_id" jdbcType="VARCHAR" property="wxEnterpriseId"/>
-        <result column="enterprise_id" jdbcType="VARCHAR" property="enterpriseId"/>
-        <result column="data_id" jdbcType="VARCHAR" property="dataId"/>
-        <result column="data_content" jdbcType="VARCHAR" property="dataContent"/>
-        <result column="reason" jdbcType="VARCHAR" property="reason"/>
-        <result column="p_data_id" jdbcType="VARCHAR" property="pDataId"/>
-        <result column="task_id" jdbcType="VARCHAR" property="taskId"/>
-        <result column="data_type" jdbcType="INTEGER" property="dataType"/>
-        <result column="status_flag" jdbcType="INTEGER" property="statusFlag"/>
-        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
-        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
-    </resultMap>
-    <sql id="Base_Column_List">
-        id, wx_enterprise_id,enterprise_id, data_id, p_data_id, task_id, data_type, status_flag,reason, create_time,
-    update_time
-  </sql>
-    <sql id="Base_Column_List_data">
-        id, wx_enterprise_id,enterprise_id, data_id,data_content, p_data_id, task_id, data_type, status_flag, create_time,reason,
-        update_time
-    </sql>
-    <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>
-        from tab_haoban_pre_deal_log
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_haoban_pre_deal_log
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-    <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHaobanPreDealLog">
-        insert into tab_haoban_pre_deal_log ( wx_enterprise_id,enterprise_id, data_id,data_content,
-      p_data_id, task_id, data_type, 
-      status_flag, create_time, update_time
-      )
-        values (#{wxEnterpriseId,jdbcType=VARCHAR},#{enterpriseId,jdbcType=VARCHAR},
-        #{dataId,jdbcType=VARCHAR},#{dataContent}
-      #{pDataId,jdbcType=VARCHAR}, #{taskId,jdbcType=VARCHAR}, #{dataType,jdbcType=INTEGER}, 
-      #{statusFlag,jdbcType=INTEGER}, now(), now()
-      )
-  </insert>
-    <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanPreDealLog">
-        insert into tab_haoban_pre_deal_log
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">
-                id,
-            </if>
-            <if test="wxEnterpriseId != null">
-                wx_enterprise_id,
-            </if>
-            <if test="enterpriseId != null">
-                enterprise_id,
-            </if>
-            <if test="dataId != null">
-                data_id,
-            </if>
-            <if test="dataContent != null">
-                data_content,
-            </if>
-            <if test="pDataId != null">
-                p_data_id,
-            </if>
-            <if test="taskId != null">
-                task_id,
-            </if>
-            <if test="dataType != null">
-                data_type,
-            </if>
-            <if test="statusFlag != null">
-                status_flag,
-            </if>
-                create_time,
-            update_time
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">
-                #{id,jdbcType=INTEGER},
-            </if>
-            <if test="wxEnterpriseId != null">
-                #{wxEnterpriseId,jdbcType=VARCHAR},
-            </if>
-            <if test="enterpriseId != null">
-                #{enterpriseId,jdbcType=VARCHAR},
-            </if>
-            <if test="dataId != null">
-                #{dataId,jdbcType=VARCHAR},
-            </if>
-            <if test="dataContent != null">
-                #{dataContent},
-            </if>
-            <if test="pDataId != null">
-                #{pDataId,jdbcType=VARCHAR},
-            </if>
-            <if test="taskId != null">
-                #{taskId,jdbcType=VARCHAR},
-            </if>
-            <if test="dataType != null">
-                #{dataType,jdbcType=INTEGER},
-            </if>
-            <if test="statusFlag != null">
-                #{statusFlag,jdbcType=INTEGER},
-            </if>
-            now(),
-            now()
-        </trim>
-    </insert>
-
-
-    <insert id="insertSelectiveBatch">
-        insert into tab_haoban_pre_deal_log ( wx_enterprise_id,enterprise_id, data_id,data_content,
-        p_data_id, task_id, data_type,
-        status_flag, create_time, update_time
-        )
-        values
-        <foreach collection="list" separator="," item="item" index="index">
-            (#{item.wxEnterpriseId,jdbcType=VARCHAR},#{item.enterpriseId,jdbcType=VARCHAR},
-            #{item.dataId,jdbcType=VARCHAR},#{item.dataContent},
-            #{item.pDataId,jdbcType=VARCHAR}, #{item.taskId,jdbcType=VARCHAR}, #{item.dataType,jdbcType=INTEGER},
-            #{item.statusFlag,jdbcType=INTEGER}, now(), now()
-            )
-        </foreach>
-    </insert>
-
-    <update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanPreDealLog">
-        update tab_haoban_pre_deal_log
-        <set>
-            <if test="wxEnterpriseId != null">
-                wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
-            </if>
-            <if test="enterpriseId != null">
-                enterprise_id = #{enterpriseId,jdbcType=VARCHAR},
-            </if>
-            <if test="dataId != null">
-                data_id = #{dataId,jdbcType=VARCHAR},
-            </if>
-            <if test="pDataId != null">
-                p_data_id = #{pDataId,jdbcType=VARCHAR},
-            </if>
-            <if test="taskId != null">
-                task_id = #{taskId,jdbcType=VARCHAR},
-            </if>
-            <if test="dataType != null">
-                data_type = #{dataType,jdbcType=INTEGER},
-            </if>
-            <if test="statusFlag != null">
-                status_flag = #{statusFlag,jdbcType=INTEGER},
-            </if>
-            <if test="createTime != null">
-                create_time = #{createTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="updateTime != null">
-                update_time = #{updateTime,jdbcType=TIMESTAMP},
-            </if>
-        </set>
-        where id = #{id,jdbcType=INTEGER}
-    </update>
-    <update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.TabHaobanPreDealLog">
-    update tab_haoban_pre_deal_log
-    set wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
-      data_id = #{dataId,jdbcType=VARCHAR},
-      p_data_id = #{pDataId,jdbcType=VARCHAR},
-      task_id = #{taskId,jdbcType=VARCHAR},
-      data_type = #{dataType,jdbcType=INTEGER},
-      status_flag = #{statusFlag,jdbcType=INTEGER},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-
-    <select id="getByDataId" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List_data"/>
-        from tab_haoban_pre_deal_log
-        where task_id = #{taskId} and data_id=#{dataId}
-        <if test="status!=-1">
-            and status_flag=#{status}
-        </if>
-        <if test="dataType!=-1">
-            and data_type=#{dataType}
-        </if>
-    </select>
-
-    <select id="listByPDataId" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>
-        from tab_haoban_pre_deal_log
-        where task_id = #{taskId} and p_data_id=#{dataId} and data_type=#{dataType}
-        <if test="status!=-1">
-            and status_flag=#{status}
-        </if>
-    </select>
-
-    <select id="listReByPDataId" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>
-        from tab_haoban_pre_deal_log
-        where task_id = #{taskId} and p_data_id=#{dataId} and data_type=#{dataType}
-        and status_flag in(0,1,3)
-    </select>
-
-    <update id="updateStatusByDataId">
-        update tab_haoban_pre_deal_log
-        <set>
-            status_flag = #{status,jdbcType=INTEGER},
-            reason=#{reason},
-            update_time = now()
-        </set>
-        where data_id = #{dataId,jdbcType=INTEGER} and task_id=#{taskId}
-        <if test="dataType!=-1">
-            and data_type=#{dataType}
-        </if>
-    </update>
-
-    <select id="checkTask" resultType="Integer">
-    select
-     count(*)
-    from tab_haoban_pre_deal_log
-    where task_id = #{taskId} and data_type=#{dataType}
-      and status_flag=#{status}
-  </select>
-
-    <select id="listByTaskId" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>
-        from tab_haoban_pre_deal_log
-        where task_id = #{taskId} and data_type=#{dataType}
-        and status_flag=#{status}
-    </select>
-
-    <select id="countByTaskId" resultType="Integer">
-        select
-        COUNT(*)
-        from tab_haoban_pre_deal_log
-        where task_id = #{taskId}
-        <if test="dataType!=-1">
-            and data_type=#{dataType}
-        </if>
-        <if test="status!=-1">
-            and status_flag=#{status}
-        </if>
-    </select>
-
-
-    <select id="countExcepAndPreByTaskId" resultType="Integer">
-        select
-        COUNT(*)
-        from tab_haoban_pre_deal_log
-        where task_id = #{taskId}
-        <if test="dataType!=-1">
-            and data_type=#{dataType}
-        </if>
-        and status_flag in(0,3)
-    </select>
-
-    <select id="listRebuildDepartByTaskId" resultMap="BaseResultMap">
-        SELECT
-        <include refid="Base_Column_List"/>
-        FROM
-        tab_haoban_pre_deal_log a
-        WHERE
-        a.task_id = #{taskId}
-        AND data_type = 0
-        AND status_flag in(0,3)
-        AND EXISTS (
-        SELECT
-        1
-        FROM
-        tab_haoban_pre_deal_log b
-        WHERE
-        b.task_id = #{taskId}
-        AND data_type = 0
-        AND a.p_data_id = b.data_id
-        AND b.status_flag = 2
-        )
-    </select>
-
-
-    <select id="listRebuildByTaskId" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>
-        from tab_haoban_pre_deal_log
-        where task_id = #{taskId} and data_type=#{dataType}
-        and status_flag in(0,3)
-    </select>
-
-
-    <update id="updateExceptionToPre">
-        update tab_haoban_pre_deal_log
-        <set>
-
-            status_flag = 0,
-            update_time = now()
-        </set>
-        where status_flag = 3 and task_id=#{taskId}
-    </update>
-
-    <select id="listExceptionByTask" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List_data"/>
-        from tab_haoban_pre_deal_log
-        where task_id = #{taskId}
-        and status_flag =3
-    </select>
-    
-    <select id="listDataIdByTaskIdAndDataType" resultType="java.lang.String">
-        select
-          data_id
-        from tab_haoban_pre_deal_log
-        where task_id = #{taskId}
-        and data_type =#{dataType}
-    </select>
-
-
-    <select id="getLastPreDataByTaskId"  resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>
-        from tab_haoban_pre_deal_log
-        where task_id = #{taskId,jdbcType=INTEGER} order by update_time desc limit 1
-    </select>
-
-    
-    <update id="updateFriendStatusByDataId">
-        update tab_haoban_pre_deal_log
-        <set>
-            status_flag = #{status,jdbcType=INTEGER},
-            reason=#{reason},
-            data_content = #{dataContent},
-            update_time = now()
-        </set>
-        where data_id = #{dataId,jdbcType=INTEGER} and task_id=#{taskId}
-    </update>
-
-    <update id="updateFriendStatusAndRelationKeyByDataId">
-        update tab_haoban_pre_deal_log
-        <set>
-            status_flag = #{status,jdbcType=INTEGER},
-            reason=#{reason},
-            <if test="dataContent !=null">
-                data_content = #{dataContent},
-            </if>
-            relation_key=#{relationKey},
-            update_time = now()
-        </set>
-        where data_id = #{dataId,jdbcType=INTEGER} and task_id=#{taskId} and data_type = #{dataType}
-    </update>
-
-
-    <select id="getByRelationKey" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List_data"/>
-        from tab_haoban_pre_deal_log
-        where task_id = #{taskId}
-        and relation_key =#{relationKey}
-        and data_type =#{dataType}
-    </select>
-
-    <select id="checkTaskFriend" resultType="Integer">
-        select
-        count(*)
-        from tab_haoban_pre_deal_log
-        where task_id = #{taskId}
-        <if test="pDataId!=null">
-            and p_data_id=#{pDataId}
-        </if>
-        and data_type=#{dataType}
-        and status_flag in(0,1)
-    </select>
-
-    <select id="listReDataIdByPDataId" resultType="String">
-        select
-         data_id
-        from tab_haoban_pre_deal_log
-        where task_id = #{taskId} and p_data_id=#{dataId} and data_type=#{dataType}
-        and status_flag in(0,1,3)
-    </select>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gic.haoban.manage.service.dao.mapper.PreDealLogMapper">
+    <resultMap id="BaseResultMap" type="com.gic.haoban.manage.service.entity.TabHaobanPreDealLog">
+        <id column="id" jdbcType="INTEGER" property="id"/>
+        <result column="wx_enterprise_id" jdbcType="VARCHAR" property="wxEnterpriseId"/>
+        <result column="enterprise_id" jdbcType="VARCHAR" property="enterpriseId"/>
+        <result column="data_id" jdbcType="VARCHAR" property="dataId"/>
+        <result column="data_content" jdbcType="VARCHAR" property="dataContent"/>
+        <result column="reason" jdbcType="VARCHAR" property="reason"/>
+        <result column="p_data_id" jdbcType="VARCHAR" property="pDataId"/>
+        <result column="task_id" jdbcType="VARCHAR" property="taskId"/>
+        <result column="data_type" jdbcType="INTEGER" property="dataType"/>
+        <result column="status_flag" jdbcType="INTEGER" property="statusFlag"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        id, wx_enterprise_id,enterprise_id, data_id, p_data_id, task_id, data_type, status_flag,reason, create_time,
+    update_time
+  </sql>
+    <sql id="Base_Column_List_data">
+        id, wx_enterprise_id,enterprise_id, data_id,data_content, p_data_id, task_id, data_type, status_flag, create_time,reason,
+        update_time
+    </sql>
+    <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from tab_haoban_pre_deal_log
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from tab_haoban_pre_deal_log
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+    <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHaobanPreDealLog">
+        insert into tab_haoban_pre_deal_log ( wx_enterprise_id,enterprise_id, data_id,data_content,
+      p_data_id, task_id, data_type, 
+      status_flag, create_time, update_time
+      )
+        values (#{wxEnterpriseId,jdbcType=VARCHAR},#{enterpriseId,jdbcType=VARCHAR},
+        #{dataId,jdbcType=VARCHAR},#{dataContent}
+      #{pDataId,jdbcType=VARCHAR}, #{taskId,jdbcType=VARCHAR}, #{dataType,jdbcType=INTEGER}, 
+      #{statusFlag,jdbcType=INTEGER}, now(), now()
+      )
+  </insert>
+    <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanPreDealLog">
+        insert into tab_haoban_pre_deal_log
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            <if test="wxEnterpriseId != null">
+                wx_enterprise_id,
+            </if>
+            <if test="enterpriseId != null">
+                enterprise_id,
+            </if>
+            <if test="dataId != null">
+                data_id,
+            </if>
+            <if test="dataContent != null">
+                data_content,
+            </if>
+            <if test="pDataId != null">
+                p_data_id,
+            </if>
+            <if test="taskId != null">
+                task_id,
+            </if>
+            <if test="dataType != null">
+                data_type,
+            </if>
+            <if test="statusFlag != null">
+                status_flag,
+            </if>
+                create_time,
+            update_time
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            <if test="wxEnterpriseId != null">
+                #{wxEnterpriseId,jdbcType=VARCHAR},
+            </if>
+            <if test="enterpriseId != null">
+                #{enterpriseId,jdbcType=VARCHAR},
+            </if>
+            <if test="dataId != null">
+                #{dataId,jdbcType=VARCHAR},
+            </if>
+            <if test="dataContent != null">
+                #{dataContent},
+            </if>
+            <if test="pDataId != null">
+                #{pDataId,jdbcType=VARCHAR},
+            </if>
+            <if test="taskId != null">
+                #{taskId,jdbcType=VARCHAR},
+            </if>
+            <if test="dataType != null">
+                #{dataType,jdbcType=INTEGER},
+            </if>
+            <if test="statusFlag != null">
+                #{statusFlag,jdbcType=INTEGER},
+            </if>
+            now(),
+            now()
+        </trim>
+    </insert>
+
+
+    <insert id="insertSelectiveBatch">
+        insert into tab_haoban_pre_deal_log ( wx_enterprise_id,enterprise_id, data_id,data_content,
+        p_data_id, task_id, data_type,
+        status_flag, create_time, update_time,reason
+        )
+        values
+        <foreach collection="list" separator="," item="item" index="index">
+            (#{item.wxEnterpriseId,jdbcType=VARCHAR},#{item.enterpriseId,jdbcType=VARCHAR},
+            #{item.dataId,jdbcType=VARCHAR},#{item.dataContent},
+            #{item.pDataId,jdbcType=VARCHAR}, #{item.taskId,jdbcType=VARCHAR}, #{item.dataType,jdbcType=INTEGER},
+            #{item.statusFlag,jdbcType=INTEGER}, now(), now(),#{item.reason}
+            )
+        </foreach>
+    </insert>
+
+    <update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanPreDealLog">
+        update tab_haoban_pre_deal_log
+        <set>
+            <if test="wxEnterpriseId != null">
+                wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
+            </if>
+            <if test="enterpriseId != null">
+                enterprise_id = #{enterpriseId,jdbcType=VARCHAR},
+            </if>
+            <if test="dataId != null">
+                data_id = #{dataId,jdbcType=VARCHAR},
+            </if>
+            <if test="pDataId != null">
+                p_data_id = #{pDataId,jdbcType=VARCHAR},
+            </if>
+            <if test="taskId != null">
+                task_id = #{taskId,jdbcType=VARCHAR},
+            </if>
+            <if test="dataType != null">
+                data_type = #{dataType,jdbcType=INTEGER},
+            </if>
+            <if test="statusFlag != null">
+                status_flag = #{statusFlag,jdbcType=INTEGER},
+            </if>
+            <if test="createTime != null">
+                create_time = #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateTime != null">
+                update_time = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+        </set>
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.TabHaobanPreDealLog">
+    update tab_haoban_pre_deal_log
+    set wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
+      data_id = #{dataId,jdbcType=VARCHAR},
+      p_data_id = #{pDataId,jdbcType=VARCHAR},
+      task_id = #{taskId,jdbcType=VARCHAR},
+      data_type = #{dataType,jdbcType=INTEGER},
+      status_flag = #{statusFlag,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+    <select id="getByDataId" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List_data"/>
+        from tab_haoban_pre_deal_log
+        where task_id = #{taskId} and data_id=#{dataId}
+        <if test="status!=-1">
+            and status_flag=#{status}
+        </if>
+        <if test="dataType!=-1">
+            and data_type=#{dataType}
+        </if>
+    </select>
+
+    <select id="listByPDataId" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from tab_haoban_pre_deal_log
+        where task_id = #{taskId} and p_data_id=#{dataId} and data_type=#{dataType}
+        <if test="status!=-1">
+            and status_flag=#{status}
+        </if>
+    </select>
+
+    <select id="listReByPDataId" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from tab_haoban_pre_deal_log
+        where task_id = #{taskId} and p_data_id=#{dataId} and data_type=#{dataType}
+        and status_flag in(0,1,3)
+    </select>
+
+    <update id="updateStatusByDataId">
+        update tab_haoban_pre_deal_log
+        <set>
+            status_flag = #{status,jdbcType=INTEGER},
+            reason=#{reason},
+            update_time = now()
+        </set>
+        where data_id = #{dataId,jdbcType=INTEGER} and task_id=#{taskId}
+        <if test="dataType!=-1">
+            and data_type=#{dataType}
+        </if>
+    </update>
+
+    <select id="checkTask" resultType="Integer">
+    select
+     count(*)
+    from tab_haoban_pre_deal_log
+    where task_id = #{taskId} and data_type=#{dataType}
+      and status_flag=#{status}
+  </select>
+
+    <select id="listByTaskId" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from tab_haoban_pre_deal_log
+        where task_id = #{taskId} and data_type=#{dataType}
+        and status_flag=#{status}
+    </select>
+
+    <select id="countByTaskId" resultType="Integer">
+        select
+        COUNT(*)
+        from tab_haoban_pre_deal_log
+        where task_id = #{taskId}
+        <if test="dataType!=-1">
+            and data_type=#{dataType}
+        </if>
+        <if test="status!=-1">
+            and status_flag=#{status}
+        </if>
+    </select>
+
+
+    <select id="countExcepAndPreByTaskId" resultType="Integer">
+        select
+        COUNT(*)
+        from tab_haoban_pre_deal_log
+        where task_id = #{taskId}
+        <if test="dataType!=-1">
+            and data_type=#{dataType}
+        </if>
+        and status_flag in(0,3)
+    </select>
+
+    <select id="listRebuildDepartByTaskId" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM
+        tab_haoban_pre_deal_log a
+        WHERE
+        a.task_id = #{taskId}
+        AND data_type = 0
+        AND status_flag in(0,3)
+        AND EXISTS (
+        SELECT
+        1
+        FROM
+        tab_haoban_pre_deal_log b
+        WHERE
+        b.task_id = #{taskId}
+        AND data_type = 0
+        AND a.p_data_id = b.data_id
+        AND b.status_flag = 2
+        )
+    </select>
+	
+	 <select id="listAllByTaskId" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from tab_haoban_pre_deal_log
+        where task_id = #{taskId}  
+    </select>
+
+    <select id="listRebuildByTaskId" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from tab_haoban_pre_deal_log
+        where task_id = #{taskId} and data_type=#{dataType}
+        and status_flag in(0,3)
+    </select>
+
+
+    <update id="updateExceptionToPre">
+        update tab_haoban_pre_deal_log
+        <set>
+
+            status_flag = 0,
+            update_time = now()
+        </set>
+        where status_flag = 3 and task_id=#{taskId}
+    </update>
+
+    <select id="listExceptionByTask" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List_data"/>
+        from tab_haoban_pre_deal_log
+        where task_id = #{taskId}
+        and status_flag =3
+    </select>
+    
+    <select id="listDataIdByTaskIdAndDataType" resultType="java.lang.String">
+        select
+          data_id
+        from tab_haoban_pre_deal_log
+        where task_id = #{taskId}
+        and data_type =#{dataType}
+    </select>
+
+
+    <select id="getLastPreDataByTaskId"  resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from tab_haoban_pre_deal_log
+        where task_id = #{taskId,jdbcType=INTEGER} order by update_time desc limit 1
+    </select>
+
+    
+    <update id="updateFriendStatusByDataId">
+        update tab_haoban_pre_deal_log
+        <set>
+            status_flag = #{status,jdbcType=INTEGER},
+            reason=#{reason},
+            data_content = #{dataContent},
+            update_time = now()
+        </set>
+        where data_id = #{dataId,jdbcType=INTEGER} and task_id=#{taskId}
+    </update>
+
+    <update id="updateFriendStatusAndRelationKeyByDataId">
+        update tab_haoban_pre_deal_log
+        <set>
+            status_flag = #{status,jdbcType=INTEGER},
+            reason=#{reason},
+            <if test="dataContent !=null">
+                data_content = #{dataContent},
+            </if>
+            relation_key=#{relationKey},
+            update_time = now()
+        </set>
+        where data_id = #{dataId,jdbcType=INTEGER} and task_id=#{taskId} and data_type = #{dataType}
+    </update>
+
+
+    <select id="getByRelationKey" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List_data"/>
+        from tab_haoban_pre_deal_log
+        where task_id = #{taskId}
+        and relation_key =#{relationKey}
+        and data_type =#{dataType}
+    </select>
+
+    <select id="checkTaskFriend" resultType="Integer">
+        select
+        count(*)
+        from tab_haoban_pre_deal_log
+        where task_id = #{taskId}
+        <if test="pDataId!=null">
+            and p_data_id=#{pDataId}
+        </if>
+        and data_type=#{dataType}
+        and status_flag in(0,1)
+    </select>
+
+    <select id="listReDataIdByPDataId" resultType="String">
+        select
+         data_id
+        from tab_haoban_pre_deal_log
+        where task_id = #{taskId} and p_data_id=#{dataId} and data_type=#{dataType}
+        and status_flag in(0,1,3)
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -288,7 +288,7 @@
         and status_flag = 1
     </select>
 
-    <select id="pageStaff" resultMap="BaseResultMap">
+    <select id="pageStaff" parameterType="com.gic.haoban.manage.service.pojo.bo.StaffListBO" resultMap="BaseResultMap">
         select
         a.*
         <if test="departmentIds != null and departmentIds.size() > 0">
@@ -302,8 +302,8 @@
         <if test="occupy == null or 1!=occupy">
 	        and a.status_flag = 1
         </if>
-        <if test="keyword != null and keyword != ''">
-            and (a.staff_name like CONCAT('%',#{keyword},'%') or a.phone_number like CONCAT('%',#{keyword},'%'))
+        <if test="keyWord != null and keyWord != ''">
+            and (a.staff_name like CONCAT('%',#{keyWord},'%') or a.phone_number like CONCAT('%',#{keyWord},'%'))
         </if>
         <if test="activeFlag != null">
             and a.active_flag = #{activeFlag}
@@ -356,7 +356,7 @@
         <if test="departmentIds != null and departmentIds.size() > 0">
             group by a.staff_id
         </if>
-        order by a.create_time desc
+        order by ${sortField} ${sortType}
     </select>
     <select id="listByIds" resultMap="BaseResultMap">
         select

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

@@ -21,6 +21,14 @@
         from tab_haoban_sync_task
         where task_id = #{taskId,jdbcType=VARCHAR}
     </select>
+    
+    <select id="getSyncNewestTask"  resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from tab_haoban_sync_task
+        where wx_enterprise_id = #{wxEnterpriseId} and task_type = #{taskType} order by create_time desc limit 1 
+    </select>
+    
     <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
         delete from tab_haoban_sync_task
         where task_id = #{taskId,jdbcType=VARCHAR}

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

@@ -460,9 +460,9 @@
         </foreach>
         and wx_enterprise_id = #{wxEnterpriseId}
         and enterprise_id = #{enterpriseId}
-        and status_flag = 1 and external_status = 1 
-		and external_user_id is not null 
-        group by member_id 
+        and status_flag = 1 and external_status = 1
+		and external_user_id is not null
+        group by member_id
     </select>
     
     <select id="getLastByExTernalUseridAndWxUserIdNoStatus" resultMap="BaseResultMap">

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

@@ -453,4 +453,26 @@
         where a.enterprise_id = #{enterpriseId} and a.status_flag=1 and b.status_flag = 1
     </select>
 
+    <select id="listByWxEnterpriseIdAndStaffId" resultType="com.gic.haoban.manage.api.dto.StaffClerkRelationDTO">
+        select
+        staff_id  staffId,
+        enterprise_id  enterpriseId
+        from tab_haoban_staff_clerk_relation
+        WHERE
+            wx_enterprise_id = #{wxEnterpriseId}
+          AND status_flag = 1
+          AND staff_id in
+        <foreach collection="staffIdList" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </select>
+
+    <select id="listAllStaffIdByEnterpriseId" resultType="java.lang.String">
+        select a.staff_id
+        from tab_haoban_staff_clerk_relation a left join tab_haoban_staff b on b.staff_id = a.staff_id
+        where a.enterprise_id = #{enterpriseId} and a.status_flag=1 and b.status_flag = 1 and a.wx_enterprise_id = #{wxEnterpriseId}
+        GROUP BY
+            a.staff_id
+    </select>
+
 </mapper>
\ No newline at end of file

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatPlanOwnerLogMapper.xml

-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gic.haoban.manage.service.dao.mapper.chat.GroupChatPlanOwnerLogMapper">
-  <resultMap type="com.gic.haoban.manage.service.entity.chat.TabGroupChatPlanOwnerLog" id="result-map-tabHaobanGroupChatPlanOwnerLog">
-      <result column="owner_log_id"  property="ownerLogId"/>
-      <result column="plan_id"  property="planId"/>
-      <result column="wx_enterprise_id"  property="wxEnterpriseId"/>
-      <result column="enterprise_id"  property="enterpriseId"/>
-      <result column="staff_id"  property="staffId"/>
-      <result column="store_id"  property="storeId"/>
-      <result column="clerk_id"  property="clerkId"/>
-      <result column="send_status"  property="sendStatus"/>
-      <result column="send_count"  property="sendCount"/>
-      <result column="create_time"  property="createTime"/>
-      <result column="update_time"  property="updateTime"/>
-      <result column="remark" property="remark"/>
-      <result column="msgid" property="msgid"/>
-      <result column="delete_flag" property="deleteFlag"/>
-      <result column="done_flag" property="doneFlag"/>
-      <result column="send_time" property="sendTime"/>
-      <result column="fail_count" property="failCount"/>
-  </resultMap>
-  <sql id="Base_Column_List">
-	  owner_log_id,
-	  plan_id,
-	  wx_enterprise_id,
-	  enterprise_id,
-	  staff_id,
-	  store_id,
-	  clerk_id,
-	  send_status,
-	  send_count,
-	  create_time,
-	  update_time , remark , msgid , delete_flag , done_flag , send_time ,  fail_count
-  </sql>
-  <!-- ===================== 新增 ======================== -->
-  
-  <insert id="batchInsert">
-		 INSERT INTO tab_haoban_group_chat_plan_owner_log(
-		  owner_log_id,
-		  plan_id,
-		  wx_enterprise_id,
-		  enterprise_id,
-		  staff_id,
-		  store_id,
-		  clerk_id,
-		  send_status,
-		  send_count,
-		  fail_count,
-		  create_time,
-		  update_time , remark , msgid , delete_flag , done_flag 
-		)VALUES
-		<foreach collection="list" item="item" separator=","  >
-			(     #{item.ownerLogId,jdbcType=BIGINT},
-				  #{item.planId,jdbcType=BIGINT},
-				  #{item.wxEnterpriseId},
-				  #{item.enterpriseId},
-				  #{item.staffId},
-				  #{item.storeId},
-				  #{item.clerkId},
-				  #{item.sendStatus},
-				  0,
-				  0,
-				  #{item.createTime},
-				  #{item.updateTime} , #{item.remark} , #{item.msgid} , 0 , 0
-			)
-		</foreach>
-	</insert>
-	
-	<update id="update" parameterType="com.gic.haoban.manage.service.entity.chat.TabGroupChatPlanOwnerLog">
-		 <![CDATA[
-			  UPDATE tab_haoban_group_chat_plan_owner_log SET
-				  store_id=#{storeId},
-				  clerk_id=#{clerkId},
-				  send_status=#{sendStatus},
-				  update_time=now(),
-				  remark=#{remark},
-				  msgid=#{msgid}
-			  where owner_log_id = #{ownerLogId}
-			  ]]>
-	</update>
-	
-	<update id="deleteByStaffIds">
-		update tab_haoban_group_chat_plan_owner_log set delete_flag = 1 , update_time =now() where plan_id=#{planId} 
-		and staff_id in 
-		<foreach collection="staffIdList" close=")" open="(" separator="," item="id">
-			#{id}
-		</foreach>
-	</update>
-	
-   <!-- ==================更新 ========== -->
-  <update id="updateSendCount">
-  	<![CDATA[
-  		UPDATE tab_haoban_group_chat_plan_owner_log SET send_count = #{sendCount} ,  fail_count =#{failCount} , done_flag = 1 , 
-  		send_status = 2 , send_time = #{sendTime} , 
-  		update_time = now() where owner_log_id = #{id}
-  	]]>
-  </update>
-  
-  <!-- ============ 查询=============-->
-  <select id="selectById" parameterType="long" resultMap="result-map-tabHaobanGroupChatPlanOwnerLog">
-  SELECT <include refid="Base_Column_List"/> FROM tab_haoban_group_chat_plan_owner_log WHERE owner_log_id = #{ownerLogId} and delete_flag = 0
-  </select>
-  
-  <select id="listForTimer" resultType="long">
-  	  SELECT a.owner_log_id  FROM tab_haoban_group_chat_plan_owner_log a left join tab_haoban_group_chat_plan b on a.plan_id = b.plan_id 
-  	  WHERE b.end_time >= DATE_ADD(NOW(),INTERVAL -6 hour) and a.done_flag = 0  and a.delete_flag = 0  and b.delete_flag = 0 and a.msgid is not null  
-  	  <if test="null != planId and -1 != planId">
-	  	  and a.plan_id = #{planId}
-  	  </if>
-  </select>
-  
-  <select id="listForDoPlan" resultMap="result-map-tabHaobanGroupChatPlanOwnerLog">
-  	select <include refid="Base_Column_List"/> FROM tab_haoban_group_chat_plan_owner_log WHERE plan_id = #{planId} and delete_flag = 0 limit ${startItem},${pageSize}
-  </select>
-  
-  <select id="listPage"  parameterType="com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO" resultType="com.gic.haoban.manage.api.dto.chat.GroupChatPlanOwnerLogDTO">
-  	 select 
-  	    a.owner_log_id ownerLogId , 
-  	    a.wx_enterprise_id wxEnterpriseId ,
-  	    a.plan_id planId ,
-  	 	b.staff_name staffName ,
-  	 	a.staff_id  staffId , 
-  	 	a.clerk_id  clerkId ,
-  	 	a.store_id  storeId ,
-  	 	a.send_status sendStatus ,
-  	 	a.send_count  sendCount , 
-  	 	a.send_time   sendTime ,
-  	 	a.create_time createTime ,
-  	 	a.done_flag   doneFlag ,
-  	 	a.msgid       msgid 
-  	  from tab_haoban_group_chat_plan_owner_log a left join tab_haoban_staff b on a.staff_id = b.staff_id 
-  	  where 
-  	  	a.wx_enterprise_id = #{wxEnterpriseId} and a.plan_id = #{planId}  and a.delete_flag = 0
-  	  	<if test="null != sendStatus">
-  	  		and send_status = #{sendStatus}
-  	  	</if>
-  	  	<if test="null != searchParams and ''!=searchParams">
-  	  		and b.staff_name like #{searchParams}
-  	  	</if>
-  	  	<if test="null != startDate">
-			and a.create_time <![CDATA[>=]]> #{startDate} and a.create_time <![CDATA[<=]]> #{endDate}
-	    </if>
-  	  	order by a.create_time , a.owner_log_id
-  </select>
-  
-  <select id="listOwnerLogPageForWxaTotal"  parameterType="com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO" resultType="com.gic.haoban.manage.api.dto.chat.ChatOwnerTotalDTO">
-  		select 
-  		b.plan_id   planId   ,
-  	 	b.name      planName ,
-  	 	b.start_time  startTime , 
-  	 	b.end_time    endTime , 
-  	 	<!-- 已发送 -->
-  	 	SUM(CASE a.send_status WHEN 2 THEN 1 ELSE 0 END ) sendCount,
-  	 	<!-- 待发送 -->
-  	 	SUM(CASE a.send_status WHEN 1 THEN 1 ELSE 0 END ) notSendCount 
-  	 	
-  	  from tab_haoban_group_chat_plan_owner_log a left join tab_haoban_group_chat_plan b on a.plan_id = b.plan_id 
-  	  where 
-  	  	a.wx_enterprise_id = #{wxEnterpriseId} and b.delete_flag = 0
-  	  	<if test="null != storeId">
-  	  		 and a.store_id = #{storeId}
-  	  	</if>
-  	  	<if test="null != clerkId">
-  	  		and a.clerk_id = #{clerkId}
-  	  	</if>
-  	  	<if test="null != sendStatus">
-  	  		and a.send_status = #{sendStatus}
-  	  	</if>
-  	  	<if test="null != searchParams">
-  	  		and b.name like #{searchParams}
-  	  	</if>
-  	  	group by b.plan_id
-  	  	
-  	  	order by a.create_time desc , a.owner_log_id
-  </select>
-  
-  <select id="listOwnerLogPageForWxa"  parameterType="com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO" resultType="com.gic.haoban.manage.api.dto.chat.GroupChatPlanOwnerLogDTO">
-  		select 
-  		a.owner_log_id ownerLogId ,
-  		b.plan_id   planId , 
-  	 	b.name      planName ,
-  	 	a.staff_id  staffId , 
-  	 	a.clerk_id  clerkId ,
-  	 	a.store_id  storeId ,
-  	 	a.send_status sendStatus ,
-  	 	a.send_count  sendCount , 
-  	 	a.fail_count  failCount ,
-  	 	a.send_time   sendTime ,
-  	 	a.create_time createTime ,
-  	 	b.end_time  expireDate ,
-  	 	b.end_time  endTime ,
-  	 	b.start_time startTime ,
-  	 	a.done_flag   doneFlag ,
-  	 	a.msgid       msgid 
-  	  from tab_haoban_group_chat_plan_owner_log a left join tab_haoban_group_chat_plan b on a.plan_id = b.plan_id 
-  	  where a.wx_enterprise_id = #{wxEnterpriseId} and a.plan_id = #{planId}  and b.delete_flag = 0
-  	  	<if test="null != storeId">
-  	  		 and a.store_id = #{storeId}
-  	  	</if>
-  	  	<if test="null != clerkId">
-  	  		and a.clerk_id = #{clerkId}
-  	  	</if>
-  	  	<if test="null != sendStatus">
-  	  		and a.send_status = #{sendStatus}
-  	  	</if>
-  	  	 order by a.create_time desc , a.owner_log_id
-  </select>
-  
-  <select id="getOwnerInfo"  resultType="com.gic.haoban.manage.api.dto.chat.GroupChatPlanOwnerLogDTO">
-  		select 
-  		a.owner_log_id ownerLogId ,
-  		b.plan_id   planId , 
-  	 	b.name      planName ,
-  	 	a.staff_id  staffId , 
-  	 	a.clerk_id  clerkId ,
-  	 	a.store_id  storeId ,
-  	 	a.send_status sendStatus ,
-  	 	a.send_count  sendCount , 
-  	 	a.fail_count  failCount ,
-  	 	a.send_time   sendTime ,
-  	 	a.create_time createTime ,
-  	 	b.end_time  expireDate ,
-  	 	b.end_time  endTime ,
-  	 	b.start_time startTime ,
-  	 	a.done_flag   doneFlag ,
-  	 	a.msgid       msgid 
-  	  from tab_haoban_group_chat_plan_owner_log a left join tab_haoban_group_chat_plan b on a.plan_id = b.plan_id 
-  	  where a.wx_enterprise_id = #{wxEnterpriseId} and a.plan_id = #{planId}  and b.delete_flag = 0 and a.staff_id = #{staffId}
-  	  and a.clerk_id = #{clerkId}
-  </select>
-  
-  
-  
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gic.haoban.manage.service.dao.mapper.chat.GroupChatPlanOwnerLogMapper">
+  <resultMap type="com.gic.haoban.manage.service.entity.chat.TabGroupChatPlanOwnerLog" id="result-map-tabHaobanGroupChatPlanOwnerLog">
+      <result column="owner_log_id"  property="ownerLogId"/>
+      <result column="plan_id"  property="planId"/>
+      <result column="wx_enterprise_id"  property="wxEnterpriseId"/>
+      <result column="enterprise_id"  property="enterpriseId"/>
+      <result column="staff_id"  property="staffId"/>
+      <result column="store_id"  property="storeId"/>
+      <result column="clerk_id"  property="clerkId"/>
+      <result column="send_status"  property="sendStatus"/>
+      <result column="send_count"  property="sendCount"/>
+      <result column="create_time"  property="createTime"/>
+      <result column="update_time"  property="updateTime"/>
+      <result column="remark" property="remark"/>
+      <result column="msgid" property="msgid"/>
+      <result column="delete_flag" property="deleteFlag"/>
+      <result column="done_flag" property="doneFlag"/>
+      <result column="send_time" property="sendTime"/>
+      <result column="fail_count" property="failCount"/>
+  </resultMap>
+  <sql id="Base_Column_List">
+	  owner_log_id,
+	  plan_id,
+	  wx_enterprise_id,
+	  enterprise_id,
+	  staff_id,
+	  store_id,
+	  clerk_id,
+	  send_status,
+	  send_count,
+	  create_time,
+	  update_time , remark , msgid , delete_flag , done_flag , send_time ,  fail_count
+  </sql>
+  <!-- ===================== 新增 ======================== -->
+  
+  <insert id="batchInsert">
+		 INSERT INTO tab_haoban_group_chat_plan_owner_log(
+		  owner_log_id,
+		  plan_id,
+		  wx_enterprise_id,
+		  enterprise_id,
+		  staff_id,
+		  store_id,
+		  clerk_id,
+		  send_status,
+		  send_count,
+		  fail_count,
+		  create_time,
+		  update_time , remark , msgid , delete_flag , done_flag 
+		)VALUES
+		<foreach collection="list" item="item" separator=","  >
+			(     #{item.ownerLogId,jdbcType=BIGINT},
+				  #{item.planId,jdbcType=BIGINT},
+				  #{item.wxEnterpriseId},
+				  #{item.enterpriseId},
+				  #{item.staffId},
+				  #{item.storeId},
+				  #{item.clerkId},
+				  #{item.sendStatus},
+				  0,
+				  0,
+				  #{item.createTime},
+				  #{item.updateTime} , #{item.remark} , #{item.msgid} , 0 , 0
+			)
+		</foreach>
+	</insert>
+	
+	<update id="update" parameterType="com.gic.haoban.manage.service.entity.chat.TabGroupChatPlanOwnerLog">
+		 <![CDATA[
+			  UPDATE tab_haoban_group_chat_plan_owner_log SET
+				  store_id=#{storeId},
+				  clerk_id=#{clerkId},
+				  send_status=#{sendStatus},
+				  update_time=now(),
+				  remark=#{remark},
+				  msgid=#{msgid}
+			  where owner_log_id = #{ownerLogId}
+			  ]]>
+	</update>
+	
+	<update id="deleteByStaffIds">
+		update tab_haoban_group_chat_plan_owner_log set delete_flag = 1 , update_time =now() where plan_id=#{planId} 
+		and staff_id in 
+		<foreach collection="staffIdList" close=")" open="(" separator="," item="id">
+			#{id}
+		</foreach>
+	</update>
+	
+   <!-- ==================更新 ========== -->
+  <update id="updateSendCount">
+  	<![CDATA[
+  		UPDATE tab_haoban_group_chat_plan_owner_log SET send_count = #{sendCount} ,  fail_count =#{failCount} , done_flag = 1 , 
+  		send_status = 2 , send_time = #{sendTime} , 
+  		update_time = now() where owner_log_id = #{id}
+  	]]>
+  </update>
+  
+  <!-- ============ 查询=============-->
+  <select id="selectById" parameterType="long" resultMap="result-map-tabHaobanGroupChatPlanOwnerLog">
+  SELECT <include refid="Base_Column_List"/> FROM tab_haoban_group_chat_plan_owner_log WHERE owner_log_id = #{ownerLogId} and delete_flag = 0
+  </select>
+  
+  <select id="listForTimer" resultType="long">
+  	  SELECT a.owner_log_id  FROM tab_haoban_group_chat_plan_owner_log a left join tab_haoban_group_chat_plan b on a.plan_id = b.plan_id 
+  	  WHERE b.end_time >= DATE_ADD(NOW(),INTERVAL -6 hour) and a.done_flag = 0  and a.delete_flag = 0  and b.delete_flag = 0 and a.msgid is not null  
+  	  <if test="null != planId and -1 != planId">
+	  	  and a.plan_id = #{planId}
+  	  </if>
+  </select>
+  
+  <select id="listForDoPlan" resultMap="result-map-tabHaobanGroupChatPlanOwnerLog">
+  	select <include refid="Base_Column_List"/> FROM tab_haoban_group_chat_plan_owner_log WHERE plan_id = #{planId} and delete_flag = 0 limit ${startItem},${pageSize}
+  </select>
+  
+  <select id="listPage"  parameterType="com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO" resultType="com.gic.haoban.manage.api.dto.chat.GroupChatPlanOwnerLogDTO">
+  	 select 
+  	    a.owner_log_id ownerLogId , 
+  	    a.wx_enterprise_id wxEnterpriseId ,
+  	    a.plan_id planId ,
+  	 	b.staff_name staffName ,
+  	 	a.staff_id  staffId , 
+  	 	a.clerk_id  clerkId ,
+  	 	a.store_id  storeId ,
+  	 	a.send_status sendStatus ,
+  	 	a.send_count  sendCount , 
+  	 	a.send_time   sendTime ,
+  	 	a.create_time createTime ,
+  	 	a.done_flag   doneFlag ,
+  	 	a.msgid       msgid 
+  	  from tab_haoban_group_chat_plan_owner_log a left join tab_haoban_staff b on a.staff_id = b.staff_id 
+  	  where 
+  	  	a.wx_enterprise_id = #{wxEnterpriseId} and a.plan_id = #{planId}  and a.delete_flag = 0
+  	  	<if test="null != sendStatus">
+  	  		and send_status = #{sendStatus}
+  	  	</if>
+  	  	<if test="null != searchParams and ''!=searchParams">
+  	  		and b.staff_name like #{searchParams}
+  	  	</if>
+  	  	<if test="null != startDate">
+			and a.create_time <![CDATA[>=]]> #{startDate} and a.create_time <![CDATA[<=]]> #{endDate}
+	    </if>
+  	  	order by a.create_time , a.owner_log_id
+  </select>
+  
+  <select id="listOwnerLogPageForWxaTotal"  parameterType="com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO" resultType="com.gic.haoban.manage.api.dto.chat.ChatOwnerTotalDTO">
+  		select 
+  		b.plan_id   planId   ,
+  	 	b.name      planName ,
+  	 	b.start_time  startTime , 
+  	 	b.end_time    endTime , 
+  	 	<!-- 已发送 -->
+  	 	SUM(CASE a.send_status WHEN 2 THEN 1 ELSE 0 END ) sendCount,
+  	 	<!-- 待发送 -->
+  	 	SUM(CASE a.send_status WHEN 1 THEN 1 ELSE 0 END ) notSendCount 
+  	 	
+  	  from tab_haoban_group_chat_plan_owner_log a left join tab_haoban_group_chat_plan b on a.plan_id = b.plan_id 
+  	  where 
+  	  	a.wx_enterprise_id = #{wxEnterpriseId} and b.delete_flag = 0
+  	  	<if test="null != storeId">
+  	  		 and a.store_id = #{storeId}
+  	  	</if>
+  	  	<if test="null != clerkId">
+  	  		and a.clerk_id = #{clerkId}
+  	  	</if>
+  	  	<if test="null != sendStatus">
+  	  		and a.send_status = #{sendStatus}
+  	  	</if>
+  	  	<if test="null != searchParams">
+  	  		and b.name like #{searchParams}
+  	  	</if>
+  	  	and b.end_time > now() 
+  	  	group by b.plan_id
+  	  	having notSendCount 
+  	  	order by b.end_time desc ,  a.create_time desc
+  </select>
+  
+  <select id="listOwnerLogPageForWxa"  parameterType="com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO" resultType="com.gic.haoban.manage.api.dto.chat.GroupChatPlanOwnerLogDTO">
+  		select 
+  		a.owner_log_id ownerLogId ,
+  		b.plan_id   planId , 
+  	 	b.name      planName ,
+  	 	a.staff_id  staffId , 
+  	 	a.clerk_id  clerkId ,
+  	 	a.store_id  storeId ,
+  	 	a.send_status sendStatus ,
+  	 	a.send_count  sendCount , 
+  	 	a.fail_count  failCount ,
+  	 	a.send_time   sendTime ,
+  	 	a.create_time createTime ,
+  	 	b.end_time  expireDate ,
+  	 	b.end_time  endTime ,
+  	 	b.start_time startTime ,
+  	 	a.done_flag   doneFlag ,
+  	 	a.msgid       msgid 
+  	  from tab_haoban_group_chat_plan_owner_log a left join tab_haoban_group_chat_plan b on a.plan_id = b.plan_id 
+  	  where a.wx_enterprise_id = #{wxEnterpriseId} and a.plan_id = #{planId}  and b.delete_flag = 0
+  	  	<if test="null != storeId">
+  	  		 and a.store_id = #{storeId}
+  	  	</if>
+  	  	<if test="null != clerkId">
+  	  		and a.clerk_id = #{clerkId}
+  	  	</if>
+  	  	<if test="null != sendStatus">
+  	  		and a.send_status = #{sendStatus}
+  	  	</if>
+  	  	 order by a.create_time desc , a.owner_log_id
+  </select>
+  
+  <select id="getOwnerInfo"  resultType="com.gic.haoban.manage.api.dto.chat.GroupChatPlanOwnerLogDTO">
+  		select 
+  		a.owner_log_id ownerLogId ,
+  		b.plan_id   planId , 
+  	 	b.name      planName ,
+  	 	a.staff_id  staffId , 
+  	 	a.clerk_id  clerkId ,
+  	 	a.store_id  storeId ,
+  	 	a.send_status sendStatus ,
+  	 	a.send_count  sendCount , 
+  	 	a.fail_count  failCount ,
+  	 	a.send_time   sendTime ,
+  	 	a.create_time createTime ,
+  	 	b.end_time  expireDate ,
+  	 	b.end_time  endTime ,
+  	 	b.start_time startTime ,
+  	 	a.done_flag   doneFlag ,
+  	 	a.msgid       msgid 
+  	  from tab_haoban_group_chat_plan_owner_log a left join tab_haoban_group_chat_plan b on a.plan_id = b.plan_id 
+  	  where a.wx_enterprise_id = #{wxEnterpriseId} and a.plan_id = #{planId}  and b.delete_flag = 0 and a.staff_id = #{staffId}
+  	  and a.clerk_id = #{clerkId}
+  </select>
+
+
+	<select id="getTotalCount" resultType="java.lang.Integer">
+		SELECT
+			count(*)
+		FROM
+			tab_haoban_group_chat_plan_owner_log a
+		left join tab_haoban_group_chat_plan b on  a.plan_id = b.plan_id
+		WHERE
+			a.enterprise_id = #{enterpriseId}
+		<if test="null != storeId">
+			AND a.store_id = #{storeId}
+		</if>
+		<if test="null != clerkId">
+			AND a.clerk_id = #{clerkId}
+		</if>
+		  AND a.send_status = 1
+		  AND a.delete_flag = 0
+		  AND b.delete_flag = 0
+		  AND b.status_flag = 1
+		  AND b.end_time >= now()
+	</select>
+  
+  
+  
 </mapper> 
\ No newline at end of file

haoban-manage3-service/src/main/resources/mapper/hm/TabHaobanHmClerkRelationMapper.xml

@@ -87,6 +87,16 @@
         from tab_haoban_hm_clerk_relation
         where hm_id = #{hmId} and status = 1
     </select>
+    
+    <select id="listHmClerkByHmIdList" resultMap="TabHaobanHmClerkRelationMap">
+    	select <include refid="Base_Column_List" />
+        from tab_haoban_hm_clerk_relation
+        where hm_id in 
+        <foreach item="id" index="index" collection="hmIdList" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+        and status = 1
+    </select>
 
     <select id="getHmClerkByHmIdAndStaffId" resultMap="TabHaobanHmClerkRelationMap">
         select <include refid="Base_Column_List"></include>

haoban-manage3-service/src/main/resources/mapper/hm/TabHaobanHmQrcodeMapper.xml

@@ -50,7 +50,16 @@
         from tab_haoban_hm_qrcode
         where hm_id = #{hmId}
     </select>
-
+	
+	 <select id="queryByIdList" resultMap="TabHaobanHmQrcodeMap">
+        select
+        <include refid="Base_Column_List"></include>
+        from tab_haoban_hm_qrcode
+        where hm_id in 
+         <foreach collection="hmIds" open="(" close=")" separator="," item="hmId">
+                #{hmId}
+         </foreach>
+    </select>
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="hmId" useGeneratedKeys="true">
@@ -304,8 +313,11 @@
 		            </foreach>
             )
         </if>
-        <if test="null != statusFlagInt">
-        	and a.status_flag = #{statusFlagInt}
+        <if test="null != statusFlagInt and statusFlagInt !=10">
+            and a.status_flag = #{statusFlagInt}
+        </if>
+        <if test="null != statusFlagInt and statusFlagInt ==10">
+            and a.status_flag in (1,3)
         </if>
         <if test="null != hmTypeInt">
         	and a.hm_type=#{hmTypeInt}  

haoban-manage3-service/src/test/java/HmLinkTest.java

@@ -2,6 +2,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -10,15 +11,19 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.BasePageInfo;
-import com.gic.haoban.manage.api.dto.ContentMaterialDTO;
+import com.gic.haoban.manage.api.dto.DealParamMqDTO;
 import com.gic.haoban.manage.api.dto.hm.HmLinkDTO;
 import com.gic.haoban.manage.api.dto.hm.HmLinkStoreDTO;
+import com.gic.haoban.manage.api.dto.qdto.hm.HmBatchModifyQDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmLinkSearchQDTO;
+import com.gic.haoban.manage.api.enums.SyncTaskStatusEnum;
+import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
 import com.gic.haoban.manage.api.service.KeyDataApiService;
 import com.gic.haoban.manage.api.service.hm.HmLinkApiService;
-import com.gic.haoban.manage.api.service.hm.HmLinkVisitLogApiService;
 import com.gic.haoban.manage.service.service.QywxSendService;
+import com.gic.haoban.manage.service.service.hm.HmClerkRelationService;
 import com.gic.haoban.manage.service.service.hm.HmLinkStoreService;
 import com.gic.haoban.manage.service.util.QwFriendLimitCountUtil;
 
@@ -29,7 +34,7 @@ public class HmLinkTest {
     private HmLinkApiService hmLinkApiService;
 
     @Autowired
-    private HmLinkVisitLogApiService hmLinkVisitLogApiService;
+    private HmClerkRelationService hmClerkRelationService;
 
     @Autowired
     private KeyDataApiService keyDataApiService;
@@ -38,21 +43,34 @@ public class HmLinkTest {
     private HmLinkStoreService hmLinkStoreService;
     @Autowired
     private QywxSendService  qywxSendService ;
+
+    @Autowired
+    private DealSyncOperationApiService dealSyncOperationApiService ;
     
      volatile int x = 0 ;
     @Test
     public void test() throws IOException, InterruptedException {
-        
-        
-        List<ContentMaterialDTO> imageList = new ArrayList<>();
-        ContentMaterialDTO d = new ContentMaterialDTO() ;
-        d.setImgUrl("https://p.qlogo.cn/bizmail/hxlMR3pdsfnslruRxMXebKiabKrgOOpdmJ7shD0jUFbcUMoOh9I7AXw/0");
-        d.setMaterialType(2);
-        imageList.add(d) ;
-        
-        this.qywxSendService.share("ca66a01b79474c40b3e7c7f93daf1a3b", Arrays.asList("c6420c17febe426a9fb197dbd90bdc7b","4f2ae2fbfe594ad2a8ccdf9ab7b28713","fce45ed485e94d619b0124f2daf4b083"), "test", imageList);
-        
-            
+        String taskId = "c7e319c16ba942eea8a3b91d6a763518" ;
+
+                DealParamMqDTO dealParamMqDTO = new DealParamMqDTO();
+                dealParamMqDTO.setTaskId(taskId);
+                dealParamMqDTO.setData(517064205447217236l+"");
+                dealParamMqDTO.setType(SyncTaskStatusEnum.modify_hm.getVal());
+
+
+        this.dealSyncOperationApiService.departmentDealMq(JSON.toJSONString(dealParamMqDTO)) ;
+        if(true) {
+            return ;
+        }
+
+        HmBatchModifyQDTO qdto = new HmBatchModifyQDTO();
+        qdto.setHmIdList(Arrays.asList(517064205447217236L,457922550308036636L));
+        qdto.setWxEnterpriseId("ca66a01b79474c40b3e7c7f93daf1a3b");
+        qdto.setOptStaffId("fefd1c81641711e69d0818c58a146fd2");
+        qdto.setOptName("达摩管理员");
+        qdto.setOptType(1);
+        qdto.setClerkIdList(Arrays.asList("4a566818111a45bbae9f962580df82c0"));
+        this.hmClerkRelationService.batchModify(qdto);
         
         
         

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

@@ -6,13 +6,15 @@ import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.gic.haoban.manage.api.dto.*;
 import com.gic.haoban.manage.api.dto.qdto.TransferActiveCodeQDTO;
 import com.gic.haoban.manage.api.service.*;
 import com.gic.haoban.manage.web.log.LogRecordUserServiceImpl;
+import com.gic.haoban.manage.web.qo.StaffListQO;
 import com.gic.haoban.manage.web.qo.TransferActiveCodeQO;
-import com.gic.haoban.manage.web.vo.StaffActiveDataVO;
+import com.gic.haoban.manage.web.vo.*;
 import com.gic.log.record.anno.GicLogRecord;
 import com.gic.log.record.util.GicLogRecordCategoryEnum;
 import com.gic.log.record.util.GicLogRecordEvaluationContext;
@@ -47,9 +49,6 @@ import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.qo.StaffEditJsonQO;
-import com.gic.haoban.manage.web.vo.ClerkInfoVo;
-import com.gic.haoban.manage.web.vo.StaffExportVO;
-import com.gic.haoban.manage.web.vo.StaffVO;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import com.google.common.collect.Lists;
 
@@ -119,36 +118,25 @@ public class StaffController extends WebBaseController {
 
     /**
      * 分页查询员工列表
-     *
-     * @param departmentId 部门id
-     * @param activeFlag   激活状态 - 后期删除
-     * @param keyWord      关键字
-     * @param relationFlag 关联状态
-     * @param permitState 许可状态  0 未激活，1 正常有效，2 即将过期，3 已过期，可多传，按‘,’隔开
-     * @param occupy     其他占用许可页面标志，传1返回该页面数据
-     * @param pageInfo     分页参数
-     * @return res
      */
     @RequestMapping("staff-list")
-    public HaobanResponse staffList(String departmentId,
-                                    Integer activeFlag,
-                                    Integer relationFlag,
-                                    String keyWord,
-                                    String permitState,
-                                    Integer occupy,
-                                    BasePageInfo pageInfo) {
+    public HaobanResponse staffList(@RequestBody StaffListQO qo) {
+        logger.info("通讯录列表查询参数：{}",JSONObject.toJSONString(qo));
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
         String wxEnterpriseId = login.getWxEnterpriseId();
         List<String> departmentIds = new ArrayList<>();
-        DepartmentDTO departmentDTO = departmentApiService.selectById(departmentId);
+        DepartmentDTO departmentDTO = departmentApiService.selectById(qo.getDepartmentId());
         if (departmentDTO != null) {
             String parentDepartmentId = departmentDTO.getParentDepartmentId();
             if (!"0".equals(parentDepartmentId)) {
-                departmentIds = departmentApiService.listSonDeptIdsByDepartmentId(departmentId, wxEnterpriseId);
+                departmentIds = departmentApiService.listSonDeptIdsByDepartmentId(qo.getDepartmentId(), wxEnterpriseId);
             }
         }
         //员工
-        Page<StaffDTO> page = staffApiService.pageStaff(departmentIds, activeFlag, keyWord, pageInfo, relationFlag, wxEnterpriseId,permitState,occupy);
+        StaffListDTO dto = EntityUtil.changeEntityByJSON(StaffListDTO.class, qo);
+        dto.setWxEnterpriseId(wxEnterpriseId);
+        dto.setDepartmentIds(departmentIds);
+        Page<StaffDTO> page = staffApiService.pageStaff(dto);
 
         logger.info("pages={},totalPage={}", page.getCurrentPage(), page.getTotalPage());
         if(CollectionUtils.isNotEmpty(page.getResult())) {
@@ -475,7 +463,9 @@ public class StaffController extends WebBaseController {
      * @Description 会员导出
      */
     @RequestMapping("staff-export")
-    public HaobanResponse staffExport(HttpServletRequest request, HttpServletResponse response, String departmentId, Integer activeFlag, Integer relationFlag, String keyWord, String permitState,BasePageInfo pageInfo) {
+    public HaobanResponse staffExport(HttpServletRequest request, HttpServletResponse response,String departmentId, Integer activeFlag, Integer relationFlag,
+                                      String keyWord, String permitState,BasePageInfo pageInfo,@RequestParam(defaultValue = "create_time") String sortField,
+                                      @RequestParam(defaultValue = "desc") String sortType,String enterpriseIdParam) {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
         String wxEnterpriseId = login.getWxEnterpriseId();
         if(StringUtils.isBlank(departmentId)){
@@ -489,11 +479,23 @@ public class StaffController extends WebBaseController {
         List<String> departmentIds ;
         departmentIds = relationList.stream().map(DepartmentDTO::getDepartmentId).collect(Collectors.toList());
         List<StaffDTO> staffAllList = Lists.newArrayListWithCapacity(5000);
+        StaffListDTO dto = new StaffListDTO();
+        dto.setWxEnterpriseId(wxEnterpriseId);
+        dto.setDepartmentIds(departmentIds);
+        dto.setDepartmentId(departmentId);
+        dto.setActiveFlag(activeFlag);
+        dto.setRelationFlag(relationFlag);
+        dto.setKeyWord(keyWord);
+        dto.setPermitState(permitState);
+        dto.setSortField(sortField);
+        dto.setSortType(sortType);
+        dto.setEnterpriseIdParam(enterpriseIdParam);
         pageInfo.setPageSize(Integer.MAX_VALUE);
         int pageNum = 1;
         while (true) {
             pageInfo.setPageNum(pageNum);
-            Page<StaffDTO> page = staffApiService.pageStaff(departmentIds, activeFlag, keyWord, pageInfo, relationFlag, wxEnterpriseId,permitState,null);
+            dto.setPageInfo(pageInfo);
+            Page<StaffDTO> page = staffApiService.pageStaff(dto);
             List<StaffDTO> list = page.getResult();
             if (CollectionUtils.isEmpty(list)) {
                 break;
@@ -502,6 +504,12 @@ public class StaffController extends WebBaseController {
             pageNum++;
         }
         List<StaffExportVO> voList = new ArrayList<>();
+        //针对多个商户使用一个企微时，导出所属商户名称
+        Boolean flag=false;
+        List<WxEnterpriseRelatedDTO> result = staffApiService.getWxEnterpriseRelatedList(wxEnterpriseId).getResult();
+        if (CollUtil.isNotEmpty(result) && result.size()>1){
+            flag = true;
+        }
         for (StaffDTO staffDTO : staffAllList) {
             StaffExportVO vo = new StaffExportVO();
             vo.setStaffId(staffDTO.getStaffId());
@@ -510,6 +518,15 @@ public class StaffController extends WebBaseController {
             vo.setPosition(staffDTO.getPostion());
             vo.setDepartmentName(departmentMap.get(staffDTO.getDepartmentIds()) == null ? null : departmentMap.get(staffDTO.getDepartmentIds()).getDepartmentName());
             vo.setRelationFlag((Objects.isNull(staffDTO.getRelationFlag()) || staffDTO.getRelationFlag() == 0) ? "未关联" : "已关联");
+            if (flag){
+                List<String> enterpriseNameList = staffDTO.getEnterpriseNameList();
+                if (CollUtil.isNotEmpty(enterpriseNameList)){
+                    String enterpriseName = String.join(",", enterpriseNameList);
+                    vo.setEnterpriseName(enterpriseName);
+                }else {
+                    vo.setEnterpriseName("无归属");
+                }
+            }
             voList.add(vo);
         }
         //拼接导购信息
@@ -520,8 +537,15 @@ public class StaffController extends WebBaseController {
         }
         mergeClerkInfo(voList, wxEnterpriseId);
         String fileName = wxEnterpriseName + "通讯录" + DateUtil.dateToStr(new Date(), DateUtil.FORMAT_DATE_8);
-        List<String> titleList = Arrays.asList("姓名", "职务", "部门", "手机号", "关联状态", "关联导购");
-        List<String> fileList = Arrays.asList("staffName", "position", "departmentName", "phoneNumber", "relationFlag", "clerkName");
+        List<String> titleList =new ArrayList<>();
+        List<String> fileList = new ArrayList<>();
+        if (flag){
+            titleList = Arrays.asList("姓名", "职务", "部门", "手机号", "关联状态", "关联导购","所属商户");
+            fileList = Arrays.asList("staffName", "position", "departmentName", "phoneNumber", "relationFlag", "clerkName","enterpriseName");
+        }else {
+            titleList = Arrays.asList("姓名", "职务", "部门", "手机号", "关联状态", "关联导购");
+            fileList = Arrays.asList("staffName", "position", "departmentName", "phoneNumber", "relationFlag", "clerkName");
+        }
         try {
             ExcelUtils.xls(response, request, fileName, voList, fileList, titleList);
         } catch (Exception e) {
@@ -631,4 +655,20 @@ public class StaffController extends WebBaseController {
         return RestResponse.successResult(transferActiveCodeDTOServiceResponse);
     }
 
+    /**
+     * 查询企业微信对应的所有商户品牌信息
+     *
+     */
+    @RequestMapping("get-wxEnterprise-related-list")
+    public RestResponse<List<WxEnterpriseRelatedVO>> getWxEnterpriseRelatedList() {
+        WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
+        String wxEnterpriseId = login.getWxEnterpriseId();
+        ServiceResponse<List<WxEnterpriseRelatedDTO>> response = staffApiService.getWxEnterpriseRelatedList(wxEnterpriseId);
+        List<WxEnterpriseRelatedVO> vo = JSONArray.parseArray(JSONObject.toJSONString(response.getResult()), WxEnterpriseRelatedVO.class);
+        if (CollUtil.isEmpty(vo)){
+            return RestResponse.successResult(new ArrayList<>());
+        }
+        return RestResponse.successResult(vo);
+    }
+
 }

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

+package com.gic.haoban.manage.web.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.haoban.common.anno.IgnoreLogin;
+import com.gic.log.record.bean.WebErrorLogReport;
+import com.gic.log.record.util.LogWebErrorLogReportUtil;
+import org.apache.logging.log4j.LogManager;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+
+/**
+ * @description:
+ * @Author: wenhua
+ * @Date: 2023/5/11 21:50
+ */
+@RestController
+public class TabHaobanAppLogController {
+
+    private static org.apache.logging.log4j.Logger logger = LogManager.getLogger(TabHaobanAppLogController.class);
+
+    @RequestMapping("/insert_log")
+    @ResponseBody
+    @IgnoreLogin
+    @com.gic.web.common.ano.IgnoreLogin
+    public RestResponse<Boolean> insertLog(@RequestBody WebErrorLogReport qo) {
+        logger.info("插入日志的参数：{}", JSON.toJSONString(qo));
+        qo.setCreateTime(new Date());
+        LogWebErrorLogReportUtil.pushWebErrorLogReport(qo);
+        return RestResponse.successResult();
+    }
+
+}

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

 package com.gic.haoban.manage.web.controller.hm;
 
-import cn.hutool.core.convert.Convert;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeSet;
+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.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
@@ -10,7 +28,16 @@ import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.manage.api.constants.StatisticsApolloKeyConstant;
-import com.gic.haoban.manage.api.dto.hm.*;
+import com.gic.haoban.manage.api.dto.hm.HmBatchCountDTO;
+import com.gic.haoban.manage.api.dto.hm.HmBatchModifyResultDTO;
+import com.gic.haoban.manage.api.dto.hm.HmClerkDTO;
+import com.gic.haoban.manage.api.dto.hm.HmClerkRelationDTO;
+import com.gic.haoban.manage.api.dto.hm.HmGroupDTO;
+import com.gic.haoban.manage.api.dto.hm.HmQrcodeDTO;
+import com.gic.haoban.manage.api.dto.hm.HmQrcodeListDTO;
+import com.gic.haoban.manage.api.dto.hm.HmStoreDTO;
+import com.gic.haoban.manage.api.dto.hm.WxUserAddLogDTO;
+import com.gic.haoban.manage.api.dto.qdto.hm.HmBatchModifyQDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeListQDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeQDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.WxUserAddLogSearchQDTO;
@@ -24,6 +51,7 @@ import com.gic.haoban.manage.api.service.hm.WxUserAddLogApiService;
 import com.gic.haoban.manage.api.util.DataHttpUtil;
 import com.gic.haoban.manage.web.dto.HmOverviewDTO;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
+import com.gic.haoban.manage.web.qo.hm.HmBatchModifyQO;
 import com.gic.haoban.manage.web.qo.hm.HmQrcodeDetailQO;
 import com.gic.haoban.manage.web.qo.hm.HmQrcodeUpdateQO;
 import com.gic.haoban.manage.web.qo.hm.data.HmDetailClerkListQO;
@@ -33,18 +61,8 @@ import com.gic.haoban.manage.web.utils.statistics.DataStatisticsParamUtils;
 import com.gic.haoban.manage.web.utils.statistics.DateUtils;
 import com.gic.haoban.manage.web.vo.hm.HmDetailClerkListVO;
 import com.gic.haoban.manage.web.vo.hm.HmTrendVO;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
 
-import java.text.ParseException;
-import java.util.*;
-import java.util.stream.Collectors;
+import cn.hutool.core.convert.Convert;
 
 /**
  * 活码(TabHaobanHmQrcode)表控制层
@@ -238,6 +256,79 @@ public class HmQrcodeController {
         }
         return RestResponse.successResult(statisticsDTO);
     }
+    
+    @RequestMapping(value = "get-hm-for-batch", method = RequestMethod.POST)
+    public RestResponse<Object> getHmFormBatch(@RequestBody HmQrcodeListQO qo) {
+        // 查询有效的
+        if(qo.getInFields().getHmTypeInt() !=null && qo.getInFields().getHmTypeInt()==1) {
+            return RestResponse.failure("9999", "不能只选择单人活码") ;
+        }
+        qo.getInFields().setStatusFlagInt(10);
+        qo.getInFields().setHmTypeInt(2);
+        List<String> list = this.getHmCount(qo) ;
+        if(list.size() > 1000) {
+            return RestResponse.failure("9999", "最多支持1000条数据") ;
+        }
+        return RestResponse.successResult(list); 
+    }
+    
+    @RequestMapping(value = "batch-modify-hm", method = RequestMethod.POST)
+    public RestResponse<Object> batchModify(@RequestBody HmBatchModifyQO qo) {
+        HmBatchModifyQDTO qdto = EntityUtil.changeEntityByJSON(HmBatchModifyQDTO.class, qo) ;
+        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
+        qdto.setOptClerkId(loginUser.getClerkId());
+        qdto.setOptName(loginUser.getClerkName());
+        qdto.setEnterpriseId(loginUser.getEnterpriseId());
+        ServiceResponse<List<HmBatchModifyResultDTO>> resp = this.hmQrcodeApiService.batchModify(qdto) ;
+        if(resp.isSuccess()) {
+            RestResponse successResult = RestResponse.successResult() ;
+            successResult.setMessage(resp.getMessage());
+            successResult.setResult(resp.getResult());
+            return successResult  ;
+        }
+        return RestResponse.failure("9999", resp.getMessage()) ;
+    }
+    
+    @RequestMapping("hm-sync-check")
+    public RestResponse<Object> synchmSuccess(String taskId) {
+        WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
+        String wxEnterpriseId = login.getWxEnterpriseId();
+        ServiceResponse<HmBatchCountDTO> resp = this.hmQrcodeApiService.getModifyResult(wxEnterpriseId,taskId);
+        return RestResponse.successResult(resp.getResult()) ;
+    }
+    
+    private List<String> getHmCount(HmQrcodeListQO hmQrcodeListQO) {
+        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        hmQrcodeListQO.getInFields().setEnterpriseId(loginUser.getEnterpriseId());
+        hmQrcodeListQO.getInFields().setWxEnterpriseId(loginUser.getWxEnterpriseId());
+        List<String> storeList = staffApiService.getHaoBanStoreIdsRolesByClerkId(loginUser.getClerkId(), loginUser.getWxEnterpriseId());
+        if (CollectionUtils.isEmpty(storeList)) {
+            return Collections.EMPTY_LIST ;
+        }
+        if (!storeList.contains("-1")) {
+            StringBuffer stringBuffer = new StringBuffer();
+            storeList.forEach(c -> stringBuffer.append(c).append(","));
+            hmQrcodeListQO.getInFields().setStoreId(stringBuffer.toString());
+        }
+        Long hmGroupId = hmQrcodeListQO.getInFields().getHmGroupId();
+        //-1 代表全部分组
+        if (hmGroupId == -1) {
+            hmQrcodeListQO.getInFields().setHmGroupId(null);
+        }
+        HmQrcodeListQDTO qdto = EntityUtil.changeEntityByJSON(HmQrcodeListQDTO.class, hmQrcodeListQO.getInFields());
+        if (!storeList.contains("-1")) {
+            qdto.setStoreId(storeList);
+        }
+        ServiceResponse<List<String>> listResp = this.hmQrcodeApiService.listHmIdForIndex(qdto);
+        logger.info("HMid列表={}", JSON.toJSONString(listResp));
+        List<String> hmIds = listResp.getResult();
+        if(CollectionUtils.isEmpty(hmIds)) {
+            return Collections.EMPTY_LIST ;
+        }
+        return hmIds ;
+    }
+    
 
     /**
      * 详情
@@ -376,7 +467,13 @@ public class HmQrcodeController {
 
     @RequestMapping(path = "/update/qrcode/group")
     public RestResponse<?> batchUpdateQrcodeGroup(@RequestBody HmQrcodeUpdateQO qrcodeUpdateQo) {
-        ServiceResponse<Boolean> serviceResponse = hmQrcodeApiService.batchUpdateHmQrcodeGroup(qrcodeUpdateQo.getHmIds(), qrcodeUpdateQo.getGroupId());
+        List<Long> idlist = qrcodeUpdateQo.getHmIds() ;
+        if(qrcodeUpdateQo.getAllFlag()==1) {
+            HmQrcodeListQO qo = new HmQrcodeListQO() ;
+            qo.setInFields(qrcodeUpdateQo.getInFields());
+            idlist = this.getHmCount(qo).stream().map(o->Long.valueOf(o)).collect(Collectors.toList()) ;
+        }
+        ServiceResponse<Boolean> serviceResponse = hmQrcodeApiService.batchUpdateHmQrcodeGroup(idlist, qrcodeUpdateQo.getGroupId());
         if (!serviceResponse.isSuccess()) {
             return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
         }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/StaffListQO.java

+package com.gic.haoban.manage.web.qo;
+
+import com.gic.haoban.base.api.common.BasePageInfo;
+
+import java.io.Serializable;
+
+/**
+ * @description: 列表查询VO
+ * @Author: wenhua
+ * @Date: 2023/5/17 10:45
+ */
+public class StaffListQO implements Serializable {
+    /**
+     * 部门id
+     */
+    private String departmentId;
+    /**
+     * 激活状态 - 后期删除
+     */
+    private Integer activeFlag;
+    /**
+     * 关联状态
+     */
+    private Integer relationFlag;
+    /**
+     * 关键字
+     */
+    private String keyWord;
+    /**
+     * 许可状态  0 未激活，1 正常有效，2 即将过期，3 已过期，可多传，按‘,’隔开
+     */
+    private String permitState;
+    /**
+     * 其他占用许可页面标志，传1返回该页面数据
+     */
+    private Integer occupy;
+    /**
+     * 排序字段  不传默认create_time
+     */
+    private String sortField = "create_time";
+    /**
+     * 排序类型  不传默认desc
+     */
+    private String sortType = "desc";
+    /**
+     * 所属商户id
+     */
+    private String enterpriseIdParam;
+    /**
+     * 分页参数
+     */
+    private BasePageInfo pageInfo;
+
+    public String getDepartmentId() {
+        return departmentId;
+    }
+
+    public void setDepartmentId(String departmentId) {
+        this.departmentId = departmentId;
+    }
+
+    public Integer getActiveFlag() {
+        return activeFlag;
+    }
+
+    public void setActiveFlag(Integer activeFlag) {
+        this.activeFlag = activeFlag;
+    }
+
+    public Integer getRelationFlag() {
+        return relationFlag;
+    }
+
+    public void setRelationFlag(Integer relationFlag) {
+        this.relationFlag = relationFlag;
+    }
+
+    public String getKeyWord() {
+        return keyWord;
+    }
+
+    public void setKeyWord(String keyWord) {
+        this.keyWord = keyWord;
+    }
+
+    public String getPermitState() {
+        return permitState;
+    }
+
+    public void setPermitState(String permitState) {
+        this.permitState = permitState;
+    }
+
+    public Integer getOccupy() {
+        return occupy;
+    }
+
+    public void setOccupy(Integer occupy) {
+        this.occupy = occupy;
+    }
+
+    public String getSortField() {
+        return sortField;
+    }
+
+    public void setSortField(String sortField) {
+        this.sortField = sortField;
+    }
+
+    public String getSortType() {
+        return sortType;
+    }
+
+    public void setSortType(String sortType) {
+        this.sortType = sortType;
+    }
+
+    public String getEnterpriseIdParam() {
+        return enterpriseIdParam;
+    }
+
+    public void setEnterpriseIdParam(String enterpriseIdParam) {
+        this.enterpriseIdParam = enterpriseIdParam;
+    }
+
+    public BasePageInfo getPageInfo() {
+        return pageInfo;
+    }
+
+    public void setPageInfo(BasePageInfo pageInfo) {
+        this.pageInfo = pageInfo;
+    }
+}

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/hm/HmBatchModifyQO.java

+package com.gic.haoban.manage.web.qo.hm;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 
+* @ClassName: HmBatchModifyQO
+* @Description: 活码批量修改成员
+* @author xugh
+* @date 2023年5月15日 上午10:25:42
+*
+ */
+public class HmBatchModifyQO implements Serializable {
+
+    /**
+    * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
+    */
+    private static final long serialVersionUID = 551906331625487555L;
+
+    private List<String> hmIdList;
+
+    // 1新增 2删除
+    private int optType;
+
+    private List<String> clerkIdList;
+
+    // 1 继续执行更新 2不废弃活码
+    private int updateType;
+
+    public List<String> getHmIdList() {
+        return hmIdList;
+    }
+
+    public int getOptType() {
+        return optType;
+    }
+
+    public void setHmIdList(List<String> hmIdList) {
+        this.hmIdList = hmIdList;
+    }
+
+    public void setOptType(int optType) {
+        this.optType = optType;
+    }
+
+    public List<String> getClerkIdList() {
+        return clerkIdList;
+    }
+
+    public int getUpdateType() {
+        return updateType;
+    }
+
+    public void setClerkIdList(List<String> clerkIdList) {
+        this.clerkIdList = clerkIdList;
+    }
+
+    public void setUpdateType(int updateType) {
+        this.updateType = updateType;
+    }
+}

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/hm/HmQrcodeUpdateQO.java

-package com.gic.haoban.manage.web.qo.hm;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @Author MUSI
- * @Date 2022/7/13 6:54 PM
- * @Description
- * @Version
- **/
-public class HmQrcodeUpdateQO implements Serializable {
-    private static final long serialVersionUID = -1636719509633485056L;
-
-    private List<Long> hmIds;
-
-    private Long groupId;
-
-    public List<Long> getHmIds() {
-        return hmIds;
-    }
-
-    public void setHmIds(List<Long> hmIds) {
-        this.hmIds = hmIds;
-    }
-
-    public Long getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(Long groupId) {
-        this.groupId = groupId;
-    }
-}
+package com.gic.haoban.manage.web.qo.hm;
+
+import java.io.Serializable;
+import java.util.List;
+
+import com.gic.haoban.manage.web.qo.hm.data.HmQrcodeListQO.InFields;
+
+/**
+ * @Author MUSI
+ * @Date 2022/7/13 6:54 PM
+ * @Description
+ * @Version
+ **/
+public class HmQrcodeUpdateQO implements Serializable {
+    private static final long serialVersionUID = -1636719509633485056L;
+
+    private List<Long> hmIds;
+
+    private Long groupId;
+    
+    private InFields inFields;
+    
+    private int allFlag ;
+    
+    public int getAllFlag() {
+        return allFlag;
+    }
+
+    public void setAllFlag(int allFlag) {
+        this.allFlag = allFlag;
+    }
+
+    public InFields getInFields() {
+        return inFields;
+    }
+
+    public void setInFields(InFields inFields) {
+        this.inFields = inFields;
+    }
+
+    public List<Long> getHmIds() {
+        return hmIds;
+    }
+
+    public void setHmIds(List<Long> hmIds) {
+        this.hmIds = hmIds;
+    }
+
+    public Long getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(Long groupId) {
+        this.groupId = groupId;
+    }
+}

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/StaffExportVO.java

@@ -27,6 +27,18 @@ public class StaffExportVO implements Serializable{
 	 * 关联状态为 员工是否关联某门店导购
 	 */
 	private String relationFlag;
+	/**
+	 * gic品牌名称
+	 */
+	private String enterpriseName;
+
+	public String getEnterpriseName() {
+		return enterpriseName;
+	}
+
+	public void setEnterpriseName(String enterpriseName) {
+		this.enterpriseName = enterpriseName;
+	}
 
 	public String getActiveFlag() {
 		return activeFlag;

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/WxEnterpriseRelatedVO.java

+package com.gic.haoban.manage.web.vo;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class WxEnterpriseRelatedVO implements Serializable {
+    private String wxEnterpriseRelatedId;
+
+    private String wxEnterpriseId;
+
+    private String enterpriseId;
+    
+    private String enterpriseName;
+
+    private String version;
+
+    private Integer statusFlag;
+
+    private Date createTime;
+
+    private Date updateTime;
+    
+    private String staffId;
+    
+    private String staffName;
+
+    private Integer wxEnterpriseType;
+
+    private Integer memberOpenCardFlag;
+
+    private Integer rangeType;
+
+    private Integer clerkEditFlag;
+
+    public Integer getClerkEditFlag() {
+        return clerkEditFlag;
+    }
+
+    public void setClerkEditFlag(Integer clerkEditFlag) {
+        this.clerkEditFlag = clerkEditFlag;
+    }
+
+    private static final long serialVersionUID = 1L;
+
+    public Integer getRangeType() {
+        return rangeType;
+    }
+
+    public void setRangeType(Integer rangeType) {
+        this.rangeType = rangeType;
+    }
+
+    public Integer getWxEnterpriseType() {
+        return wxEnterpriseType;
+    }
+
+    public void setWxEnterpriseType(Integer wxEnterpriseType) {
+        this.wxEnterpriseType = wxEnterpriseType;
+    }
+
+    public Integer getMemberOpenCardFlag() {
+        return memberOpenCardFlag;
+    }
+
+    public void setMemberOpenCardFlag(Integer memberOpenCardFlag) {
+        this.memberOpenCardFlag = memberOpenCardFlag;
+    }
+
+    public String getWxEnterpriseRelatedId() {
+        return wxEnterpriseRelatedId;
+    }
+
+    public void setWxEnterpriseRelatedId(String wxEnterpriseRelatedId) {
+        this.wxEnterpriseRelatedId = wxEnterpriseRelatedId == null ? null : wxEnterpriseRelatedId.trim();
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId == null ? null : wxEnterpriseId.trim();
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId == null ? null : enterpriseId.trim();
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version == null ? null : version.trim();
+    }
+
+    public Integer getStatusFlag() {
+        return statusFlag;
+    }
+
+    public void setStatusFlag(Integer statusFlag) {
+        this.statusFlag = statusFlag;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+	public String getStaffId() {
+		return staffId;
+	}
+
+	public void setStaffId(String staffId) {
+		this.staffId = staffId;
+	}
+
+	public String getStaffName() {
+		return staffName;
+	}
+
+	public void setStaffName(String staffName) {
+		this.staffName = staffName;
+	}
+
+    public String getEnterpriseName() {
+        return enterpriseName;
+    }
+
+    public void setEnterpriseName(String enterpriseName) {
+        this.enterpriseName = enterpriseName;
+    }
+}
\ No newline at end of file

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/WxEnterpriseVO.java

@@ -102,6 +102,7 @@ public class WxEnterpriseVO implements Serializable {
     private Integer wxSecurityType ;
     private String wxCorpid ;
     private String openCorpid ;
+    private String wxaAppid ;
     
     public Integer getWxSecurityType() {
         return wxSecurityType;
@@ -466,4 +467,12 @@ public class WxEnterpriseVO implements Serializable {
     public void setEnterpriseId(String enterpriseId) {
         this.enterpriseId = enterpriseId;
     }
+
+    public String getWxaAppid() {
+        return wxaAppid;
+    }
+
+    public void setWxaAppid(String wxaAppid) {
+        this.wxaAppid = wxaAppid;
+    }
 }

haoban-manage3-wx/pom.xml

@@ -231,6 +231,21 @@
             <artifactId>gic-evaluate-manage-api</artifactId>
             <version>${gic-evaluate-manage-api}</version>
         </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-member-source-api</artifactId>
+            <version>${gic-member-source-api}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>haoban-task-manage-api</artifactId>
+            <version>${haoban-task-manage-api}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>haoban-task-api</artifactId>
+            <version>${haoban-task-api}</version>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -2,24 +2,30 @@ package com.gic.haoban.manage.web.controller;
 
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
-import com.gic.commons.web.qo.PageQo;
+import com.gic.clerk.api.dto.ClerkDTO;
+import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.base.api.common.PageResult2;
 import com.gic.haoban.common.utils.EntityUtil;
-import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.manage.api.dto.notify.dto.NoticeMessageInfoDTO;
 import com.gic.haoban.manage.api.dto.notify.dto.PendingTaskDetailDTO;
 import com.gic.haoban.manage.api.dto.notify.qdto.PendingListQDTO;
 import com.gic.haoban.manage.api.enums.NoticeMessageCategoryTypeEnum;
 import com.gic.haoban.manage.api.enums.PendingTaskTypeEnum;
+import com.gic.haoban.manage.api.service.chat.GroupChatPlanApiService;
 import com.gic.haoban.manage.api.service.notify.NoticeMessageApiService;
 import com.gic.haoban.manage.api.service.notify.PendingTaskApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.qo.CommonQO;
 import com.gic.haoban.manage.web.qo.PendingListQO;
 import com.gic.haoban.manage.web.qo.notify.MessageListQO;
+import com.gic.haoban.manage.web.vo.MarketingCountVO;
 import com.gic.haoban.manage.web.vo.notify.PairValVO;
+import com.gic.haoban.task.api.service.TelTaskApiService;
+import com.gic.haoban.task.manage.api.service.IMarketClueTaskApiService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -39,12 +45,23 @@ import java.util.Map;
 @RestController
 public class NotifyController extends WebBaseController {
 
+    private static final Logger logger = LoggerFactory.getLogger(NotifyController.class);
     @Autowired
     private PendingTaskApiService pendingTaskApiService;
 
     @Autowired
     private NoticeMessageApiService noticeMessageService;
 
+    @Autowired
+    private GroupChatPlanApiService groupChatPlanApiService;
+
+    @Autowired
+    private ClerkService clerkService;
+    @Autowired
+    private IMarketClueTaskApiService iMarketClueTaskApiService;
+    @Autowired
+    private TelTaskApiService telTaskApiService;
+
     /**
      * 待办列表
      *
@@ -58,7 +75,7 @@ public class NotifyController extends WebBaseController {
         if (qo.getFilterStatus() == 1) {
             pendingListQDTO.setOverdueFlag(1);
         }
-        if (qo.getShowSelf()==0) {
+        if (qo.getShowSelf() == 0) {
             pendingListQDTO.setClerkId(null);
         }
         ServiceResponse<Page<PendingTaskDetailDTO>> retPage = pendingTaskApiService.pagePendingTask(pendingListQDTO, qo.getBasePageInfo());
@@ -136,7 +153,7 @@ public class NotifyController extends WebBaseController {
     @RequestMapping("/message/read")
     public RestResponse readSingle(Long noticeMessageId) {
         if (noticeMessageId == null) {
-            return RestResponse.failure(HaoBanErrCode.ERR_2.getCode()+"",HaoBanErrCode.ERR_2.getMsg());
+            return RestResponse.failure(HaoBanErrCode.ERR_2.getCode() + "", HaoBanErrCode.ERR_2.getMsg());
         }
         noticeMessageService.updateReadFlagById(noticeMessageId);
         return RestResponse.successResult();
@@ -183,5 +200,56 @@ public class NotifyController extends WebBaseController {
         return RestResponse.successResult(ret.getResult());
     }
 
+    /**
+     * 查询营销模块未完成任务数量
+     *
+     * @param qo
+     * @return
+     */
+    @RequestMapping("/marketing/count")
+    public RestResponse<MarketingCountVO> marketingCount(@RequestBody @Valid CommonQO qo) {
+
+        String clerkId = qo.getClerkId();
+        String enterpriseId = qo.getEnterpriseId();
+        String storeId = qo.getStoreId();
+        MarketingCountVO marketingCountVO = new MarketingCountVO();
+        logger.info("查询是否店长：{}", clerkId);
+        ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
+        if (clerkDTO != null) {
+            Integer groupChatCount, telTaskCount, groupMessageCount, total = 0;
+            Integer clerkType = clerkDTO.getClerkType();
+            if (clerkType == 1 || clerkType == 2) {
+                //店长维度
+                //社群群发
+                logger.info("店长维度查询社群群发");
+                groupChatCount = groupChatPlanApiService.getTotalCount(enterpriseId, null, storeId).getResult();
+                //话务群发
+                logger.info("店长维度查询话务群发");
+                telTaskCount = telTaskApiService.getTotalCount(enterpriseId, null, storeId).getResult();
+                //群发
+                logger.info("店长维度查询群发");
+                groupMessageCount = iMarketClueTaskApiService.getTotalCount(enterpriseId, null, storeId).getResult();
+                total = groupChatCount + telTaskCount + groupMessageCount;
+            } else {
+                //导购维度
+                //社群群发
+                logger.info("导购维度查询社群群发");
+                groupChatCount = groupChatPlanApiService.getTotalCount(enterpriseId, clerkId, storeId).getResult();
+                //话务群发
+                logger.info("导购维度查询话务群发");
+                telTaskCount = telTaskApiService.getTotalCount(enterpriseId, clerkId, storeId).getResult();
+                //群发
+                logger.info("导购维度查询群发");
+                groupMessageCount = iMarketClueTaskApiService.getTotalCount(enterpriseId, clerkId, storeId).getResult();
+                total = groupChatCount + telTaskCount + groupMessageCount;
+            }
+            marketingCountVO.setGroupChatCount(groupChatCount);
+            marketingCountVO.setGroupMessageCount(groupMessageCount);
+            marketingCountVO.setTelTaskCount(telTaskCount);
+            marketingCountVO.setTotal(total);
+        }
+        return RestResponse.successResult(marketingCountVO);
+    }
+
 
 }

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

@@ -82,6 +82,8 @@ import com.gic.haoban.manage.web.vo.MemberSendMessageVo;
 import com.gic.haoban.manage.web.vo.StoreMemberVO;
 import com.gic.haoban.manage.web.vo.WellDoneLoginInfoVO;
 import com.gic.member.api.service.MemberOpenCardBusinessService;
+import com.gic.membersource.api.dto.output.BusinessRefInfoDTO;
+import com.gic.membersource.api.service.MemberOutsideApiService;
 import com.gic.redis.data.util.RedisUtil;
 import com.gic.wechat.api.dto.qywx.UserDTO;
 import com.gic.wechat.api.service.qywx.QywxCorpApiService;
@@ -134,6 +136,8 @@ public class WxEnterpriseInfoController extends WebBaseController {
     private CustomerApiService customerApiService;
     @Autowired
     private AccountService accountService ;
+    @Autowired
+    MemberOutsideApiService memberOutsideApiService;
 
 
     /**
@@ -499,6 +503,19 @@ public class WxEnterpriseInfoController extends WebBaseController {
         List<MemberStoreDTO> result = memberUnionidRelatedApiService.listByExTernalUseridAndWxUserId(externalUserid, staffId, storeId);
         return resultResponse(HaoBanErrCode.ERR_1, result);
     }
+    
+    @RequestMapping("get-externaluser-memberid")
+    public RestResponse<Object> getMemberDetail(String externalUserid, String staffId, String enterpriseId) {
+        logger.info("获取外部联系人memberid={},{}",externalUserid,staffId);
+        if (StringUtils.isAnyBlank(externalUserid, staffId,enterpriseId)) {
+            return RestResponse.failure("9999",HaoBanErrCode.ERR_2.getMsg());
+        }
+        ServiceResponse<MemberStoreDTO> resp = memberUnionidRelatedApiService.getMemberIdForDetail(externalUserid, staffId, enterpriseId);
+        if(resp.isSuccess()) {
+            return RestResponse.successResult(resp.getResult());
+        }
+        return RestResponse.failure("9999",resp.getMessage());
+    }
 
     /**
      * 是否能打开客户详情权限
@@ -700,6 +717,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
         memberLog.setMemberId(memberId);
         if(StringUtils.isEmpty(memberId)) {
             this.memberUnionidRelatedApiService.saveExternalMemberLog(memberLog) ;
+            this.save(enterpriseId, unionid, relationKey);
             return resultResponse(HaoBanErrCode.ERR_1);
         }
         ExternalClerkRelatedDTO externalClerkRelatedDTO = externalClerkRelatedApiService.getExternalClerkByRelationKeyAndPre(relationKey);
@@ -714,6 +732,16 @@ public class WxEnterpriseInfoController extends WebBaseController {
     }
     
     
+    private void save(String enterpriseId , String unionid , String relationKey) {
+        BusinessRefInfoDTO businessRefInfoDTO=new BusinessRefInfoDTO();
+        businessRefInfoDTO.setKeyType(1);
+        businessRefInfoDTO.setEnterpriseId(enterpriseId);
+        businessRefInfoDTO.setKey(unionid);
+        businessRefInfoDTO.setType(4);
+        businessRefInfoDTO.setValue(relationKey);
+        memberOutsideApiService.addBusinessRefInfo(businessRefInfoDTO);
+    }
+    
     @RequestMapping("check-storage-fee")
     @ResponseBody
     public RestResponse<Object> checkStorageFee(String enterpriseId , String url) {

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/MarketingCountVO.java

+package com.gic.haoban.manage.web.vo;
+
+import java.io.Serializable;
+
+/**
+ * @description: 营销任务待发送数量VO
+ * @Author: wenhua
+ * @Date: 2023/5/15 16:36
+ */
+public class MarketingCountVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 社群群发待发送数量
+     */
+    private Integer groupChatCount;
+    /**
+     * 群发待发送数量
+     */
+    private Integer groupMessageCount;
+    /**
+     * 话务群发待发送数量
+     */
+    private Integer telTaskCount;
+    /**
+     * 营销任务待发送总量
+     */
+    private Integer total;
+
+    public Integer getGroupChatCount() {
+        return groupChatCount;
+    }
+
+    public void setGroupChatCount(Integer groupChatCount) {
+        this.groupChatCount = groupChatCount;
+    }
+
+    public Integer getGroupMessageCount() {
+        return groupMessageCount;
+    }
+
+    public void setGroupMessageCount(Integer groupMessageCount) {
+        this.groupMessageCount = groupMessageCount;
+    }
+
+    public Integer getTelTaskCount() {
+        return telTaskCount;
+    }
+
+    public void setTelTaskCount(Integer telTaskCount) {
+        this.telTaskCount = telTaskCount;
+    }
+
+    public Integer getTotal() {
+        return total;
+    }
+
+    public void setTotal(Integer total) {
+        this.total = total;
+    }
+}

haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml

@@ -139,5 +139,9 @@
 	<dubbo:reference id="productStockApiService" interface="com.gic.store.goods.service.ProductStockApiService" timeout="100000" retries="0" check="false" />
 	<dubbo:reference id="orderSettingApiService" interface="com.gic.business.order.service.setting.OrderSettingApiService" timeout="100000" retries="0" check="false" />
 	<dubbo:reference id="evaluateDataApiService" interface="com.gic.evaluate.manage.api.service.EvaluateDataApiService" timeout="100000" retries="0" check="false" />
+    <dubbo:reference interface="com.gic.membersource.api.service.MemberOutsideApiService" id="memberOutsideApiService" timeout="10000" retries="0" check="false" />
+
+    <dubbo:reference interface="com.gic.haoban.task.manage.api.service.IMarketClueTaskApiService" id="iMarketClueTaskApiService" timeout="10000" retries="0" check="false" />
+    <dubbo:reference interface="com.gic.haoban.task.api.service.TelTaskApiService" id="telTaskApiService" timeout="10000" retries="0" check="false" />
 
 </beans>