|
@@ -28,10 +28,24 @@ type UserMessage struct {
|
|
|
CreatedTime time.Time `gorm:"column:created_time;type:timestamps;comment:创建时间"`
|
|
|
UpdatedTime time.Time `gorm:"column:updated_time"`
|
|
|
}
|
|
|
+type UserMessageView struct {
|
|
|
+ Message string
|
|
|
+ Type SourceType
|
|
|
+ Status StatusType
|
|
|
+ CreatedTime time.Time
|
|
|
+}
|
|
|
|
|
|
+func (u *UserMessage) ToView() *UserMessageView {
|
|
|
+ return &UserMessageView{
|
|
|
+ Message: u.Message,
|
|
|
+ Type: u.Type,
|
|
|
+ Status: u.Status,
|
|
|
+ CreatedTime: u.CreatedTime,
|
|
|
+ }
|
|
|
+}
|
|
|
func GetMessageList(userId int, offset, size int) (messages []UserMessage, err error) {
|
|
|
o := orm.NewOrm()
|
|
|
- sql := `select id,type,message,status from user_messages where user_id=? and user_type=? order by Field(status,'UNREAD','READ'), created_time desc limit ?,?`
|
|
|
+ sql := `select id,type,message,status,created_time from user_messages where user_id=? and user_type=? order by Field(status,'UNREAD','READ'), created_time desc limit ?,?`
|
|
|
_, err = o.Raw(sql, userId, Admin, offset, size).QueryRows(&messages)
|
|
|
return
|
|
|
}
|