From b9a22ea667197efc6aceef10a78337461fc7029d Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Mon, 8 Apr 2024 15:38:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=8F=96=E6=B6=88=E6=9C=AA?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=9A=84=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Services/DetectionService.php    | 4 ++--
 app/Services/InquiryService.php      | 2 +-
 app/Services/PatientOrderService.php | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Services/DetectionService.php b/app/Services/DetectionService.php
index 97767d0..f8e920e 100644
--- a/app/Services/DetectionService.php
+++ b/app/Services/DetectionService.php
@@ -821,7 +821,7 @@ class DetectionService extends BaseService
      * @param string|int $cancel_remarks 取消备注
      * @return array
      */
-    public function cancelUnpayDetectionOrder(string|int $order_id, string|int $cancel_reason, string|int $cancel_remarks): array
+    public function cancelUnpayDetectionOrder(string|int $order_no, string|int $cancel_reason, string|int $cancel_remarks): array
     {
         $result = array();
         $result['status'] = 1;
@@ -829,7 +829,7 @@ class DetectionService extends BaseService
 
         // 获取检测订单数据
         $params = array();
-        $params['order_id'] = $order_id;
+        $params['detection_no'] = $order_no;
         $order_detection = OrderDetection::getOne($params);
         if (empty($order_detection)) {
             $result['status'] = 0;
diff --git a/app/Services/InquiryService.php b/app/Services/InquiryService.php
index 3ebb594..4280170 100644
--- a/app/Services/InquiryService.php
+++ b/app/Services/InquiryService.php
@@ -1842,7 +1842,7 @@ class InquiryService extends BaseService
 
             // 获取问诊订单数据
             $params = array();
-            $params['order_no'] = $order_no;
+            $params['inquiry_no'] = $order_no;
             $order_inquiry = OrderInquiry::getOne($params);
             if (empty($order_inquiry)) {
                 throw new BusinessException("未查询到对应订单数据");
diff --git a/app/Services/PatientOrderService.php b/app/Services/PatientOrderService.php
index 23e4042..b126cbd 100644
--- a/app/Services/PatientOrderService.php
+++ b/app/Services/PatientOrderService.php
@@ -488,7 +488,7 @@ class PatientOrderService extends BaseService
             $result = $OrderService->cancelUnpayOrder($order_inquiry['inquiry_no'],2,"主动取消");
             if ($result['status'] != 1) {
                 Db::rollBack();
-                return fail();
+                return fail(HttpEnumCode::HTTP_ERROR, $result['message']);
             }
 
             Db::commit();
@@ -663,7 +663,7 @@ class PatientOrderService extends BaseService
             $result = $OrderService->cancelUnpayOrder($order_product['order_product_no'], 1, "主动取消");
             if ($result['status'] != 1) {
                 Db::rollBack();
-                return fail();
+                return fail(HttpEnumCode::HTTP_ERROR, $result['message']);
             }
 
             Db::commit();