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

feat: 提现优化 — 取消状态 + 收款方式 + TableName 修复 (HIF-42)

Browse Source 
- P04: 修复 Withdrawal.TableName() 返回正确表名 withdrawals
- P03: 新增提现状态常量 (constant/withdrawal.go)，消除魔法数字 0/1/2/3；
       新增 CommissionTypeWithdrawCancel (338) 和 WithdrawalCancelForbidden 错误码
- P02: 迁移 02123 为 withdrawals 表添加 method/account/qr_code_url 列；
       扩展 Withdrawal GORM 模型和 API 类型（CommissionWithdrawRequest、WithdrawalLog）；
       申请提现时增加收款方式校验逻辑
- P01: 新增用户取消提现接口 POST /v1/public/user/withdrawal_cancel；
       仅可取消自己的待审核提现，退还佣金并写佣金日志
- P05: 管理端提现列表新增 method 过滤参数

Co-authored-by: multica-agent <github@multica.ai>
This commit is contained in:
shanshanzhong
2026-05-25 20:39:45 -07:00
parent fd522b6c71
commit 2be25df7d2
18 changed files with 194 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/handler/public/user/cancelWithdrawalHandler.go
+25
View File
@@ -0,0 +1,25 @@
package user
import (
"github.com/gin-gonic/gin"
"github.com/perfect-panel/server/internal/logic/public/user"
"github.com/perfect-panel/server/internal/svc"
"github.com/perfect-panel/server/internal/types"
"github.com/perfect-panel/server/pkg/result"
)
func CancelWithdrawalHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
return func(c *gin.Context) {
var req types.CancelWithdrawalRequest
_ = c.ShouldBind(&req)
validateErr := svcCtx.Validate(&req)
if validateErr != nil {
result.ParamErrorResult(c, validateErr)
return
}
l := user.NewCancelWithdrawalLogic(c.Request.Context(), svcCtx)
err := l.CancelWithdrawal(&req)
result.HttpResult(c, nil, err)
}
}
internal/handler/routes.go
+3
View File
@@ -1126,6 +1126,9 @@ func RegisterHandlers(router *gin.Engine, serverCtx *svc.ServiceContext) {
// Query Withdrawal Log
publicUserGroupRouter.GET("/withdrawal_log", publicUser.QueryWithdrawalLogHandler(serverCtx))
// Cancel Withdrawal
publicUserGroupRouter.POST("/withdrawal_cancel", publicUser.CancelWithdrawalHandler(serverCtx))
}
publicUserWsGroupRouter := router.Group("/v1/public/user")
internal/logic/admin/user/getWithdrawalListLogic.go
+6
View File
@@ -42,6 +42,9 @@ func (l *GetWithdrawalListLogic) GetWithdrawalList(req *types.GetWithdrawalListR
if req.Status != nil {
query = query.Where("status = ?", *req.Status)
}
if req.Method != nil {
query = query.Where("method = ?", *req.Method)
}
var total int64
if err := query.Count(&total).Error; err != nil {
@@ -59,6 +62,9 @@ func (l *GetWithdrawalListLogic) GetWithdrawalList(req *types.GetWithdrawalListR
Id: row.Id,
UserId: row.UserId,
Amount: row.Amount,
Method: row.Method,
Account: row.Account,
QrCodeUrl: row.QrCodeUrl,
Content: row.Content,
Status: row.Status,
Reason: row.Reason,
internal/logic/admin/user/withdrawalCommon.go
+5 -4
View File
@@ -8,6 +8,7 @@ import (
"github.com/perfect-panel/server/internal/model/log"
usermodel "github.com/perfect-panel/server/internal/model/user"
"github.com/perfect-panel/server/internal/svc"
"github.com/perfect-panel/server/pkg/constant"
"github.com/perfect-panel/server/pkg/logger"
"github.com/perfect-panel/server/pkg/xerr"
"github.com/pkg/errors"
@@ -25,9 +26,9 @@ func approveWithdrawal(ctx context.Context, svcCtx *svc.ServiceContext, withdraw
}
if err := tx.Model(&usermodel.Withdrawal{}).
Where("id = ? AND status = 0", withdrawalID).
Where("id = ? AND status = ?", withdrawalID, constant.WithdrawalStatusPending).
Updates(map[string]interface{}{
"status": 1,
"status": constant.WithdrawalStatusApproved,
"reason": "",
}).Error; err != nil {
return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "approve withdrawal failed: %v", err)
@@ -52,9 +53,9 @@ func rejectWithdrawal(ctx context.Context, svcCtx *svc.ServiceContext, withdrawa
}
if err := tx.Model(&usermodel.Withdrawal{}).
Where("id = ? AND status = 0", withdrawalID).
Where("id = ? AND status = ?", withdrawalID, constant.WithdrawalStatusPending).
Updates(map[string]interface{}{
"status": 2,
"status": constant.WithdrawalStatusRejected,
"reason": reason,
}).Error; err != nil {
return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "reject withdrawal failed: %v", err)
internal/logic/common/withdrawal.go
+2 -1
View File
@@ -6,6 +6,7 @@ import (
"github.com/perfect-panel/server/internal/model/log"
usermodel "github.com/perfect-panel/server/internal/model/user"
"github.com/perfect-panel/server/pkg/constant"
"github.com/pkg/errors"
"gorm.io/gorm"
"gorm.io/gorm/clause"
@@ -41,7 +42,7 @@ func LoadPendingWithdrawalForUpdate(ctx context.Context, tx *gorm.DB, withdrawal
First(&withdrawal).Error; err != nil {
return nil, err
}
if withdrawal.Status != 0 {
if withdrawal.Status != constant.WithdrawalStatusPending {
return nil, errors.New("withdrawal status invalid")
}
return &withdrawal, nil
internal/logic/public/user/cancelWithdrawalLogic.go
+68
View File
@@ -0,0 +1,68 @@
package user
import (
"context"
logicCommon "github.com/perfect-panel/server/internal/logic/common"
"github.com/perfect-panel/server/internal/model/log"
usermodel "github.com/perfect-panel/server/internal/model/user"
"github.com/perfect-panel/server/internal/svc"
"github.com/perfect-panel/server/internal/types"
"github.com/perfect-panel/server/pkg/constant"
"github.com/perfect-panel/server/pkg/logger"
"github.com/perfect-panel/server/pkg/xerr"
"github.com/pkg/errors"
"gorm.io/gorm"
)
type CancelWithdrawalLogic struct {
logger.Logger
ctx context.Context
svcCtx *svc.ServiceContext
}
func NewCancelWithdrawalLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CancelWithdrawalLogic {
return &CancelWithdrawalLogic{
Logger: logger.WithContext(ctx),
ctx: ctx,
svcCtx: svcCtx,
}
}
func (l *CancelWithdrawalLogic) CancelWithdrawal(req *types.CancelWithdrawalRequest) error {
u, ok := l.ctx.Value(constant.CtxKeyUser).(*usermodel.User)
if !ok {
l.Error("current user is not found in context")
return errors.Wrapf(xerr.NewErrCode(xerr.InvalidAccess), "Invalid Access")
}
return l.svcCtx.DB.WithContext(l.ctx).Transaction(func(tx *gorm.DB) error {
withdrawal, err := logicCommon.LoadPendingWithdrawalForUpdate(l.ctx, tx, req.WithdrawalId)
if err != nil {
if err.Error() == "withdrawal status invalid" {
return errors.Wrapf(xerr.NewErrCode(xerr.WithdrawalStatusInvalid), "withdrawal %d already processed", req.WithdrawalId)
}
return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "load withdrawal failed: %v", err)
}
if withdrawal.UserId != u.Id {
return errors.Wrapf(xerr.NewErrCode(xerr.WithdrawalCancelForbidden), "cannot cancel other user's withdrawal %d", req.WithdrawalId)
}
if err := tx.Model(&usermodel.Withdrawal{}).
Where("id = ? AND status = ?", req.WithdrawalId, constant.WithdrawalStatusPending).
Updates(map[string]interface{}{"status": constant.WithdrawalStatusCancelled}).Error; err != nil {
return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "cancel withdrawal failed: %v", err)
}
if err := l.svcCtx.UserModel.UpdateCommission(l.ctx, u.Id, withdrawal.Amount, tx); err != nil {
return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "refund commission failed: %v", err)
}
if err := logicCommon.WriteCommissionLog(tx, u.Id, log.CommissionTypeWithdrawCancel, withdrawal.Amount, ""); err != nil {
return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "write commission log failed: %v", err)
}
return nil
})
}
internal/logic/public/user/commissionWithdrawLogic.go
+28 -6
View File
@@ -2,6 +2,7 @@ package user
import (
"context"
"strings"
"time"
logicCommon "github.com/perfect-panel/server/internal/logic/common"
@@ -38,6 +39,21 @@ func (l *CommissionWithdrawLogic) CommissionWithdraw(req *types.CommissionWithdr
return nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidAccess), "Invalid Access")
}
switch req.Method {
case 1, 2: // Alipay, WeChat
if strings.TrimSpace(req.QrCodeUrl) == "" {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "qr_code_url is required for method %d", req.Method)
}
case 3: // Bank
if strings.TrimSpace(req.Account) == "" {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "account is required for bank transfer")
}
default: // Other
if strings.TrimSpace(req.Account) == "" && strings.TrimSpace(req.Content) == "" {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "account or content is required")
}
}
if u.Commission < req.Amount {
logger.Errorf("User %d has insufficient commission balance: %.2f, requested: %.2f", u.Id, float64(u.Commission)/100, float64(req.Amount)/100)
return nil, errors.Wrapf(xerr.NewErrCode(xerr.UserCommissionNotEnough), "User %d has insufficient commission balance", u.Id)
@@ -65,11 +81,14 @@ func (l *CommissionWithdrawLogic) CommissionWithdraw(req *types.CommissionWithdr
}
err = tx.Model(&user.Withdrawal{}).Create(&user.Withdrawal{
UserId: u.Id,
Amount: req.Amount,
Content: req.Content,
Status: 0,
Reason: "",
UserId: u.Id,
Amount: req.Amount,
Method: req.Method,
Account: req.Account,
QrCodeUrl: req.QrCodeUrl,
Content: req.Content,
Status: constant.WithdrawalStatusPending,
Reason: "",
}).Error
if err != nil {
@@ -85,8 +104,11 @@ func (l *CommissionWithdrawLogic) CommissionWithdraw(req *types.CommissionWithdr
return &types.WithdrawalLog{
UserId: u.Id,
Amount: req.Amount,
Method: req.Method,
Account: req.Account,
QrCodeUrl: req.QrCodeUrl,
Content: req.Content,
Status: 0,
Status: constant.WithdrawalStatusPending,
Reason: "",
CreatedAt: now.UnixMilli(),
UpdatedAt: now.UnixMilli(),
internal/logic/public/user/queryWithdrawalLogLogic.go
+3
View File
@@ -61,6 +61,9 @@ func (l *QueryWithdrawalLogLogic) QueryWithdrawalLog(req *types.QueryWithdrawalL
Id: row.Id,
UserId: row.UserId,
Amount: row.Amount,
Method: row.Method,
Account: row.Account,
QrCodeUrl: row.QrCodeUrl,
Content: row.Content,
Status: row.Status,
Reason: row.Reason,
internal/model/log/log.go
+2 -1
View File
@@ -49,7 +49,8 @@ const (
CommissionTypeWithdraw uint16 = 334 // withdraw
CommissionTypeAdjust uint16 = 335 // Admin Adjust
CommissionTypeConvertBalance uint16 = 336 // Convert to Balance
CommissionTypeWithdrawReject uint16 = 337 // Withdraw rejected refund
CommissionTypeWithdrawReject uint16 = 337 // Withdraw rejected refund
CommissionTypeWithdrawCancel uint16 = 338 // Withdraw cancelled refund
GiftTypeIncrease uint16 = 341 // Increase
GiftTypeReduce uint16 = 342 // Reduce
)
internal/model/user/user.go
+5 -2
View File
@@ -167,12 +167,15 @@ type Withdrawal struct {
UserId int64 `gorm:"index:idx_user_id;not null;comment:User ID"`
Amount int64 `gorm:"not null;comment:Withdrawal Amount"`
Content string `gorm:"type:text;comment:Withdrawal Content"`
Status uint8 `gorm:"type:tinyint(1);default:0;comment:Withdrawal Status: 0: Pending 1: Approved 2: Rejected"`
Method uint8 `gorm:"type:tinyint(1);default:0;comment:Payment Method: 0:Other 1:Alipay 2:WeChat 3:Bank"`
Account string `gorm:"type:varchar(255);default:'';comment:Payment Account"`
QrCodeUrl string `gorm:"type:varchar(500);default:'';comment:QR Code Image URL"`
Status uint8 `gorm:"type:tinyint(1);default:0;comment:Withdrawal Status: 0: Pending 1: Approved 2: Rejected 3: Cancelled"`
Reason string `gorm:"type:varchar(500);default:'';comment:Rejection Reason"`
CreatedAt time.Time `gorm:"<-:create;comment:Creation Time"`
UpdatedAt time.Time `gorm:"comment:Update Time"`
}
func (*Withdrawal) TableName() string {
return "user_withdrawal"
return "withdrawals"
}
internal/types/types.go
+13 -2
View File
@@ -289,8 +289,11 @@ type CommissionLog struct {
}
type CommissionWithdrawRequest struct {
Amount int64 `json:"amount"`
Content string `json:"content"`
Amount int64 `json:"amount"`
Method uint8 `json:"method"`
Account string `json:"account"`
QrCodeUrl string `json:"qr_code_url"`
Content string `json:"content"`
}
type ConnectionRecords struct {
@@ -2284,11 +2287,16 @@ type QueryWithdrawalLogListResponse struct {
Total int64 `json:"total"`
}
type CancelWithdrawalRequest struct {
WithdrawalId int64 `json:"withdrawal_id" validate:"required,gt=0"`
}
type GetWithdrawalListRequest struct {
Page int `form:"page"`
Size int `form:"size"`
UserId *int64 `form:"user_id,omitempty"`
Status *uint8 `form:"status,omitempty"`
Method *uint8 `form:"method,omitempty"`
}
type GetWithdrawalListResponse struct {
@@ -3604,6 +3612,9 @@ type WithdrawalLog struct {
Id int64 `json:"id"`
UserId int64 `json:"user_id"`
Amount int64 `json:"amount"`
Method uint8 `json:"method"`
Account string `json:"account"`
QrCodeUrl string `json:"qr_code_url"`
Content string `json:"content"`
Status uint8 `json:"status"`
Reason string `json:"reason,omitempty"`