Merge branch 'master-xgh-好办停用' into 'master'

好友查询

See merge request !274

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

@@ -189,6 +189,8 @@ public interface ExternalClerkRelatedApiService {
      */
     boolean isFriends(String memberId, String clerkId, String enterpriseId);
     
+    List<String> listMemberAndClerk(List<String> memberIdList , List<String> clerkIdList , String enterpriseId) ; 
+
     /**
      * 批量查询会员与导购好友关系
      *

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

@@ -369,4 +369,6 @@ public interface TabHaobanExternalClerkRelatedMapper {
      */
     List<String> getByStoreIdAndStaffId(@Param("storeId") String storeId,
                                         @Param("staffId") String staffId);
+
+    List<String> listMemberAndClerk(@Param("memberIdList")List<String> memberIdList, @Param("clerkIdList")List<String> clerkIdList, @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

@@ -435,6 +435,12 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
     }
     
     @Override
+    public List<String> listMemberAndClerk(List<String> memberIdList, List<String> clerkIdList, String enterpriseId) {
+        List<String> list = tabHaobanExternalClerkRelatedMapper.listMemberAndClerk(memberIdList, clerkIdList, enterpriseId);
+        return list;
+    }
+
+    @Override
     public Map<String, List<ClerkStaffWxUserDTO>> listMemberStaffRel(List<String> memberIdList, List<String> clerkIdList, String enterpriseId, String wxEnterpriseId) {
         if (CollectionUtils.isEmpty(memberIdList) || CollectionUtils.isEmpty(clerkIdList)) {
             // 2个列表都为空查不了关系

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

@@ -677,4 +677,19 @@
           and status_flag in (1, 3, 4)
     </select>
     
+    <select id="listMemberAndClerk"  resultType="java.lang.String">
+    	 select member_id
+        from tab_haoban_external_clerk_related
+        where member_id in
+        <foreach collection="memberIdList" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+        and clerk_id in
+        <foreach collection="clerkIdList" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+        and enterprise_id = #{enterpriseId}
+        AND status_flag = 1 
+    </select>
+
 </mapper>
\ No newline at end of file