Merge branch 'master_欢迎语调整' into 'master'

Master 欢迎语调整

See merge request !1131

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

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable ;
+
+/**
+ * 
+ * @ClassName: TabHaobanExternalMemberLog
+ * @Description: TODO
+ * @Author 徐高华
+ * @Date 2023年04月04日 10:19:47
+ * @Modify
+ * @CopyRight 
+ */
+public class ExternalMemberLogDTO implements Serializable{
+
+	private static final long serialVersionUID = 1709395027793900L;
+	
+	private Long logId;
+	private String enterpriseId;
+	private String unionid;
+	private String relationKey;
+	private Integer deleteFlag;
+	private java.util.Date createTime;
+	private java.util.Date updateTime;
+	/**1有效 0无效*/
+	private Integer statusFlag;
+	private String memberId ;
+	
+	public String getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(String memberId) {
+        this.memberId = memberId;
+    }
+
+    public void setLogId(Long logId){
+		this.logId = logId;
+	}
+	
+	public Long getLogId(){
+		return logId;
+	}
+	public void setEnterpriseId(String enterpriseId){
+		this.enterpriseId = enterpriseId;
+	}
+	
+	public String getEnterpriseId(){
+		return enterpriseId;
+	}
+	public void setUnionid(String unionid){
+		this.unionid = unionid;
+	}
+	
+	public String getUnionid(){
+		return unionid;
+	}
+	public void setRelationKey(String relationKey){
+		this.relationKey = relationKey;
+	}
+	
+	public String getRelationKey(){
+		return relationKey;
+	}
+	public void setDeleteFlag(Integer deleteFlag){
+		this.deleteFlag = deleteFlag;
+	}
+	
+	public Integer getDeleteFlag(){
+		return deleteFlag;
+	}
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return createTime;
+	}
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return updateTime;
+	}
+	public void setStatusFlag(Integer statusFlag){
+		this.statusFlag = statusFlag;
+	}
+	
+	public Integer getStatusFlag(){
+		return statusFlag;
+	}
+}
\ No newline at end of file

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

@@ -99,5 +99,10 @@ public interface HaobanTimerApiService {
     * @throws
      */
     public ServiceResponse<Void> ownerDimission(String params);
+    
+    /**
+     * 定时处理欢迎语后的好友
+     */
+    public ServiceResponse<Void> welcomeForMember(String params);
 
 }

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

@@ -215,17 +215,14 @@ public interface MemberUnionidRelatedApiService {
      * @date 2022-02-21 14:56:25
      */
     void addMemberUnionidWechatAccountByClerk(String res);
-
-
+    
     /**
-     * 事件订阅test
-     *
-     * @param param 参数
-     * @author mozhu
-     * @date 2022-09-09 14:18:34
+     * 
+    * @Title: saveExternalMemberLog
+    * @Description: 欢迎语业务
+    * @author xugh
+    * @param memberLog
+    * @throws
      */
-    //无效接口
-//    void addDelFriendEventTest(String param);
-
-
+    void saveExternalMemberLog(ExternalMemberLogDTO memberLog);
 }

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

