feat: 添加订单详情和退款功能,更新用户角色管理,增强超级管理员鉴权
This commit is contained in:
@@ -60,8 +60,13 @@ func (ctl *auth) login(ctx fiber.Ctx, form *dto.LoginForm) (*dto.LoginResponse,
|
|||||||
//
|
//
|
||||||
// @Router /super/v1/auth/token [get]
|
// @Router /super/v1/auth/token [get]
|
||||||
func (ctl *auth) token(ctx fiber.Ctx) (*dto.LoginResponse, error) {
|
func (ctl *auth) token(ctx fiber.Ctx) (*dto.LoginResponse, error) {
|
||||||
|
claims, ok := ctx.Locals(consts.CtxKeyClaims).(*jwt.Claims)
|
||||||
|
if !ok || claims == nil || claims.UserID <= 0 {
|
||||||
|
return nil, errorx.ErrTokenInvalid
|
||||||
|
}
|
||||||
|
|
||||||
token, err := ctl.jwt.CreateToken(ctl.jwt.CreateClaims(jwt.BaseClaims{
|
token, err := ctl.jwt.CreateToken(ctl.jwt.CreateClaims(jwt.BaseClaims{
|
||||||
UserID: 2,
|
UserID: claims.UserID,
|
||||||
}))
|
}))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errorx.Wrap(err).WithMsg("登录凭证生成失败")
|
return nil, errorx.Wrap(err).WithMsg("登录凭证生成失败")
|
||||||
|
|||||||
10
backend/app/http/super/dto/order_detail.go
Normal file
10
backend/app/http/super/dto/order_detail.go
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
package dto
|
||||||
|
|
||||||
|
import "quyun/v2/database/models"
|
||||||
|
|
||||||
|
type SuperOrderDetail struct {
|
||||||
|
Order *models.Order `json:"order,omitempty"`
|
||||||
|
|
||||||
|
Tenant *OrderTenantLite `json:"tenant,omitempty"`
|
||||||
|
Buyer *OrderBuyerLite `json:"buyer,omitempty"`
|
||||||
|
}
|
||||||
10
backend/app/http/super/dto/order_refund.go
Normal file
10
backend/app/http/super/dto/order_refund.go
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
package dto
|
||||||
|
|
||||||
|
type SuperOrderRefundForm struct {
|
||||||
|
// Force indicates bypassing the default refund window check (paid_at + 24h).
|
||||||
|
Force bool `json:"force,omitempty"`
|
||||||
|
// Reason is the human-readable refund reason used for audit.
|
||||||
|
Reason string `json:"reason,omitempty"`
|
||||||
|
// IdempotencyKey ensures refund request is processed at most once.
|
||||||
|
IdempotencyKey string `json:"idempotency_key,omitempty"`
|
||||||
|
}
|
||||||
7
backend/app/http/super/dto/user_roles.go
Normal file
7
backend/app/http/super/dto/user_roles.go
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
package dto
|
||||||
|
|
||||||
|
import "quyun/v2/pkg/consts"
|
||||||
|
|
||||||
|
type UserRolesUpdateForm struct {
|
||||||
|
Roles []consts.Role `json:"roles" validate:"required,min=1,dive,oneof=user super_admin"`
|
||||||
|
}
|
||||||
@@ -1,9 +1,15 @@
|
|||||||
package super
|
package super
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"quyun/v2/app/errorx"
|
||||||
"quyun/v2/app/http/super/dto"
|
"quyun/v2/app/http/super/dto"
|
||||||
"quyun/v2/app/requests"
|
"quyun/v2/app/requests"
|
||||||
"quyun/v2/app/services"
|
"quyun/v2/app/services"
|
||||||
|
"quyun/v2/database/models"
|
||||||
|
"quyun/v2/pkg/consts"
|
||||||
|
"quyun/v2/providers/jwt"
|
||||||
|
|
||||||
"github.com/gofiber/fiber/v3"
|
"github.com/gofiber/fiber/v3"
|
||||||
)
|
)
|
||||||
@@ -26,6 +32,56 @@ func (*order) list(ctx fiber.Ctx, filter *dto.OrderPageFilter) (*requests.Pager,
|
|||||||
return services.Order.SuperOrderPage(ctx, filter)
|
return services.Order.SuperOrderPage(ctx, filter)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// detail
|
||||||
|
//
|
||||||
|
// @Summary 订单详情
|
||||||
|
// @Tags Super
|
||||||
|
// @Accept json
|
||||||
|
// @Produce json
|
||||||
|
// @Param orderID path int64 true "OrderID"
|
||||||
|
// @Success 200 {object} dto.SuperOrderDetail
|
||||||
|
//
|
||||||
|
// @Router /super/v1/orders/:orderID [get]
|
||||||
|
// @Bind orderID path
|
||||||
|
func (*order) detail(ctx fiber.Ctx, orderID int64) (*dto.SuperOrderDetail, error) {
|
||||||
|
return services.Order.SuperOrderDetail(ctx, orderID)
|
||||||
|
}
|
||||||
|
|
||||||
|
// refund
|
||||||
|
//
|
||||||
|
// @Summary 订单退款(平台)
|
||||||
|
// @Description 该接口只负责将订单从 paid 推进到 refunding,并提交异步退款任务;退款入账与权益回收由 worker 异步完成。
|
||||||
|
// @Tags Super
|
||||||
|
// @Accept json
|
||||||
|
// @Produce json
|
||||||
|
// @Param orderID path int64 true "OrderID"
|
||||||
|
// @Param form body dto.SuperOrderRefundForm true "Form"
|
||||||
|
// @Success 200 {object} models.Order
|
||||||
|
//
|
||||||
|
// @Router /super/v1/orders/:orderID/refund [post]
|
||||||
|
// @Bind orderID path
|
||||||
|
// @Bind form body
|
||||||
|
func (*order) refund(ctx fiber.Ctx, orderID int64, form *dto.SuperOrderRefundForm) (*models.Order, error) {
|
||||||
|
if form == nil {
|
||||||
|
return nil, errorx.ErrInvalidParameter
|
||||||
|
}
|
||||||
|
|
||||||
|
claims, ok := ctx.Locals(consts.CtxKeyClaims).(*jwt.Claims)
|
||||||
|
if !ok || claims == nil || claims.UserID <= 0 {
|
||||||
|
return nil, errorx.ErrTokenInvalid
|
||||||
|
}
|
||||||
|
|
||||||
|
return services.Order.SuperRefundOrder(
|
||||||
|
ctx,
|
||||||
|
claims.UserID,
|
||||||
|
orderID,
|
||||||
|
form.Force,
|
||||||
|
form.Reason,
|
||||||
|
form.IdempotencyKey,
|
||||||
|
time.Now(),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
// statistics
|
// statistics
|
||||||
//
|
//
|
||||||
// @Summary 订单统计信息
|
// @Summary 订单统计信息
|
||||||
|
|||||||
@@ -61,6 +61,17 @@ func (r *Routes) Register(router fiber.Router) {
|
|||||||
r.order.list,
|
r.order.list,
|
||||||
Query[dto.OrderPageFilter]("filter"),
|
Query[dto.OrderPageFilter]("filter"),
|
||||||
))
|
))
|
||||||
|
r.log.Debugf("Registering route: Get /super/v1/orders/:orderID -> order.detail")
|
||||||
|
router.Get("/super/v1/orders/:orderID"[len(r.Path()):], DataFunc1(
|
||||||
|
r.order.detail,
|
||||||
|
PathParam[int64]("orderID"),
|
||||||
|
))
|
||||||
|
r.log.Debugf("Registering route: Post /super/v1/orders/:orderID/refund -> order.refund")
|
||||||
|
router.Post("/super/v1/orders/:orderID/refund"[len(r.Path()):], DataFunc2(
|
||||||
|
r.order.refund,
|
||||||
|
PathParam[int64]("orderID"),
|
||||||
|
Body[dto.SuperOrderRefundForm]("form"),
|
||||||
|
))
|
||||||
r.log.Debugf("Registering route: Get /super/v1/orders/statistics -> order.statistics")
|
r.log.Debugf("Registering route: Get /super/v1/orders/statistics -> order.statistics")
|
||||||
router.Get("/super/v1/orders/statistics"[len(r.Path()):], DataFunc0(
|
router.Get("/super/v1/orders/statistics"[len(r.Path()):], DataFunc0(
|
||||||
r.order.statistics,
|
r.order.statistics,
|
||||||
@@ -124,6 +135,12 @@ func (r *Routes) Register(router fiber.Router) {
|
|||||||
PathParam[int64]("userID"),
|
PathParam[int64]("userID"),
|
||||||
Body[dto.UserStatusUpdateForm]("form"),
|
Body[dto.UserStatusUpdateForm]("form"),
|
||||||
))
|
))
|
||||||
|
r.log.Debugf("Registering route: Patch /super/v1/users/:userID/roles -> user.updateRoles")
|
||||||
|
router.Patch("/super/v1/users/:userID/roles"[len(r.Path()):], Func2(
|
||||||
|
r.user.updateRoles,
|
||||||
|
PathParam[int64]("userID"),
|
||||||
|
Body[dto.UserRolesUpdateForm]("form"),
|
||||||
|
))
|
||||||
|
|
||||||
r.log.Info("Successfully registered all routes")
|
r.log.Info("Successfully registered all routes")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,5 +5,7 @@ func (r *Routes) Path() string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (r *Routes) Middlewares() []any {
|
func (r *Routes) Middlewares() []any {
|
||||||
return []any{}
|
return []any{
|
||||||
|
r.middlewares.SuperAuth,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -61,6 +61,22 @@ func (*user) updateStatus(ctx fiber.Ctx, userID int64, form *dto.UserStatusUpdat
|
|||||||
return services.User.UpdateStatus(ctx, userID, form.Status)
|
return services.User.UpdateStatus(ctx, userID, form.Status)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// updateRoles
|
||||||
|
//
|
||||||
|
// @Summary 更新用户角色
|
||||||
|
// @Tags Super
|
||||||
|
// @Accept json
|
||||||
|
// @Produce json
|
||||||
|
// @Param userID path int64 true "UserID"
|
||||||
|
// @Param form body dto.UserRolesUpdateForm true "Form"
|
||||||
|
//
|
||||||
|
// @Router /super/v1/users/:userID/roles [patch]
|
||||||
|
// @Bind userID path
|
||||||
|
// @Bind form body
|
||||||
|
func (*user) updateRoles(ctx fiber.Ctx, userID int64, form *dto.UserRolesUpdateForm) error {
|
||||||
|
return services.User.UpdateRoles(ctx, userID, form.Roles)
|
||||||
|
}
|
||||||
|
|
||||||
// statusList
|
// statusList
|
||||||
//
|
//
|
||||||
// @Summary 用户状态列表
|
// @Summary 用户状态列表
|
||||||
|
|||||||
68
backend/app/middlewares/super.go
Normal file
68
backend/app/middlewares/super.go
Normal file
@@ -0,0 +1,68 @@
|
|||||||
|
package middlewares
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"quyun/v2/app/errorx"
|
||||||
|
"quyun/v2/app/services"
|
||||||
|
"quyun/v2/pkg/consts"
|
||||||
|
"quyun/v2/providers/jwt"
|
||||||
|
|
||||||
|
"github.com/gofiber/fiber/v3"
|
||||||
|
)
|
||||||
|
|
||||||
|
func shouldSkipSuperJWTAuth(path string) bool {
|
||||||
|
// 登录接口允许匿名访问。
|
||||||
|
return strings.Contains(path, "/super/v1/auth/login")
|
||||||
|
}
|
||||||
|
|
||||||
|
// SuperAuth 平台侧超级管理员鉴权:
|
||||||
|
// - 校验 JWT 并写入 claims
|
||||||
|
// - 加载用户并校验包含 super_admin 角色
|
||||||
|
func (f *Middlewares) SuperAuth(c fiber.Ctx) error {
|
||||||
|
if shouldSkipSuperJWTAuth(c.Path()) {
|
||||||
|
f.log.Debug("middlewares.super.auth.skipped")
|
||||||
|
return c.Next()
|
||||||
|
}
|
||||||
|
|
||||||
|
authHeader := c.Get(jwt.HttpHeader)
|
||||||
|
if authHeader == "" {
|
||||||
|
f.log.Info("middlewares.super.auth.missing_token")
|
||||||
|
return errorx.ErrTokenMissing
|
||||||
|
}
|
||||||
|
|
||||||
|
claims, err := f.jwt.Parse(authHeader)
|
||||||
|
if err != nil {
|
||||||
|
f.log.WithError(err).Warn("middlewares.super.auth.invalid_token")
|
||||||
|
switch err {
|
||||||
|
case jwt.TokenExpired:
|
||||||
|
return errorx.ErrTokenExpired
|
||||||
|
case jwt.TokenMalformed, jwt.TokenNotValidYet, jwt.TokenInvalid:
|
||||||
|
return errorx.ErrTokenInvalid
|
||||||
|
default:
|
||||||
|
return errorx.ErrTokenInvalid
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if claims.UserID == 0 {
|
||||||
|
f.log.Warn("middlewares.super.auth.missing_user_id")
|
||||||
|
return errorx.ErrTokenInvalid
|
||||||
|
}
|
||||||
|
|
||||||
|
userModel, err := services.User.FindByID(c, claims.UserID)
|
||||||
|
if err != nil {
|
||||||
|
f.log.WithField("user_id", claims.UserID).WithError(err).Warn("middlewares.super.auth.load_user_failed")
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if !userModel.Roles.Contains(consts.RoleSuperAdmin) {
|
||||||
|
f.log.WithField("user_id", claims.UserID).Warn("middlewares.super.auth.denied")
|
||||||
|
return errorx.ErrPermissionDenied.WithMsg("需要超级管理员权限")
|
||||||
|
}
|
||||||
|
|
||||||
|
f.log.WithFields(map[string]any{
|
||||||
|
"user_id": claims.UserID,
|
||||||
|
}).Info("middlewares.super.auth.ok")
|
||||||
|
|
||||||
|
c.Locals(consts.CtxKeyClaims, claims)
|
||||||
|
c.Locals(consts.CtxKeyUser, userModel)
|
||||||
|
return c.Next()
|
||||||
|
}
|
||||||
@@ -417,6 +417,66 @@ func (s *order) SuperOrderPage(ctx context.Context, filter *superdto.OrderPageFi
|
|||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SuperOrderDetail 平台侧订单详情(跨租户)。
|
||||||
|
func (s *order) SuperOrderDetail(ctx context.Context, orderID int64) (*superdto.SuperOrderDetail, error) {
|
||||||
|
if orderID <= 0 {
|
||||||
|
return nil, errorx.ErrInvalidParameter.WithMsg("order_id must be > 0")
|
||||||
|
}
|
||||||
|
|
||||||
|
tbl, query := models.OrderQuery.QueryContext(ctx)
|
||||||
|
orderModel, err := query.Preload(tbl.Items).Where(tbl.ID.Eq(orderID)).First()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var tenantLite *superdto.OrderTenantLite
|
||||||
|
if orderModel.TenantID > 0 {
|
||||||
|
tTbl, tQuery := models.TenantQuery.QueryContext(ctx)
|
||||||
|
tenantModel, err := tQuery.Where(tTbl.ID.Eq(orderModel.TenantID)).First()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
tenantLite = &superdto.OrderTenantLite{ID: tenantModel.ID, Code: tenantModel.Code, Name: tenantModel.Name}
|
||||||
|
}
|
||||||
|
|
||||||
|
var buyerLite *superdto.OrderBuyerLite
|
||||||
|
if orderModel.UserID > 0 {
|
||||||
|
uTbl, uQuery := models.UserQuery.QueryContext(ctx)
|
||||||
|
userModel, err := uQuery.Where(uTbl.ID.Eq(orderModel.UserID)).First()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
buyerLite = &superdto.OrderBuyerLite{ID: userModel.ID, Username: userModel.Username}
|
||||||
|
}
|
||||||
|
|
||||||
|
return &superdto.SuperOrderDetail{
|
||||||
|
Order: orderModel,
|
||||||
|
Tenant: tenantLite,
|
||||||
|
Buyer: buyerLite,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// SuperRefundOrder 平台侧发起退款(跨租户)。
|
||||||
|
func (s *order) SuperRefundOrder(
|
||||||
|
ctx context.Context,
|
||||||
|
operatorUserID, orderID int64,
|
||||||
|
force bool,
|
||||||
|
reason, idempotencyKey string,
|
||||||
|
now time.Time,
|
||||||
|
) (*models.Order, error) {
|
||||||
|
if operatorUserID <= 0 || orderID <= 0 {
|
||||||
|
return nil, errorx.ErrInvalidParameter.WithMsg("operator_user_id/order_id must be > 0")
|
||||||
|
}
|
||||||
|
|
||||||
|
tbl, query := models.OrderQuery.QueryContext(ctx)
|
||||||
|
orderModel, err := query.Where(tbl.ID.Eq(orderID)).First()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return s.AdminRefundOrder(ctx, orderModel.TenantID, operatorUserID, orderID, force, reason, idempotencyKey, now)
|
||||||
|
}
|
||||||
|
|
||||||
// PurchaseContentParams 定义“租户内使用余额购买内容”的入参。
|
// PurchaseContentParams 定义“租户内使用余额购买内容”的入参。
|
||||||
type PurchaseContentParams struct {
|
type PurchaseContentParams struct {
|
||||||
// TenantID 租户 ID(多租户隔离范围)。
|
// TenantID 租户 ID(多租户隔离范围)。
|
||||||
|
|||||||
@@ -276,6 +276,35 @@ func (t *user) UpdateStatus(ctx context.Context, userID int64, status consts.Use
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// UpdateRoles 更新用户角色(超级管理员侧)。
|
||||||
|
func (t *user) UpdateRoles(ctx context.Context, userID int64, roles []consts.Role) error {
|
||||||
|
if userID <= 0 {
|
||||||
|
return errors.New("user_id must be > 0")
|
||||||
|
}
|
||||||
|
|
||||||
|
roles = lo.Uniq(lo.Filter(roles, func(r consts.Role, _ int) bool {
|
||||||
|
return r != ""
|
||||||
|
}))
|
||||||
|
if len(roles) == 0 {
|
||||||
|
return errors.New("roles is empty")
|
||||||
|
}
|
||||||
|
|
||||||
|
// 约定:系统用户至少包含 user 角色。
|
||||||
|
if !lo.Contains(roles, consts.RoleUser) {
|
||||||
|
roles = append(roles, consts.RoleUser)
|
||||||
|
}
|
||||||
|
roles = lo.Uniq(roles)
|
||||||
|
|
||||||
|
m, err := t.FindByID(ctx, userID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
m.Roles = types.NewArray(roles)
|
||||||
|
_, err = m.Update(ctx)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
// Statistics 按状态统计用户数量(超级管理员侧)。
|
// Statistics 按状态统计用户数量(超级管理员侧)。
|
||||||
func (t *user) Statistics(ctx context.Context) ([]*dto.UserStatistics, error) {
|
func (t *user) Statistics(ctx context.Context) ([]*dto.UserStatistics, error) {
|
||||||
tbl, query := models.UserQuery.QueryContext(ctx)
|
tbl, query := models.UserQuery.QueryContext(ctx)
|
||||||
|
|||||||
@@ -21,6 +21,25 @@
|
|||||||
- `/`:概览 Dashboard
|
- `/`:概览 Dashboard
|
||||||
- `/superadmin/tenants`:租户管理
|
- `/superadmin/tenants`:租户管理
|
||||||
- `/superadmin/users`:用户管理
|
- `/superadmin/users`:用户管理
|
||||||
|
- `/superadmin/orders`:订单管理
|
||||||
|
|
||||||
|
## 1.1 迭代路线(按优先级依次实现)
|
||||||
|
|
||||||
|
1) **安全与鉴权**
|
||||||
|
- `/super/v1/*`(除 `/auth/login`)强制 JWT 校验与 `super_admin` 角色校验
|
||||||
|
- `/super/v1/auth/token` 改为基于当前 token 的续期/校验(不再返回固定用户 token)
|
||||||
|
2) **订单管理**
|
||||||
|
- 订单列表(跨租户筛选/分页/排序)
|
||||||
|
- 订单详情(含 items / snapshot 展示)
|
||||||
|
- 平台侧退款(支持强制退款,记录操作人)
|
||||||
|
3) **租户管理增强**
|
||||||
|
- 租户详情页(基本信息、过期续期、状态变更、管理员/成员管理)
|
||||||
|
4) **用户管理增强**
|
||||||
|
- 用户详情页(角色、状态、余额/冻结、加入/拥有的租户、操作记录)
|
||||||
|
- 角色授予/回收(`super_admin`)
|
||||||
|
5) **审计与运维**
|
||||||
|
- 操作审计日志、关键行为告警
|
||||||
|
- 任务队列/退款处理监控、健康检查面板
|
||||||
|
|
||||||
## 2. 页面规格(页面 → 功能 → API)
|
## 2. 页面规格(页面 → 功能 → API)
|
||||||
|
|
||||||
|
|||||||
4
frontend/superadmin/dist/index.html
vendored
4
frontend/superadmin/dist/index.html
vendored
@@ -7,8 +7,8 @@
|
|||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
<title>Sakai Vue</title>
|
<title>Sakai Vue</title>
|
||||||
<link href="https://fonts.cdnfonts.com/css/lato" rel="stylesheet">
|
<link href="https://fonts.cdnfonts.com/css/lato" rel="stylesheet">
|
||||||
<script type="module" crossorigin src="./assets/index-CYuRitZG.js"></script>
|
<script type="module" crossorigin src="./assets/index-D_TMcKRC.js"></script>
|
||||||
<link rel="stylesheet" crossorigin href="./assets/index-DMmaUuq9.css">
|
<link rel="stylesheet" crossorigin href="./assets/index-gxWMay_c.css">
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
|
|||||||
@@ -71,5 +71,20 @@ export const OrderService = {
|
|||||||
},
|
},
|
||||||
async getOrderStatistics() {
|
async getOrderStatistics() {
|
||||||
return requestJson('/super/v1/orders/statistics');
|
return requestJson('/super/v1/orders/statistics');
|
||||||
|
},
|
||||||
|
async getOrderDetail(orderID) {
|
||||||
|
if (!orderID) throw new Error('orderID is required');
|
||||||
|
return requestJson(`/super/v1/orders/${orderID}`);
|
||||||
|
},
|
||||||
|
async refundOrder(orderID, { force, reason, idempotency_key } = {}) {
|
||||||
|
if (!orderID) throw new Error('orderID is required');
|
||||||
|
return requestJson(`/super/v1/orders/${orderID}/refund`, {
|
||||||
|
method: 'POST',
|
||||||
|
body: {
|
||||||
|
force: Boolean(force),
|
||||||
|
reason,
|
||||||
|
idempotency_key
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -77,6 +77,11 @@ export const UserService = {
|
|||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
async updateUserRoles({ userID, roles }) {
|
||||||
|
if (!userID) throw new Error('userID is required');
|
||||||
|
if (!Array.isArray(roles) || roles.length === 0) throw new Error('roles is required');
|
||||||
|
return requestJson(`/super/v1/users/${userID}/roles`, { method: 'PATCH', body: { roles } });
|
||||||
|
},
|
||||||
async getUserStatistics() {
|
async getUserStatistics() {
|
||||||
try {
|
try {
|
||||||
const data = await requestJson('/super/v1/users/statistics');
|
const data = await requestJson('/super/v1/users/statistics');
|
||||||
|
|||||||
@@ -10,6 +10,16 @@ const toast = useToast();
|
|||||||
const orders = ref([]);
|
const orders = ref([]);
|
||||||
const loading = ref(false);
|
const loading = ref(false);
|
||||||
|
|
||||||
|
const detailDialogVisible = ref(false);
|
||||||
|
const detailLoading = ref(false);
|
||||||
|
const detail = ref(null);
|
||||||
|
|
||||||
|
const refundDialogVisible = ref(false);
|
||||||
|
const refundLoading = ref(false);
|
||||||
|
const refundOrder = ref(null);
|
||||||
|
const refundForce = ref(false);
|
||||||
|
const refundReason = ref('');
|
||||||
|
|
||||||
const totalRecords = ref(0);
|
const totalRecords = ref(0);
|
||||||
const page = ref(1);
|
const page = ref(1);
|
||||||
const rows = ref(10);
|
const rows = ref(10);
|
||||||
@@ -77,6 +87,14 @@ function getOrderStatusSeverity(value) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function safeJson(value) {
|
||||||
|
try {
|
||||||
|
return JSON.stringify(value ?? null, null, 2);
|
||||||
|
} catch {
|
||||||
|
return String(value ?? '');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function loadOrders() {
|
async function loadOrders() {
|
||||||
loading.value = true;
|
loading.value = true;
|
||||||
try {
|
try {
|
||||||
@@ -111,6 +129,51 @@ async function loadOrders() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function openDetailDialog(order) {
|
||||||
|
const id = order?.id;
|
||||||
|
if (!id) return;
|
||||||
|
|
||||||
|
detailDialogVisible.value = true;
|
||||||
|
detailLoading.value = true;
|
||||||
|
detail.value = null;
|
||||||
|
|
||||||
|
try {
|
||||||
|
detail.value = await OrderService.getOrderDetail(id);
|
||||||
|
} catch (error) {
|
||||||
|
toast.add({ severity: 'error', summary: '加载失败', detail: error?.message || '无法加载订单详情', life: 4000 });
|
||||||
|
detailDialogVisible.value = false;
|
||||||
|
} finally {
|
||||||
|
detailLoading.value = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function openRefundDialog(order) {
|
||||||
|
refundOrder.value = order;
|
||||||
|
refundDialogVisible.value = true;
|
||||||
|
refundForce.value = false;
|
||||||
|
refundReason.value = '';
|
||||||
|
}
|
||||||
|
|
||||||
|
async function confirmRefund() {
|
||||||
|
const id = refundOrder.value?.id;
|
||||||
|
if (!id) return;
|
||||||
|
|
||||||
|
refundLoading.value = true;
|
||||||
|
try {
|
||||||
|
await OrderService.refundOrder(id, { force: refundForce.value, reason: refundReason.value });
|
||||||
|
toast.add({ severity: 'success', summary: '已提交退款', detail: `订单ID: ${id}`, life: 3000 });
|
||||||
|
refundDialogVisible.value = false;
|
||||||
|
await loadOrders();
|
||||||
|
if (detailDialogVisible.value && detail.value?.order?.id === id) {
|
||||||
|
detail.value = await OrderService.getOrderDetail(id);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
toast.add({ severity: 'error', summary: '退款失败', detail: error?.message || '无法发起退款', life: 4000 });
|
||||||
|
} finally {
|
||||||
|
refundLoading.value = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function onSearch() {
|
function onSearch() {
|
||||||
page.value = 1;
|
page.value = 1;
|
||||||
loadOrders();
|
loadOrders();
|
||||||
@@ -238,7 +301,12 @@ loadOrders();
|
|||||||
scrollHeight="flex"
|
scrollHeight="flex"
|
||||||
responsiveLayout="scroll"
|
responsiveLayout="scroll"
|
||||||
>
|
>
|
||||||
<Column field="id" header="ID" sortable style="min-width: 7rem" />
|
<Column field="id" header="ID" sortable style="min-width: 8rem">
|
||||||
|
<template #body="{ data }">
|
||||||
|
<Button label="详情" icon="pi pi-search" text size="small" class="p-0 mr-2" @click="openDetailDialog(data)" />
|
||||||
|
<span>{{ data.id }}</span>
|
||||||
|
</template>
|
||||||
|
</Column>
|
||||||
<Column header="租户" style="min-width: 16rem">
|
<Column header="租户" style="min-width: 16rem">
|
||||||
<template #body="{ data }">
|
<template #body="{ data }">
|
||||||
<div class="flex flex-col">
|
<div class="flex flex-col">
|
||||||
@@ -291,7 +359,132 @@ loadOrders();
|
|||||||
{{ formatDate(data.refunded_at) }}
|
{{ formatDate(data.refunded_at) }}
|
||||||
</template>
|
</template>
|
||||||
</Column>
|
</Column>
|
||||||
|
<Column header="操作" style="min-width: 10rem">
|
||||||
|
<template #body="{ data }">
|
||||||
|
<Button
|
||||||
|
label="退款"
|
||||||
|
icon="pi pi-replay"
|
||||||
|
text
|
||||||
|
size="small"
|
||||||
|
class="p-0"
|
||||||
|
:disabled="data?.status !== 'paid'"
|
||||||
|
@click="openRefundDialog(data)"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
</Column>
|
||||||
</DataTable>
|
</DataTable>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
|
||||||
|
|
||||||
|
<Dialog v-model:visible="detailDialogVisible" :modal="true" :style="{ width: '1180px' }">
|
||||||
|
<template #header>
|
||||||
|
<div class="flex items-center gap-2">
|
||||||
|
<span class="font-medium">订单详情</span>
|
||||||
|
<span class="text-muted-color truncate max-w-[520px]">
|
||||||
|
{{ detail?.order?.id ? `#${detail.order.id}` : '' }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
<div v-if="detailLoading" class="flex items-center justify-center py-10">
|
||||||
|
<ProgressSpinner style="width: 36px; height: 36px" strokeWidth="6" />
|
||||||
|
</div>
|
||||||
|
<div v-else class="flex flex-col gap-4">
|
||||||
|
<div class="grid grid-cols-12 gap-3">
|
||||||
|
<div class="col-span-12 md:col-span-6">
|
||||||
|
<div class="text-sm text-muted-color">租户</div>
|
||||||
|
<div class="font-medium">{{ detail?.tenant?.name ?? '-' }}</div>
|
||||||
|
<div class="text-sm text-muted-color">{{ detail?.tenant?.code ?? '-' }} / {{ detail?.tenant?.id ?? '-' }}</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-span-12 md:col-span-6">
|
||||||
|
<div class="text-sm text-muted-color">买家</div>
|
||||||
|
<div class="font-medium">{{ detail?.buyer?.username ?? '-' }}</div>
|
||||||
|
<div class="text-sm text-muted-color">ID: {{ detail?.buyer?.id ?? '-' }}</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-span-12 md:col-span-3">
|
||||||
|
<div class="text-sm text-muted-color">状态</div>
|
||||||
|
<Tag :value="detail?.order?.status_description || detail?.order?.status || '-'" :severity="getOrderStatusSeverity(detail?.order?.status)" />
|
||||||
|
</div>
|
||||||
|
<div class="col-span-12 md:col-span-3">
|
||||||
|
<div class="text-sm text-muted-color">实付</div>
|
||||||
|
<div class="font-medium">{{ formatCny(detail?.order?.amount_paid) }}</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-span-12 md:col-span-3">
|
||||||
|
<div class="text-sm text-muted-color">创建时间</div>
|
||||||
|
<div class="font-medium">{{ formatDate(detail?.order?.created_at) }}</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-span-12 md:col-span-3">
|
||||||
|
<div class="text-sm text-muted-color">支付时间</div>
|
||||||
|
<div class="font-medium">{{ formatDate(detail?.order?.paid_at) }}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="grid grid-cols-12 gap-3">
|
||||||
|
<div class="col-span-12 md:col-span-6">
|
||||||
|
<div class="text-sm text-muted-color mb-2">订单快照(snapshot)</div>
|
||||||
|
<pre class="text-xs whitespace-pre-wrap bg-surface-50 border border-surface-200 rounded-md p-3 max-h-[360px] overflow-auto">{{ safeJson(detail?.order?.snapshot) }}</pre>
|
||||||
|
</div>
|
||||||
|
<div class="col-span-12 md:col-span-6">
|
||||||
|
<div class="text-sm text-muted-color mb-2">订单明细(items)</div>
|
||||||
|
<DataTable :value="detail?.order?.items || []" dataKey="id" responsiveLayout="scroll" scrollable scrollHeight="360px">
|
||||||
|
<Column field="id" header="ItemID" style="min-width: 7rem" />
|
||||||
|
<Column field="content_id" header="ContentID" style="min-width: 8rem" />
|
||||||
|
<Column field="amount_paid" header="金额" style="min-width: 10rem">
|
||||||
|
<template #body="{ data }">
|
||||||
|
{{ formatCny(data.amount_paid) }}
|
||||||
|
</template>
|
||||||
|
</Column>
|
||||||
|
<Column field="snapshot" header="内容快照" style="min-width: 24rem">
|
||||||
|
<template #body="{ data }">
|
||||||
|
<pre class="text-xs whitespace-pre-wrap bg-surface-50 border border-surface-200 rounded-md p-2 max-h-[180px] overflow-auto">{{ safeJson(data.snapshot) }}</pre>
|
||||||
|
</template>
|
||||||
|
</Column>
|
||||||
|
</DataTable>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<template #footer>
|
||||||
|
<Button label="关闭" icon="pi pi-times" text @click="detailDialogVisible = false" />
|
||||||
|
<Button
|
||||||
|
label="退款"
|
||||||
|
icon="pi pi-replay"
|
||||||
|
severity="danger"
|
||||||
|
@click="openRefundDialog(detail?.order)"
|
||||||
|
:disabled="detail?.order?.status !== 'paid'"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
</Dialog>
|
||||||
|
|
||||||
|
<Dialog v-model:visible="refundDialogVisible" :modal="true" :style="{ width: '520px' }">
|
||||||
|
<template #header>
|
||||||
|
<div class="flex items-center gap-2">
|
||||||
|
<span class="font-medium">发起退款</span>
|
||||||
|
<span class="text-muted-color truncate max-w-[280px]">
|
||||||
|
{{ refundOrder?.id ? `#${refundOrder.id}` : '' }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
<div class="flex flex-col gap-4">
|
||||||
|
<div class="text-sm text-muted-color">
|
||||||
|
该操作会将订单从 <span class="font-medium">paid</span> 推进到 <span class="font-medium">refunding</span> 并提交异步退款任务。
|
||||||
|
</div>
|
||||||
|
<div class="flex items-center gap-2">
|
||||||
|
<Checkbox v-model="refundForce" inputId="refundForce" binary />
|
||||||
|
<label for="refundForce" class="cursor-pointer">强制退款(绕过默认时间窗)</label>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<label class="block font-medium mb-2">退款原因</label>
|
||||||
|
<InputText v-model="refundReason" placeholder="可选,用于审计" class="w-full" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<template #footer>
|
||||||
|
<Button label="取消" icon="pi pi-times" text @click="refundDialogVisible = false" :disabled="refundLoading" />
|
||||||
|
<Button
|
||||||
|
label="确认退款"
|
||||||
|
icon="pi pi-check"
|
||||||
|
severity="danger"
|
||||||
|
@click="confirmRefund"
|
||||||
|
:loading="refundLoading"
|
||||||
|
:disabled="refundOrder?.status !== 'paid'"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
</Dialog>
|
||||||
|
</template>
|
||||||
|
|||||||
@@ -67,6 +67,11 @@ const statusValue = ref(null);
|
|||||||
|
|
||||||
const statusFilterOptions = computed(() => [{ label: '全部', value: '' }, ...(statusOptions.value || [])]);
|
const statusFilterOptions = computed(() => [{ label: '全部', value: '' }, ...(statusOptions.value || [])]);
|
||||||
|
|
||||||
|
const rolesDialogVisible = ref(false);
|
||||||
|
const rolesLoading = ref(false);
|
||||||
|
const rolesUser = ref(null);
|
||||||
|
const rolesSuperAdmin = ref(false);
|
||||||
|
|
||||||
const ownedTenantsDialogVisible = ref(false);
|
const ownedTenantsDialogVisible = ref(false);
|
||||||
const ownedTenantsLoading = ref(false);
|
const ownedTenantsLoading = ref(false);
|
||||||
const ownedTenantsUser = ref(null);
|
const ownedTenantsUser = ref(null);
|
||||||
@@ -187,6 +192,37 @@ async function confirmUpdateStatus() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function hasRole(user, role) {
|
||||||
|
const roles = user?.roles || [];
|
||||||
|
return Array.isArray(roles) && roles.includes(role);
|
||||||
|
}
|
||||||
|
|
||||||
|
function openRolesDialog(user) {
|
||||||
|
rolesUser.value = user;
|
||||||
|
rolesSuperAdmin.value = hasRole(user, 'super_admin');
|
||||||
|
rolesDialogVisible.value = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function confirmUpdateRoles() {
|
||||||
|
const userID = rolesUser.value?.id;
|
||||||
|
if (!userID) return;
|
||||||
|
|
||||||
|
const roles = ['user'];
|
||||||
|
if (rolesSuperAdmin.value) roles.push('super_admin');
|
||||||
|
|
||||||
|
rolesLoading.value = true;
|
||||||
|
try {
|
||||||
|
await UserService.updateUserRoles({ userID, roles });
|
||||||
|
toast.add({ severity: 'success', summary: '更新成功', detail: `用户ID: ${userID}`, life: 3000 });
|
||||||
|
rolesDialogVisible.value = false;
|
||||||
|
await loadUsers();
|
||||||
|
} catch (error) {
|
||||||
|
toast.add({ severity: 'error', summary: '更新失败', detail: error?.message || '无法更新用户角色', life: 4000 });
|
||||||
|
} finally {
|
||||||
|
rolesLoading.value = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function loadUsers() {
|
async function loadUsers() {
|
||||||
loading.value = true;
|
loading.value = true;
|
||||||
try {
|
try {
|
||||||
@@ -451,6 +487,18 @@ onMounted(() => {
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</Column>
|
</Column>
|
||||||
|
<Column header="超管" style="min-width: 9rem">
|
||||||
|
<template #body="{ data }">
|
||||||
|
<Button
|
||||||
|
:label="hasRole(data, 'super_admin') ? '是' : '否'"
|
||||||
|
icon="pi pi-user-edit"
|
||||||
|
text
|
||||||
|
size="small"
|
||||||
|
class="p-0"
|
||||||
|
@click="openRolesDialog(data)"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
</Column>
|
||||||
<Column field="balance" header="余额" sortable style="min-width: 10rem">
|
<Column field="balance" header="余额" sortable style="min-width: 10rem">
|
||||||
<template #body="{ data }">
|
<template #body="{ data }">
|
||||||
{{ formatCny(data.balance) }}
|
{{ formatCny(data.balance) }}
|
||||||
@@ -524,6 +572,26 @@ onMounted(() => {
|
|||||||
</template>
|
</template>
|
||||||
</Dialog>
|
</Dialog>
|
||||||
|
|
||||||
|
<Dialog v-model:visible="rolesDialogVisible" :modal="true" :style="{ width: '420px' }">
|
||||||
|
<template #header>
|
||||||
|
<div class="flex items-center gap-2">
|
||||||
|
<span class="font-medium">更新用户角色</span>
|
||||||
|
<span class="text-muted-color truncate max-w-[240px]">{{ rolesUser?.username ?? '-' }}</span>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
<div class="flex flex-col gap-4">
|
||||||
|
<div class="flex items-center gap-2">
|
||||||
|
<Checkbox inputId="rolesSuperAdmin" v-model="rolesSuperAdmin" binary :disabled="rolesLoading" />
|
||||||
|
<label for="rolesSuperAdmin" class="cursor-pointer">super_admin</label>
|
||||||
|
</div>
|
||||||
|
<div class="text-sm text-muted-color">默认包含 user 角色。</div>
|
||||||
|
</div>
|
||||||
|
<template #footer>
|
||||||
|
<Button label="取消" icon="pi pi-times" text @click="rolesDialogVisible = false" :disabled="rolesLoading" />
|
||||||
|
<Button label="确认" icon="pi pi-check" @click="confirmUpdateRoles" :loading="rolesLoading" />
|
||||||
|
</template>
|
||||||
|
</Dialog>
|
||||||
|
|
||||||
<Dialog v-model:visible="ownedTenantsDialogVisible" :modal="true" :style="{ width: '980px' }">
|
<Dialog v-model:visible="ownedTenantsDialogVisible" :modal="true" :style="{ width: '980px' }">
|
||||||
<template #header>
|
<template #header>
|
||||||
<div class="flex items-center gap-2">
|
<div class="flex items-center gap-2">
|
||||||
|
|||||||
Reference in New Issue
Block a user