|
@@ -3,7 +3,6 @@ package service
|
|
|
import (
|
|
|
"app.yhyue.com/moapp/MessageCenter/entity"
|
|
|
"app.yhyue.com/moapp/MessageCenter/rpc/message"
|
|
|
- "errors"
|
|
|
"log"
|
|
|
)
|
|
|
|
|
@@ -13,7 +12,6 @@ type MessageService struct {
|
|
|
// 修改消息阅读状态
|
|
|
func (service *MessageService) ChangeReadStatus(data *message.ChangeReadStatusRequest) (int64, string) {
|
|
|
orm := entity.Engine.NewSession()
|
|
|
- log.Println("123")
|
|
|
defer orm.Close()
|
|
|
m := entity.Message{}
|
|
|
count, err1 := orm.Where("id=? and isdel=1 and appid=?", data.Id, data.Appid).Count(m)
|
|
@@ -37,14 +35,12 @@ func (service *MessageService) ChangeReadStatus(data *message.ChangeReadStatusRe
|
|
|
// 删除消息
|
|
|
func (service *MessageService) DeleteMessage(id []int64, appId string) (int64, string) {
|
|
|
orm := entity.Engine.NewSession()
|
|
|
- log.Println("123")
|
|
|
defer orm.Close()
|
|
|
m := entity.Message{}
|
|
|
m.Isdel = -1
|
|
|
count, err := orm.Where("appid=?", appId).In("id", id).Cols("isdel").Update(&m)
|
|
|
if err != nil || count == 0 {
|
|
|
log.Println(err)
|
|
|
- log.Println(count)
|
|
|
orm.Rollback()
|
|
|
return 0, "删除消息失败"
|
|
|
}
|
|
@@ -58,13 +54,11 @@ func (service *MessageService) DeleteMessage(id []int64, appId string) (int64, s
|
|
|
// 未读消息合计
|
|
|
func (service *MessageService) CountUnread(userId string, appId string) (int64, string, int64) {
|
|
|
orm := entity.Engine.NewSession()
|
|
|
- log.Println("123")
|
|
|
defer orm.Close()
|
|
|
m := entity.Message{}
|
|
|
count, err := orm.Where("receive_userid=? and isRead=0 and isdel=1 and appid=?", userId, appId).Count(m)
|
|
|
if err != nil {
|
|
|
log.Println(err)
|
|
|
- log.Println(count)
|
|
|
return 0, "查询未读消息失败", 0
|
|
|
}
|
|
|
log.Println(count)
|
|
@@ -86,9 +80,7 @@ func (service *MessageService) LastMessage(userId string, appId string, msgType
|
|
|
err := orm.Select("*").Where(sql, valueList...).OrderBy("createtime desc").Limit(1, 0).Find(&m1)
|
|
|
|
|
|
if err != nil {
|
|
|
- log.Println(err)
|
|
|
- log.Println("咋回事")
|
|
|
- return nil, errors.New("查询未读消息失败")
|
|
|
+ return nil, err
|
|
|
}
|
|
|
|
|
|
if len(m1) > 0 {
|
|
@@ -134,20 +126,13 @@ func (service *MessageService) ClassCountAndMessage(userId string, appId string)
|
|
|
defer orm.Close()
|
|
|
//m := []*message.Messages{}
|
|
|
query, err := orm.QueryInterface("SELECT msg_type,COUNT(CASE WHEN isRead=0 THEN 1 END) as count FROM message where receive_userid=? and isdel=1 and appid=? GROUP BY msg_type ORDER BY FIELD(`msg_type`,\"1\",\"2\",\"3\",\"4\",\"5\",\"6\",\"7\")", userId, appId)
|
|
|
- log.Println(query)
|
|
|
if err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
- if err != nil {
|
|
|
- log.Println(err)
|
|
|
- return nil, errors.New("查询未读消息失败")
|
|
|
- }
|
|
|
typeCount := []*message.ResCount{}
|
|
|
- log.Println(query)
|
|
|
// 未读消息分类及数量
|
|
|
if query != nil && len(query) > 0 {
|
|
|
for _, v := range query {
|
|
|
- log.Println(v)
|
|
|
typeCount = append(typeCount, &message.ResCount{MsgType: v["msg_type"].(int64), Count: v["count"].(int64)})
|
|
|
}
|
|
|
}
|
|
@@ -162,7 +147,6 @@ func (service *MessageService) ReceiveMsgType(userId string, appId string) ([]in
|
|
|
m := []entity.Message{}
|
|
|
err := orm.Distinct("msg_type").Where("receive_userid=? and isdel=1 and appid=?", userId, appId).Find(&m)
|
|
|
if err != nil {
|
|
|
- log.Println(err)
|
|
|
return nil, err
|
|
|
}
|
|
|
msgTypeList := []int64{}
|
|
@@ -178,7 +162,7 @@ func (service *MessageService) UpdateMessageReadStatus(msgType int, receiveUseri
|
|
|
msg := entity.Message{}
|
|
|
msg.IsRead = 1
|
|
|
c, err := orm.Where("receive_userid=? and msg_type = ? and appid = ?", receiveUserid, msgType, appId).Cols("isRead").Update(&msg)
|
|
|
- log.Println("更新后返回值:", c, err)
|
|
|
+ //log.Println("更新后返回值:", c, err)
|
|
|
if c < 0 && err != nil {
|
|
|
return 0, err
|
|
|
}
|