feat: 添加租户创建功能,支持设置管理员及有效期,新增订单统计接口
This commit is contained in:
17
backend/app/http/super/dto/order.go
Normal file
17
backend/app/http/super/dto/order.go
Normal file
@@ -0,0 +1,17 @@
|
||||
package dto
|
||||
|
||||
import "quyun/v2/pkg/consts"
|
||||
|
||||
type OrderStatisticsRow struct {
|
||||
Status consts.OrderStatus `json:"status"`
|
||||
StatusDescription string `json:"status_description"`
|
||||
|
||||
Count int64 `json:"count"`
|
||||
AmountPaidSum int64 `json:"amount_paid_sum"`
|
||||
}
|
||||
|
||||
type OrderStatisticsResponse struct {
|
||||
TotalCount int64 `json:"total_count"`
|
||||
TotalAmountPaidSum int64 `json:"total_amount_paid_sum"`
|
||||
ByStatus []*OrderStatisticsRow `json:"by_status"`
|
||||
}
|
||||
@@ -25,6 +25,14 @@ type TenantItem struct {
|
||||
StatusDescription string `json:"status_description"`
|
||||
}
|
||||
|
||||
type TenantCreateForm struct {
|
||||
Code string `json:"code" validate:"required,max=64"`
|
||||
Name string `json:"name" validate:"required,max=128"`
|
||||
AdminUserID int64 `json:"admin_user_id" validate:"required,gt=0"`
|
||||
// Duration 租户有效期(天),从“创建时刻”起算;与续期接口保持一致。
|
||||
Duration int `json:"duration" validate:"required,oneof=7 30 90 180 365"`
|
||||
}
|
||||
|
||||
type TenantExpireUpdateForm struct {
|
||||
Duration int `json:"duration" validate:"required,oneof=7 30 90 180 365"`
|
||||
}
|
||||
|
||||
25
backend/app/http/super/order.go
Normal file
25
backend/app/http/super/order.go
Normal file
@@ -0,0 +1,25 @@
|
||||
package super
|
||||
|
||||
import (
|
||||
"quyun/v2/app/http/super/dto"
|
||||
"quyun/v2/app/services"
|
||||
|
||||
"github.com/gofiber/fiber/v3"
|
||||
)
|
||||
|
||||
// @provider
|
||||
type order struct{}
|
||||
|
||||
// statistics
|
||||
//
|
||||
// @Summary 订单统计信息
|
||||
// @Tags Super
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
// @Success 200 {object} dto.OrderStatisticsResponse
|
||||
//
|
||||
// @Router /super/v1/orders/statistics [get]
|
||||
func (*order) statistics(ctx fiber.Ctx) (*dto.OrderStatisticsResponse, error) {
|
||||
return services.Order.SuperStatistics(ctx)
|
||||
}
|
||||
|
||||
@@ -28,12 +28,14 @@ func Provide(opts ...opt.Option) error {
|
||||
if err := container.Container.Provide(func(
|
||||
auth *auth,
|
||||
middlewares *middlewares.Middlewares,
|
||||
order *order,
|
||||
tenant *tenant,
|
||||
user *user,
|
||||
) (contracts.HttpRoute, error) {
|
||||
obj := &Routes{
|
||||
auth: auth,
|
||||
middlewares: middlewares,
|
||||
order: order,
|
||||
tenant: tenant,
|
||||
user: user,
|
||||
}
|
||||
@@ -52,6 +54,13 @@ func Provide(opts ...opt.Option) error {
|
||||
}); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := container.Container.Provide(func() (*order, error) {
|
||||
obj := &order{}
|
||||
|
||||
return obj, nil
|
||||
}); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := container.Container.Provide(func() (*tenant, error) {
|
||||
obj := &tenant{}
|
||||
|
||||
|
||||
@@ -24,6 +24,7 @@ type Routes struct {
|
||||
middlewares *middlewares.Middlewares
|
||||
// Controller instances
|
||||
auth *auth
|
||||
order *order
|
||||
tenant *tenant
|
||||
user *user
|
||||
}
|
||||
@@ -53,12 +54,22 @@ func (r *Routes) Register(router fiber.Router) {
|
||||
r.auth.login,
|
||||
Body[dto.LoginForm]("form"),
|
||||
))
|
||||
// Register routes for controller: order
|
||||
r.log.Debugf("Registering route: Get /super/v1/orders/statistics -> order.statistics")
|
||||
router.Get("/super/v1/orders/statistics"[len(r.Path()):], DataFunc0(
|
||||
r.order.statistics,
|
||||
))
|
||||
// Register routes for controller: tenant
|
||||
r.log.Debugf("Registering route: Get /super/v1/tenants -> tenant.list")
|
||||
router.Get("/super/v1/tenants"[len(r.Path()):], DataFunc1(
|
||||
r.tenant.list,
|
||||
Query[dto.TenantFilter]("filter"),
|
||||
))
|
||||
r.log.Debugf("Registering route: Post /super/v1/tenants -> tenant.create")
|
||||
router.Post("/super/v1/tenants"[len(r.Path()):], DataFunc1(
|
||||
r.tenant.create,
|
||||
Body[dto.TenantCreateForm]("form"),
|
||||
))
|
||||
r.log.Debugf("Registering route: Get /super/v1/tenants/statuses -> tenant.statusList")
|
||||
router.Get("/super/v1/tenants/statuses"[len(r.Path()):], DataFunc0(
|
||||
r.tenant.statusList,
|
||||
|
||||
@@ -5,6 +5,7 @@ import (
|
||||
"quyun/v2/app/http/super/dto"
|
||||
"quyun/v2/app/requests"
|
||||
"quyun/v2/app/services"
|
||||
"quyun/v2/database/models"
|
||||
"quyun/v2/pkg/consts"
|
||||
|
||||
"github.com/gofiber/fiber/v3"
|
||||
@@ -28,6 +29,21 @@ func (*tenant) list(ctx fiber.Ctx, filter *dto.TenantFilter) (*requests.Pager, e
|
||||
return services.Tenant.Pager(ctx, filter)
|
||||
}
|
||||
|
||||
// create
|
||||
//
|
||||
// @Summary 创建租户并设置租户管理员
|
||||
// @Tags Super
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
// @Param form body dto.TenantCreateForm true "Form"
|
||||
// @Success 200 {object} models.Tenant
|
||||
//
|
||||
// @Router /super/v1/tenants [post]
|
||||
// @Bind form body
|
||||
func (*tenant) create(ctx fiber.Ctx, form *dto.TenantCreateForm) (*models.Tenant, error) {
|
||||
return services.Tenant.SuperCreateTenant(ctx, form)
|
||||
}
|
||||
|
||||
// updateExpire
|
||||
//
|
||||
// @Summary 更新过期时间
|
||||
|
||||
Reference in New Issue
Block a user