离职继承的标识

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

@@ -37,6 +37,16 @@ public class ExternalUserDTO implements Serializable{
 
     private String state;
 
+	private Integer addWay ;
+
+	public Integer getAddWay() {
+		return addWay;
+	}
+
+	public void setAddWay(Integer addWay) {
+		this.addWay = addWay;
+	}
+
 	public Integer getFriendType() {
         return friendType;
     }

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

@@ -48,6 +48,16 @@ public class MemberUnionidRelatedDTO implements Serializable{
     // 是否从自建应用下的回调
     private int selfCallback = 0;
 
+    private Integer addWay ;
+
+    public Integer getAddWay() {
+        return addWay;
+    }
+
+    public void setAddWay(Integer addWay) {
+        this.addWay = addWay;
+    }
+
     public int getSelfCallback() {
         return selfCallback;
     }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/hm/WxUserAddLogQDTO.java

@@ -19,6 +19,15 @@ public class WxUserAddLogQDTO implements Serializable{
     private String staffId;
     private String staffName;
     private String clerkId;
+    private Integer addWay ;
+
+    public Integer getAddWay() {
+        return addWay;
+    }
+
+    public void setAddWay(Integer addWay) {
+        this.addWay = addWay;
+    }
 
     public boolean isDelClerkFlag() {
         return delClerkFlag;

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

@@ -24,6 +24,17 @@ public class ExternalUserPojo implements Serializable{
 	private Integer friendType;
 	private String state;
 
+	// https://developer.work.weixin.qq.com/document/path/92265#%E6%9D%A5%E6%BA%90%E5%AE%9A%E4%B9%89
+	private int addWay ;
+
+	public int getAddWay() {
+		return addWay;
+	}
+
+	public void setAddWay(int addWay) {
+		this.addWay = addWay;
+	}
+
 	public Integer getFriendType() {
 		return friendType;
 	}

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

@@ -87,6 +87,9 @@ public class WxUserAddLogServiceImpl implements WxUserAddLogService {
                     entity.setAllDelFlag(this.isAllDel(externalUserid));
                 }
             }
+            if(null != qdto.getAddWay() && qdto.getAddWay().equals(202)) {
+                entity.setAddChannel(3);
+            }
             // 新增好友
             if (!qdto.isDelFlag()) {
                 String memberLabelId = null;

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

@@ -654,6 +654,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
        wxUserAddLogQDTO.setStaffId(staffId);
        wxUserAddLogQDTO.setStaffName(staffName);
        wxUserAddLogQDTO.setClerkId(hyClerkId);
+       wxUserAddLogQDTO.setAddWay(dto.getAddWay());
        this.wxUserAddLogService.save(wxUserAddLogQDTO);
        if(StringUtils.isNotBlank(memberId)) {
            this.groupChatService.matchGicMember(wxEnterpriseId, enterpriseId, memberId, externalUserId);
@@ -998,7 +999,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         dto.setAvatar(StringUtils.isBlank(dto.getAvatar()) ? cacheDTO.getAvatar() : dto.getAvatar());
         dto.setExternalUserid(StringUtils.isBlank(dto.getExternalUserid()) ? cacheDTO.getExternalUserid() : externalUserid);
         dto.setSelfExternalUserid(StringUtils.isBlank(dto.getSelfExternalUserid()) ? cacheDTO.getSelfExternalUserid() : dto.getSelfExternalUserid());
-
+        dto.setAddWay(externalUserDTO.getAddWay());
         if (StringUtils.isAnyBlank(dto.getExternalUserid(), dto.getSelfExternalUserid())) {
             log.error("新增外部联系人,只有一个外部联系人id,wxEnterpriseId：{}", wxEnterpriseId, dto.getExternalUserid());
             return null;
@@ -1401,6 +1402,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         String avatar = "";
         Integer friendType = 1;
         String state = "";
+        Integer addWay = 0 ;
         if (StringUtils.isNotBlank(uJ)) {
             JSONObject jo = JSON.parseObject(uJ);
             String external_contact = jo.getString("external_contact");
@@ -1428,6 +1430,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
                         if (jt != null) {
                             externalUserId = jt.getString("external_userid");
                             createTime = follow.getString("createtime");
+                            addWay = follow.getIntValue("add_way") ;
                             break;
                         }
                     }
@@ -1442,6 +1445,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         pojo.setAvatar(avatar);
         pojo.setFriendType(friendType);
         pojo.setState(state);
+        pojo.setAddWay(addWay);
         return EntityUtil.changeEntityByJSON(ExternalUserDTO.class, pojo);
     }