feat: add orders

This commit is contained in:
yanghao05
2025-04-10 21:42:13 +08:00
parent 5a63eee1ce
commit 8baab46132
20 changed files with 979 additions and 1 deletions

View File

@@ -0,0 +1,25 @@
package admin
import (
"quyun/app/models"
"quyun/app/requests"
"github.com/gofiber/fiber/v3"
)
type OrderListQuery struct {
OrderNumber *string `query:"order_number"`
UserID *int64 `query:"user_id"`
}
// @provider
type orders struct{}
// List users
// @Router /v1/admin/orders [get]
// @Bind pagination query
// @Bind query query
func (ctl *orders) List(ctx fiber.Ctx, pagination *requests.Pagination, query *OrderListQuery) (*requests.Pager, error) {
cond := models.Orders.BuildConditionWithKey(query.OrderNumber, query.UserID)
return models.Orders.List(ctx.Context(), pagination, cond)
}

View File

@@ -18,6 +18,13 @@ func Provide(opts ...opt.Option) error {
}); err != nil {
return err
}
if err := container.Container.Provide(func() (*orders, error) {
obj := &orders{}
return obj, nil
}); err != nil {
return err
}
if err := container.Container.Provide(func() (*posts, error) {
obj := &posts{}
@@ -27,12 +34,14 @@ func Provide(opts ...opt.Option) error {
}
if err := container.Container.Provide(func(
medias *medias,
orders *orders,
posts *posts,
uploads *uploads,
users *users,
) (contracts.HttpRoute, error) {
obj := &Routes{
medias: medias,
orders: orders,
posts: posts,
uploads: uploads,
users: users,

View File

@@ -16,6 +16,7 @@ import (
type Routes struct {
log *log.Entry `inject:"false"`
medias *medias
orders *orders
posts *posts
uploads *uploads
users *users
@@ -38,6 +39,13 @@ func (r *Routes) Register(router fiber.Router) {
Query[ListQuery]("query"),
))
// 注册路由组: orders
router.Get("/v1/admin/orders", DataFunc2(
r.orders.List,
Query[requests.Pagination]("pagination"),
Query[OrderListQuery]("query"),
))
// 注册路由组: posts
router.Get("/v1/admin/posts", DataFunc2(
r.posts.List,

View File

@@ -9,6 +9,7 @@ import (
var db *sql.DB
var Medias *mediasModel
var Orders *ordersModel
var Posts *postsModel
var Users *usersModel
@@ -16,6 +17,7 @@ var Users *usersModel
type models struct {
db *sql.DB
medias *mediasModel
orders *ordersModel
posts *postsModel
users *usersModel
}
@@ -23,6 +25,7 @@ type models struct {
func (m *models) Prepare() error {
db = m.db
Medias = m.medias
Orders = m.orders
Posts = m.posts
Users = m.users
return nil

View File

@@ -0,0 +1,168 @@
package models
import (
"context"
"fmt"
"time"
"quyun/app/requests"
"quyun/database/fields"
"quyun/database/schemas/public/model"
"quyun/database/schemas/public/table"
. "github.com/go-jet/jet/v2/postgres"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
)
// @provider
type ordersModel struct {
log *logrus.Entry `inject:"false"`
}
func (m *ordersModel) Prepare() error {
m.log = logrus.WithField("model", "ordersModel")
return nil
}
// GetByID returns an order by ID
func (m *ordersModel) GetByID(ctx context.Context, id int64) (*model.Orders, error) {
tbl := table.Orders
stmt := tbl.
SELECT(tbl.AllColumns).
WHERE(
tbl.ID.EQ(Int64(id)),
)
m.log.Infof("sql: %s", stmt.DebugSql())
var order model.Orders
err := stmt.QueryContext(ctx, db, &order)
if err != nil {
m.log.Errorf("error querying order by ID: %v", err)
return nil, err
}
return &order, nil
}
// BuildConditionWithKey builds the WHERE clause for order queries
func (m *ordersModel) BuildConditionWithKey(orderNumber *string, userID *int64) BoolExpression {
tbl := table.Orders
cond := Bool(true)
if orderNumber != nil && *orderNumber != "" {
cond = cond.AND(
tbl.OrderNo.LIKE(String("%" + *orderNumber + "%")),
)
}
if userID != nil {
cond = cond.AND(
tbl.UserID.EQ(Int(*userID)),
)
}
return cond
}
// countByCondition counts orders matching the given condition
func (m *ordersModel) countByCondition(ctx context.Context, expr BoolExpression) (int64, error) {
var cnt struct {
Cnt int64
}
tbl := table.Orders
stmt := SELECT(COUNT(tbl.ID).AS("cnt")).FROM(tbl).WHERE(expr)
m.log.Infof("sql: %s", stmt.DebugSql())
err := stmt.QueryContext(ctx, db, &cnt)
if err != nil {
m.log.Errorf("error counting orders: %v", err)
return 0, err
}
return cnt.Cnt, nil
}
// List returns a paginated list of orders
func (m *ordersModel) List(ctx context.Context, pagination *requests.Pagination, cond BoolExpression) (*requests.Pager, error) {
pagination.Format()
tbl := table.Orders
stmt := tbl.
SELECT(tbl.AllColumns).
WHERE(cond).
ORDER_BY(tbl.ID.DESC()).
LIMIT(pagination.Limit).
OFFSET(pagination.Offset)
m.log.Infof("sql: %s", stmt.DebugSql())
var orders []model.Orders = make([]model.Orders, 0)
err := stmt.QueryContext(ctx, db, &orders)
if err != nil {
m.log.Errorf("error querying orders: %v", err)
return nil, err
}
count, err := m.countByCondition(ctx, cond)
if err != nil {
m.log.Errorf("error getting order count: %v", err)
return nil, err
}
return &requests.Pager{
Items: orders,
Total: count,
Pagination: *pagination,
}, nil
}
// Create creates a new order
func (m *ordersModel) Create(ctx context.Context, userId, postId int64) (*model.Orders, error) {
post, err := Posts.GetByID(ctx, postId)
if err != nil {
return nil, errors.Wrap(err, "failed to get post")
}
model := &model.Orders{}
model.CreatedAt = time.Now()
model.UpdatedAt = time.Now()
model.Status = fields.OrderStatusPending
model.OrderNo = fmt.Sprintf("%s", time.Now().Format("20060102150405"))
model.SubOrderNo = model.OrderNo
model.UserID = userId
model.PostID = postId
model.Meta = fields.ToJson(fields.OrderMeta{})
model.Price = post.Price
model.Discount = post.Discount
tbl := table.Orders
stmt := tbl.INSERT(tbl.MutableColumns).MODEL(model)
m.log.Infof("sql: %s", stmt.DebugSql())
if _, err := stmt.ExecContext(ctx, db); err != nil {
m.log.Errorf("error creating order: %v", err)
return nil, err
}
return model, nil
}
// DeleteByID soft deletes an order by ID
func (m *ordersModel) SetStatus(ctx context.Context, orderNo string, status fields.OrderStatus) error {
tbl := table.Orders
stmt := tbl.
UPDATE(tbl.Status).
SET(status).
WHERE(
tbl.OrderNo.EQ(String(orderNo)),
)
m.log.Infof("sql: %s", stmt.DebugSql())
if _, err := stmt.ExecContext(ctx, db); err != nil {
m.log.Errorf("error set order status: %v", err)
return err
}
return nil
}

View File

@@ -0,0 +1,47 @@
package models
import (
"context"
"testing"
"quyun/app/service/testx"
"quyun/database"
"quyun/database/schemas/public/table"
. "github.com/smartystreets/goconvey/convey"
"go.ipao.vip/atom/contracts"
// . "github.com/go-jet/jet/v2/postgres"
"github.com/stretchr/testify/suite"
"go.uber.org/dig"
)
type OrdersInjectParams struct {
dig.In
Initials []contracts.Initial `group:"initials"`
}
type OrdersTestSuite struct {
suite.Suite
OrdersInjectParams
}
func Test_Orders(t *testing.T) {
providers := testx.Default().With(Provide)
testx.Serve(providers, t, func(params OrdersInjectParams) {
suite.Run(t, &OrdersTestSuite{
OrdersInjectParams: params,
})
})
}
func (s *OrdersTestSuite) Test_Create() {
Convey("Test_Create", s.T(), func() {
database.Truncate(context.Background(), db, table.Orders.TableName())
order, err := Orders.Create(context.Background(), 1, 1)
So(err, ShouldBeNil)
s.T().Logf("order: %v", order)
})
}

View File

@@ -23,12 +23,14 @@ func Provide(opts ...opt.Option) error {
if err := container.Container.Provide(func(
db *sql.DB,
medias *mediasModel,
orders *ordersModel,
posts *postsModel,
users *usersModel,
) (contracts.Initial, error) {
obj := &models{
db: db,
medias: medias,
orders: orders,
posts: posts,
users: users,
}
@@ -40,6 +42,16 @@ func Provide(opts ...opt.Option) error {
}, atom.GroupInitial); err != nil {
return err
}
if err := container.Container.Provide(func() (*ordersModel, error) {
obj := &ordersModel{}
if err := obj.Prepare(); err != nil {
return nil, err
}
return obj, nil
}); err != nil {
return err
}
if err := container.Container.Provide(func() (*postsModel, error) {
obj := &postsModel{}
if err := obj.Prepare(); err != nil {