重构 orm 代码生成逻辑，实现 bill 接口，优化请求字段检查与 list total 查询逻辑

web/handlers/bill.go

@@ -1 +1,96 @@
 package handlers
+
+import (
+	"platform/web/auth"
+	"platform/web/common"
+	q "platform/web/queries"
+	"platform/web/services"
+	"time"
+
+	"github.com/gofiber/fiber/v2"
+)
+
+// region ListBill
+
+type ListBillReq struct {
+	Page         int        `json:"page" validate:"required"`
+	Size         int        `json:"size" validate:"required"`
+	BillNo       *string    `json:"bill_no"`
+	Type         *int       `json:"type"`
+	Status       *int       `json:"status"`
+	CreateAfter  *time.Time `json:"create_after"`
+	CreateBefore *time.Time `json:"create_before"`
+}
+
+// ListBill 获取账单列表
+func ListBill(c *fiber.Ctx) error {
+	// 检查权限
+	authContext, err := auth.Protect(c, []services.PayloadType{services.PayloadUser}, []string{})
+	if err != nil {
+		return err
+	}
+
+	// 解析请求参数
+	req := new(ListBillReq)
+	if err := c.BodyParser(req); err != nil {
+		return err
+	}
+	if req.Page < 1 {
+		req.Page = 1
+	}
+	if req.Size < 1 {
+		req.Size = 10
+	}
+	var offset = (req.Page - 1) * req.Size
+	var limit = req.Size
+
+	// 查询账单列表
+	do := q.Bill.
+		Where(q.Bill.UserID.Eq(authContext.Payload.Id))
+
+	if req.Status != nil {
+		do = do.Where(q.Bill.Status.Eq(int32(*req.Status)))
+	}
+	if req.Type != nil {
+		do = do.Where(q.Bill.Type.Eq(int32(*req.Type)))
+	}
+	if req.CreateAfter != nil {
+		do = do.Where(q.Bill.CreatedAt.Gte(common.LocalDateTime(*req.CreateAfter)))
+	}
+	if req.CreateBefore != nil {
+		do = do.Where(q.Bill.CreatedAt.Lte(common.LocalDateTime(*req.CreateBefore)))
+	}
+	if req.BillNo != nil && *req.BillNo != "" {
+		do = do.Where(q.Bill.BillNo.Eq(*req.BillNo))
+	}
+
+	bills, err := do.Debug().
+		Preload(q.Bill.Resource, q.Bill.Trade, q.Bill.Refund).
+		Preload(q.Bill.Resource.Pss).
+		Order(q.Bill.CreatedAt.Desc()).
+		Offset(offset).
+		Limit(limit).
+		Find()
+	if err != nil {
+		return err
+	}
+
+	var total int64
+	if len(bills) < limit {
+		total = int64(len(bills) + offset)
+	} else {
+		total, err = do.Count()
+		if err != nil {
+			return err
+		}
+	}
+
+	return c.JSON(common.PageResp{
+		Total: int(total),
+		Page:  req.Page,
+		Size:  req.Size,
+		List:  bills,
+	})
+}
+
+// endregion

web/handlers/resource.go

