Merge branch 'feature/xgh/zq12'

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

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

 package com.gic.haoban.manage.api;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 会员和导购加的好友列表
@@ -10,6 +11,43 @@ public class ExternalUserClerkDTO implements Serializable {
     private String memberId ;
     private String clerkId ;
     private String storeId ;
+    // 企微加好友时间
+    private Date addTime ;
+    // 好友删成员时间
+    private Date halfDelTime ;
+
+    // 外部联系人ID状态1正常,  3单向好友
+    private Integer 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 Integer getExternalStatus() {
+        if(null == externalStatus) {
+            return 1;
+        }
+        if(externalStatus != 3) {
+            return  1;
+        }
+        return externalStatus;
+    }
 
     // 外部联系人ID状态1正常,  3单向好友
     private Integer externalStatus ;

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

@@ -839,6 +839,8 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
             dto.setStoreId(o.getStoreId());
             dto.setMemberId(memberId);
             dto.setExternalStatus(o.getExternalStatus());
+            dto.setHalfDelTime(o.getHalfDelTime());
+            dto.setAddTime(new Date(o.getAddTime()*1000));
             return dto ;
         }).collect(Collectors.toList());
         log.info("好友={}",JSONObject.toJSONString(retList));