Merge branch 'developer' into 'master'

Developer

See merge request !77

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

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.api.service;
 
 import com.gic.api.base.commons.Page;
 import com.gic.haoban.base.api.common.BasePageInfo;
+import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.manage.api.dto.PreDealLogInfoDTO;
 import com.gic.haoban.manage.api.dto.SyncCheckDTO;
 import com.gic.haoban.manage.api.dto.SyncSingleDealDTO;
@@ -108,7 +109,7 @@ public interface DealSyncOperationApiService {
     /**
      * 处理同步
      */
-    public void dealQywxDepartment(String taskId, String wxEnterpriseId);
+    public String dealQywxDepartment(String taskId, String wxEnterpriseId);
 
     /**
      * 清理不存在的数据

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

@@ -114,4 +114,12 @@ public interface StaffClerkRelationApiService {
 	 */
 	public void pushToBindLog(String staffId,String optStaffId,int optType,int channelCode,String relationId);
 
+
+	/**
+	 * 获取config
+	 * @param clerkId
+	 * @param memberId
+	 * @return
+	 */
+	ServiceResponse<String> getClerkMemberChatConfig(String clerkId);
 }

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

@@ -151,4 +151,13 @@ public interface PreDealLogMapper {
      */
     public int countByDataId(@Param("taskId") String taskId, @Param("dataId") String dataId,@Param("dataType") int dataType);
 
+    /**
+     * 统计任务数量
+     * countExcepAndPreByTaskId
+     *
+     * @param taskId
+     * @return
+     */
+    public TabHaobanPreDealLog getLastPreDataByTaskId(@Param("taskId") String taskId);
+
 }
\ No newline at end of file

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

+package com.gic.haoban.manage.service.dao.mapper;
+
+import com.gic.haoban.manage.service.entity.MemberClerkChatConfig;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface TabHaobanMemberClerkChatConfigMapper {
+    /**
+     */
+    int deleteByPrimaryKey(Integer memberClerkChatConfigId);
+
+    /**
+     */
+    int insert(MemberClerkChatConfig record);
+
+    /**
+     */
+    int insertSelective(MemberClerkChatConfig record);
+
+    /**
+     */
+    MemberClerkChatConfig selectByPrimaryKey(Integer memberClerkChatConfigId);
+
+    /**
+     */
+    int updateByPrimaryKeySelective(MemberClerkChatConfig record);
+
+    /**
+     */
+    int updateByPrimaryKey(MemberClerkChatConfig record);
+
+    /**
+     */
+    MemberClerkChatConfig getChatByMemberIdStaffId(@Param("memberId") String memberId, @Param("staffId") String staffId);
+}
\ No newline at end of file

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

