欢迎语调整

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/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-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/ExternalMemberLogMapper.java

+package com.gic.haoban.manage.service.dao.mapper;
+
+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("unionid") String unionid,
+            @Param("statusFlag") int statusFlag);
+
+    public TabExternalMemberLog selectUnionid(@Param("enterpriseId") String enterpriseId,
+            @Param("unionid") String unionid);
+
+}
\ 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 , 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 insert(ExternalMemberLogDTO log);
+
+    public TabExternalMemberLog selectUnionid(String enterpriseId, String unioinid);
+
+}

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

+package com.gic.haoban.manage.service.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+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.entity.TabExternalMemberLog;
+import com.gic.haoban.manage.service.service.ExternalMemberService;
+
+@Service
+public class ExternalMemberServiceImpl implements ExternalMemberService {
+
+    @Autowired
+    private ExternalMemberLogMapper externalMemberLogMapper;
+
+    @Override
+    public int insert(ExternalMemberLogDTO log) {
+        TabExternalMemberLog entity = EntityUtil.changeEntity(TabExternalMemberLog.class, log);
+        entity.setLogId(UniqueIdUtils.uniqueLong());
+        this.externalMemberLogMapper.insert(entity);
+        return 0;
+    }
+
+    @Override
+    public TabExternalMemberLog selectUnionid(String enterpriseId, String unioinid) {
+        return null;
+    }
+
+}

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/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml

@@ -392,22 +392,16 @@
         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>
          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,11 +665,24 @@ 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) {
+        if (externalClerkRelatedDTO == null || StringUtils.isEmpty(externalClerkRelatedDTO.getMemberId())) {
+            if(null == externalClerkRelatedDTO) {
+                this.memberUnionidRelatedApiService.saveExternalMemberLog(memberLog) ;
+            }
             logger.info("会员绑定好友，该会员已经绑定成功，无需再次绑定,memberId:{},enterpriseId:{},unionid:{},relationKey:{}", memberId, enterpriseId, unionid, relationKey);
             return resultResponse(HaoBanErrCode.ERR_1);
         }