新用户消息修改

rpc/internal/common/messageService.go

@@ -19,7 +19,8 @@ func (service *MessageService) ChangeReadStatus(data *message.ChangeReadStatusRe
 	if msg != nil && len(*msg) > 0 {
 		groupId := qutil.IntAll((*msg)["group_id"])
 		//更新用户未读消息bitmap
-		sql := fmt.Sprintf(`alter table message_user_summary UPDATE readMsg = bitmapOr(readMsg,bitmapBuild([toUInt64(%d)])) where userId = '%s'`, groupId, data.UserId)
+		sql := fmt.Sprintf(`alter table message_user_summary UPDATE readMsg = bitmapOr(readMsg,bitmapBuild([toUInt64(%d)])) where userId = '%s'`, data.Id, data.UserId)
+		fmt.Println(sql)
 		err1 := entity.ClickhouseConn.Exec(context.Background(), sql)
 		if err1 != nil {
 			return err1

rpc/internal/common/msglistService.go

@@ -5,12 +5,14 @@ import (
 	"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"
 	"context"
 	"errors"
 	"fmt"
 	"log"
 	"strconv"
+	"time"
 )
 
 func BitmapUserMsgList(this *message.UserMsgListReq) (*message.UserMsgList, *message.Messages) {
@@ -172,7 +174,7 @@ func BitmapUserMsgList(this *message.UserMsgListReq) (*message.UserMsgList, *mes
 				resArr := userMsgArr[end:start]
 				resData := []*message.Messages{}
 				if len(resArr) > 0 {
-					count = int64(len(resArr))
+					//count = int64(len(resArr))
 					unReadMap := map[int]bool{}
 					for _, vv := range userUnreadArr {
 						unReadMap[int(vv)] = true
@@ -180,13 +182,20 @@ func BitmapUserMsgList(this *message.UserMsgListReq) (*message.UserMsgList, *mes
 					for _, v := range resArr {
 						msg := GlobMsgMap[v]
 						if msg == nil || len(msg) <= 0 {
-							m := entity.Mysql.FindOne("message_send_log", map[string]interface{}{"id": v}, "id,msg_type,title,content,send_time,link,menu_name,group_id", "")
-							if m != nil && len(*m) > 0 {
-								msg = *m
+							ms := entity.Mysql.FindOne("message_send_log", map[string]interface{}{"id": v}, "id,msg_type,title,content,send_time,link,menu_name,group_id,sign", "")
+							if ms != nil && len(*ms) > 0 {
+								msg = *ms
 							} else {
 								continue
 							}
 						}
+						if common.IntAll(msg["sign"]) == 4 {
+							//查询用户注册时间
+							rData, _ := entity.MQFW.FindOneByField("user", map[string]interface{}{"_id": m.StringTOBsonId(this.UserId)}, `{"l_registedate":1}`)
+							if rData != nil && len(*rData) > 0 {
+								msg["send_time"] = time.Unix(common.Int64All((*rData)["l_registedate"]), 0).Local().Format("2006-01-02 15:04:05")
+							}
+						}
 						resData = append(resData, &message.Messages{
 							Id:         common.InterfaceToStr(v),
 							Createtime: common.InterfaceToStr(msg["send_time"]),
@@ -202,8 +211,6 @@ func BitmapUserMsgList(this *message.UserMsgListReq) (*message.UserMsgList, *mes
 						data.Data = append(data.Data, resData[i])
 					}
 					fmt.Println("数据长度：", len(data.Data))
-				} else {
-					count = 0
 				}
 			}
 		}

rpc/internal/common/task.go

@@ -22,7 +22,7 @@ func LoadTask() {
 func LoadMsgOnTime() {
 	fmt.Println("开始执行")
 	msgMap := make(map[int]map[string]interface{})
-	m := entity.Mysql.SelectBySql("SELECT id,msg_type,title,content,send_time,menu_name,link,group_id FROM message_send_log WHERE send_status = 4 AND isdel = 1 ORDER BY send_time DESC limit 2000")
+	m := entity.Mysql.SelectBySql("SELECT id,msg_type,title,content,send_time,menu_name,link,group_id,sign FROM message_send_log WHERE send_status = 4 AND isdel = 1 ORDER BY send_time DESC limit 2000")
 	if m != nil && len(*m) > 0 {
 		for _, val := range *m {
 			msgMap[common.IntAll(val["id"])] = val