@@ -17,6 +17,7 @@ import (
 type ListResourcePssReq struct {
 	Page         int        `json:"page" validate:"required"`
 	Size         int        `json:"size" validate:"required"`
+	ResourceNo   *string    `json:"resource_no"`
 	Active       *bool      `json:"active"`
 	Type         *int       `json:"type"`
 	CreateAfter  *time.Time `json:"create_after"`
@@ -38,16 +39,27 @@ func ListResourcePss(c *fiber.Ctx) error {
 	if err := c.BodyParser(req); err != nil {
 		return err
 	}
+	if req.Page < 1 {
+		req.Page = 1
+	}
+	if req.Size < 1 {
+		req.Size = 10
+	}
+	var offset = (req.Page - 1) * req.Size
+	var limit = req.Size
 
 	// 查询资源列表
 	do := q.Resource.
-		Join(q.ResourcePss, q.ResourcePss.ResourceID.EqCol(q.Resource.ID)).
+		Joins(q.Resource.Pss).
 		Where(q.Resource.UserID.Eq(authContext.Payload.Id))
+	if req.ResourceNo != nil && *req.ResourceNo != "" {
+		do = do.Where(q.Resource.ResourceNo.Eq(*req.ResourceNo))
+	}
 	if req.Active != nil {
 		do = do.Where(q.Resource.Active.Is(*req.Active))
 	}
 	if req.Type != nil {
-		do = do.Where(q.ResourcePss.Type.Eq(int32(*req.Type)))
+		do = do.Where(q.ResourcePss.As(q.Resource.Pss.Name()).Type.Eq(int32(*req.Type)))
 	}
 	if req.CreateAfter != nil {
 		do = do.Where(q.Resource.CreatedAt.Gte(common.LocalDateTime(*req.CreateAfter)))
@@ -56,34 +68,37 @@ func ListResourcePss(c *fiber.Ctx) error {
 		do = do.Where(q.Resource.CreatedAt.Lte(common.LocalDateTime(*req.CreateBefore)))
 	}
 	if req.ExpireAfter != nil {
-		do = do.Where(q.ResourcePss.Expire.Gte(*req.ExpireAfter))
+		do = do.Where(q.ResourcePss.As(q.Resource.Pss.Name()).Expire.Gte(common.LocalDateTime(*req.ExpireAfter)))
 	}
 	if req.ExpireBefore != nil {
-		do = do.Where(q.ResourcePss.Expire.Lte(*req.ExpireBefore))
+		do = do.Where(q.ResourcePss.As(q.Resource.Pss.Name()).Expire.Lte(common.LocalDateTime(*req.ExpireBefore)))
 	}
 
-	total, err := do.Debug().
-		Count()
-	if err != nil {
-		return err
-	}
-
-	var resourcePss []*m.ResourcePss
+	var resource []*m.Resource
 	err = do.Debug().
-		Select(q.ResourcePss.ALL).
-		Order(q.ResourcePss.CreatedAt.Desc()).
-		Offset((req.Page - 1) * req.Size).
-		Limit(req.Size).
-		Scan(&resourcePss)
+		Order(q.ResourcePss.As(q.Resource.Pss.Name()).CreatedAt.Desc()).
+		Offset(offset).
+		Limit(limit).
+		Scan(&resource)
 	if err != nil {
 		return err
 	}
 
+	var total int64
+	if len(resource) < limit {
+		total = int64(len(resource) + offset)
+	} else {
+		total, err = do.Count()
+		if err != nil {
+			return err
+		}
+	}
+
 	return c.JSON(common.PageResp{
 		Total: int(total),
 		Page:  req.Page,
 		Size:  req.Size,
-		List:  resourcePss,
+		List:  resource,
 	})
 }
 
@@ -141,9 +156,10 @@ func CreateResourceByBalance(c *fiber.Ctx) error {
 
 		// 创建资源
 		resource := m.Resource{
-			UserID: authContext.Payload.Id,
+			UserID:     authContext.Payload.Id,
+			ResourceNo: services.ID.GenReadable("res"),
 		}
-		err = q.Resource.Save(&resource)
+		err = q.Resource.Create(&resource)
 		if err != nil {
 			return err
 		}
@@ -152,10 +168,10 @@ func CreateResourceByBalance(c *fiber.Ctx) error {
 			Type:       req.Type,
 			Live:       req.Live,
 			Quota:      req.Quota,
-			Expire:     time.Now().Add(time.Duration(req.Expire) * time.Second),
+			Expire:     common.LocalDateTime(time.Now().Add(time.Duration(req.Expire) * time.Second)),
 			DailyLimit: req.DailyLimit,
 		}
-		err = q.ResourcePss.Save(&resourcePss)
+		err = q.ResourcePss.Create(&resourcePss)
 		if err != nil {
 			return err
 		}

web/handlers/whitelist.go

@@ -2,6 +2,7 @@ package handlers
 
 import (
 	"platform/web/auth"
+	"platform/web/common"
 	m "platform/web/models"
 	q "platform/web/queries"
 	"platform/web/services"
@@ -35,38 +36,44 @@ func ListWhitelist(c *fiber.Ctx) error {
 	if err := c.BodyParser(req); err != nil {
 		return err
 	}
-	var page = req.Page
-	if page < 1 {
-		page = 1
+	if req.Page < 1 {
+		req.Page = 1
 	}
-	var size = req.Size
-	if size < 1 {
-		size = 10
+	if req.Size < 1 {
+		req.Size = 10
 	}
+	var offset = (req.Page - 1) * req.Size
+	var limit = req.Size
 
 	// 获取用户信息
-	list, err := q.Whitelist.
-		Where(q.Whitelist.UserID.Eq(authContext.Payload.Id)).
-		Offset((page - 1) * size).
-		Limit(size).
+	do := q.Whitelist.
+		Where(q.Whitelist.UserID.Eq(authContext.Payload.Id))
+
+	list, err := do.
+		Offset(offset).
+		Limit(limit).
 		Order(q.Whitelist.CreatedAt.Desc()).
 		Find()
 	if err != nil {
 		return err
 	}
-	count, err := q.Whitelist.
-		Where(q.Whitelist.UserID.Eq(authContext.Payload.Id)).
-		Count()
-	if err != nil {
-		return err
+
+	var total int64
+	if len(list) < limit {
+		total = int64(len(list) + offset)
+	} else {
+		total, err = do.Count()
+		if err != nil {
+			return err
+		}
 	}
 
 	// 返回结果
-	return c.Status(fiber.StatusOK).JSON(ListWhitelistResp{
-		Total: count,
+	return c.JSON(common.PageResp{
+		Total: int(total),
 		List:  list,
-		Page:  page,
-		Size:  size,
+		Page:  req.Page,
+		Size:  req.Size,
 	})
 }