Merge remote-tracking branch 'origin/developer' into developer

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

 package com.gic.haoban.manage.api.service;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -52,6 +53,14 @@ public interface ExternalClerkRelatedApiService {
      * @return
      */
     boolean pushExternalByRelationKey(String relationKey);
+    
+    @Deprecated
+    List<ExternalClerkRelatedDTO> listByEnterpriseIdAndDate(String enterpriseId, Date date);
+
+    @Deprecated
+    Page<ExternalClerkRelatedDTO> pageMemberUnionByParams(List<String> userIdList, List<String> sendMemberIds,
+                                                          String enterpriseId, BasePageInfo pageInfo);
+
 
     /**
      * 推送外部联系人 更新次数以及状态（会员回调-绑定好友）
@@ -151,6 +160,15 @@ public interface ExternalClerkRelatedApiService {
      * @date 2022-03-29 10:19:24
      */
     List<ExternalClerkRelatedShortInfoDTO> listExternalClerkByMemberId(String memberId,String enterpriseId);
+    
+    /**
+     * 这个是所有企业下的会员关联关系 性能很差
+     * 获取会员下的关联关系列表
+     * @param memberId
+     * @return
+     */
+    @Deprecated
+    List<ExternalClerkRelatedShortInfoDTO> listExternalClerkByMemberId(String memberId);
 
 
     /**

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

@@ -144,6 +144,20 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
         tabHaobanExternalClerkRelatedMapper.pushExternalByRelationKey(relationKey);
         return true;
     }
+    
+    @Override
+    public List<ExternalClerkRelatedDTO> listByEnterpriseIdAndDate(
+            String enterpriseId, Date date) {
+        List<TabHaobanExternalClerkRelated> list = tabHaobanExternalClerkRelatedMapper.listByEnterpriseIdAndDate(enterpriseId, date);
+        return EntityUtil.changeEntityListByJSON(ExternalClerkRelatedDTO.class, list);
+    }
+
+    @Override
+    public Page<ExternalClerkRelatedDTO> pageMemberUnionByParams(List<String> userIdList, List<String> sendMemberIds,
+                                                                 String enterpriseId, BasePageInfo pageInfo) {
+        PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize());
+        return PageUtil.changePageHelperToCurrentPage(tabHaobanExternalClerkRelatedMapper.pageMemberUnionByParams(userIdList, sendMemberIds, enterpriseId), ExternalClerkRelatedDTO.class);
+    }
 
     @Override
     public ServiceResponse<ExternalClerkRelatedDTO> bindMemberIdExternalByRelationKey(String relationKey, String enterpriseId, String memberId, String unionid) {
@@ -291,6 +305,15 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
         List<TabHaobanExternalClerkRelated> list = tabHaobanExternalClerkRelatedMapper.listByMemberId(memberId, enterpriseId);
         return EntityUtil.changeEntityListNew(ExternalClerkRelatedShortInfoDTO.class, list);
     }
+    
+    @Override
+    public List<ExternalClerkRelatedShortInfoDTO> listExternalClerkByMemberId(String memberId) {
+        if (StringUtils.isBlank(memberId)) {
+            return null;
+        }
+        List<TabHaobanExternalClerkRelated> list = tabHaobanExternalClerkRelatedMapper.listByMemberId(memberId, null);
+        return EntityUtil.changeEntityListNew(ExternalClerkRelatedShortInfoDTO.class, list);
+    }
 
     @Override
     public List<String> listStoreIdByMemberId(String memberId) {