+package com.gic.haoban.manage.service.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Created By MBG-GUI-EXTENSION https://github.com/spawpaw/mybatis-generator-gui-extension
+ * Description:
+ * 
+ * @author fdh
+ */
+public class MemberClerkChatConfig implements Serializable {
+    /**
+     *
+     */
+    private Integer memberClerkChatConfigId;
+
+    /**
+     *
+     */
+    private String staffId;
+
+    /**
+     *
+     */
+    private String enterpriseId;
+
+    /**
+     *
+     */
+    private String memberId;
+
+    /**
+     *
+     */
+    private String configId;
+
+    /**
+     *   0 删除 1整除
+     *
+     */
+    private Integer status;
+
+    /**
+     *
+     */
+    private Date createTime;
+
+    /**
+     *
+     */
+    private Date updateTime;
+
+    /**
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method returns the value of the database column tab_haoban_member_clerk_chat_config.member_clerk_chat_config_id
+     *
+     * @return the value of tab_haoban_member_clerk_chat_config.member_clerk_chat_config_id
+     */
+    public Integer getMemberClerkChatConfigId() {
+        return memberClerkChatConfigId;
+    }
+
+    /**
+     * This method sets the value of the database column tab_haoban_member_clerk_chat_config.member_clerk_chat_config_id
+     *
+     * @param memberClerkChatConfigId the value for tab_haoban_member_clerk_chat_config.member_clerk_chat_config_id
+     */
+    public void setMemberClerkChatConfigId(Integer memberClerkChatConfigId) {
+        this.memberClerkChatConfigId = memberClerkChatConfigId;
+    }
+
+    /**
+     * This method returns the value of the database column tab_haoban_member_clerk_chat_config.staff_id
+     *
+     * @return the value of tab_haoban_member_clerk_chat_config.staff_id
+     */
+    public String getStaffId() {
+        return staffId;
+    }
+
+    /**
+     * This method sets the value of the database column tab_haoban_member_clerk_chat_config.staff_id
+     *
+     * @param staffId the value for tab_haoban_member_clerk_chat_config.staff_id
+     */
+    public void setStaffId(String staffId) {
+        this.staffId = staffId;
+    }
+
+    /**
+     * This method returns the value of the database column tab_haoban_member_clerk_chat_config.enterprise_id
+     *
+     * @return the value of tab_haoban_member_clerk_chat_config.enterprise_id
+     */
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    /**
+     * This method sets the value of the database column tab_haoban_member_clerk_chat_config.enterprise_id
+     *
+     * @param enterpriseId the value for tab_haoban_member_clerk_chat_config.enterprise_id
+     */
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    /**
+     * This method returns the value of the database column tab_haoban_member_clerk_chat_config.member_id
+     *
+     * @return the value of tab_haoban_member_clerk_chat_config.member_id
+     */
+    public String getMemberId() {
+        return memberId;
+    }
+
+    /**
+     * This method sets the value of the database column tab_haoban_member_clerk_chat_config.member_id
+     *
+     * @param memberId the value for tab_haoban_member_clerk_chat_config.member_id
+     */
+    public void setMemberId(String memberId) {
+        this.memberId = memberId;
+    }
+
+    /**
+     * This method returns the value of the database column tab_haoban_member_clerk_chat_config.config_id
+     *
+     * @return the value of tab_haoban_member_clerk_chat_config.config_id
+     */
+    public String getConfigId() {
+        return configId;
+    }
+
+    /**
+     * This method sets the value of the database column tab_haoban_member_clerk_chat_config.config_id
+     *
+     * @param configId the value for tab_haoban_member_clerk_chat_config.config_id
+     */
+    public void setConfigId(String configId) {
+        this.configId = configId;
+    }
+
+    /**
+     * This method returns the value of the database column tab_haoban_member_clerk_chat_config.status
+     *
+     * @return the value of tab_haoban_member_clerk_chat_config.status
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * This method sets the value of the database column tab_haoban_member_clerk_chat_config.status
+     *
+     * @param status the value for tab_haoban_member_clerk_chat_config.status
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * This method returns the value of the database column tab_haoban_member_clerk_chat_config.create_time
+     *
+     * @return the value of tab_haoban_member_clerk_chat_config.create_time
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method sets the value of the database column tab_haoban_member_clerk_chat_config.create_time
+     *
+     * @param createTime the value for tab_haoban_member_clerk_chat_config.create_time
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method returns the value of the database column tab_haoban_member_clerk_chat_config.update_time
+     *
+     * @return the value of tab_haoban_member_clerk_chat_config.update_time
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method sets the value of the database column tab_haoban_member_clerk_chat_config.update_time
+     *
+     * @param updateTime the value for tab_haoban_member_clerk_chat_config.update_time
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+}
\ No newline at end of file

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

@@ -138,4 +138,11 @@ public interface PreDealService {
      * @return
      */
     public boolean existDataId(String taskId, String dataId);
+
+    /**
+     * 获取最近的数据
+     *
+     * @return
+     */
+    public PreDealLogInfoDTO getLastPreDataByTaskId(String taskId);
 }

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

@@ -3,7 +3,9 @@ package com.gic.haoban.manage.service.service;
 import java.util.List;
 import java.util.Set;
 
