From 2a72e10a65419affb637c46b073c8f51ad087eb7 Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Wed, 10 May 2023 10:49:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=AF=E4=BB=98=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Services/PatientOrderService.php | 49 ++++++++++++++++++++++------
 1 file changed, 39 insertions(+), 10 deletions(-)

diff --git a/app/Services/PatientOrderService.php b/app/Services/PatientOrderService.php
index 9382e7a..967aadc 100644
--- a/app/Services/PatientOrderService.php
+++ b/app/Services/PatientOrderService.php
@@ -670,6 +670,12 @@ class PatientOrderService extends BaseService
         $order_type = $this->request->input('order_type');
         $order_no = $this->request->input('order_no');
 
+        $return_result = array();
+        $return_result['data'] = null;
+        $return_result['status'] = 2; // 状态 1：正常 2：状态错误
+        $return_result['message'] = "";
+
+
         // 获取订单金额
         $result = array();
         $result['amount_total'] = 0; // 订单金额
@@ -693,18 +699,29 @@ class PatientOrderService extends BaseService
 
             // 验证订单状态
             if ($order_inquiry['inquiry_status'] != 1) {
-                return fail(HttpEnumCode::HTTP_ERROR, "订单状态错误");
+                $return_result['message'] = "订单状态错误";
+                $return_result['data']['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
+                $return_result['data']['inquiry_status'] = $order_inquiry['inquiry_status'];
+                $return_result['data']['inquiry_pay_status'] = $order_inquiry['inquiry_pay_status'];
             }
 
             // 验证订单支付状态
             if ($order_inquiry['inquiry_pay_status'] != 1) {
-                return fail(HttpEnumCode::HTTP_ERROR, "订单支付状态错误");
+                $return_result['message'] = "订单支付状态错误";
+                $return_result['data']['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
+                $return_result['data']['inquiry_status'] = $order_inquiry['inquiry_status'];
+                $return_result['data']['inquiry_pay_status'] = $order_inquiry['inquiry_pay_status'];
+                return success($return_result);
             }
 
             // 验证订单过期支付时间
             $diff_time = (strtotime($order_inquiry['created_at']) - time()) / 60;
             if ($diff_time >= 30){
-                return fail(HttpEnumCode::HTTP_ERROR, "订单已过期");
+                $return_result['message'] = "订单已过期";
+                $return_result['data']['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
+                $return_result['data']['inquiry_status'] = $order_inquiry['inquiry_status'];
+                $return_result['data']['inquiry_pay_status'] = $order_inquiry['inquiry_pay_status'];
+                return success($return_result);
             }
 
             $result['order_id'] = $order_inquiry['order_inquiry_id'];
@@ -729,9 +746,6 @@ class PatientOrderService extends BaseService
                 // 获取小程序支付配置
                 $pay_config = $WechatPay->getAppletsPayConfig($prepay['prepay_id']);
             }
-
-
-
         } elseif ($order_type == 2) {
             // 药品订单
             $params = array();
@@ -744,18 +758,30 @@ class PatientOrderService extends BaseService
 
             // 验证订单状态
             if ($order_product['order_product_status'] != 1) {
-                return fail(HttpEnumCode::HTTP_ERROR, "订单状态错误");
+                $return_result['message'] = "订单状态错误";
+                $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']['pay_status'] = $order_product['pay_status'];
+                return success($return_result);
             }
 
             // 验证订单支付状态
             if ($order_product['pay_status'] != 1) {
-                return fail(HttpEnumCode::HTTP_ERROR, "订单支付状态错误");
+                $return_result['message'] = "订单支付状态错误";
+                $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']['pay_status'] = $order_product['pay_status'];
+                return success($return_result);
             }
 
             // 验证订单过期支付时间
             $diff_time = (strtotime($order_product['created_at']) - time()) / 60;
             if ($diff_time >= 30){
-                return fail(HttpEnumCode::HTTP_ERROR, "订单已过期");
+                $return_result['message'] = "订单已过期";
+                $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']['pay_status'] = $order_product['pay_status'];
+                return success($return_result);
             }
 
             $result['order_id'] = $order_product['order_product_id'];
@@ -786,7 +812,10 @@ class PatientOrderService extends BaseService
 
         $result['pay_config'] = $pay_config ?? [];
 
-        return success($result);
+        $return_result['message'] = "成功";
+        $return_result['status'] = 1;
+        $return_result['data'] = $result;
+        return success($return_result);
     }
 
     /**