Commit 5ff0b0ec by 墨竹

fix:查询客户修改

parent f28ad3d2
......@@ -35,6 +35,8 @@ public class ExternalUserDTO implements Serializable{
*/
private Integer friendType;
private String state;
public Integer getFriendType() {
return friendType;
}
......@@ -147,7 +149,11 @@ public class ExternalUserDTO implements Serializable{
this.staffId = staffId;
}
public String getState() {
return state;
}
public void setState(String state) {
this.state = state;
}
}
......@@ -22,6 +22,7 @@ public class ExternalUserPojo implements Serializable{
* 1表示该外部联系人是微信用户,2表示该外部联系人是企业微信用户
*/
private Integer friendType;
private String state;
public Integer getFriendType() {
return friendType;
......@@ -86,4 +87,12 @@ public class ExternalUserPojo implements Serializable{
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId;
}
public String getState() {
return state;
}
public void setState(String state) {
this.state = state;
}
}
......@@ -985,6 +985,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
String avatar = "";
String relaName = "";
String externalUserId = "";
String state = "";
if (StringUtils.isNotBlank(unionIdJson)) {
JSONObject jo = JSON.parseObject(unionIdJson);
String external_contact = jo.getString("external_contact");
......@@ -1006,6 +1007,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
String followJson = JSON.toJSONString(object);
JSONObject follow = JSON.parseObject(followJson);
userId = follow.getString("userid");
state = follow.getString("state");
if (userId.equals(userId1)) {
createTime = follow.getString("createtime");
}
......@@ -1018,6 +1020,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
pojo.setUnionId(unionId);
pojo.setExternalUserId(externalUserId);
pojo.setWxEnterpriseId(wxEnterpriseId);
pojo.setState(state);
return pojo;
}
......@@ -1704,6 +1707,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
String createTime = "";
String avatar = "";
Integer friendType = 1;
String state = "";
if (StringUtils.isNotBlank(uJ)) {
JSONObject jo = JSON.parseObject(uJ);
String external_contact = jo.getString("external_contact");
......@@ -1725,6 +1729,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
String followJson = JSON.toJSONString(object);
JSONObject follow = JSON.parseObject(followJson);
uj_userId = follow.getString("userid");
state = follow.getString("state");
//第三方返回的是加密的,多做一层判断
if (uj_userId.equals(wxUserId) || uj_userId.equals(wxOpenUseId)) {
if (jt != null) {
......@@ -1743,6 +1748,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
pojo.setWxEnterpriseId(wxEnterpriseId);
pojo.setAvatar(avatar);
pojo.setFriendType(friendType);
pojo.setState(state);
return EntityUtil.changeEntityByJSON(ExternalUserDTO.class, pojo);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment