yml/affiliate_dash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化：平台管理员账号独立管理

Browse Source
This commit is contained in:
yml2213
2026-08-13 13:31:06 +08:00
parent c928c5b8e8
commit cfdc12cf94
7 changed files with 250 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/internal/handler/user.go
+23 -58
View File
@@ -4,7 +4,6 @@ import (
"strconv"
"affiliate_dash/internal/middleware"
"affiliate_dash/internal/model"
"affiliate_dash/internal/pkg/response"
"affiliate_dash/internal/service"
@@ -19,23 +18,10 @@ func NewUserHandler(svc *service.UserService) *UserHandler {
return &UserHandler{svc: svc}
}
func (h *UserHandler) List(c *gin.Context) {
func (h *UserHandler) ListPlatformAdmins(c *gin.Context) {
page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
size, _ := strconv.Atoi(c.DefaultQuery("size", "20"))
q := service.UserListQuery{
Page: page,
Size: size,
Keyword: c.Query("keyword"),
Role: c.Query("role"),
}
if middleware.GetRole(c) != model.RoleAdmin {
q.MerchantID = middleware.GetMerchantID(c)
}
if s := c.Query("status"); s != "" {
v, _ := strconv.Atoi(s)
q.Status = &v
}
list, total, err := h.svc.List(q)
list, total, err := h.svc.ListPlatformAdmins(page, size)
if err != nil {
response.ServerError(c, err.Error())
return
@@ -43,31 +29,19 @@ func (h *UserHandler) List(c *gin.Context) {
response.Page(c, list, total, page, size)
}
func (h *UserHandler) ListMerchantMembers(c *gin.Context) {
page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
size, _ := strconv.Atoi(c.DefaultQuery("size", "20"))
list, total, err := h.svc.ListMerchantMembers(page, size)
if err != nil {
response.ServerError(c, err.Error())
return
}
response.Page(c, list, total, page, size)
}
type createUserReq struct {
type createPlatformAdminReq struct {
Username string `json:"username" binding:"required"`
Password string `json:"password" binding:"required,min=6"`
Nickname string `json:"nickname"`
Role string `json:"role"`
}
func (h *UserHandler) Create(c *gin.Context) {
var req createUserReq
func (h *UserHandler) CreatePlatformAdmin(c *gin.Context) {
var req createPlatformAdminReq
if err := c.ShouldBindJSON(&req); err != nil {
response.BadRequest(c, "参数错误")
return
}
user, err := h.svc.Create(req.Username, req.Password, req.Nickname, req.Role, middleware.GetMerchantID(c))
user, err := h.svc.CreatePlatformAdmin(req.Username, req.Password, req.Nickname)
if err != nil {
response.BadRequest(c, err.Error())
return
@@ -75,45 +49,36 @@ func (h *UserHandler) Create(c *gin.Context) {
response.OK(c, user)
}
type userStatusReq struct {
Status int `json:"status"`
type updatePlatformAdminReq struct {
Username string `json:"username" binding:"required"`
Nickname string `json:"nickname"`
Password string `json:"password" binding:"omitempty,min=6"`
Status int `json:"status"`
}
func (h *UserHandler) UpdateStatus(c *gin.Context) {
func (h *UserHandler) UpdatePlatformAdmin(c *gin.Context) {
id, _ := strconv.ParseUint(c.Param("id"), 10, 64)
var req userStatusReq
var req updatePlatformAdminReq
if err := c.ShouldBindJSON(&req); err != nil {
response.BadRequest(c, "参数错误")
return
}
if err := h.svc.UpdateStatus(uint(id), req.Status); err != nil {
user, err := h.svc.UpdatePlatformAdmin(uint(id), service.UpdatePlatformAdminInput{
Username: req.Username,
Nickname: req.Nickname,
Password: req.Password,
Status: req.Status,
}, middleware.GetUserID(c))
if err != nil {
response.BadRequest(c, err.Error())
return
}
response.OK(c, nil)
response.OK(c, user)
}
type userRoleReq struct {
Role string `json:"role" binding:"required"`
}
func (h *UserHandler) UpdateRole(c *gin.Context) {
func (h *UserHandler) DeletePlatformAdmin(c *gin.Context) {
id, _ := strconv.ParseUint(c.Param("id"), 10, 64)
var req userRoleReq
if err := c.ShouldBindJSON(&req); err != nil {
response.BadRequest(c, "参数错误：角色必填")
return
}
if err := h.svc.UpdateRole(uint(id), req.Role, middleware.GetUserID(c)); err != nil {
response.BadRequest(c, err.Error())
return
}
response.OK(c, nil)
}
func (h *UserHandler) Delete(c *gin.Context) {
id, _ := strconv.ParseUint(c.Param("id"), 10, 64)
if err := h.svc.Delete(uint(id), middleware.GetUserID(c)); err != nil {
if err := h.svc.DeletePlatformAdmin(uint(id), middleware.GetUserID(c)); err != nil {
response.BadRequest(c, err.Error())
return
}