+import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
+import com.gic.haoban.manage.service.entity.MemberClerkChatConfig;
 import org.apache.ibatis.annotations.Param;
 
 public interface StaffClerkRelationService {
@@ -57,4 +59,19 @@ public interface StaffClerkRelationService {
 
 	List<StaffClerkRelationDTO> lisByStaffId(String wxEnterpriseId, String staffId);
 
+	/**
+	 * 保存
+	 * @param memberClerkChatConfig
+	 */
+	public void saveChatConfig(MemberClerkChatConfig memberClerkChatConfig);
+
+	/**
+	 *
+	 * @param staffId
+	 * @param memberId
+	 * @return
+	 */
+	public MemberClerkChatConfig getChatConfig(String staffId,String memberId);
+
+
 }

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

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.service.service.impl;
 
 import com.gic.api.base.commons.Page;
 import com.gic.haoban.base.api.common.BasePageInfo;
+import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.manage.api.dto.PreDealLogInfoDTO;
 import com.gic.haoban.manage.api.dto.SyncCheckDTO;
@@ -120,4 +121,10 @@ public class PreDealServiceImpl implements PreDealService {
         int i = preDealLogMapper.countByDataId(taskId, dataId,PreDealTypeEnum.clerk.getVal());
         return i > 0;
     }
+
+    @Override
+    public PreDealLogInfoDTO getLastPreDataByTaskId(String taskId) {
+        TabHaobanPreDealLog preDealLog = preDealLogMapper.getLastPreDataByTaskId(taskId);
+        return EntityUtil.changeEntityByOrika(PreDealLogInfoDTO.class,preDealLog);
+    }
 }

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

@@ -49,9 +49,9 @@ public class StaffServiceImpl implements StaffService {
 			tab.setStaffId(StringUtil.randomUUID());
 		}
 		tab.setStatusFlag(1);
-		if(StringUtils.isBlank(tab.getWxUserId())){
-			tab.setWxUserId(tab.getStaffId());
-		}
+//		if(StringUtils.isBlank(tab.getWxUserId())){
+//			tab.setWxUserId(tab.getStaffId());
+//		}
 		mapper.insertSelective(tab);
 		return tab.getStaffId();
 	}

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

@@ -37,6 +37,7 @@ import com.task.allocation.exception.TaskAllocationException;
 import com.task.allocation.qo.TaskAllocationComputed;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -449,6 +450,19 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
         TabHaobanSyncTask syncTask = syncTaskService.getSyncTask(taskId);
         syncCheckDTO.setSyncStatus(syncTask.getStatusFlag());
 
+        PreDealLogInfoDTO dealLogInfoDTO = preDealService.getLastPreDataByTaskId(taskId);
+        //一分钟内没执行就重试 并在一天内
+        Date date = DateUtils.addMinutes(new Date(), -1);
+        Date dayDate = DateUtils.addDays(new Date(), -1);
+        if (dealLogInfoDTO.getUpdateTime().before(date)
+                &&syncTask.getUpdateTime().before(date)
+                &&syncTask.getCreateTime().after(dayDate)) {
+            logger.info("重试：{}",taskId);
+            syncTaskService.updateTaskStatus(taskId,SyncTaskStatusEnum.exception_close.getVal());
+            reDealDepartment(taskId,-1);
+            return syncCheckDTO;
+        }
+
         int totalCount = preDealService.countByTaskId(taskId, -1, -1);
         int groupErrCount = preDealService.countByTaskId(taskId, PreDealTypeEnum.group.getVal(), PreDealStatusEnum.exception.getVal());
         int storeErrCount = preDealService.countByTaskId(taskId, PreDealTypeEnum.store.getVal(), PreDealStatusEnum.exception.getVal());
@@ -528,21 +542,21 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
 
 
     @Override
