diff --git a/README.md b/README.md index 9e03a55..b29f6ac 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ ## TODO -手动充值备注 关闭支付弹窗 -兜底手动操作 后台限制 ip - edge.area_id 可为空,代表节点无固定地区 diff --git a/web/handlers/trade.go b/web/handlers/trade.go index 3aba1d9..f59df8d 100644 --- a/web/handlers/trade.go +++ b/web/handlers/trade.go @@ -351,6 +351,24 @@ func TradeCancel(c *fiber.Ctx) error { return c.SendStatus(fiber.StatusNoContent) } +// 管理员取消订单 +func TradeCancelByAdmin(c *fiber.Ctx) error { + // 解析请求参数 + req := new(s.TradeRef) + if err := g.Validator.ParseBody(c, req); err != nil { + return err + } + + // 取消交易 + err := s.Trade.CancelTrade(req) + if err != nil && err != s.ErrTradeStatusIgnored { + slog.Error("取消交易失败", "trade_no", req.TradeNo, "error", err) + return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{"error": "取消交易失败"}) + } + + return c.SendStatus(fiber.StatusNoContent) +} + // ============================================================ // 结束订单:完成或取消订单 diff --git a/web/handlers/user.go b/web/handlers/user.go index f7beea8..8343a48 100644 --- a/web/handlers/user.go +++ b/web/handlers/user.go @@ -234,38 +234,6 @@ func RemoveUserByAdmin(c *fiber.Ctx) error { return c.JSON(nil) } -// 管理员更新用户余额 -func UpdateUserBalanceByAdmin(c *fiber.Ctx) error { - authCtx, err := auth.GetAuthCtx(c).PermitAdmin(core.ScopeUserWriteBalance) - if err != nil { - return err - } - - var req UpdateUserBalanceByAdminData - if err := g.Validator.ParseBody(c, &req); err != nil { - return err - } - - user, err := s.User.Get(q.Q, req.UserID) - if err != nil { - return err - } - balance, err := decimal.NewFromString(req.Balance) - if err != nil { - return err - } - if err := s.User.UpdateBalanceByAdmin(user, balance, &authCtx.Admin.ID); err != nil { - return err - } - - return c.JSON(nil) -} - -type UpdateUserBalanceByAdminData struct { - UserID int32 `json:"user_id" validate:"required"` - Balance string `json:"balance" validate:"required"` -} - // 绑定管理员 func BindAdmin(c *fiber.Ctx) error { // 检查权限 @@ -514,7 +482,7 @@ func UpdateUserBalanceIncByAdmin(c *fiber.Ctx) error { } newBalance := user.Balance.Add(amount) - if err := s.User.UpdateBalanceByAdmin(user, newBalance, &authCtx.Admin.ID); err != nil { + if err := s.User.UpdateBalanceByAdmin(user, newBalance, req.Remark, &authCtx.Admin.ID); err != nil { return err } @@ -547,7 +515,7 @@ func UpdateUserBalanceDecByAdmin(c *fiber.Ctx) error { } newBalance := user.Balance.Sub(amount) - if err := s.User.UpdateBalanceByAdmin(user, newBalance, &authCtx.Admin.ID); err != nil { + if err := s.User.UpdateBalanceByAdmin(user, newBalance, req.Remark, &authCtx.Admin.ID); err != nil { return err } @@ -557,4 +525,5 @@ func UpdateUserBalanceDecByAdmin(c *fiber.Ctx) error { type UpdateUserBalanceChangeByAdminData struct { UserID int32 `json:"user_id" validate:"required"` Amount string `json:"amount" validate:"required"` + Remark string `json:"remark" validate:"required"` } diff --git a/web/routes.go b/web/routes.go index f8a4776..c1bb9d3 100644 --- a/web/routes.go +++ b/web/routes.go @@ -199,7 +199,6 @@ func adminRouter(api fiber.Router) { user.Post("/remove", handlers.RemoveUserByAdmin) user.Post("/update/bind", handlers.BindAdmin) - user.Post("/update/balance", handlers.UpdateUserBalanceByAdmin) user.Post("/update/balance-inc", handlers.UpdateUserBalanceIncByAdmin) user.Post("/update/balance-dec", handlers.UpdateUserBalanceDecByAdmin) @@ -239,6 +238,7 @@ func adminRouter(api fiber.Router) { trade.Post("/page/of-user", handlers.PageTradeOfUserByAdmin) trade.Post("/complete", handlers.TradeCompleteByAdmin) trade.Post("/convert", handlers.TradeConvertByAdmin) + trade.Post("/cancel", handlers.TradeCancelByAdmin) trade.Post("/update/remark", handlers.TradeUpdateRemarkByAdmin) trade.Post("/check", handlers.TradeCheck) diff --git a/web/services/user.go b/web/services/user.go index ee925b5..94b645b 100644 --- a/web/services/user.go +++ b/web/services/user.go @@ -28,7 +28,7 @@ func (s *userService) Get(q *q.Query, uid int32) (*m.User, error) { return user, nil } -func (s *userService) UpdateBalanceByAdmin(user *m.User, newBalance decimal.Decimal, adminId *int32) error { +func (s *userService) UpdateBalanceByAdmin(user *m.User, newBalance decimal.Decimal, remark string, adminId *int32) error { if user == nil { return core.NewServErr("用户不存在") } @@ -39,14 +39,14 @@ func (s *userService) UpdateBalanceByAdmin(user *m.User, newBalance decimal.Deci } return q.Q.Transaction(func(q *q.Query) error { - return s.UpdateBalance(q, user, amount, "管理员修改余额", adminId, nil) + return s.UpdateBalance(q, user, amount, remark, adminId, nil) }) } func (s *userService) UpdateBalance(q *q.Query, user *m.User, amount decimal.Decimal, remark string, adminId *int32, billId *int32) error { balance := user.Balance.Add(amount) if balance.IsNegative() { - return core.NewServErr("用户余额不足") + return core.NewBizErr("用户余额不足") } // 更新余额