S-VPN/server
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(ticket): 添加issue_type字段支持工单分类

Browse Source 
在工单系统中新增issue_type字段用于区分工单类型（0-普通工单，1-提现工单）
修改相关API、模型和逻辑以支持该字段的创建、查询和筛选
This commit is contained in:
shanshanzhong 2025-09-15 01:42:44 -07:00
parent 2d4bfe0330
commit ac3bbaf7bf
8 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apis/admin/ticket.api
View File

@ -16,11 +16,12 @@ type (
Status *uint8 `json:"status" validate:"required"` Status *uint8 `json:"status" validate:"required"`
} }
GetTicketListRequest { GetTicketListRequest {
Page int64 `form:"page"` Page int64 `form:"page"`
Size int64 `form:"size"` Size int64 `form:"size"`
UserId int64 `form:"user_id,omitempty"` UserId int64 `form:"user_id,omitempty"`
Status *uint8 `form:"status,omitempty"` Status *uint8 `form:"status,omitempty"`
Search string `form:"search,omitempty"` IssueType *uint8 `form:"issue_type,omitempty"`
Search string `form:"search,omitempty"`
} }
GetTicketListResponse { GetTicketListResponse {
Total int64 `json:"total"` Total int64 `json:"total"`

10
apis/public/ticket.api
View File

@ -18,12 +18,14 @@ type (
CreateUserTicketRequest { CreateUserTicketRequest {
Title string `json:"title"` Title string `json:"title"`
Description string `json:"description"` Description string `json:"description"`
IssueType uint8 `json:"issue_type"`
} }
GetUserTicketListRequest { GetUserTicketListRequest {
Page int `form:"page"` Page int `form:"page"`
Size int `form:"size"` Size int `form:"size"`
Status *uint8 `form:"status,omitempty"` Status *uint8 `form:"status,omitempty"`
Search string `form:"search,omitempty"` IssueType *uint8 `form:"issue_type,omitempty"`
Search string `form:"search,omitempty"`
} }
GetUserTicketDetailRequest { GetUserTicketDetailRequest {
Id int64 `form:"id" validate:"required"` Id int64 `form:"id" validate:"required"`

2
internal/logic/admin/ticket/getTicketListLogic.go
View File

@ -27,7 +27,7 @@ func NewGetTicketListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Get
} }
func (l *GetTicketListLogic) GetTicketList(req *types.GetTicketListRequest) (resp *types.GetTicketListResponse, err error) { func (l *GetTicketListLogic) GetTicketList(req *types.GetTicketListRequest) (resp *types.GetTicketListResponse, err error) {
total, list, err := l.svcCtx.TicketModel.QueryTicketList(l.ctx, int(req.Page), int(req.Size), req.UserId, req.Status, req.Search) total, list, err := l.svcCtx.TicketModel.QueryTicketList(l.ctx, int(req.Page), int(req.Size), req.UserId, req.Status, req.IssueType, req.Search)
if err != nil { if err != nil {
l.Errorw("[GetTicketList] Query Database Error: ", logger.Field("error", err.Error())) l.Errorw("[GetTicketList] Query Database Error: ", logger.Field("error", err.Error()))
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "QueryTicketList error: %v", err) return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "QueryTicketList error: %v", err)

1
internal/logic/public/ticket/createUserTicketLogic.go
View File

@ -41,6 +41,7 @@ func (l *CreateUserTicketLogic) CreateUserTicket(req *types.CreateUserTicketRequ
Description: req.Description, Description: req.Description,
UserId: u.Id, UserId: u.Id,
Status: ticket.Pending, Status: ticket.Pending,
IssueType: req.IssueType,
}) })
if err != nil { if err != nil {
return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "insert ticket error: %v", err.Error()) return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "insert ticket error: %v", err.Error())

2
internal/logic/public/ticket/getUserTicketListLogic.go
View File

@ -36,7 +36,7 @@ func (l *GetUserTicketListLogic) GetUserTicketList(req *types.GetUserTicketListR
return nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidAccess), "Invalid Access") return nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidAccess), "Invalid Access")
} }
l.Logger.Debugf("Current user: %v", u.Id) l.Logger.Debugf("Current user: %v", u.Id)
total, list, err := l.svcCtx.TicketModel.QueryTicketList(l.ctx, req.Page, req.Size, u.Id, req.Status, req.Search) total, list, err := l.svcCtx.TicketModel.QueryTicketList(l.ctx, req.Page, req.Size, u.Id, req.Status, req.IssueType, req.Search)
if err != nil { if err != nil {
l.Errorw("[GetUserTicketListLogic] Database Error", logger.Field("error", err.Error())) l.Errorw("[GetUserTicketListLogic] Database Error", logger.Field("error", err.Error()))
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "QueryTicketList error: %v", err) return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "QueryTicketList error: %v", err)

