完善订单兜底处理

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"`
 }