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