-    public void dealQywxDepartment(String taskId, String wxEnterpriseId) {
+    public String dealQywxDepartment(String taskId, String wxEnterpriseId) {
         WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
         SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseDTO.getWxEnterpriseId(), SecretTypeEnum.HAOBAN_HELP.getVal());
         if (null == secretSetting||secretSetting.getCheckFlag()==0) {
             logger.info("没有配置secret");
             syncTaskService.updateTaskStatus(taskId,SyncTaskStatusEnum.exception_close.getVal());
             unlockTask(wxEnterpriseId);
-            return ;
+            return "没有配置secret";
         }
         List<com.gic.wechat.api.dto.qywx.DepartmentDTO> list = qywxDepartmentApiService.listSelfDepartment(wxEnterpriseDTO.getCorpid(), secretSetting.getSecretVal(), 1);
         if (CollectionUtils.isEmpty(list)) {
             logger.info("没有数据同步");
             syncTaskService.updateTaskStatus(taskId,SyncTaskStatusEnum.exception_close.getVal());
             unlockTask(wxEnterpriseId);
-            return;
+            return "没有数据同步或权限没设置全部";
         }
         List<TabHaobanPreDealLog> dealLogList = list.stream().map(dto -> {
             TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog();
@@ -560,6 +574,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
         HashSet<String> hashSet = new HashSet<>();
         hashSet.add("1");
         dealDepartmentToMq(taskId, hashSet, SyncTaskStatusEnum.group_sync);
+        return null;
     }
 
 

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

@@ -18,22 +18,16 @@ import com.gic.haoban.manage.api.dto.*;
 import com.gic.haoban.manage.api.enums.AuditType;
 import com.gic.haoban.manage.api.enums.BindTypeEnum;
 import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
+import com.gic.haoban.manage.api.enums.SecretTypeEnum;
 import com.gic.haoban.manage.api.service.AuditApiService;
 import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
-import com.gic.haoban.manage.service.entity.TabHaobanClerkMainStoreRelated;
+import com.gic.haoban.manage.service.entity.*;
 import com.gic.haoban.manage.service.entity.TabHaobanStaff;
-import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkBindLog;
-import com.gic.haoban.manage.service.entity.TabHaobanStaff;
-import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation;
-import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated;
-import com.gic.haoban.manage.service.service.StaffClerkBindLogService;
-import com.gic.haoban.manage.service.service.ClerkMainStoreRelatedService;
-import com.gic.haoban.manage.service.service.ExternalClerkRelatedService;
-import com.gic.haoban.manage.service.service.StaffClerkRelationService;
-
-import com.gic.haoban.manage.service.service.StaffService;
-import com.gic.haoban.manage.service.service.WxEnterpriseRelatedService;
+import com.gic.haoban.manage.service.service.*;
+
+import com.gic.wechat.api.dto.qywx.QywxExternalcontactDTO;
+import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
@@ -85,6 +79,15 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
 	@Autowired
 	private ExternalClerkRelatedService externalClerkRelatedService;
 
+	@Autowired
+	private QywxUserApiService qywxUserApiService;
+
+	@Autowired
+	private SecretSettingService secretSettingService;
+
+	@Autowired
+	private WxEnterpriseService wxEnterpriseService;
+
 	@Override
 	public void bindLogMq(String params) {
 		logger.info("绑定日志mq:{}",params);
@@ -392,4 +395,58 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
 			 clerkMainStoreRelatedService.setMainStore(staffId, list.get(list.size()-1).getStoreId(), wxEnterpriseId);
 		 }
 	}
+
+	@Override
+	public ServiceResponse<String> getClerkMemberChatConfig(String clerkId) {
+
+		ServiceResponse response=new ServiceResponse();
+		StaffClerkRelationDTO relationDTO = staffClerkRelatinService.getByClerkId(clerkId);
+		if (null == relationDTO) {
+			logger.info("导购没有关联企业微信：{}",clerkId);
+			response.setCode(2);
+			response.setMessage("导购没有关联企业微信");
+			return response;
+		}
+
+		MemberClerkChatConfig chatConfig = staffClerkRelatinService.getChatConfig(relationDTO.getStaffId(), "-1");
+		if (chatConfig!=null) {
+			response.setResult(chatConfig.getConfigId());
+			return response;
+		}
+
+		QywxExternalcontactDTO send = new QywxExternalcontactDTO();
+		send.setType(1);
+		send.setScene(1);
+		send.setRemark("导购:" + relationDTO.getClerkCode());
+		List<String> userIds = new ArrayList<>();
+		userIds.add(relationDTO.getWxUserId());
+		send.setUser(userIds);
+
+
+		SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(relationDTO.getWxEnterpriseId(), SecretTypeEnum.HAOBAN_HELP.getVal());
+		if (null == secretSetting||secretSetting.getCheckFlag()==0) {
+			logger.info("没有配置secret:{}",relationDTO.getWxEnterpriseId());
+			response.setCode(3);
+			response.setMessage("企业微信配置异常");
+			return response;
+		}
+		WxEnterpriseDTO enterpriseDTO = wxEnterpriseService.selectById(relationDTO.getWxEnterpriseId());
+		String configId = qywxUserApiService.getExternalcontactByUserId(enterpriseDTO.getCorpid(), secretSetting.getSecretVal(), send);
+		logger.info("configId:{}",configId);
+		if (StringUtils.isBlank(configId)) {
+			logger.info("staff:{}", configId, JSONObject.toJSONString(relationDTO));
+			response.setCode(4);
+			response.setMessage("创建config失败");
+			return response;
+		}
+		MemberClerkChatConfig clerkChatConfig = new MemberClerkChatConfig();
+		clerkChatConfig.setConfigId(configId);
+		clerkChatConfig.setEnterpriseId(relationDTO.getEnterpriseId());
+		clerkChatConfig.setMemberId("-1");
+		clerkChatConfig.setStaffId(relationDTO.getStaffId());
+		staffClerkRelatinService.saveChatConfig(clerkChatConfig);
+
+		response.setResult(clerkChatConfig.getConfigId());
+		return response;
+	}
 }

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

