提供查询会员好友的导购列表

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/MemberExternalUserDTO.java

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class MemberExternalUserDTO implements Serializable , Comparable<MemberExternalUserDTO>{
+
+    private String staffId ;
+    private String memberId ;
+    private String clerkHead ;
+    private String clerkId ;
+    private String clerkCode ;
+    private String clerkName ;
+    private String storeId ;
+    private String storeName ;
+    private String storeCode ;
+
+    /**
+     * 添加好友时间
+     */
+    private Date addTime ;
+    /**
+     * 单向好友-客户删客户时间
+     */
+    private Date halfDelTime ;
+
+    /**
+     * 导购删除客户时间
+     */
+    private Date delTime ;
+
+    /**
+     * 1 好友 2已删除
+     */
+    private Integer statusFlag ;
+
+    // 外部联系人ID状态1正常,  3单向好友
+    private Integer externalStatus = 1 ;
+
+    public String getStaffId() {
+        return staffId;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId;
+    }
+
+    public String getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(String memberId) {
+        this.memberId = memberId;
+    }
+
+    public String getClerkHead() {
+        return clerkHead;
+    }
+
+    public void setClerkHead(String clerkHead) {
+        this.clerkHead = clerkHead;
+    }
+
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId;
+    }
+
+    public String getClerkCode() {
+        return clerkCode;
+    }
+
+    public void setClerkCode(String clerkCode) {
+        this.clerkCode = clerkCode;
+    }
+
+    public String getClerkName() {
+        return clerkName;
+    }
+
+    public void setClerkName(String clerkName) {
+        this.clerkName = clerkName;
+    }
+
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public String getStoreCode() {
+        return storeCode;
+    }
+
+    public void setStoreCode(String storeCode) {
+        this.storeCode = storeCode;
+    }
+
+    public Integer getStatusFlag() {
+        return statusFlag;
+    }
+
+    public void setStatusFlag(Integer statusFlag) {
+        this.statusFlag = statusFlag;
+    }
+
+    public Integer getExternalStatus() {
+        return externalStatus;
+    }
+
+    public void setExternalStatus(Integer externalStatus) {
+        this.externalStatus = externalStatus;
+    }
+
+    public Date getAddTime() {
+        return addTime;
+    }
+
+    public void setAddTime(Date addTime) {
+        this.addTime = addTime;
+    }
+
+    public Date getHalfDelTime() {
+        return halfDelTime;
+    }
+
+    public void setHalfDelTime(Date halfDelTime) {
+        this.halfDelTime = halfDelTime;
+    }
+
+    public Date getDelTime() {
+        return delTime;
+    }
+
+    public void setDelTime(Date delTime) {
+        this.delTime = delTime;
+    }
+
+    @Override
+    public int compareTo(MemberExternalUserDTO o) {
+        return  o.addTime.compareTo(this.addTime);
+    }
+}

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

