From 5e5fd2d1c74de248cf87b7aaee59645f238a1bb6 Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Tue, 25 Apr 2023 19:00:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=80=80=E6=AC=BE=E8=AE=A2?=
 =?UTF-8?q?=E9=98=85=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Amqp/Consumer/AssignDoctorConsumer.php |  2 +-
 app/Services/MessagePush.php               | 24 ----------------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/app/Amqp/Consumer/AssignDoctorConsumer.php b/app/Amqp/Consumer/AssignDoctorConsumer.php
index dd932fa..95743f7 100644
--- a/app/Amqp/Consumer/AssignDoctorConsumer.php
+++ b/app/Amqp/Consumer/AssignDoctorConsumer.php
@@ -98,7 +98,7 @@ class AssignDoctorConsumer extends ConsumerMessage
                 $save_data['inquiry_status'] = 7;
                 $save_data['cancel_time'] = date("Y-m-d H:i:s", time());
                 $save_data['cancel_reason'] = 3; // 取消订单原因（1:医生未接诊 2:主动取消 3:无可分配医生 4:客服取消 5:支付超时）
-                $save_data['cancel_remarks'] = "无可分配医生"; // 取消订单备注
+                $save_data['cancel_remarks'] = "未分配到合适的医生"; // 取消订单备注
                 $save_data['updated_at'] = date("Y-m-d H:i:s", time());
 
                 $params = array();
diff --git a/app/Services/MessagePush.php b/app/Services/MessagePush.php
index e070b06..9181910 100644
--- a/app/Services/MessagePush.php
+++ b/app/Services/MessagePush.php
@@ -686,30 +686,6 @@ class MessagePush extends BaseService
                 Log::getInstance("MessagePush")->error("错误：加入推送队列失败" . json_encode($data,JSON_UNESCAPED_UNICODE));
             }
 
-            // 订阅
-            $sub_data = array();
-            $sub_data['push_user_id'] = $this->user['user_id'];
-            $sub_data['wx_template_id'] = "UOMww1S30Oq7rErJrqO8wN6lNEVKRo2fgcXnb0tBwHI"; //问诊异常通知
-            $sub_data['params']['page'] = "pages/orderDetail/orderDetail?order_inquiry_id={$this->order_inquiry['order_inquiry_id']}";
-            $sub_data['params']['data'] = [
-                "character_string1" => $this->order_inquiry['inquiry_no'],// 订单ID
-                "name2" => (string)($user_doctor['user_name'] ?? "接诊医生"),// 问诊医生
-                "date3" => $this->order_inquiry['created_at'],// 问诊时间
-                "thing4" => inquiryCancelReasonToPushString($cancel_reason),// 取消原因
-                "thing5" => "已进行退款处理，请注意查看账户信息。",// 提示说明
-            ];
-
-            $data = array();
-            $data['sub_data'] = $sub_data;
-            $data['sms_data'] = array();
-
-            $message = new SendSubMessageProducer($data);
-            $producer = ApplicationContext::getContainer()->get(Producer::class);
-            $result = $producer->produce($message);
-            if (!$result) {
-                Log::getInstance("MessagePush")->error("错误：加入推送队列失败" . json_encode($data,JSON_UNESCAPED_UNICODE));
-            }
-
             // 短信
             // 获取系统接诊配置
             $data = array();