@@ -318,4 +318,11 @@
             and data_type=#{dataType}
         </if>
     </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>
 </mapper>
\ No newline at end of file

haoban-manage3-service/src/main/resources/mapper/TabHaobanMemberClerkChatConfigMapper.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.TabHaobanMemberClerkChatConfigMapper">
+  <resultMap id="BaseResultMap" type="com.gic.haoban.manage.service.entity.MemberClerkChatConfig">
+    <id column="member_clerk_chat_config_id" jdbcType="INTEGER" property="memberClerkChatConfigId" />
+    <result column="staff_id" jdbcType="VARCHAR" property="staffId" />
+    <result column="enterprise_id" jdbcType="VARCHAR" property="enterpriseId" />
+    <result column="member_id" jdbcType="VARCHAR" property="memberId" />
+    <result column="config_id" jdbcType="VARCHAR" property="configId" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    member_clerk_chat_config_id, staff_id, enterprise_id, member_id, config_id, status, 
+    create_time, update_time
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_member_clerk_chat_config
+    where member_clerk_chat_config_id = #{memberClerkChatConfigId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from tab_haoban_member_clerk_chat_config
+    where member_clerk_chat_config_id = #{memberClerkChatConfigId,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.MemberClerkChatConfig">
+    insert into tab_haoban_member_clerk_chat_config (member_clerk_chat_config_id, staff_id, 
+      enterprise_id, member_id, config_id, 
+      status, create_time, update_time
+      )
+    values (#{memberClerkChatConfigId,jdbcType=INTEGER}, #{staffId,jdbcType=VARCHAR}, 
+      #{enterpriseId,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, #{configId,jdbcType=VARCHAR}, 
+      #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.MemberClerkChatConfig">
+    insert into tab_haoban_member_clerk_chat_config
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="memberClerkChatConfigId != null">
+        member_clerk_chat_config_id,
+      </if>
+      <if test="staffId != null">
+        staff_id,
+      </if>
+      <if test="enterpriseId != null">
+        enterprise_id,
+      </if>
+      <if test="memberId != null">
+        member_id,
+      </if>
+      <if test="configId != null">
+        config_id,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="memberClerkChatConfigId != null">
+        #{memberClerkChatConfigId,jdbcType=INTEGER},
+      </if>
+      <if test="staffId != null">
+        #{staffId,jdbcType=VARCHAR},
+      </if>
+      <if test="enterpriseId != null">
+        #{enterpriseId,jdbcType=VARCHAR},
+      </if>
+      <if test="memberId != null">
+        #{memberId,jdbcType=VARCHAR},
+      </if>
+      <if test="configId != null">
+        #{configId,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.MemberClerkChatConfig">
+    update tab_haoban_member_clerk_chat_config
+    <set>
+      <if test="staffId != null">
+        staff_id = #{staffId,jdbcType=VARCHAR},
+      </if>
+      <if test="enterpriseId != null">
+        enterprise_id = #{enterpriseId,jdbcType=VARCHAR},
+      </if>
+      <if test="memberId != null">
+        member_id = #{memberId,jdbcType=VARCHAR},
+      </if>
+      <if test="configId != null">
+        config_id = #{configId,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        status = #{status,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 member_clerk_chat_config_id = #{memberClerkChatConfigId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.MemberClerkChatConfig">
+    update tab_haoban_member_clerk_chat_config
+    set staff_id = #{staffId,jdbcType=VARCHAR},
+      enterprise_id = #{enterpriseId,jdbcType=VARCHAR},
+      member_id = #{memberId,jdbcType=VARCHAR},
+      config_id = #{configId,jdbcType=VARCHAR},
+      status = #{status,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where member_clerk_chat_config_id = #{memberClerkChatConfigId,jdbcType=INTEGER}
+  </update>
+
+  <select id="getChatByMemberIdStaffId"  resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tab_haoban_member_clerk_chat_config
+    where staff_id = #{staffId,jdbcType=VARCHAR} and member_id = #{memberId,jdbcType=VARCHAR}
+    and status =1
+  </select>
+</mapper>
\ No newline at end of file

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

 import com.alibaba.fastjson.JSONObject;
+import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.api.dto.SyncSingleDealDTO;
 import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
 import com.gic.haoban.manage.api.service.StaffApiService;
+import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
 import com.gic.haoban.manage.service.service.StaffService;
 import com.gic.haoban.manage.service.service.TestService;
 import com.gic.redis.data.util.RedisUtil;
@@ -44,6 +46,9 @@ public class DealSyncTest {
     @Autowired
     private TestService testService;
 
+    @Autowired
+    private StaffClerkRelationApiService staffClerkRelationApiService;
+
     @Test
     public void test() {
         List<SyncSingleDealDTO> add = new ArrayList<>();
@@ -175,4 +180,11 @@ public class DealSyncTest {
         });
 
     }
+
+    @Test
+    public void test7() {
+        ServiceResponse<String> memberChatConfig = staffClerkRelationApiService.getClerkMemberChatConfig("ff8080816106031401612207e9b405aa");
+        System.out.println(JSONObject.toJSONString(memberChatConfig));
+
+    }
 }

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

@@ -272,7 +272,10 @@ public class ApplicationController extends WebBaseController{
 			if (StringUtils.isBlank(taskId)) {
 				return resultResponse(HaoBanErrCode.ERR_0, false);
 			}
-			dealSyncOperationApiService.dealQywxDepartment(taskId, wxEnterpriseId);
+			String ret = dealSyncOperationApiService.dealQywxDepartment(taskId, wxEnterpriseId);
+			if (null!=ret) {
+				return resultResponse(HaoBanErrCode.ERR_0,ret,null,null);
+			}
 		}
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java

@@ -83,7 +83,7 @@ public enum HaoBanErrCode {
     
     ERR_10012(10012,"企业微信不存在"),
     
-    ERR_10013(10013,"secret设置失败，请确认"),
+    ERR_10013(10013,"secret设置失败，请确认好办助手是否设置全部可见或登录账号是否被删除"),
     
     ERR_10014(10014,"暂存部门人员不能删除"),