@@ -343,6 +343,9 @@ public interface ExternalClerkRelatedApiService {
      */
     List<ExternalUserClerkDTO> listExternalClerk(String enterpriseId , String memberId) ;
 
+
+    List<MemberExternalUserDTO> listMemberExternalUser(String enterpriseId , String memberId) ;
+
     // 0不是好友 1是好友 3是单向好友
     int isClerkFriend(String enterpriseId , String clerkId , String memberId) ;
 

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

 package com.gic.haoban.manage.service.service;
 
 import com.gic.haoban.manage.api.dto.ExternalClerkRelatedDTO;
+import com.gic.haoban.manage.api.dto.MemberExternalUserDTO;
 import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
 import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
 import org.apache.ibatis.annotations.Param;
@@ -133,4 +134,5 @@ public interface ExternalClerkRelatedService {
 	 */
 	int getFriendNum(String memberId , String storeId , String clerkId) ;
 
+    List<MemberExternalUserDTO> listMemberExternalUser(String enterpriseId, String memberId);
 }

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

@@ -14,10 +14,7 @@ import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.common.utils.DingUtils;
 import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.StringUtil;
-import com.gic.haoban.manage.api.dto.ExternalClerkRelatedDTO;
-import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
-import com.gic.haoban.manage.api.dto.SecretSettingDTO;
-import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
+import com.gic.haoban.manage.api.dto.*;
 import com.gic.haoban.manage.api.dto.qdto.hm.WxUserAddLogQDTO;
 import com.gic.haoban.manage.api.enums.SecretTypeEnum;
 import com.gic.haoban.manage.service.config.Config;
@@ -41,6 +38,7 @@ import com.gic.search.engine.api.dto.dynamic.DynamicSearchDTO;
 import com.gic.search.engine.api.service.dynamic.ESDataDynamicOperationApiService;
 import com.gic.wechat.api.dto.qywx.QywxNewExternalUseridDTO;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
+import com.google.common.collect.Lists;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -597,4 +595,55 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
     public int getFriendNum(String memberId, String storeId, String clerkId) {
         return this.mapper.getFriendNum(memberId,storeId,clerkId);
     }
+
+    @Override
+    public List<MemberExternalUserDTO> listMemberExternalUser(String enterpriseId, String memberId) {
+        List<TabHaobanExternalClerkRelated> list = this.mapper.getAddTimeByMemberId(memberId,enterpriseId,null) ;
+        if(CollectionUtils.isEmpty(list)) {
+            return Lists.newArrayList();
+        }
+        List<MemberExternalUserDTO> retList = new ArrayList<>() ;
+        String externalUserId = null ;
+        Map<String,String> map = new HashMap<>() ;
+        for(TabHaobanExternalClerkRelated item : list) {
+            MemberExternalUserDTO dto = new MemberExternalUserDTO() ;
+            if(null == externalUserId) {
+                externalUserId = item.getExternalUserId() ;
+            }else if(!externalUserId.equals(item.getExternalUserId())) {
+               continue;
+            }
+            String staffId = item.getStaffId() ;
+            String clerkId = item.getClerkId() ;
+            if(null != map.get(staffId) && !map.get(staffId).equals(clerkId)) {
+                continue;
+            }
+            map.put(staffId,clerkId) ;
+            dto.setMemberId(memberId);
+            dto.setClerkId(item.getClerkId());
+            dto.setStoreId(item.getStoreId());
+            dto.setExternalStatus(item.getExternalStatus());
+            dto.setHalfDelTime(item.getHalfDelTime());
+            dto.setAddTime(new Date(item.getAddTime()*1000));
+            dto.setStatusFlag(item.getStatusFlag());
+            if(dto.getStatusFlag()==2) {
+                dto.setDelTime(item.getUpdateTime());
+                dto.setExternalStatus(1);
+                dto.setHalfDelTime(null);
+            }
+            retList.add(dto);
+        }
+        for(MemberExternalUserDTO dto : retList) {
+            ClerkDTO clerkDTO = this.clerkService.getclerkById(dto.getClerkId()) ;
+            dto.setClerkCode(clerkDTO.getClerkCode());
+            dto.setClerkName(clerkDTO.getClerkName());
+            dto.setClerkHead(clerkDTO.getHeadImgUrl());
+            dto.setStoreId(clerkDTO.getStoreId());
+            dto.setStoreCode(clerkDTO.getStoreCode());
+            dto.setStoreName(clerkDTO.getStoreName());
+        }
+        if(CollectionUtils.isNotEmpty(retList)) {
+            Collections.sort(retList);
+        }
+        return retList;
+    }
 }

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

@@ -939,4 +939,9 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
         }
         return Lists.newArrayList();
     }
+
+    @Override
+    public List<MemberExternalUserDTO> listMemberExternalUser(String enterpriseId, String memberId) {
+        return this.externalClerkRelatedService.listMemberExternalUser(enterpriseId,memberId);
+    }
 }