Commit bd5c9812 by 徐高华

test

parent d5b2beb5
...@@ -34,6 +34,7 @@ public class TabGroupChatUser implements Serializable{ ...@@ -34,6 +34,7 @@ public class TabGroupChatUser implements Serializable{
private String memberId; private String memberId;
/**邀请者*/ /**邀请者*/
private String invitorUserId; private String invitorUserId;
private String invitorUserName ;
private java.util.Date createTime; private java.util.Date createTime;
private java.util.Date updateTime; private java.util.Date updateTime;
/**1是0否*/ /**1是0否*/
...@@ -52,7 +53,15 @@ public class TabGroupChatUser implements Serializable{ ...@@ -52,7 +53,15 @@ public class TabGroupChatUser implements Serializable{
private String joinRemark; private String joinRemark;
private String joinState; private String joinState;
public void setChatUserId(Long chatUserId){ public String getInvitorUserName() {
return invitorUserName;
}
public void setInvitorUserName(String invitorUserName) {
this.invitorUserName = invitorUserName;
}
public void setChatUserId(Long chatUserId){
this.chatUserId = chatUserId; this.chatUserId = chatUserId;
} }
......
...@@ -470,7 +470,12 @@ public class GroupChatServiceImpl implements GroupChatService { ...@@ -470,7 +470,12 @@ public class GroupChatServiceImpl implements GroupChatService {
user.setCreateTime(new Date()); user.setCreateTime(new Date());
user.setUpdateTime(new Date()); user.setUpdateTime(new Date());
if (null != member.getInvitor()) { if (null != member.getInvitor()) {
user.setInvitorUserId(member.getInvitor().getUserid()); String invitorId = member.getInvitor().getUserid();
user.setInvitorUserId(invitorId);
TabHaobanStaff invitor = this.staffMapper.selectByUserIdAndEnterpriseId(invitorId, wxEnterpriseId);
if (null != invitor) {
user.setInvitorUserName(invitor.getStaffName());
}
} }
this.matchGicMember(wxEnterpriseId, enterpriseId, member.getUnionid(), userId, user); this.matchGicMember(wxEnterpriseId, enterpriseId, member.getUnionid(), userId, user);
userList.add(user); userList.add(user);
......
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