liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
苏尹岚
2020-11-24 17:09:46 +08:00
parent b04870c607
commit ff125d53aa
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxstore/event/event.go
View File

@@ -174,7 +174,7 @@ func CreateMessageGroup(ctx *jxcontext.Context, userID, userID2, groupName strin
if data, err := json.Marshal(messageGroup); err == nil { if data, err := json.Marshal(messageGroup); err == nil {
json.Unmarshal(data, &messageGroupResult) json.Unmarshal(data, &messageGroupResult)
messageGroupResult.Name = user.Name messageGroupResult.Name = user.Name
messageGroupResult.MessageGroupMembers = append(messageGroupResult.MessageGroupMembers, messageGroupMember) // messageGroupResult.MessageGroupMembers = append(messageGroupResult.MessageGroupMembers, messageGroupMember)
} }
} else { } else {
userMembers, err := dao.GetUserMember(db, userID, model.MemberTypeNormal) userMembers, err := dao.GetUserMember(db, userID, model.MemberTypeNormal)

24
business/model/dao/event.go
View File

@@ -200,12 +200,17 @@ func GetImMessageRecord(db *DaoDB, groupID int, userID string, storeID, vendorID
type GetMessageGroupsResult struct { type GetMessageGroupsResult struct {
model.MessageGroup model.MessageGroup
Avatar string `json:"avatar"` Avatar string `json:"avatar"`
LastMessageType int `json:"lastMessageType"` LastMessageType int `json:"lastMessageType"`
LastContent string `json:"lastContent"` LastContent string `json:"lastContent"`
LastTime time.Time `json:"lastTime"` LastTime time.Time `json:"lastTime"`
LastUserName string `json:"lastUserName"` LastUserName string `json:"lastUserName"`
MessageGroupMembers []*model.MessageGroupMember `json:"messageGroupMembers"` MessageGroupMembers []*GetMessageGroupsMemberResult `json:"messageGroupMembers"`
}
type GetMessageGroupsMemberResult struct {
model.User
model.MessageGroupMember
} }
func GetMessageGroups(db *DaoDB, userID string, groupID, groupType int, isMember bool, userID2 string) (messageGroupsResult []*GetMessageGroupsResult, err error) { func GetMessageGroups(db *DaoDB, userID string, groupID, groupType int, isMember bool, userID2 string) (messageGroupsResult []*GetMessageGroupsResult, err error) {
@@ -230,9 +235,12 @@ func GetMessageGroups(db *DaoDB, userID string, groupID, groupType int, isMember
if err = GetRows(db, &messageGroupsResult, sql, sqlParams); err == nil { if err = GetRows(db, &messageGroupsResult, sql, sqlParams); err == nil {
if isMember { if isMember {
for _, v := range messageGroupsResult { for _, v := range messageGroupsResult {
var messageGroupMembers []*model.MessageGroupMember var messageGroupMembers []*GetMessageGroupsMemberResult
sql2 := ` sql2 := `
SELECT * FROM message_group_member WHERE group_id = ? SELECT a.*, b.*
FROM message_group_member a
JOIN user b ON b.user_id = a.member_user_id
WHERE a.group_id = ?
` `
sqlParams2 := []interface{}{v.GroupID} sqlParams2 := []interface{}{v.GroupID}
if userID2 != "" { if userID2 != "" {