修正了取消订单等操作

api/controller/OrderMember.go

@@ -96,6 +96,19 @@ func (b *OrderMember) GetOrderMember(c *gin.Context) {
 
 // PutCancelOrderMember 取消会员订单
 func (b *OrderMember) PutCancelOrderMember(c *gin.Context) {
+	orderMemberRequest := requests.OrderMemberRequest{}
+	req := orderMemberRequest.CancelOrderMember
+	if err := c.ShouldBind(&req); err != nil {
+		responses.FailWithMessage(err.Error(), c)
+		return
+	}
+
+	// 参数验证
+	if err := global.Validate.Struct(req); err != nil {
+		responses.FailWithMessage(utils.Translate(err), c)
+		return
+	}
+
 	id := c.Param("order_id")
 	if id == "" {
 		responses.FailWithMessage("缺少参数", c)
@@ -127,7 +140,7 @@ func (b *OrderMember) PutCancelOrderMember(c *gin.Context) {
 
 	// 取消单项订单
 	orderMemberService := service.OrderMemberService{}
-	res, err := orderMemberService.CancelOrderMember(tx, orderMember.UserId, orderId, 2)
+	res, err := orderMemberService.CancelOrderMember(tx, orderMember, req.RefundAmount, 2)
 	if err != nil {
 		tx.Rollback()
 		responses.FailWithMessage(err.Error(), c)

api/controller/OrderSingle.go

@@ -68,6 +68,19 @@ func (b *OrderSingle) GetOrderSinglePage(c *gin.Context) {
 
 // PutCancelOrderSingle 取消单项订单
 func (b *OrderSingle) PutCancelOrderSingle(c *gin.Context) {
+	orderSingleRequest := requests.OrderSingleRequest{}
+	req := orderSingleRequest.CancelOrderSingle
+	if err := c.ShouldBind(&req); err != nil {
+		responses.FailWithMessage(err.Error(), c)
+		return
+	}
+
+	// 参数验证
+	if err := global.Validate.Struct(req); err != nil {
+		responses.FailWithMessage(utils.Translate(err), c)
+		return
+	}
+
 	id := c.Param("order_id")
 	if id == "" {
 		responses.FailWithMessage("缺少参数", c)
@@ -83,9 +96,7 @@ func (b *OrderSingle) PutCancelOrderSingle(c *gin.Context) {
 
 	// 获取订单数据
 	orderSingleDao := dao.OrderSingleDao{}
-	maps := make(map[string]interface{})
-	maps["order_id"] = orderId
-	orderSingle, err := orderSingleDao.GetOrderSingle(maps)
+	orderSingle, err := orderSingleDao.GetOrderSingleById(orderId)
 	if err != nil {
 		responses.FailWithMessage("订单异常", c)
 		return
@@ -101,7 +112,7 @@ func (b *OrderSingle) PutCancelOrderSingle(c *gin.Context) {
 
 	// 取消单项订单
 	orderSingleService := service.OrderSingleService{}
-	res, err := orderSingleService.CancelOrderSingle(tx, orderSingle.UserId, orderId, 2)
+	res, err := orderSingleService.CancelOrderSingle(tx, orderSingle, req.RefundAmount, 2)
 	if err != nil {
 		tx.Rollback()
 		responses.FailWithMessage(err.Error(), c)