完善 admin 接口筛选机制

web/handlers/resource.go

@@ -214,11 +214,33 @@ func PageResourceShortByAdmin(c *fiber.Ctx) error {
 		return err
 	}
 
-	req := new(struct{ core.PageReq })
-	if err = g.Validator.ParseBody(c, req); err != nil {
+	var req PageResourceShortByAdminReq
+	if err = g.Validator.ParseBody(c, &req); err != nil {
 		return err
 	}
 
+	do := q.Resource.Where()
+	if req.UserPhone != nil {
+		do = do.Where(q.User.Phone.Eq(*req.UserPhone))
+	}
+	if req.ResourceNo != nil {
+		do = do.Where(q.Resource.ResourceNo.Eq(*req.ResourceNo))
+	}
+	if req.Active != nil {
+		do = do.Where(q.Resource.Active.Is(*req.Active))
+	}
+	if req.Mode != nil {
+		do = do.Where(q.Resource.Type.Eq(int(m.ResourceTypeShort)))
+	}
+	if req.CreatedAtStart != nil {
+		time := u.DateHead(*req.CreatedAtStart)
+		do = do.Where(q.Resource.CreatedAt.Gte(time))
+	}
+	if req.CreatedAtEnd != nil {
+		time := u.DateTail(*req.CreatedAtEnd)
+		do = do.Where(q.Resource.CreatedAt.Lte(time))
+	}
+
 	list, total, err := q.Resource.
 		Joins(q.Resource.User, q.Resource.Short).
 		Select(
@@ -227,7 +249,7 @@ func PageResourceShortByAdmin(c *fiber.Ctx) error {
 			q.User.As("User").Phone.As("User__phone"),
 			q.User.As("User").Name.As("User__name"),
 		).
-		Where(q.Resource.Type.Eq(int(m.ResourceTypeShort))).
+		Where(q.Resource.Type.Eq(int(m.ResourceTypeShort)), do).
 		FindByPage(req.GetOffset(), req.GetLimit())
 
 	return c.JSON(core.PageResp{
@@ -238,6 +260,16 @@ func PageResourceShortByAdmin(c *fiber.Ctx) error {
 	})
 }
 
+type PageResourceShortByAdminReq struct {
+	core.PageReq
+	UserPhone      *string    `json:"user_phone" form:"user_phone"`
+	ResourceNo     *string    `json:"resource_no" form:"resource_no"`
+	Active         *bool      `json:"active" form:"active"`
+	Mode           *int       `json:"mode" form:"mode"`
+	CreatedAtStart *time.Time `json:"created_at_start" form:"created_at_start"`
+	CreatedAtEnd   *time.Time `json:"created_at_end" form:"created_at_end"`
+}
+
 // PageResourceLongByAdmin 分页查询全部短效套餐
 func PageResourceLongByAdmin(c *fiber.Ctx) error {
 	_, err := auth.GetAuthCtx(c).PermitAdmin()