修改列表

rpc/internal/common/msglistService.go

@@ -17,7 +17,7 @@ import (
 	"app.yhyue.com/moapp/jybase/redis"
 )
 
-func BitmapUserMsgList(this *message.UserMsgListReq) (*message.UserMsgList, *message.Messages) {
+func BitmapUserMsgList(this *message.UserMsgListReq) (*message.UserMsgList, *message.Messages, error) {
 	var (
 		unread, count, toDoUnread int64
 		data                      = new(message.UserMsgList)
@@ -33,7 +33,8 @@ func BitmapUserMsgList(this *message.UserMsgListReq) (*message.UserMsgList, *mes
 	//classUnreadCountMap, classUnreadMsgMap := FindUserClassUnread(this.UserId)
 	classUnreadCountMap, classUnreadMsgMap, userClassMsgMap, err := FindUserClassUnreadAndClassAllMsg(this.UserId)
 	if err != nil {
-		return nil, nil
+		fmt.Println("加载FindUserClassUnreadAndClassAllMsg")
+		return nil, nil, err
 	}
 	//fmt.Println("用户所有消息数：", userAllMsgArr, "已读消息数：", userReadArr, "未读消息数：", userUnreadArr)
 	//导航未读消息总数
@@ -42,7 +43,7 @@ func BitmapUserMsgList(this *message.UserMsgListReq) (*message.UserMsgList, *mes
 		sortUnread, unread = BitmapCountUnread(this.UserId, classUnreadCountMap, true)
 		data.Unread = unread
 		data.ToDoUnread = sortUnread["11"]
-		return data, nil
+		return data, nil, nil
 	}
 	//获取栏目下的数据
 	sData := make(map[string][]*message.Messages)
@@ -157,7 +158,7 @@ func BitmapUserMsgList(this *message.UserMsgListReq) (*message.UserMsgList, *mes
 	data.SortData = columnData
 	if len(userAllMsgArr) == 0 {
 		log.Printf("此用户暂无消息 : %s", err)
-		return data, nil
+		return data, nil, nil
 	}
 
 	count = int64(len(userAllMsgArr))
@@ -206,7 +207,7 @@ func BitmapUserMsgList(this *message.UserMsgListReq) (*message.UserMsgList, *mes
 				}
 				//fmt.Println(end, start)
 				if end < 0 || start < 0 {
-					return data, nil
+					return data, nil, nil
 				}
 				resArr := userMsgArr[end:start]
 				resData := []*message.Messages{}
@@ -264,9 +265,9 @@ func BitmapUserMsgList(this *message.UserMsgListReq) (*message.UserMsgList, *mes
 	if len(classUnreadMsgMap[1]) > 0 {
 		activeMsgArr := classUnreadMsgMap[1]
 		res2 := BitmapMessageGetLast(this, activeMsgArr[len(activeMsgArr)-1])
-		return data, res2
+		return data, res2, nil
 	}
-	return data, nil
+	return data, nil, nil
 }
 
 // BitmapMessageGetLast 获取优惠活动的最新一条消息
@@ -408,6 +409,7 @@ func FindUserClassUnreadAndClassAllMsg(userId string) (classUnreadCountMap map[i
 	rdataArr := []uint32{}
 	if rdata != nil {
 		if json.Unmarshal(*rdata, &rdataArr); err != nil {
+			fmt.Println("取出本次已读消息反序列化出错：", err)
 			return classUnreadCountMap, classUnreadMsgMap, classAllMsgMap, err
 		}
 	}

rpc/internal/logic/usermsglistlogic.go

@@ -31,7 +31,10 @@ func (l *UserMsgListLogic) UserMsgList(in *message.UserMsgListReq) (*message.Use
 	data := new(message.UserMsgListRes)
 	/*res1 := service.UserMsgList(in)    //具体信息
 	res2 := service.MessageGetLast(in) //最新信息*/
-	res1, res2 := service.BitmapUserMsgList(in)
+	res1, res2, err := service.BitmapUserMsgList(in)
+	if err != nil {
+		return data, err
+	}
 	var finalData []*message.Messages
 	if res1 != nil && res1.Data != nil {
 		for _, v := range res1.Data {