代码合并

rpc/internal/common/msglistService.go

@@ -1,8 +1,6 @@
 package common
 
 import (
-<<<<<<< HEAD
-=======
 	"app.yhyue.com/moapp/MessageCenter/entity"
 	"app.yhyue.com/moapp/MessageCenter/rpc/internal/config"
 	"app.yhyue.com/moapp/MessageCenter/rpc/type/message"
@@ -10,20 +8,12 @@ import (
 	"app.yhyue.com/moapp/jybase/common"
 	m "app.yhyue.com/moapp/jybase/mongodb"
 	"app.yhyue.com/moapp/jybase/redis"
->>>>>>> master
 	"context"
 	"errors"
 	"fmt"
 	"log"
 	"strconv"
 	"time"
-
-	"app.yhyue.com/moapp/MessageCenter/entity"
-	"app.yhyue.com/moapp/MessageCenter/rpc/type/message"
-	"app.yhyue.com/moapp/MessageCenter/util"
-	"app.yhyue.com/moapp/jybase/common"
-	m "app.yhyue.com/moapp/jybase/mongodb"
-	"app.yhyue.com/moapp/jybase/redis"
 )
 
 func BitmapUserMsgList(this *message.UserMsgListReq) (*message.UserMsgList, *message.Messages) {
@@ -139,7 +129,6 @@ func BitmapUserMsgList(this *message.UserMsgListReq) (*message.UserMsgList, *mes
 		sortUnread, total := BitmapCountUnread(this.UserId, classUnreadCountMap, false)
 		//fmt.Println("*************", total)
 		unread += total
-<<<<<<< HEAD
 		toDoUnread = sortUnread["11"]
 		for _, v := range entity.MessageColumn {
 			var column message.AllSortData
@@ -156,26 +145,6 @@ func BitmapUserMsgList(this *message.UserMsgListReq) (*message.UserMsgList, *mes
 			}
 			if _, ok := entity.ClassSearchMap[column.MsgType]; ok {
 				column.IsClassSearch = true
-=======
-		if this.IsColumn {
-			for _, v := range entity.MessageColumn {
-				var column message.AllSortData
-				column.Name = common.InterfaceToStr(v["name"])
-				column.Img = fmt.Sprintf("/common-module/msgCenter/%s.png", common.InterfaceToStr(v["img"]))
-				column.MsgType = common.Int64All(v["group_id"])
-				if column.Name == "私信" {
-					column.UnreadMessages = unreadMsg(this)
-				} else if common.IntAll(v["group_id"]) > 0 {
-					//消息未读数
-					msgType := common.InterfaceToStr(v["group_id"])
-					column.UnreadMessages = sortUnread[msgType]
-					column.Data = sData[msgType]
-				}
-				if _, ok := entity.ClassSearchMap[column.MsgType]; ok {
-					column.IsClassSearch = true
-				}
-				columnData = append(columnData, &column)
->>>>>>> master
 			}
 		}
 	}

rpc/message.proto

@@ -200,7 +200,6 @@ message UserMsgListReq {
 }
 
 message UserMsgListRes {
-<<<<<<< HEAD
     int64 code = 1; //状态码
     string message = 2; //响应消息
     repeated Messages list = 3; //
@@ -215,24 +214,8 @@ message UserMsgList {
     repeated Messages data = 1; //
     repeated AllSortData sortData = 2; //
     int64 count = 3; //总数
-    int64 unread = 4; //未读总数
+    int64 unread = 4; //未读总数F
     int64 toDoUnread = 5; //待办未读数量
-=======
-  int64 code = 1; //状态码
-  string message = 2; //响应消息
-  repeated Messages list = 3; //
-  Messages last = 4; //
-  repeated AllSortData column = 5; //
-  int64 count = 6; //总数
-  int64 unread = 7; //未读总数
-}
-
-message UserMsgList {
-  repeated Messages data = 1; //
-  repeated AllSortData sortData = 2; //
-  int64 count = 3; //总数
-  int64 unread = 4; //未读总数
->>>>>>> master
 }
 
 message AllSortData {