Merge branch 'master' into fixbug_0308

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

@@ -158,6 +158,7 @@ public interface MemberUnionidRelatedApiService {
      * @param wxUserId
      * @param resWes
      */
+    @Deprecated
     void cleanNoExsitFriend(String wxEnterpriseId, String wxUserId, String resWes);
 
     /**

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

@@ -297,4 +297,13 @@ public interface TabHaobanExternalClerkRelatedMapper {
     TabHaobanExternalClerkRelated getByEnterpriseIdAndExternalUserId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("wxUserId") String wxUserId,
                                                                      @Param("enterpriseId") String enterpriseId, @Param("externalUserId") String externalUserId);
 
+
+    /**
+     * 查询所有好友关系
+     *
+     * @param wxEnterpriseId wx企业标识
+     * @param wxUserId       wx用户id
+     * @return {@link List}<{@link TabHaobanExternalClerkRelated}>
+     */
+    List<TabHaobanExternalClerkRelated> getByWxUserIdAndWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("wxUserId") String wxUserId);
 }
\ No newline at end of file

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

@@ -1288,7 +1288,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     @Override
     public void cleanNoExsitFriend(String wxEnterpriseId, String wxUserId, String wxRes) {
         log.info("【清除不存在的好友】wxEnterpriseId={},wxUserId={}", wxEnterpriseId, wxUserId);
-        WxEnterpriseDTO enterprise = wxEnterpriseService.selectById(wxEnterpriseId);
         List<MemberUnionidRelatedDTO> list = this.getByWxUserIdAndWxEnterpriseId(wxUserId, wxEnterpriseId);
         List<String> externalUserIdList = list.stream().map(external -> external.getExternalUserid())
                 .collect(Collectors.toList());
@@ -1668,14 +1667,12 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     public void cleanNoExsitFriendNew(String wxEnterpriseId, String wxUserId, List<String> externalUserIds) {
         log.info("【清除不存在的好友】wxEnterpriseId={},wxUserId={}", wxEnterpriseId, wxUserId);
         //查询所有的外部联系人
-        List<MemberUnionidRelatedDTO> list = memberUnionRelatedService.getByWxUserIdAndWxEnterpriseId(wxUserId, wxEnterpriseId);
+        List<TabHaobanExternalClerkRelated> list = externalClerkRelatedMapper.getByWxUserIdAndWxEnterpriseId(wxUserId, wxEnterpriseId);
         if (CollectionUtils.isEmpty(list)) {
             log.info("改导购下没有外部联系人，无需清理外部联系人：{},{}", wxUserId, wxEnterpriseId);
             return;
         }
-        Set<String> externalUserIdList = list.stream().map(external -> external.getExternalUserid())
-                .collect(Collectors.toSet());
-
+        Set<String> externalUserIdList = list.stream().map(external -> external.getExternalUserId()).collect(Collectors.toSet());
         Sets.SetView<String> delExternalUserIds = Sets.difference(new HashSet<>(externalUserIds), externalUserIdList);
         if (CollectionUtils.isEmpty(delExternalUserIds)) {
             log.info("没有需要删除逇外部联系人:{},{}", wxUserId, wxEnterpriseId);

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

@@ -626,7 +626,7 @@
         select
         <include refid="Base_Column_List"/>
         from tab_haoban_external_clerk_related
-        where  wx_user_id = #{wxUserId,jdbcType=VARCHAR}
+        where wx_user_id = #{wxUserId,jdbcType=VARCHAR}
         and wx_enterprise_id = #{wxEnterpriseId}
         and enterprise_id = #{enterpriseId}
         and external_user_id = #{externalUserId}
@@ -634,4 +634,13 @@
         order by update_time desc limit 1
     </select>
 
+
+    <select id="getByWxUserIdAndWxEnterpriseId" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from tab_haoban_external_clerk_related
+        where wx_user_id = #{wxUserId,jdbcType=VARCHAR}
+        and wx_enterprise_id = #{wxEnterpriseId} and status_flag in(1,3,4)
+    </select>
+
 </mapper>
\ No newline at end of file