فهرست منبع

增加系统配置接口

kobe6258 4 ماه پیش
والد
کامیت
221886b10e
3فایلهای تغییر یافته به همراه21 افزوده شده و 3 حذف شده
  1. 5 1
      controllers/user.go
  2. 1 1
      models/response/user.go
  3. 15 1
      models/user_message.go

+ 5 - 1
controllers/user.go

@@ -635,10 +635,14 @@ func (u *UserController) MessageList() {
 		br.Msg = "查询退款通知失败,Err:" + err.Error()
 		return
 	}
+	var list []*models.UserMessageView
+	for _, message := range messages {
+		list = append(list, message.ToView())
+	}
 	resp := new(response.MessageListResp)
 	page := paging.GetPaging(currentIndex, pageSize, total)
 	resp.Paging = page
-	resp.List = messages
+	resp.List = list
 	br.Ret = 200
 	br.Success = true
 	br.Data = resp

+ 1 - 1
models/response/user.go

@@ -26,6 +26,6 @@ type TemplateUserListResp struct {
 }
 
 type MessageListResp struct {
-	List   []models.UserMessage
+	List   []*models.UserMessageView
 	Paging *paging.PagingItem `description:"分页数据"`
 }

+ 15 - 1
models/user_message.go

@@ -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
 }