增加系统配置接口

controllers/user.go

@@ -601,23 +601,44 @@ func (this *UserController) ExportOfficialUsers() {
 	br.Msg = "获取成功"
 }
 
-// UnReadMessageList  获取未读消息
+// MessageList  获取未读消息
 // @Summary 获取未读消息
 // @Description 获取未读消息
 // @Success 200 {object} controllers.BaseResponse
 // @router /message [get]
-func (u *UserController) UnReadMessageList() {
+func (u *UserController) MessageList() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		u.Data["json"] = br
 		u.ServeJSON()
 	}()
-	messages, err := models.GetUnReadMessageList(u.SysUser.SysUserId)
+	pageSize, _ := u.GetInt("PageSize")
+	currentIndex, _ := u.GetInt("CurrentIndex")
+	if currentIndex <= 0 {
+		currentIndex = 1
+	}
+	if pageSize <= 0 {
+		pageSize = utils.PageSize20
+	} else if pageSize > utils.PageSize100 {
+		pageSize = utils.PageSize100
+	}
+	startSize := utils.StartIndex(currentIndex, pageSize)
+	total, err := models.GetMessageListCount(u.SysUser.SysUserId)
+	if err != nil {
+		br.Msg = "查询退款通知失败"
+		br.Msg = "查询退款通知失败，Err:" + err.Error()
+		return
+	}
+	messages, err := models.GetMessageList(u.SysUser.SysUserId, startSize, pageSize)
 	if err != nil {
 		br.Msg = "查询退款通知失败"
 		br.Msg = "查询退款通知失败，Err:" + err.Error()
 		return
 	}
+	resp := new(response.MessageListResp)
+	page := paging.GetPaging(currentIndex, pageSize, total)
+	resp.Paging = page
+	resp.List = messages
 	br.Ret = 200
 	br.Success = true
 	br.Data = messages

models/response/user.go

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

models/user_message.go

@@ -23,16 +23,16 @@ type UserMessage struct {
 	UserType    UserType   `gorm:"column:user_type;type:enum('user','admin')"`
 	SourceId    int        `gorm:"column:source_id"`
 	Message     string     `gorm:"column:message"`
-	Type        SourceType `gorm:"column:type;type:enum('REPORT','VIDEO','AUDIO')"`
+	Type        SourceType `gorm:"column:type;type:enum('REPORT','VIDEO','AUDIO','REFUND')"`
 	Status      StatusType `gorm:"column:status;type:enum('UNREAD','READ')"`
 	CreatedTime time.Time  `gorm:"column:created_time;type:timestamps;comment:创建时间"`
 	UpdatedTime time.Time  `gorm:"column:updated_time"`
 }
 
-func GetUnReadMessageList(userId int) (messages []UserMessage, err error) {
+func GetMessageList(userId int, offset, size int) (messages []UserMessage, err error) {
 	o := orm.NewOrm()
-	sql := `select id,source_id,type,message from user_messages where user_id=? and status=? order by created_time desc `
-	_, err = o.Raw(sql, userId, UnReadStatus).QueryRows(&messages)
+	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 ?,?`
+	_, err = o.Raw(sql, userId, Admin, offset, size).QueryRows(&messages)
 	return
 }
 
@@ -55,3 +55,10 @@ func ReadMessages(userId int) bool {
 	}
 	return true
 }
+
+func GetMessageListCount(userId int) (count int, err error) {
+	o := orm.NewOrm()
+	sql := `select count(*) from user_messages where user_id=? and user_type=? `
+	err = o.Raw(sql, userId, Admin).QueryRow(&count)
+	return
+}

routers/commentsRouter.go

@@ -686,7 +686,7 @@ func init() {
 
     beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:UserController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:UserController"],
         beego.ControllerComments{
-            Method: "UnReadMessageList",
+            Method: "MessageList",
             Router: `/message`,
             AllowHTTPMethods: []string{"get"},
             MethodParams: param.Make(),