unionid表优化

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

@@ -9,8 +9,6 @@ public interface MemberUnionidRelatedMapper {
 
     int insert(MemberUnionidRelated record);
 
-    MemberUnionidRelated selectByPrimaryKey(String memberUnionidRelatedId);
-
     /**
      * 根据应用内的外部联系人获取信息
      *
@@ -20,7 +18,7 @@ public interface MemberUnionidRelatedMapper {
      * @return
      */
     MemberUnionidRelated getBySelfExternalUserId(@Param("staffId") String staffId, @Param("wxEnterpriseId") String wxEnterpriseId, @Param("selfExternalUserId") String selfExternalUserId);
-
+    
     List<MemberUnionidRelated> listByWxEnterpriseIdAndExternalUserId(@Param("wxEnterpriseId") String wxEnterpriseId , @Param("list")List<String> externalUserIdList);
 
 }
\ No newline at end of file

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

@@ -8,23 +8,6 @@ public interface MemberUnionRelatedService {
 	
 	/**
 	 * 根据应用内的外部联系人id 获取信息
-	 *
-	 * @param wxUserId
-	 * @param wxEnterpriseId
-	 * @param selfExternalUserId
-	 * @return
-	 */
-	MemberUnionidRelatedDTO getByWxUserIdAndSelfExternalUserId(String staffId, String wxEnterpriseId, String selfExternalUserId);
-
-
-	/**
-	 * 根据应用内的外部联系人id 获取信息
-	 *
-	 * @param wxEnterpriseId     wx企业标识
-	 * @param selfExternalUserId 自外部的用户id
-	 * @return {@link MemberUnionidRelatedDTO }
-	 * @author mozhu
-	 * @date 2021-12-23 22:35:47
 	 */
 	MemberUnionidRelatedDTO getBySelfExternalUserId(String wxEnterpriseId, String selfExternalUserId);
 

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

 package com.gic.haoban.manage.service.service.impl;
 
 import java.util.Date;
-import java.util.List;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -21,6 +19,13 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService
 	
 	@Override
 	public String addMemberUnionidRelated(MemberUnionidRelatedDTO dto) {
+	    String wxEnterpriseId = dto.getWxEnterpriseId() ;
+	    String staffId = dto.getStaffId() ;
+	    String selfExternalUserId = dto.getSelfExternalUserid() ;
+	    MemberUnionidRelated oldDTO = this.mapper.getBySelfExternalUserId(staffId, wxEnterpriseId, selfExternalUserId) ;
+	    if(null != oldDTO) {
+	        return oldDTO.getMemberUnionidRelatedId() ;
+	    }
 		dto.setStatusFlag(1);
 		dto.setCreateTime(new Date());
 		dto.setUpdateTime(new Date());
@@ -30,12 +35,6 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService
 	}
 
 	@Override
-	public MemberUnionidRelatedDTO getByWxUserIdAndSelfExternalUserId(String staffId, String wxEnterpriseId, String selfExternalUserId) {
-		MemberUnionidRelated unionidRelated = mapper.getBySelfExternalUserId(staffId,wxEnterpriseId, selfExternalUserId);
-		return EntityUtil.changeEntityNew(MemberUnionidRelatedDTO.class, unionidRelated);
-	}
-
-	@Override
 	public MemberUnionidRelatedDTO getBySelfExternalUserId(String wxEnterpriseId, String selfExternalUserId) {
 		MemberUnionidRelated unionidRelated = mapper.getBySelfExternalUserId(null,wxEnterpriseId, selfExternalUserId);
 		return EntityUtil.changeEntityNew(MemberUnionidRelatedDTO.class, unionidRelated);

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

@@ -1652,27 +1652,20 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 
     private String saveMemberUnionTable(ExternalUserDTO dto) {
         String wxEnterpriseId = dto.getWxEnterpriseId();
-        String name = StringUtils.isBlank(dto.getName()) ? "--" : dto.getName();
+        String name = dto.getName();
         String createTime = dto.getAddCreateTime();
         String externalUserId = dto.getExternalUserId();
         String staffId = dto.getStaffId();
         String avatar = dto.getAvatar();
-        MemberUnionidRelatedDTO exsitDTO = memberUnionRelatedService.getByWxUserIdAndSelfExternalUserId(staffId, wxEnterpriseId, dto.getSelfExternalUserId());
-        String uuid = "";
-        if (exsitDTO == null) {
-            exsitDTO = new MemberUnionidRelatedDTO();
-            exsitDTO.setAvatar(avatar);
-            exsitDTO.setSelfExternalUserid(dto.getSelfExternalUserId());
-            exsitDTO.setAddCreateTime(createTime);
-            exsitDTO.setExternalName(name);
-            exsitDTO.setExternalUserid(externalUserId);
-            exsitDTO.setWxEnterpriseId(wxEnterpriseId);
-            exsitDTO.setStaffId(staffId);
-            uuid = memberUnionRelatedService.addMemberUnionidRelated(exsitDTO);
-        }else {
-            uuid = exsitDTO.getMemberUnionidRelatedId() ;
-        }
-        return uuid ;
+        MemberUnionidRelatedDTO   exsitDTO = new MemberUnionidRelatedDTO();
+        exsitDTO.setAvatar(avatar);
+        exsitDTO.setExternalUserid(externalUserId);
+        exsitDTO.setSelfExternalUserid(dto.getSelfExternalUserId());
+        exsitDTO.setAddCreateTime(createTime);
+        exsitDTO.setExternalName(name);
+        exsitDTO.setWxEnterpriseId(wxEnterpriseId);
+        exsitDTO.setStaffId(staffId);
+        return  memberUnionRelatedService.addMemberUnionidRelated(exsitDTO);
     }
     
     @Override

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

@@ -20,12 +20,6 @@
         member_unionid_related_id, member_id, unionid, wx_enterprise_id, status_flag, external_userid,
     staff_id, create_time, update_time,add_create_time,self_external_userid,external_name,enterprise_id
     </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
-        select
-        <include refid="Base_Column_List"/>
-        from tab_haoban_member_unionid_related
-        where member_unionid_related_id = #{memberUnionidRelatedId,jdbcType=VARCHAR}
-    </select>
     <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated">
         insert into tab_haoban_member_unionid_related (member_unionid_related_id, member_id,
                                                        unionid, wx_enterprise_id, status_flag,
@@ -39,39 +33,6 @@
                 #{enterpriseId})
     </insert>
     
-    <update id="deleteByUnionidAndUserId" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated">
-        update tab_haoban_member_unionid_related
-        set status_flag = 0,
-            update_time=now()
-        where external_userid = #{externalUserid,jdbcType=VARCHAR}
-          and staff_id = #{staffId}
-    </update>
-
-    <update id="delMemberUnionidRelatedBatch" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated">
-        update tab_haoban_member_unionid_related
-        set status_flag = 0,update_time=now()
-        where
-        wx_enterprise_id=#{wxEnterpriseId}
-        and staff_id = #{staffId}
-        and external_userid in
-        <foreach collection="externalUserids" open="(" close=")" separator="," item="item">
-            #{item}
-        </foreach>
-    </update>
-
-
-    <update id="cleanStaffRelated" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated">
-        update tab_haoban_member_unionid_related
-        set status_flag = 0,
-        update_time = now()
-        where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
-        and staff_id in
-        <foreach collection="staffIds" item="id" index="index" open="(" close=")" separator=",">
-            #{id,jdbcType=VARCHAR}
-        </foreach>
-        and status_flag = 1
-    </update>
-
     <select id="getBySelfExternalUserId" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>