调整获取用户最新未读消息接口

api/internal/logic/messagedetaillogic.go

@@ -26,11 +26,8 @@ func NewMessageDetailLogic(ctx context.Context, svcCtx *svc.ServiceContext) Mess
 }
 
 func (l *MessageDetailLogic) MessageDetail(req types.MessageDetailReq) (*types.MessageDetailResp, error) {
-<<<<<<< HEAD
+
 	result := &types.MessageDetailResp{}
-=======
-	//result := &types.Response{}
->>>>>>> 5703f402bd85a664f589e9153340e500d45c1f19
 	log.Println(req)
 	lsi := l.svcCtx.MessageCenter
 	resp, err := lsi.FindMessageDetail(l.ctx, &messageclient.MessageDetailReq{

api/internal/logic/messagegetlastlogic.go

@@ -27,13 +27,15 @@ func NewMessageGetLastLogic(ctx context.Context, svcCtx *svc.ServiceContext) Mes
 func (l *MessageGetLastLogic) MessageGetLast(req types.MessageGetLastReq) (*types.MessageGetLastRes, error) {
 	// todo: add your logic here and delete this line
 	result := &types.MessageGetLastRes{}
-	log.Println(req)
+	//log.Println(req)
 	lsi := l.svcCtx.MessageCenter
 	resp, err := lsi.GetLastMessage(l.ctx, &messageclient.GetLastMessageReq{
 		MsgType: req.MsgType,
 		Appid:   req.AppId,
 		UserId:  req.UserId,
 	})
+	log.Println(resp,887898855,err)
+
 	if err != nil {
 		return nil, err
 	}
@@ -42,7 +44,7 @@ func (l *MessageGetLastLogic) MessageGetLast(req types.MessageGetLastReq) (*type
 	log.Println(resp)
 	result.Code = resp.Code
 	result.Message = resp.Message
-	if result.Data!=nil{
+	if resp.Data!=nil{
 		result.Data = map[string]interface{}{
 			"id":           resp.Data.Id,
 			"appid":        resp.Data.Appid,
@@ -58,7 +60,7 @@ func (l *MessageGetLastLogic) MessageGetLast(req types.MessageGetLastReq) (*type
 			"isRead":       resp.Data.IsRead,
 		}
 	}
-
+	log.Println(result,8989898)
 	log.Println(result)
 	return result, nil
 }

rpc/internal/logic/updatemessagereadlogic.go

@@ -29,7 +29,8 @@ func NewUpdateMessageReadLogic(ctx context.Context, svcCtx *svc.ServiceContext)
 // 修改用户指定分类下的消息已读未读
 func (l *UpdateMessageReadLogic) UpdateMessageRead(in *message.UpdateMessageReadReq) (*message.UpdateMessageReadResp, error) {
 	// todo: add your logic here and delete this line
-	status, err := service.MessageService{}.UpdateMessageReadStatus(int(in.MsgType), in.ReceiveUserid, in.AppId)
+	m := service.MessageService{}
+	status, err := m.UpdateMessageReadStatus(int(in.MsgType), in.ReceiveUserid, in.AppId)
 	if status == 0 && err != nil {
 		return &message.UpdateMessageReadResp{
 			Code:    1,

rpc/messageclient/message.go

@@ -14,28 +14,28 @@ import (
 )
 
 type (
+	SendMsgRequest               = message.SendMsgRequest
+	ResCount                     = message.ResCount
+	FindUserMsgRes               = message.FindUserMsgRes
+	GetClassUnreadCountReq       = message.GetClassUnreadCountReq
+	GetMsgTypeReq                = message.GetMsgTypeReq
+	GetMsgTypeRes                = message.GetMsgTypeRes
 	DeleteMultipleMessageRequest = message.DeleteMultipleMessageRequest
 	GetUnreadCountRequest        = message.GetUnreadCountRequest
-	FindUserMsgReq               = message.FindUserMsgReq
-	GetUnreadClassCountRes       = message.GetUnreadClassCountRes
 	GetUnreadCountResponse       = message.GetUnreadCountResponse
 	Messages                     = message.Messages
+	MessageDetailResp            = message.MessageDetailResp
 	GetLastMessageRes            = message.GetLastMessageRes
-	UpdateMessageReadResp        = message.UpdateMessageReadResp
-	SendMsgRequest               = message.SendMsgRequest
-	ResCount                     = message.ResCount
-	DeleteSingleMessageRequest   = message.DeleteSingleMessageRequest
-	FindUserMsgRes               = message.FindUserMsgRes
 	GetUnreadClassCountReq       = message.GetUnreadClassCountReq
-	GetMsgTypeReq                = message.GetMsgTypeReq
 	UpdateMessageReadReq         = message.UpdateMessageReadReq
-	ChangeReadStatusRequest      = message.ChangeReadStatusRequest
+	UpdateMessageReadResp        = message.UpdateMessageReadResp
+	DeleteSingleMessageRequest   = message.DeleteSingleMessageRequest
 	Response                     = message.Response
-	GetClassUnreadCountReq       = message.GetClassUnreadCountReq
+	FindUserMsgReq               = message.FindUserMsgReq
+	GetUnreadClassCountRes       = message.GetUnreadClassCountRes
+	ChangeReadStatusRequest      = message.ChangeReadStatusRequest
 	MessageDetailReq             = message.MessageDetailReq
-	MessageDetailResp            = message.MessageDetailResp
 	GetLastMessageReq            = message.GetLastMessageReq
-	GetMsgTypeRes                = message.GetMsgTypeRes
 
 	Message interface {
 		//  修改消息阅读状态

service/messageService.go

@@ -61,7 +61,7 @@ func (service *MessageService) CountUnread(userId string, appId string) (int64,
 	log.Println("123")
 	defer orm.Close()
 	m := entity.Message{}
-	count, err := orm.Where("receive_userid=? and isdel=1 and appid=?", userId, appId).Count(m)
+	count, err := orm.Where("receive_userid=? and isRead=0 and isdel=1 and appid=?", userId, appId).Count(m)
 	if err != nil {
 		log.Println(err)
 		log.Println(count)