Commit 5ff0b0ec by 墨竹

fix:查询客户修改

parent f28ad3d2
...@@ -35,6 +35,8 @@ public class ExternalUserDTO implements Serializable{ ...@@ -35,6 +35,8 @@ public class ExternalUserDTO implements Serializable{
*/ */
private Integer friendType; private Integer friendType;
private String state;
public Integer getFriendType() { public Integer getFriendType() {
return friendType; return friendType;
} }
...@@ -146,8 +148,12 @@ public class ExternalUserDTO implements Serializable{ ...@@ -146,8 +148,12 @@ public class ExternalUserDTO implements Serializable{
public void setStaffId(String staffId) { public void setStaffId(String staffId) {
this.staffId = staffId; 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{ ...@@ -22,6 +22,7 @@ public class ExternalUserPojo implements Serializable{
* 1表示该外部联系人是微信用户,2表示该外部联系人是企业微信用户 * 1表示该外部联系人是微信用户,2表示该外部联系人是企业微信用户
*/ */
private Integer friendType; private Integer friendType;
private String state;
public Integer getFriendType() { public Integer getFriendType() {
return friendType; return friendType;
...@@ -86,4 +87,12 @@ public class ExternalUserPojo implements Serializable{ ...@@ -86,4 +87,12 @@ public class ExternalUserPojo implements Serializable{
public void setWxUserId(String wxUserId) { public void setWxUserId(String wxUserId) {
this.wxUserId = 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 ...@@ -985,6 +985,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
String avatar = ""; String avatar = "";
String relaName = ""; String relaName = "";
String externalUserId = ""; String externalUserId = "";
String state = "";
if (StringUtils.isNotBlank(unionIdJson)) { if (StringUtils.isNotBlank(unionIdJson)) {
JSONObject jo = JSON.parseObject(unionIdJson); JSONObject jo = JSON.parseObject(unionIdJson);
String external_contact = jo.getString("external_contact"); String external_contact = jo.getString("external_contact");
...@@ -1006,6 +1007,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -1006,6 +1007,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
String followJson = JSON.toJSONString(object); String followJson = JSON.toJSONString(object);
JSONObject follow = JSON.parseObject(followJson); JSONObject follow = JSON.parseObject(followJson);
userId = follow.getString("userid"); userId = follow.getString("userid");
state = follow.getString("state");
if (userId.equals(userId1)) { if (userId.equals(userId1)) {
createTime = follow.getString("createtime"); createTime = follow.getString("createtime");
} }
...@@ -1018,6 +1020,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -1018,6 +1020,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
pojo.setUnionId(unionId); pojo.setUnionId(unionId);
pojo.setExternalUserId(externalUserId); pojo.setExternalUserId(externalUserId);
pojo.setWxEnterpriseId(wxEnterpriseId); pojo.setWxEnterpriseId(wxEnterpriseId);
pojo.setState(state);
return pojo; return pojo;
} }
...@@ -1704,6 +1707,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -1704,6 +1707,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
String createTime = ""; String createTime = "";
String avatar = ""; String avatar = "";
Integer friendType = 1; Integer friendType = 1;
String state = "";
if (StringUtils.isNotBlank(uJ)) { if (StringUtils.isNotBlank(uJ)) {
JSONObject jo = JSON.parseObject(uJ); JSONObject jo = JSON.parseObject(uJ);
String external_contact = jo.getString("external_contact"); String external_contact = jo.getString("external_contact");
...@@ -1725,6 +1729,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -1725,6 +1729,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
String followJson = JSON.toJSONString(object); String followJson = JSON.toJSONString(object);
JSONObject follow = JSON.parseObject(followJson); JSONObject follow = JSON.parseObject(followJson);
uj_userId = follow.getString("userid"); uj_userId = follow.getString("userid");
state = follow.getString("state");
//第三方返回的是加密的,多做一层判断 //第三方返回的是加密的,多做一层判断
if (uj_userId.equals(wxUserId) || uj_userId.equals(wxOpenUseId)) { if (uj_userId.equals(wxUserId) || uj_userId.equals(wxOpenUseId)) {
if (jt != null) { if (jt != null) {
...@@ -1743,6 +1748,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -1743,6 +1748,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
pojo.setWxEnterpriseId(wxEnterpriseId); pojo.setWxEnterpriseId(wxEnterpriseId);
pojo.setAvatar(avatar); pojo.setAvatar(avatar);
pojo.setFriendType(friendType); pojo.setFriendType(friendType);
pojo.setState(state);
return EntityUtil.changeEntityByJSON(ExternalUserDTO.class, pojo); 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