8
internal/model/ticket/model.go
View File

@ -17,6 +17,7 @@ type Details struct {
Description string `gorm:"type:text;comment:Description"` Description string `gorm:"type:text;comment:Description"`
UserId int64 `gorm:"type:bigint;not null;default:0;comment:UserId"` UserId int64 `gorm:"type:bigint;not null;default:0;comment:UserId"`
Status uint8 `gorm:"type:tinyint(1);not null;default:1;comment:Status"` Status uint8 `gorm:"type:tinyint(1);not null;default:1;comment:Status"`
IssueType uint8 `gorm:"type:tinyint(1);not null;default:0;comment:Issue Type: 0 ticket, 1 withdraw"`
Follows []Follow `gorm:"foreignKey:TicketId;references:Id"` Follows []Follow `gorm:"foreignKey:TicketId;references:Id"`
CreatedAt time.Time `gorm:"<-:create;comment:Create Time"` CreatedAt time.Time `gorm:"<-:create;comment:Create Time"`
UpdatedAt time.Time `gorm:"comment:Update Time"` UpdatedAt time.Time `gorm:"comment:Update Time"`
@ -24,7 +25,7 @@ type Details struct {
type customTicketLogicModel interface { type customTicketLogicModel interface {
QueryTicketDetail(ctx context.Context, id int64) (*Details, error) QueryTicketDetail(ctx context.Context, id int64) (*Details, error)
InsertTicketFollow(ctx context.Context, data *Follow) error InsertTicketFollow(ctx context.Context, data *Follow) error
QueryTicketList(ctx context.Context, page, size int, userId int64, status *uint8, search string) (int64, []*Ticket, error) QueryTicketList(ctx context.Context, page, size int, userId int64, status *uint8, issueType *uint8, search string) (int64, []*Ticket, error)
UpdateTicketStatus(ctx context.Context, id, userId int64, status uint8) error UpdateTicketStatus(ctx context.Context, id, userId int64, status uint8) error
QueryWaitReplyTotal(ctx context.Context) (int64, error) QueryWaitReplyTotal(ctx context.Context) (int64, error)
} }
@ -55,7 +56,7 @@ func (m *customTicketModel) InsertTicketFollow(ctx context.Context, data *Follow
} }
// QueryTicketList returns the ticket list. // QueryTicketList returns the ticket list.
func (m *customTicketModel) QueryTicketList(ctx context.Context, page, size int, userId int64, status *uint8, search string) (int64, []*Ticket, error) { func (m *customTicketModel) QueryTicketList(ctx context.Context, page, size int, userId int64, status *uint8, issueType *uint8, search string) (int64, []*Ticket, error) {
var data []*Ticket var data []*Ticket
var total int64 var total int64
err := m.QueryNoCacheCtx(ctx, &data, func(conn *gorm.DB, v interface{}) error { err := m.QueryNoCacheCtx(ctx, &data, func(conn *gorm.DB, v interface{}) error {
@ -68,6 +69,9 @@ func (m *customTicketModel) QueryTicketList(ctx context.Context, page, size int,
} else { } else {
query = query.Where("status != ?", 4) query = query.Where("status != ?", 4)
} }
if issueType != nil {
query = query.Where("issue_type = ?", issueType)
}
if search != "" { if search != "" {
query = query.Where("title like ? or description like ?", "%"+search+"%", "%"+search+"%") query = query.Where("title like ? or description like ?", "%"+search+"%", "%"+search+"%")
} }

3
internal/model/ticket/ticket.go
View File

@ -12,9 +12,10 @@ const (
type Ticket struct { type Ticket struct {
Id int64 `gorm:"primaryKey"` Id int64 `gorm:"primaryKey"`
Title string `gorm:"type:varchar(255);not null;default:'';comment:Title"` Title string `gorm:"type:varchar(255);not null;default:'';comment:Title"`
Description string `gorm:"type:text;comment:Description"` Description string `gorm:"type:longtext;comment:Description"`
UserId int64 `gorm:"type:bigint;not null;default:0;comment:UserId"` UserId int64 `gorm:"type:bigint;not null;default:0;comment:UserId"`
Status uint8 `gorm:"type:tinyint(1);not null;default:1;comment:Status"` Status uint8 `gorm:"type:tinyint(1);not null;default:1;comment:Status"`
IssueType uint8 `gorm:"type:tinyint(1);not null;default:0;comment:Issue Type: 0 ticket, 1 withdraw"`
CreatedAt time.Time `gorm:"<-:create;comment:Create Time"` CreatedAt time.Time `gorm:"<-:create;comment:Create Time"`
UpdatedAt time.Time `gorm:"comment:Update Time"` UpdatedAt time.Time `gorm:"comment:Update Time"`
} }

22
internal/types/types.go
View File

@ -529,6 +529,7 @@ type CreateUserTicketFollowRequest struct {
type CreateUserTicketRequest struct { type CreateUserTicketRequest struct {
Title string `json:"title"` Title string `json:"title"`
Description string `json:"description"` Description string `json:"description"`
IssueType uint8 `json:"issue_type"`
} }
type Currency struct { type Currency struct {
@ -905,11 +906,12 @@ type GetSubscriptionResponse struct {
} }
type GetTicketListRequest struct { type GetTicketListRequest struct {
Page int64 `form:"page"` Page int64 `form:"page"`
Size int64 `form:"size"` Size int64 `form:"size"`
UserId int64 `form:"user_id,omitempty"` UserId int64 `form:"user_id,omitempty"`
Status *uint8 `form:"status,omitempty"` Status *uint8 `form:"status,omitempty"`
Search string `form:"search,omitempty"` IssueType *uint8 `form:"issue_type,omitempty"`
Search string `form:"search,omitempty"`
} }
type GetTicketListResponse struct { type GetTicketListResponse struct {
@ -1021,10 +1023,11 @@ type GetUserTicketDetailRequest struct {
} }
type GetUserTicketListRequest struct { type GetUserTicketListRequest struct {
Page int `form:"page"` Page int `form:"page"`
Size int `form:"size"` Size int `form:"size"`
Status *uint8 `form:"status,omitempty"` Status *uint8 `form:"status,omitempty"`
Search string `form:"search,omitempty"` IssueType *uint8 `form:"issue_type,omitempty"`
Search string `form:"search,omitempty"`
} }
type GetUserTicketListResponse struct { type GetUserTicketListResponse struct {
@ -1769,6 +1772,7 @@ type Ticket struct {
UserId int64 `json:"user_id"` UserId int64 `json:"user_id"`
Follows []Follow `json:"follow,omitempty"` Follows []Follow `json:"follow,omitempty"`
Status uint8 `json:"status"` Status uint8 `json:"status"`
IssueType uint8 `json:"issue_type"`
CreatedAt int64 `json:"created_at"` CreatedAt int64 `json:"created_at"`
UpdatedAt int64 `json:"updated_at"` UpdatedAt int64 `json:"updated_at"`
} }