From f87de0a5958dee500915a6b5c285eb03ecf0051f Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Mon, 8 Apr 2024 16:30:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E6=8E=A5=E8=AF=8A=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=BB=B6=E8=BF=9F=E9=98=9F=E5=88=97=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BA=86=E5=85=A5=E5=8F=82=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Amqp/Consumer/AssignDoctorDelayDirectConsumer.php          | 1 +
 app/Amqp/Consumer/CancelUnInquiryOrdersDelayDirectConsumer.php | 2 +-
 app/Services/InquiryService.php                                | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Amqp/Consumer/AssignDoctorDelayDirectConsumer.php b/app/Amqp/Consumer/AssignDoctorDelayDirectConsumer.php
index c9726f3..340a651 100644
--- a/app/Amqp/Consumer/AssignDoctorDelayDirectConsumer.php
+++ b/app/Amqp/Consumer/AssignDoctorDelayDirectConsumer.php
@@ -252,6 +252,7 @@ class AssignDoctorDelayDirectConsumer extends ConsumerMessage
             // 加入未接诊取消订单延迟队列
             $data = array();
             $data['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
+            $data['order_no'] = $order_inquiry['inquiry_no'];
             $message = new CancelUnInquiryOrdersDelayDirectProducer($data);
             // 快速/购药-5分钟
             $message->setDelayMs(1000 * 60 * 10);
diff --git a/app/Amqp/Consumer/CancelUnInquiryOrdersDelayDirectConsumer.php b/app/Amqp/Consumer/CancelUnInquiryOrdersDelayDirectConsumer.php
index b3eef4a..8dacc25 100644
--- a/app/Amqp/Consumer/CancelUnInquiryOrdersDelayDirectConsumer.php
+++ b/app/Amqp/Consumer/CancelUnInquiryOrdersDelayDirectConsumer.php
@@ -57,7 +57,7 @@ class CancelUnInquiryOrdersDelayDirectConsumer extends ConsumerMessage
         try {
             // 检测执行次数
             $Utils = new Utils();
-            $redis_key = "orderRefund" . $data['order_no'];
+            $redis_key = "orderRefund" . $data['order_inquiry_id'];
             $res = $Utils->checkHandleNumber($redis_key);
             if (!$res) {
                 Log::getInstance("queue-CancelUnInquiryOrders")->error("超出最大执行次数或检测错误");
diff --git a/app/Services/InquiryService.php b/app/Services/InquiryService.php
index a341441..6354093 100644
--- a/app/Services/InquiryService.php
+++ b/app/Services/InquiryService.php
@@ -505,6 +505,7 @@ class InquiryService extends BaseService
 
                 $data = array();
                 $data['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
+                $data['order_no'] = $order_inquiry['inquiry_no'];
                 $message = new CancelUnInquiryOrdersDelayDirectProducer($data);
                 $message->setDelayMs(1000 * $time);
                 $producer = $this->container->get(Producer::class);