From 65456d331bfaadce7ef88fc3b7a288a1fc8ec183 Mon Sep 17 00:00:00 2001
From: Gordon <1432970085@qq.com>
Date: Wed, 29 Dec 2021 16:04:08 +0800
Subject: [PATCH] nil return modify

---
 internal/rpc/user/user.go                | 10 +++++-----
 pkg/base_info/conversation_api_struct.go |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/internal/rpc/user/user.go b/internal/rpc/user/user.go
index fbe14cb..69d3c2b 100644
--- a/internal/rpc/user/user.go
+++ b/internal/rpc/user/user.go
@@ -104,7 +104,7 @@ func (s *userServer) SetReceiveMessageOpt(ctx context.Context, req *pbUser.SetRe
 	resp := pbUser.SetReceiveMessageOptResp{CommonResp: &pbUser.CommonResp{}}
 
 	for _, v := range req.ConversationIDList {
-		resp.OptResultList = append(resp.OptResultList, &pbUser.OptResult{ConversationId: v, Result: 0})
+		resp.ConversationOptResultList = append(resp.ConversationOptResultList, &pbUser.OptResult{ConversationID: v, Result: 0})
 	}
 	log.NewInfo(req.OperationID, "SetReceiveMessageOpt rpc return ", resp.String())
 	return &resp, nil
@@ -112,14 +112,14 @@ func (s *userServer) SetReceiveMessageOpt(ctx context.Context, req *pbUser.SetRe
 
 func (s *userServer) GetReceiveMessageOpt(ctx context.Context, req *pbUser.GetReceiveMessageOptReq) (*pbUser.GetReceiveMessageOptResp, error) {
 	log.NewInfo(req.OperationID, "GetReceiveMessageOpt args ", req.String())
-	m, err := db.DB.GetMultiConversationMsgOpt(req.FromUserID, req.ConversationIdList)
+	m, err := db.DB.GetMultiConversationMsgOpt(req.FromUserID, req.ConversationIDList)
 	if err != nil {
-		log.NewError(req.OperationID, "GetMultiConversationMsgOpt failed ", err.Error(), req.FromUserID, req.ConversationIdList)
+		log.NewError(req.OperationID, "GetMultiConversationMsgOpt failed ", err.Error(), req.FromUserID, req.ConversationIDList)
 		return &pbUser.GetReceiveMessageOptResp{CommonResp: &pbUser.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
 	}
 	resp := pbUser.GetReceiveMessageOptResp{CommonResp: &pbUser.CommonResp{}}
 	for k, v := range m {
-		resp.ConversationOptResultList = append(resp.ConversationOptResultList, &pbUser.OptResult{ConversationId: k, Result: int32(v)})
+		resp.ConversationOptResultList = append(resp.ConversationOptResultList, &pbUser.OptResult{ConversationID: k, Result: int32(v)})
 	}
 	log.NewInfo(req.OperationID, "GetReceiveMessageOpt rpc return ", resp.String())
 	return &resp, nil
@@ -134,7 +134,7 @@ func (s *userServer) GetAllConversationMsgOpt(ctx context.Context, req *pbUser.G
 	}
 	resp := pbUser.GetAllConversationMsgOptResp{CommonResp: &pbUser.CommonResp{}}
 	for k, v := range m {
-		resp.ConversationOptResultList = append(resp.ConversationOptResultList, &pbUser.OptResult{ConversationId: k, Result: int32(v)})
+		resp.ConversationOptResultList = append(resp.ConversationOptResultList, &pbUser.OptResult{ConversationID: k, Result: int32(v)})
 	}
 	log.NewInfo(req.OperationID, "GetAllConversationMsgOpt rpc return ", resp.String())
 	return &resp, nil
diff --git a/pkg/base_info/conversation_api_struct.go b/pkg/base_info/conversation_api_struct.go
index 5642e80..bd54baf 100644
--- a/pkg/base_info/conversation_api_struct.go
+++ b/pkg/base_info/conversation_api_struct.go
@@ -22,6 +22,7 @@ type GetReceiveMessageOptResp struct {
 	ConversationOptResultList []*OptResult `json:"data"`
 }
 type SetReceiveMessageOptReq struct {
+	FromUserID         string   `json:"fromUserID" binding:"required"`
 	OperationID        string   `json:"operationID" binding:"required"`
 	Opt                *int32   `json:"opt" binding:"required"`
 	ConversationIDList []string `json:"conversationIDList" binding:"required"`
-- 
GitLab