From cbbc5b44133936d456b97dd0526eec5950e2aa99 Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Wed, 19 Apr 2023 16:51:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E=E9=97=AE?=
 =?UTF-8?q?=E8=AF=8A=E8=AF=84=E4=BB=B7=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Services/InquiryService.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/Services/InquiryService.php b/app/Services/InquiryService.php
index a460b70..45359a2 100644
--- a/app/Services/InquiryService.php
+++ b/app/Services/InquiryService.php
@@ -4,7 +4,6 @@ namespace App\Services;
 
 use App\Amqp\Producer\AutoFinishInquiryDelayDirectProducer;
 use App\Amqp\Producer\CancelUnInquiryOrdersDelayDirectProducer;
-use App\Amqp\Producer\CancelUnPayInquiryOrderDelayProducer;
 use App\Amqp\Producer\CancelUnpayOrdersDelayDirectProducer;
 use App\Constants\DoctorTitleCode;
 use App\Constants\HttpEnumCode;
@@ -496,7 +495,7 @@ class InquiryService extends BaseService
         }
 
         // 检测订单状态
-        if ($order_inquiry['inquiry_status'] != 5) {
+        if ($order_inquiry['inquiry_status'] != 5 && $order_inquiry['inquiry_status'] != 6) {
             // 问诊订单状态（1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消）
             return fail(HttpEnumCode::HTTP_ERROR, "请问诊完成后进行评价");
         }
@@ -1202,7 +1201,12 @@ class InquiryService extends BaseService
         // 取消问诊订单
         $data = array();
         $data['inquiry_status'] = 7;
-        $data['inquiry_pay_status'] = 5;
+        if ($cancel_reason == 5){
+            $data['inquiry_pay_status'] = 5; // 支付状态（1:未支付 2:已支付 3:支付中 4:支付失败 5:支付超时 6:支付关闭 7:已撤销 8:转入退款）
+        }else{
+            $data['inquiry_pay_status'] = 6;
+        }
+
         $data['cancel_time'] = date("Y-m-d H:i:s", time());
         $data['cancel_reason'] = $cancel_reason; // 取消订单原因（1:医生未接诊 2:主动取消 3:无可分配医生 4:客服取消 5:支付超时）
         $data['cancel_remarks'] = $cancel_remarks; // 取消订单备注