Merge branch 'chat' into dev

This commit is contained in:
徐俊杰 2025-06-18 16:43:34 +08:00
commit 4664da0d1c

View File

@ -230,8 +230,8 @@ func (cr ChatHandler) MessageList(c *gin.Context) {
service.Error(c, err)
return
}
domain := c.GetHeader("domain")
fmt.Println("MessageList domain:", domain)
//domain := c.GetHeader("domain")
//fmt.Println("MessageList domain:", domain)
if (request.Direction == 0 && !request.Recent) || (request.Direction > 0 && request.Recent) {
service.Error(c, errors.New("组合条件校验失败"))
return
@ -270,7 +270,7 @@ func (cr ChatHandler) MessageList(c *gin.Context) {
cr.cache.ResetNewMessageTotal(accessUser.ID, request.SessionId)
}
//设置消息已被客服阅读,当客服重新通过通过websocket连接时这些消息将不被纳入新消息数量统计
if len(returnDataIdList) > 0 && domain == "fontree" {
if len(returnDataIdList) > 0 && accessUser.Role == 2 {
for _, hasReadId := range returnDataIdList {
for i, message := range messages {
if message.ID == hasReadId {
@ -368,6 +368,8 @@ func (cr ChatHandler) MessageList(c *gin.Context) {
resp[i].Message.Media = []dto.MessageMedia{}
}
}
if accessUser.Role == 1 {
}
service.Success(c, resp)
}