Merge branch 'fixbug_0421' into developer

# Conflicts:
#	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/ExternalClerkRelatedApiService.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanExternalClerkRelatedMapper.java
#	haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml

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

@@ -260,6 +260,18 @@ public interface ExternalClerkRelatedApiService {
      */
     ExternalClerkRelatedDTO getByWxEnterpriseIdAndUnionId(String wxEnterpriseId, String wxUserId, String unionid);
 
+
+    /**
+     * 会员是否有好友 true:是 false:否
+     *
+     * @param memberId     成员身份
+     * @param enterpriseId 企业标识
+     * @return boolean
+     * @author mozhu
+     * @date 2022-04-21 10:03:44
+     */
+    boolean isExternalFriendByMemberId(String memberId,String enterpriseId);
+
     /**
      * 得到好友状态
      *

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

@@ -340,4 +340,16 @@ public interface TabHaobanExternalClerkRelatedMapper {
     TabHaobanExternalClerkRelated getByEnterpriseIdAndMemberId(@Param("enterpriseId") String enterpriseId,
                                                                 @Param("memberId") String memberId,
                                                                @Param("statusFlag") Integer statusFlag);
+
+    /**
+     * 会员好友数量
+     *
+     * @param memberId     成员身份
+     * @param enterpriseId 企业标识
+     * @return int
+     * @author mozhu
+     * @date 2022-04-21 10:06:21
+     */
+    int countByMemberId(@Param("memberId") String memberId,
+                        @Param("enterpriseId") String enterpriseId);
 }
\ No newline at end of file

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

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

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

@@ -671,4 +671,11 @@
         </if>
         order by create_time desc limit 1
     </select>
+    <select id="countByMemberId" resultType="int">
+        select
+        count(*)
+        from tab_haoban_external_clerk_related
+        where enterprise_id = #{enterpriseId} and member_id = #{memberId}
+        and status_flag = 1
+    </select>
 </mapper>
\ No newline at end of file