From 02822598c294e5cf63e837376295876e7ace7f95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 11 Nov 2020 16:49:01 +0800
Subject: [PATCH] heihei

---
 business/jxstore/event/event.go | 14 ++++++++++++++
 business/model/dao/event.go     |  4 ++++
 2 files changed, 18 insertions(+)

diff --git a/business/jxstore/event/event.go b/business/jxstore/event/event.go
index fd9fde15f..309a9af4a 100644
--- a/business/jxstore/event/event.go
+++ b/business/jxstore/event/event.go
@@ -229,6 +229,20 @@ func GetMessageGroupByUser(ctx *jxcontext.Context, userID string) (messageGroupR
 				v.Name = user.Name
 			}
 		}
+		//最后一条记录和时间和人
+		var imMessageRecord *model.ImMessageRecord
+		sql := `
+			SELECT * FROM im_message_record WHERE group_id = ? ORDER BY created_at DESC LIMIT 1
+		`
+		sqlParams := []interface{}{v.GroupID}
+		if err = dao.GetRow(db, &imMessageRecord, sql, sqlParams); err == nil {
+			v.LastTime = imMessageRecord.CreatedAt
+			v.LastContent = imMessageRecord.Content
+			v.LastMessageType = imMessageRecord.MessageType
+			if user3, err := dao.GetUserByID(db, "user_id", imMessageRecord.UserID); err == nil {
+				v.LastUserName = user3.Name
+			}
+		}
 	}
 	return messageGroups, err
 }
diff --git a/business/model/dao/event.go b/business/model/dao/event.go
index e9a316276..c7c9ec6e1 100644
--- a/business/model/dao/event.go
+++ b/business/model/dao/event.go
@@ -174,6 +174,10 @@ func GetImMessageRecord(db *DaoDB, groupID int, userID string, storeID, vendorID
 type GetMessageGroupsResult struct {
 	model.MessageGroup
 	Avatar              string                      `json:"avatar"`
+	LastMessageType     int                         `json:"lastMessageType"`
+	LastContent         string                      `json:"lastContent"`
+	LastTime            time.Time                   `json:"lastTime"`
+	LastUserName        string                      `json:"lastUserName"`
 	MessageGroupMembers []*model.MessageGroupMember `json:"messageGroupMembers"`
 }