@@ -54,10 +54,6 @@ public interface StaffDepartmentRelatedApiService {
 
 	List<StaffDepartmentRelatedDTO> listByStaffIds(List<String> staffIds);
 
-	void sendClerkBind(String staffId, String clerkCode, String storeId, int auditStatus, String auditReason);
-
-	void sendStaffBind(String staffId, String clerkCode, String storeId, int auditStatus, String auditReason);
-
 	void sendClerkAdd(String clerkName, String clerkCode, String storeId, int auditStatus, String auditReason);
 
 	void sendClerkDel(String clerkName, String clerkCode, String storeId, int auditStatus, String auditReason);

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

+package com.gic.haoban.manage.service.dao.mapper;
+
+import java.util.Date;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.gic.haoban.manage.service.entity.TabExternalMemberLog;
+
+/**
+ * 
+ * @ClassName: TabHaobanExternalMemberLogMapper
+ * @Description: TODO
+ * @Author 徐高华
+ * @Date 2023年04月04日 10:19:47
+ * @Modify
+ * @CopyRight 
+ */
+public interface ExternalMemberLogMapper {
+
+    public int insert(TabExternalMemberLog log);
+
+    public int updateStatus(@Param("enterpriseId") String enterpriseId,  @Param("id")long id,
+            @Param("statusFlag") int statusFlag);
+
+    public TabExternalMemberLog selectRelationKey(@Param("enterpriseId") String enterpriseId,
+            @Param("relationKey") String relationKey);
+    
+    public List<TabExternalMemberLog> listForTimer(@Param("start")Date start , @Param("end")Date end) ;
+
+}
\ No newline at end of file

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

@@ -82,21 +82,10 @@ public interface TabHaobanExternalClerkRelatedMapper {
                                                               @Param("unionId") String unionId);
 
     /**
-     * 外部联系人的unionid
-     *
-     * @param enterpriseId
-     * @param unionId
-     * @return
-     */
-//    TabHaobanExternalClerkRelated getClerkExternalByUnionId(@Param("enterpriseId") String enterpriseId,
-//                                                            @Param("clerkId") String clerkId,
-//                                                            @Param("unionId") String unionId);
-
-    /**
      * @param relationKey
      * @return
      */
-    TabHaobanExternalClerkRelated getByRelationKey(@Param("relationKey") String relationKey);
+    TabHaobanExternalClerkRelated getByRelationKey(@Param("relationKey") String relationKey , @Param("filterMember")int filterMember);
 
     /**
      * 列表数据 根据状态 时间倒序

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

+package com.gic.haoban.manage.service.entity;
+
+import java.io.Serializable ;
+/**
+ * 
+ * @ClassName: TabHaobanExternalMemberLog
+ * @Description: TODO
+ * @Author 徐高华
+ * @Date 2023年04月04日 10:19:47
+ * @Modify
+ * @CopyRight 
+ */
+public class TabExternalMemberLog implements Serializable{
+
+	private static final long serialVersionUID = 1709395027793900L;
+	
+	private Long logId;
+	private String enterpriseId;
+	private String unionid;
+	private String relationKey;
+	private Integer deleteFlag;
+	private java.util.Date createTime;
+	private java.util.Date updateTime;
+	/**1有效 0无效*/
+	private Integer statusFlag;
+	private String memberId ;
+	
+	public String getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(String memberId) {
+        this.memberId = memberId;
+    }
+
+    public void setLogId(Long logId){
+		this.logId = logId;
+	}
+	
+	public Long getLogId(){
+		return logId;
+	}
+	public void setEnterpriseId(String enterpriseId){
+		this.enterpriseId = enterpriseId;
+	}
+	
+	public String getEnterpriseId(){
+		return enterpriseId;
+	}
+	public void setUnionid(String unionid){
+		this.unionid = unionid;
+	}
+	
+	public String getUnionid(){
+		return unionid;
+	}
+	public void setRelationKey(String relationKey){
+		this.relationKey = relationKey;
+	}
+	
+	public String getRelationKey(){
+		return relationKey;
+	}
+	public void setDeleteFlag(Integer deleteFlag){
+		this.deleteFlag = deleteFlag;
+	}
+	
+	public Integer getDeleteFlag(){
+		return deleteFlag;
+	}
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return createTime;
+	}
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return updateTime;
+	}
+	public void setStatusFlag(Integer statusFlag){
+		this.statusFlag = statusFlag;
+	}
+	
+	public Integer getStatusFlag(){
+		return statusFlag;
+	}
+}
\ No newline at end of file

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

+package com.gic.haoban.manage.service.service;
+
+import com.gic.haoban.manage.api.dto.ExternalMemberLogDTO;
+import com.gic.haoban.manage.service.entity.TabExternalMemberLog;
+
+public interface ExternalMemberService {
+
+    public int updateStatus(String enterpriseId, long id, int statusFlag);
+
+    public int insert(ExternalMemberLogDTO log);
+
+    public TabExternalMemberLog selectRelationKey(String enterpriseId, String relationKey);
+
+    public void welcomeForMember();
+
+}

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

