denghui/arenax-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改查询已完成任务列表

Browse Source
This commit is contained in:
chy
2025-07-05 15:27:26 +08:00
parent c34ef7da90
commit 69f46821e7
4 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
api/task/v1/task.go
View File

@ -1,6 +1,9 @@
package v1 package v1
import "github.com/gogf/gf/v2/frame/g" import (
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/os/gtime"
)
type RankingReq struct { type RankingReq struct {
g.Meta `path:"/task/ranking" method:"get" tags:"PC/Task" summary:"(PC)任务排行榜"` g.Meta `path:"/task/ranking" method:"get" tags:"PC/Task" summary:"(PC)任务排行榜"`
@ -52,10 +55,12 @@ type GetLoginTaskListRes struct {
} }
type ListReq struct { type ListReq struct {
g.Meta `path:"/task/completed/list" method:"get" tags:"Backend/Task" summary:"(商户、门店)用户任务已完成列表"` g.Meta `path:"/task/completed/list" method:"get" tags:"Backend/Task" summary:"(商户、门店)用户任务已完成列表"`
StoreId int `json:"storeId" dc:"门店 id"` StoreId int `json:"storeId" dc:"门店 id"`
Page int `json:"page" dc:"页数"` Page int `json:"page" dc:"页数"`
Size int `json:"size" dc:"条数"` Size int `json:"size" dc:"条数"`
StartTime *gtime.Time `json:"startTime" dc:"开始时间"`
EndTime *gtime.Time `json:"endTime" dc:"结束时间"`
} }
type ListRes struct { type ListRes struct {

2
internal/controller/task/task_v1_completed_list.go
View File

@ -10,7 +10,7 @@ import (
func (c *ControllerV1) List(ctx context.Context, req *v1.ListReq) (res *v1.ListRes, err error) { func (c *ControllerV1) List(ctx context.Context, req *v1.ListReq) (res *v1.ListRes, err error) {
out, err := service.Task().GetTaskCompletedList(ctx, &model.TaskListIn{StoreId: req.StoreId, Page: req.Page, Size: req.Size}) out, err := service.Task().GetTaskCompletedList(ctx, &model.TaskListIn{StoreId: req.StoreId, Page: req.Page, Size: req.Size, StartTime: req.StartTime, EndTime: req.EndTime})
if err != nil { if err != nil {
return nil, err return nil, err

4
internal/logic/task/task.go
View File

@ -303,6 +303,10 @@ func (s *sTask) GetTaskCompletedList(ctx context.Context, in *model.TaskListIn)
m = m.Where(dao.UserTasks.Columns().StoreId, in.StoreId) m = m.Where(dao.UserTasks.Columns().StoreId, in.StoreId)
} }
if in.StartTime != nil && in.StartTime != nil {
m = m.WhereBetween(dao.UserTasks.Columns().CompletedAt, in.StartTime, in.EndTime)
}
//err = m.Page(in.Page, in.Size).Fields(fmt.Sprintf("%s.*, %s.*,%s.*, %s.*", dao.UserTasks.Table(), dao.Users.Table(), dao.Stores.Table(), dao.Games.Table())). //err = m.Page(in.Page, in.Size).Fields(fmt.Sprintf("%s.*, %s.*,%s.*, %s.*", dao.UserTasks.Table(), dao.Users.Table(), dao.Stores.Table(), dao.Games.Table())).
// LeftJoin(dao.Users.Table(), fmt.Sprintf("`%s`.`id` = `%s`.`user_id`", dao.Users.Table(), dao.UserTasks.Table())). // LeftJoin(dao.Users.Table(), fmt.Sprintf("`%s`.`id` = `%s`.`user_id`", dao.Users.Table(), dao.UserTasks.Table())).
// LeftJoin(dao.Stores.Table(), fmt.Sprintf("`%s`.`id` = `%s`.`store_id`", dao.Stores.Table(), dao.UserTasks.Table())). // LeftJoin(dao.Stores.Table(), fmt.Sprintf("`%s`.`id` = `%s`.`store_id`", dao.Stores.Table(), dao.UserTasks.Table())).

12
internal/model/task.go
View File

@ -90,11 +90,13 @@ type PrizeList struct {
} }
type TaskListIn struct { type TaskListIn struct {
Gid int `json:"gid" v:"required#游戏唯一id不能为空" dc:"游戏唯一id"` Gid int `json:"gid" v:"required#游戏唯一id不能为空" dc:"游戏唯一id"`
NetBarAccount string `json:"netBarAccount"` NetBarAccount string `json:"netBarAccount"`
Page int `json:"page" dc:"页数"` Page int `json:"page" dc:"页数"`
Size int `json:"size" dc:"条数"` Size int `json:"size" dc:"条数"`
StoreId int `json:"store_id"` StoreId int `json:"store_id"`
StartTime *gtime.Time `json:"startTime"`
EndTime *gtime.Time `json:"endTime"`
} }
type TaskListOut struct { type TaskListOut struct {