fix(fin): 提现拒绝补 remark 必填校验 FIN-02
- CommissionWithdrawalHandler 新增 validator 字段 - RejectWithdrawal 在 BodyParser 后补充 validator.Struct 参数验证,确保 remark 必填
This commit is contained in:
@@ -58,7 +58,7 @@ func initHandlers(svc *services, deps *Dependencies) *Handlers {
|
|||||||
ShopRole: admin.NewShopRoleHandler(svc.Shop),
|
ShopRole: admin.NewShopRoleHandler(svc.Shop),
|
||||||
AdminAuth: admin.NewAuthHandler(svc.Auth, validate),
|
AdminAuth: admin.NewAuthHandler(svc.Auth, validate),
|
||||||
ShopCommission: admin.NewShopCommissionHandler(svc.ShopCommission),
|
ShopCommission: admin.NewShopCommissionHandler(svc.ShopCommission),
|
||||||
CommissionWithdrawal: admin.NewCommissionWithdrawalHandler(svc.CommissionWithdrawal),
|
CommissionWithdrawal: admin.NewCommissionWithdrawalHandler(svc.CommissionWithdrawal, validate),
|
||||||
CommissionWithdrawalSetting: admin.NewCommissionWithdrawalSettingHandler(svc.CommissionWithdrawalSetting),
|
CommissionWithdrawalSetting: admin.NewCommissionWithdrawalSettingHandler(svc.CommissionWithdrawalSetting),
|
||||||
Enterprise: admin.NewEnterpriseHandler(svc.Enterprise),
|
Enterprise: admin.NewEnterpriseHandler(svc.Enterprise),
|
||||||
EnterpriseCard: admin.NewEnterpriseCardHandler(svc.EnterpriseCard),
|
EnterpriseCard: admin.NewEnterpriseCardHandler(svc.EnterpriseCard),
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package admin
|
|||||||
import (
|
import (
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
|
"github.com/go-playground/validator/v10"
|
||||||
"github.com/gofiber/fiber/v2"
|
"github.com/gofiber/fiber/v2"
|
||||||
|
|
||||||
"github.com/break/junhong_cmp_fiber/internal/model/dto"
|
"github.com/break/junhong_cmp_fiber/internal/model/dto"
|
||||||
@@ -11,12 +12,15 @@ import (
|
|||||||
"github.com/break/junhong_cmp_fiber/pkg/response"
|
"github.com/break/junhong_cmp_fiber/pkg/response"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// CommissionWithdrawalHandler 提现申请管理处理器
|
||||||
type CommissionWithdrawalHandler struct {
|
type CommissionWithdrawalHandler struct {
|
||||||
service *commissionWithdrawalService.Service
|
service *commissionWithdrawalService.Service
|
||||||
|
validator *validator.Validate
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewCommissionWithdrawalHandler(service *commissionWithdrawalService.Service) *CommissionWithdrawalHandler {
|
// NewCommissionWithdrawalHandler 创建提现申请管理处理器
|
||||||
return &CommissionWithdrawalHandler{service: service}
|
func NewCommissionWithdrawalHandler(service *commissionWithdrawalService.Service, validator *validator.Validate) *CommissionWithdrawalHandler {
|
||||||
|
return &CommissionWithdrawalHandler{service: service, validator: validator}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *CommissionWithdrawalHandler) ListWithdrawalRequests(c *fiber.Ctx) error {
|
func (h *CommissionWithdrawalHandler) ListWithdrawalRequests(c *fiber.Ctx) error {
|
||||||
@@ -62,6 +66,9 @@ func (h *CommissionWithdrawalHandler) RejectWithdrawal(c *fiber.Ctx) error {
|
|||||||
if err := c.BodyParser(&req); err != nil {
|
if err := c.BodyParser(&req); err != nil {
|
||||||
return errors.New(errors.CodeInvalidParam, "请求参数解析失败")
|
return errors.New(errors.CodeInvalidParam, "请求参数解析失败")
|
||||||
}
|
}
|
||||||
|
if err := h.validator.Struct(&req); err != nil {
|
||||||
|
return errors.New(errors.CodeInvalidParam)
|
||||||
|
}
|
||||||
|
|
||||||
result, err := h.service.Reject(c.UserContext(), uint(id), &req)
|
result, err := h.service.Reject(c.UserContext(), uint(id), &req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
Reference in New Issue
Block a user