+package com.gic.haoban.manage.service.service.impl;
+
+import java.util.Date;
+import java.util.List;
+
+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.gic.commons.util.DateUtil;
+import com.gic.commons.util.EntityUtil;
+import com.gic.commons.util.UniqueIdUtils;
+import com.gic.haoban.manage.api.dto.ExternalMemberLogDTO;
+import com.gic.haoban.manage.service.dao.mapper.ExternalMemberLogMapper;
+import com.gic.haoban.manage.service.dao.mapper.TabHaobanExternalClerkRelatedMapper;
+import com.gic.haoban.manage.service.entity.TabExternalMemberLog;
+import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
+import com.gic.haoban.manage.service.service.ExternalMemberService;
+import com.gic.member.api.dto.MemberDTO;
+import com.gic.member.api.service.MemberOpenCardBusinessService;
+import com.gic.member.api.service.MemberService;
+
+@Service
+public class ExternalMemberServiceImpl implements ExternalMemberService {
+    
+    private static final Logger logger = LoggerFactory.getLogger(ExternalMemberService.class);
+    
+    @Autowired
+    private ExternalMemberLogMapper externalMemberLogMapper;
+    @Autowired
+    private MemberOpenCardBusinessService memberOpenCardBusinessService ;
+    @Autowired
+    private TabHaobanExternalClerkRelatedMapper tabHaobanExternalClerkRelatedMapper ;
+    @Autowired
+    private MemberService memberService ;
+
+    @Override
+    public int insert(ExternalMemberLogDTO log) {
+        TabExternalMemberLog entity = EntityUtil.changeEntity(TabExternalMemberLog.class, log);
+        TabExternalMemberLog old = this.externalMemberLogMapper.selectRelationKey(log.getEnterpriseId(),
+                log.getRelationKey());
+        if (null != old) {
+            return 0;
+        }
+        entity.setLogId(UniqueIdUtils.uniqueLong());
+        this.externalMemberLogMapper.insert(entity);
+        return 0;
+    }
+
+    public int updateStatus(String enterpriseId, long id, int statusFlag) {
+        return this.externalMemberLogMapper.updateStatus(enterpriseId, id, statusFlag);
+    }
+
+    @Override
+    public TabExternalMemberLog selectRelationKey(String enterpriseId, String relationKey) {
+        TabExternalMemberLog log = this.externalMemberLogMapper.selectRelationKey(enterpriseId, relationKey);
+        return log;
+    }
+    
+    @Override
+    public void welcomeForMember() {
+        logger.info("欢迎语处理会员定时");
+        Date end = DateUtil.getStartTimeOfDay() ;
+        Date start = DateUtil.addNumForDay(end, -1) ;
+        List<TabExternalMemberLog> list = this.externalMemberLogMapper.listForTimer(start, end) ;
+        for(TabExternalMemberLog log : list) {
+            String relationKey = log.getRelationKey() ;
+            TabHaobanExternalClerkRelated related = tabHaobanExternalClerkRelatedMapper.getByRelationKey(relationKey,0);
+            if (related == null) {
+                logger.info("好友记录不存在relationKey={}",relationKey);
+                continue ;
+            }
+            String enterpriseId = log.getEnterpriseId() ;
+            if(StringUtils.isNotEmpty(related.getMemberId())) {
+                this.externalMemberLogMapper.updateStatus(enterpriseId, log.getLogId(), 2) ;
+                continue ;
+            }
+          
+            String unionid = log.getUnionid() ;
+            MemberDTO member = this.memberService.getMemberByUnionid(unionid, enterpriseId) ;
+            if(null == member) {
+                logger.info("会员记录不存在relationKey={},{}",relationKey,unionid);
+                continue ;
+            }
+            String memberId =member.getMemberId() ;
+            this.memberOpenCardBusinessService.memberClerkProcessByQywxFriend(enterpriseId, memberId, unionid, relationKey);
+            this.externalMemberLogMapper.updateStatus(enterpriseId, log.getLogId(), 2) ;
+        }
+    }
+
+}

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

@@ -132,7 +132,7 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
 
     @Override
     public ExternalClerkRelatedDTO getExternalClerkByRelationKeyAndPre(String relationKey) {
-        TabHaobanExternalClerkRelated related = tabHaobanExternalClerkRelatedMapper.getByRelationKey(relationKey);
+        TabHaobanExternalClerkRelated related = tabHaobanExternalClerkRelatedMapper.getByRelationKey(relationKey,0);
         return EntityUtil.changeEntityNew(ExternalClerkRelatedDTO.class, related);
     }
 
