From 220aea3530489b20f246ddc135443a583a792f65 Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Wed, 8 Mar 2023 12:01:59 +0800
Subject: [PATCH] 1

---
 app/Amqp/Consumer/AssignDoctorConsumer.php | 24 ++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/Amqp/Consumer/AssignDoctorConsumer.php b/app/Amqp/Consumer/AssignDoctorConsumer.php
index cb8c800..7f44024 100644
--- a/app/Amqp/Consumer/AssignDoctorConsumer.php
+++ b/app/Amqp/Consumer/AssignDoctorConsumer.php
@@ -93,17 +93,25 @@ class AssignDoctorConsumer extends ConsumerMessage
             }
 
             if ($diff_time > 300){
-                // 超出5分钟，执行退款
-                $InquiryService = new InquiryService();
-                $InquiryService->inquiryRefund($order_inquiry['order_inquiry_id'],"分配医生失败");
+                try {
+                    // 超出5分钟，执行退款
+                    Log::getInstance()->info("超出5分钟，执行退款");
+                    $InquiryService = new InquiryService();
+                    $InquiryService->inquiryRefund($order_inquiry['order_inquiry_id'],"分配医生失败");
 
-                // 退款成功
-                Db::commit();
-                Log::getInstance()->info("订单已退款");
+                    // 退款成功
+                    Db::commit();
+                    Log::getInstance()->info("订单已退款");
 
-                // 加入消息通知队列
+                    // 加入消息通知队列
+
+                    return Result::ACK;
+                } catch (\Exception $e) {
+                    Db::rollBack();
+                    Log::getInstance()->error("队列执行失败原因：" . "执行退款失败" . $e->getMessage());
+                    return Result::REQUEUE; // 重回队列
+                }
 
-                return Result::ACK;
             }
 
             $redis = $this->container->get(Redis::class);