From a342639ee86fc9f3c81501f34253408f2300d58d Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Fri, 26 Apr 2024 14:29:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A8=E9=80=811?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ncelUnInquiryOrdersDelayDirectConsumer.php | 23 ++++++++-----------
 app/Services/MessagePush.php                  |  4 ++--
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/app/Amqp/Consumer/CancelUnInquiryOrdersDelayDirectConsumer.php b/app/Amqp/Consumer/CancelUnInquiryOrdersDelayDirectConsumer.php
index 9c2f3cf..cd0a95d 100644
--- a/app/Amqp/Consumer/CancelUnInquiryOrdersDelayDirectConsumer.php
+++ b/app/Amqp/Consumer/CancelUnInquiryOrdersDelayDirectConsumer.php
@@ -153,21 +153,18 @@ class CancelUnInquiryOrdersDelayDirectConsumer extends ConsumerMessage
             // 服务包问诊订单处理
             if ($order_inquiry['inquiry_type'] == 1){
                 if ($order_inquiry['inquiry_mode'] == 8 || $order_inquiry['inquiry_mode'] == 9){
-                    // 获取服务包订单数据
-                    $params = array();
-                    $params['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
-                    $order_service_package_inquiry = OrderServicePackageInquiry::getList($params);
-                    if (empty($order_service_package_inquiry)){
-                        Db::rollBack();
-                        Log::getInstance("queue-CancelUnInquiryOrders")->error("获取服务包订单数据失败");
-                        return Result::ACK;
-                    }
+                    $OrderServicePackageService = new OrderServicePackageService();
+
+                    // 获取服务包订单编号-通过问诊订单id
+                    $order_service_no = $OrderServicePackageService->getOrderServiceNoByOrderInquiryId($order_inquiry['inquiry_no']);
+
+                    // 检测问诊是否服务包首次问诊
+                    $is_first = $OrderServicePackageService->isFirstInquiryServicePackage($order_service_no);
+                    if ($is_first){
+                        // 如果是服务包的首单问诊订单即执行服务包退款
 
-                    // 如果是服务包的首单问诊订单即执行服务包退款
-                    if (count($order_service_package_inquiry) != 0){
-                        // 首单服务包问诊订单，但问诊订单未接诊，执行服务包退款
                         $OrderService = new OrderService();
-                        $OrderService->orderRefund($order_service_package_inquiry[0]['order_service_no'], "医生未接诊");
+                        $OrderService->orderRefund($order_service_no, "医生未接诊");
                     }
                 }
             }
diff --git a/app/Services/MessagePush.php b/app/Services/MessagePush.php
index a70acca..5e094ed 100644
--- a/app/Services/MessagePush.php
+++ b/app/Services/MessagePush.php
@@ -3225,7 +3225,7 @@ class MessagePush extends BaseService
             $sub_data = array();
             $sub_data['push_user_id'] = $this->user['user_id'];
             $sub_data['wx_template_id'] = "9v6dZhjg09CttLd3W9nEUV_-eshNc4BYYNy59jglvZE";// 问诊提醒
-            $sub_data['params']['page'] = "healthyService/pages/healthyOrderDetail/healthyOrderDetail?order_service_id={$this->order['order_no']}";
+            $sub_data['params']['page'] = "healthyService/pages/healthyOrderDetail/healthyOrderDetail?order_service_id={$this->order_service_package['order_service_no']}";
             $sub_data['params']['data'] = [
                 "thing1" => "{$order_type}服务",// 问诊内容
                 "thing2" => "医生已接受",// 提醒内容
@@ -3598,7 +3598,7 @@ class MessagePush extends BaseService
             $sub_data = array();
             $sub_data['push_user_id'] = $this->user['user_id'];
             $sub_data['wx_template_id'] = "9v6dZhjg09CttLd3W9nEUV_-eshNc4BYYNy59jglvZE";// 问诊提醒
-            $sub_data['params']['page'] = "healthyService/pages/healthyOrderDetail/healthyOrderDetail?order_service_id={$this->order['order_no']}";
+            $sub_data['params']['page'] = "healthyService/pages/healthyOrderDetail/healthyOrderDetail?order_service_id={$this->order_service_package['order_service_no']}";
             $sub_data['params']['data'] = [
                 "thing1" => "{$inquiry_mode}服务",// 问诊内容
                 "thing2" => "未及时确认",// 提醒内容