@@ -166,7 +166,7 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
     @Override
     public ServiceResponse<ExternalClerkRelatedDTO> bindMemberIdExternalByRelationKey(String relationKey, String enterpriseId, String memberId, String unionid) {
         ServiceResponse<ExternalClerkRelatedDTO> resp = new ServiceResponse<>();
-        TabHaobanExternalClerkRelated externalClerkRelated = tabHaobanExternalClerkRelatedMapper.getByRelationKey(relationKey);
+        TabHaobanExternalClerkRelated externalClerkRelated = tabHaobanExternalClerkRelatedMapper.getByRelationKey(relationKey,1);
         if (null == externalClerkRelated) {
             log.error("relationKey对应的关联关系不存在或删除：relationKey:{},memberId:{},unionid:{}", relationKey, memberId, unionid);
             resp.setCode(0);

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

@@ -6,6 +6,7 @@ import org.springframework.stereotype.Service;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.haoban.manage.api.service.HaobanTimerApiService;
 import com.gic.haoban.manage.service.service.ExternalClerkRelatedService;
+import com.gic.haoban.manage.service.service.ExternalMemberService;
 import com.gic.haoban.manage.service.service.StaffDepartmentRelatedService;
 import com.gic.haoban.manage.service.service.chat.GroupChatService;
 import com.gic.haoban.manage.service.service.hm.HmQrcodeTempService;
@@ -21,6 +22,9 @@ public class HaobanTimerApiServiceImpl implements HaobanTimerApiService {
     private StaffDepartmentRelatedService staffDepartmentRelatedService;
     @Autowired
     private GroupChatService groupChatService;
+    @Autowired
+    private ExternalMemberService externalMemberService ;
+    
 
     @Override
     public ServiceResponse<Void> deleteTempWxHm(String params) {
@@ -69,4 +73,10 @@ public class HaobanTimerApiServiceImpl implements HaobanTimerApiService {
         this.groupChatService.ownerDimission();
         return ServiceResponse.success();
     }
+    
+    @Override
+    public ServiceResponse<Void> welcomeForMember(String params) {
+        this.externalMemberService.welcomeForMember() ;
+        return ServiceResponse.success();
+    }
 }

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

@@ -154,84 +154,6 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
         return map;
     }
 
-    //导购绑定，，审核记录，，消息发送
-    @Override
-    public void sendStaffBind(String staffId, String clerkCode, String storeId, int auditStatus, String auditReason) {
-        StaffDTO staffDTO = staffApiService.selectById(staffId);
-        if (staffDTO == null) {
-            logger.info("staff不存在，发送消息失败{}", staffId);
-            return;
-        }
-        String messageTitle = "账号申请";
-        String content = staffDTO.getStaffName() + "关联导购code（" + clerkCode + "）";
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("storeId", storeId);
-        String data = jsonObject.toJSONString();
-        String pageUrl = this.getPageUrl(AppPageType.MY_RELATED_RECORD.getCode(), data);
-        String name = staffDTO.getStaffName();
-        if (content.length() > 30) {
-            content = content.substring(0, 26);
-            content = content + "...";
-        }
-        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(staffDTO.getWxEnterpriseId());
-        String wxUserId = "";
-        if (qwDTO.needOpenUserId3th()) {
-            wxUserId = staffDTO.getWxOpenUseId();
-        } else {
-            wxUserId = staffDTO.getWxUserId();
-        }
-        //先发送下，试试
-        QywxXcxSendMessageDTO messageDTO = new QywxXcxSendMessageDTO();
-        List<ItemDTO> items = new ArrayList<>();
-        ItemDTO dto1 = new ItemDTO();
-        ItemDTO dto2 = new ItemDTO();
-        ItemDTO dto3 = new ItemDTO();
-        ItemDTO dto4 = new ItemDTO();
-
-        dto1.setKey("接收人");
-        dto1.setValue(name);
-        dto2.setKey("接收事件");
-        dto2.setValue(content);
-        dto3.setKey("结果");
-        dto3.setValue(auditStatus == 1 ? "已同意" : "已拒绝");
-        items.add(dto1);
-        items.add(dto2);
-        items.add(dto3);
-        if (StringUtils.isNotEmpty(auditReason)) {
-            dto4.setKey("理由");
-            dto4.setValue(auditReason);
-            items.add(dto4);
-        }
-        ArrayList<String> list = new ArrayList<>();
-        list.add(wxUserId);
-        messageDTO.setAppid(config.getAppid());
-        messageDTO.setUserIds(list);
-        messageDTO.setPage(pageUrl);
-        messageDTO.setTitle(messageTitle);
-        messageDTO.setItems(items);
-        logger.info("发送参数为corpId============:{},suitId============:{},messageDTO============:{},", qwDTO.getThirdCorpid(), config.getWxSuiteid(), JSONObject.toJSONString(messageDTO));
-        boolean b = qywxSuiteApiService.sendMessage(qwDTO.getThirdCorpid(), config.getWxSuiteid(), messageDTO);
-        logger.info("发送===============》{}", b);
-    }
-
-    //导购绑定，，审核记录，，消息发送
-    @Override
-    public void sendClerkBind(String staffId, String clerkCode, String storeId, int auditStatus, String auditReason) {
-        StaffDTO staffDTO = staffApiService.selectById(staffId);
-        if (staffDTO == null) {
-            logger.info("staff不存在，发送消息失败{}", staffId);
-            return;
-        }
-        String messageTitle = "账号申请";
-        String messageContent = staffDTO.getStaffName() + "申请关联导购code（" + clerkCode + "）";
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("storeId", storeId);
-        String data = jsonObject.toJSONString();
-        String pageUrl = this.getPageUrl(AppPageType.MY_RELATED_RECORD.getCode(), data);
-        this.sendAuditMessage(staffId, messageTitle, messageContent, pageUrl, auditStatus, auditReason);
-    }
-
-
     //导购新增，，审核记录，，消息发送
     @Override
     public void sendClerkAdd(String clerkName, String clerkCode, String storeId, int auditStatus, String auditReason) {

haoban-manage3-service/src/main/resources/mapper/ExternalMemberLogMapper.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.ExternalMemberLogMapper">
+  <resultMap type="com.gic.haoban.manage.service.entity.TabExternalMemberLog" id="result-map-tabHaobanExternalMemberLog">
+      <result column="log_id"  property="logId"/>
+      <result column="enterprise_id"  property="enterpriseId"/>
+      <result column="unionid"  property="unionid"/>
+      <result column="member_id" property="memberId"/>
+      <result column="relation_key"  property="relationKey"/>
+      <result column="delete_flag"  property="deleteFlag"/>
+      <result column="create_time"  property="createTime"/>
+      <result column="update_time"  property="updateTime"/>
+      <result column="status_flag"  property="statusFlag"/>
+  </resultMap>
+  <sql id="Base_Column_List">
+	  log_id,
+	  enterprise_id,
+	  unionid,
+	  member_id ,
+	  relation_key,
+	  delete_flag,
+	  create_time,
+	  update_time,
+	  status_flag
+  </sql>
+  <!-- ===================== 新增 ======================== -->
+  <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabExternalMemberLog">
+  <![CDATA[
+  INSERT INTO tab_haoban_external_member_log(
+	  log_id,
+	  enterprise_id,
+	  unionid,
+	  member_id , 
+	  relation_key,
+	  delete_flag,
+	  create_time,
+	  update_time,
+	  status_flag
+  )VALUES(
+	  #{logId,jdbcType=BIGINT},
+	  #{enterpriseId,jdbcType=CHAR},
+	  #{unionid,jdbcType=VARCHAR},
+	  #{memberId} ,
+	  #{relationKey,jdbcType=VARCHAR},
+	  0,
+	  now(),
+	  now(),
+	  1
+  )
+  ]]>
+  </insert>
+  
+  <update id="updateStatus">
+	  <![CDATA[
+	  UPDATE tab_haoban_external_member_log SET
+		  update_time=now() ,
+		  status_flag= #{statusFlag}
+	  where enterprise_id = #{enterpriseId} and log_id=#{id}
+	  ]]>
+  </update>
+  
+  <!-- ============ 查询=============-->
+  <select id="selectRelationKey"  resultMap="result-map-tabHaobanExternalMemberLog">
+ 	 SELECT <include refid="Base_Column_List" /> FROM tab_haoban_external_member_log 
+ 	  where enterprise_id = #{enterpriseId} and relation_key=#{relationKey} limit 1
+  </select>
+  
+  <select id="listForTimer"  resultMap="result-map-tabHaobanExternalMemberLog">
+  	 SELECT <include refid="Base_Column_List" /> FROM tab_haoban_external_member_log 
+ 	  	where  create_time >= #{start}  and  create_time <![CDATA[ < ]]>  #{end} and status_flag = 1 
+  </select>
+  	
+</mapper> 
\ No newline at end of file

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

@@ -392,22 +392,17 @@
         and status_flag = 1
     </select>
 
-<!--    <select id="getClerkExternalByUnionId" resultMap="BaseResultMap">-->
-<!--        select-->
-<!--        <include refid="Base_Column_List"/>-->
-<!--        from tab_haoban_external_clerk_related-->
-<!--        where enterprise_id = #{enterpriseId}-->
-<!--        and unionid = #{unionId}-->
-<!--        and clerk_id = #{clerkId}-->
-<!--        and status_flag = 1-->
-<!--    </select>-->
 
     <select id="getByRelationKey" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
         from tab_haoban_external_clerk_related
         where
-        relation_key = #{relationKey} and member_id is null 
+        relation_key = #{relationKey} 
+        <if test="filterMember==1">
+	        and member_id is null 
+        </if>
+        and status_flag != 2 
          order by create_time desc limit 1
     </select>
 

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

@@ -47,6 +47,7 @@ import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.api.dto.ClerkMainStoreRelatedDTO;
 import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
 import com.gic.haoban.manage.api.dto.ExternalClerkRelatedDTO;
+import com.gic.haoban.manage.api.dto.ExternalMemberLogDTO;
 import com.gic.haoban.manage.api.dto.ExternalUserDTO;
 import com.gic.haoban.manage.api.dto.MemberStoreDTO;
 import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
@@ -664,12 +665,23 @@ public class WxEnterpriseInfoController extends WebBaseController {
     @IgnoreLogin
     @RequestMapping("member-bind-friend")
     public HaobanResponse memberBindFriend(String memberId, String enterpriseId, String unionid, String relationKey) {
-        if (StringUtils.isAnyBlank(memberId, enterpriseId, relationKey)) {
+        if (StringUtils.isAnyBlank(enterpriseId, relationKey , unionid)) {
+            logger.info("参数错误");
             return resultResponse(HaoBanErrCode.ERR_2);
         }
+        ExternalMemberLogDTO memberLog = new ExternalMemberLogDTO() ;
+        memberLog.setEnterpriseId(enterpriseId);
+        memberLog.setUnionid(unionid);
+        memberLog.setRelationKey(relationKey);
+        memberLog.setMemberId(memberId);
+        if(StringUtils.isEmpty(memberId)) {
+            this.memberUnionidRelatedApiService.saveExternalMemberLog(memberLog) ;
+            return resultResponse(HaoBanErrCode.ERR_1);
+        }
         ExternalClerkRelatedDTO externalClerkRelatedDTO = externalClerkRelatedApiService.getExternalClerkByRelationKeyAndPre(relationKey);
         if (externalClerkRelatedDTO == null) {
-            logger.info("会员绑定好友，该会员已经绑定成功，无需再次绑定,memberId:{},enterpriseId:{},unionid:{},relationKey:{}", memberId, enterpriseId, unionid, relationKey);
+            this.memberUnionidRelatedApiService.saveExternalMemberLog(memberLog) ;
+            logger.info("好友表不存在记录,memberId:{},enterpriseId:{},unionid:{},relationKey:{}", memberId, enterpriseId, unionid, relationKey);
             return resultResponse(HaoBanErrCode.ERR_1);
         }
         logger.info("会员绑定好友，memberId:{},enterpriseId:{},unionid:{},relationKey:{}", memberId, enterpriseId, unionid, relationKey);