From 3169cf4bfc56fa796c51f82bd3789416a8957c3e Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Fri, 25 Aug 2023 14:37:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Services/PatientOrderService.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/Services/PatientOrderService.php b/app/Services/PatientOrderService.php
index 4b953df..85d1697 100644
--- a/app/Services/PatientOrderService.php
+++ b/app/Services/PatientOrderService.php
@@ -701,6 +701,7 @@ class PatientOrderService extends BaseService
             // 验证订单状态
             if ($order_inquiry['inquiry_status'] != 1) {
                 $return_result['message'] = "订单状态错误";
+                $return_result['data'] = $result;
                 $return_result['data']['order_id'] = $order_inquiry['order_inquiry_id'];
                 $return_result['data']['order_status'] = $order_inquiry['inquiry_status'];
                 $return_result['data']['order_pay_status'] = $order_inquiry['inquiry_pay_status'];
@@ -710,6 +711,7 @@ class PatientOrderService extends BaseService
             // 验证订单支付状态
             if ($order_inquiry['inquiry_pay_status'] != 1) {
                 $return_result['message'] = "订单支付状态错误";
+                $return_result['data'] = $result;
                 $return_result['data']['order_id'] = $order_inquiry['order_inquiry_id'];
                 $return_result['data']['order_status'] = $order_inquiry['inquiry_status'];
                 $return_result['data']['order_pay_status'] = $order_inquiry['inquiry_pay_status'];
@@ -720,6 +722,7 @@ class PatientOrderService extends BaseService
             $diff_time = (strtotime($order_inquiry['created_at']) - time()) / 60;
             if ($diff_time >= 30) {
                 $return_result['message'] = "订单已过期";
+                $return_result['data'] = $result;
                 $return_result['data']['order_id'] = $order_inquiry['order_inquiry_id'];
                 $return_result['data']['order_status'] = $order_inquiry['inquiry_status'];
                 $return_result['data']['order_pay_status'] = $order_inquiry['inquiry_pay_status'];
@@ -762,6 +765,7 @@ class PatientOrderService extends BaseService
             // 验证订单状态
             if ($order_product['order_product_status'] != 1) {
                 $return_result['message'] = "订单状态错误";
+                $return_result['data'] = $result;
                 $return_result['data']['order_id'] = $order_product['order_product_id'];
                 $return_result['data']['order_status'] = $order_product['order_product_status'];
                 $return_result['data']['order_pay_status'] = $order_product['pay_status'];
@@ -771,6 +775,7 @@ class PatientOrderService extends BaseService
             // 验证订单支付状态
             if ($order_product['pay_status'] != 1) {
                 $return_result['message'] = "订单支付状态错误";
+                $return_result['data'] = $result;
                 $return_result['data']['order_product_id'] = $order_product['order_product_id'];
                 $return_result['data']['order_product_status'] = $order_product['order_product_status'];
                 $return_result['data']['order_pay_status'] = $order_product['pay_status'];
@@ -781,6 +786,7 @@ class PatientOrderService extends BaseService
             $diff_time = (strtotime($order_product['created_at']) - time()) / 60;
             if ($diff_time >= 30) {
                 $return_result['message'] = "订单已过期";
+                $return_result['data'] = $result;
                 $return_result['data']['order_product_id'] = $order_product['order_product_id'];
                 $return_result['data']['order_product_status'] = $order_product['order_product_status'];
                 $return_result['data']['order_pay_status'] = $order_product['pay_status'];
@@ -822,6 +828,7 @@ class PatientOrderService extends BaseService
             // 验证订单状态
             if ($order_detection['detection_status'] != 1) {
                 $return_result['message'] = "订单状态错误";
+                $return_result['data'] = $result;
                 $return_result['data']['order_id'] = $order_detection['order_detection_id'];
                 $return_result['data']['order_status'] = $order_detection['detection_status'];
                 $return_result['data']['order_pay_status'] = $order_detection['detection_pay_status'];
@@ -831,6 +838,7 @@ class PatientOrderService extends BaseService
             // 验证订单支付状态
             if ($order_detection['detection_pay_status'] != 1) {
                 $return_result['message'] = "订单支付状态错误";
+                $return_result['data'] = $result;
                 $return_result['data']['order_id'] = $order_detection['order_detection_id'];
                 $return_result['data']['order_status'] = $order_detection['detection_status'];
                 $return_result['data']['order_pay_status'] = $order_detection['detection_pay_status'];
@@ -841,6 +849,7 @@ class PatientOrderService extends BaseService
             $diff_time = (strtotime($order_detection['created_at']) - time()) / 60;
             if ($diff_time >= 30) {
                 $return_result['message'] = "订单已过期";
+                $return_result['data'] = $result;
                 $return_result['data']['order_id'] = $order_detection['order_detection_id'];
                 $return_result['data']['order_status'] = $order_detection['detection_status'];
                 $return_result['data']['order_pay_status'] = $order_detection['detection_pay_status'];