Merge branch 'feature/xgh/zq12' into 'developer'

Feature/xgh/zq12

See merge request !2384

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

@@ -294,6 +294,15 @@ public interface ExternalClerkRelatedApiService {
     boolean isExternalFriendByMemberId(String memberId, String enterpriseId);
 
     /**
+     * 是否有双向好友
+     * @param memberId
+     * @param enterpriseId
+     * @return
+     */
+    boolean isBothFriendByMemberId(String memberId, String enterpriseId);
+
+
+    /**
      * 得到好友状态
      *
      * @param memberId     成员身份

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

@@ -352,8 +352,12 @@ public interface TabHaobanExternalClerkRelatedMapper {
      * @author mozhu
      * @date 2022-04-21 10:06:21
      */
-    int countByMemberId(@Param("memberId") String memberId, @Param("enterpriseId") String enterpriseId);
-    
+    int countByMemberId(@Param("memberId") String memberId, @Param("enterpriseId") String enterpriseId );
+
+
+    int countBothByMemberId(@Param("memberId") String memberId, @Param("enterpriseId") String enterpriseId );
+
+
     List<String> getIdList(@Param("memberId") String memberId, @Param("enterpriseId") String enterpriseId) ;
     
     void updateMemberByIdList(@Param("memberId") String memberId, @Param("list") List<String> idList) ;

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

@@ -692,6 +692,12 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
         return count > 0;
     }
 
+    @Override
+    public boolean isBothFriendByMemberId(String memberId, String enterpriseId) {
+        int count = tabHaobanExternalClerkRelatedMapper.countBothByMemberId(memberId, enterpriseId);
+        return count > 0;
+    }
+
     /**
      * 更新新的外部联系人id
      *

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

@@ -708,6 +708,14 @@
           and member_id = #{memberId}
           and status_flag = 1
     </select>
+
+    <select id="countBothByMemberId" resultType="int">
+        select count(*)
+        from tab_haoban_external_clerk_related
+        where enterprise_id = #{enterpriseId}
+          and member_id = #{memberId}
+          and status_flag = 1  and external_status = 1
+    </select>
     
      <select id="getIdList" resultType="string">
         select external_clerk_related_id from tab_haoban_external_clerk_related