修改查询已完成任务列表

internal/controller/task/task_v1_completed_list.go

@@ -10,7 +10,7 @@ import (
 
 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 {
 		return nil, err

internal/logic/task/task.go

@@ -303,6 +303,10 @@ func (s *sTask) GetTaskCompletedList(ctx context.Context, in *model.TaskListIn)
 		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())).
 	//	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())).

internal/model/task.go

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