diff --git a/api/controller/orderInquiry.go b/api/controller/orderInquiry.go index 2053578..d898390 100644 --- a/api/controller/orderInquiry.go +++ b/api/controller/orderInquiry.go @@ -111,24 +111,30 @@ func (r *OrderInquiry) CancelOrderInquiry(c *gin.Context) { return } - req := requests.OrderInquiryRequest{} - if err := c.ShouldBind(&req.CancelOrderInquiry); err != nil { + orderInquiryRequest := requests.OrderInquiryRequest{} + req := orderInquiryRequest.CancelOrderInquiry + if err := c.ShouldBind(&req); err != nil { responses.FailWithMessage(err.Error(), c) return } // 参数验证 - if err := global.Validate.Struct(req.CancelOrderInquiry); err != nil { + if err := global.Validate.Struct(req); err != nil { responses.FailWithMessage(utils.Translate(err), c) return } + if req.RefundAmount == nil { + responses.FailWithMessage("退款金额不可为空", c) + return + } + // 后台用户id adminUserId := c.GetInt64("UserId") // 业务处理 orderInquiryService := service.OrderInquiryService{} - _, err = orderInquiryService.CancelOrderInquiry(req.CancelOrderInquiry, orderInquiryId, adminUserId) + _, err = orderInquiryService.CancelOrderInquiry(req, orderInquiryId, adminUserId) if err != nil { responses.FailWithMessage(err.Error(), c) return diff --git a/api/requests/orderInquiry.go b/api/requests/orderInquiry.go index 8419ded..30c8c95 100644 --- a/api/requests/orderInquiry.go +++ b/api/requests/orderInquiry.go @@ -36,8 +36,8 @@ type GetOrderInquiryPage struct { // CancelOrderInquiry 取消问诊订单 type CancelOrderInquiry struct { - RefundAmount float64 `json:"refund_amount" form:"refund_amount" validate:"required" label:"退款金额"` - CancelRemarks string `json:"cancel_remarks" form:"cancel_remarks" validate:"required" label:"取消订单备注"` + RefundAmount *float64 `json:"refund_amount" form:"refund_amount" label:"退款金额"` + CancelRemarks string `json:"cancel_remarks" form:"cancel_remarks" validate:"required" label:"取消订单备注"` } // GetOrderInquiryRecordPage 获取问诊记录列表-分页