修正了取消订单等操作

api/amqp/consumer/CancelUnPayOrder.go

@@ -3,6 +3,7 @@ package consumer
 import (
 	"encoding/json"
 	"github.com/rabbitmq/amqp091-go"
+	"hepa-calc-api/api/dao"
 	"hepa-calc-api/api/service"
 	"hepa-calc-api/extend/weChat"
 	"hepa-calc-api/global"
@@ -66,8 +67,21 @@ func CancelUnPayOrder(msg amqp091.Delivery) {
 
 	// 单项订单
 	if data.OrderType == 1 {
+		// 获取订单数据
+		orderSingleDao := dao.OrderSingleDao{}
+		maps := make(map[string]interface{})
+		maps["user_id"] = userId
+		maps["order_id"] = orderId
+		orderSingle, err := orderSingleDao.GetOrderSingle(maps)
+		if err != nil {
+			tx.Rollback()
+			utils.LogJsonErr("consumer.CouponExpire:", "订单异常")
+			_ = msg.Reject(true)
+			return
+		}
+
 		orderSingleService := service.OrderSingleService{}
-		res, err := orderSingleService.CancelOrderSingle(tx, userId, orderId, 3)
+		res, err := orderSingleService.CancelOrderSingle(tx, orderSingle, 3)
 		if err != nil {
 			tx.Rollback()
 			utils.LogJsonErr("consumer.CouponExpire:", err)