From 931d2def985c6d591eadf950125fab4a8e649a24 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Tue, 21 May 2024 10:01:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9A=84=E9=80=80=E6=AC=BE=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E5=85=A5=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/controller/orderInquiry.go | 14 ++++++++++----
 api/requests/orderInquiry.go   |  4 ++--
 2 files changed, 12 insertions(+), 6 deletions(-)

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 获取问诊记录列表-分页