From e08947f9ac4ae061ba724d85e84d228c1fcfbd4d Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Mon, 9 Dec 2024 14:59:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=A3=80=E6=9F=A5=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD=EF=BC=8C=E9=81=BF?=
 =?UTF-8?q?=E5=85=8D=E9=87=8D=E5=A4=8D=E9=A2=84=E7=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Http/Controllers/API/H5/OrderController.php   | 14 ++++++++------
 .../app/Http/Controllers/API/H5/PayController.php | 15 +++++++++------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/H5/OrderController.php b/Laravel/app/Http/Controllers/API/H5/OrderController.php
index d3826c9..bacbc0c 100644
--- a/Laravel/app/Http/Controllers/API/H5/OrderController.php
+++ b/Laravel/app/Http/Controllers/API/H5/OrderController.php
@@ -1040,12 +1040,14 @@ class OrderController extends Controller
     //判断如果支付成功，更改订单状态
     if ($res['data']['trade_state'] === 'SUCCESS') {
       $order = DB::table('orders')->where(['order_number' => $order_number])->first();
-      DB::table('orders')->where(['id' => $order->id])->update([
-        'status' => 2,
-        'pay_time' => date('Y-m-d H:i:s'),
-      ]);
-      $Finish = new OrderController();//预约体检
-      $Finish->Finish($order_number);
+      if($order->status == 1){
+        DB::table('orders')->where(['id' => $order->id])->update([
+          'status' => 2,
+          'pay_time' => date('Y-m-d H:i:s'),
+        ]);
+        $Finish = new OrderController();//预约体检
+        $Finish->Finish($order_number);
+      }
       return \Yz::Return(true, "支付成功", ['id' => $order->id]);
     } else {
       return \Yz::echoError1("未支付" . $res['data']['trade_state']);
diff --git a/Laravel/app/Http/Controllers/API/H5/PayController.php b/Laravel/app/Http/Controllers/API/H5/PayController.php
index 7686b36..71b73d7 100644
--- a/Laravel/app/Http/Controllers/API/H5/PayController.php
+++ b/Laravel/app/Http/Controllers/API/H5/PayController.php
@@ -87,12 +87,15 @@ class PayController extends Controller
     //判断如果支付成功，更改订单状态
     if ($res['data']['trade_state'] === 'SUCCESS') {
       $order = DB::table('orders')->where(['order_number' => $order_number])->first();
-      DB::table('orders')->where(['id' => $order->id])->update([
-        'status' => 2,
-        'pay_time' => date('Y-m-d H:i:s'),
-      ]);
-      $Finish = new OrderController();//预约体检
-      $Finish->Finish($order_number);
+      if($order->status == 1){
+        DB::table('orders')->where(['id' => $order->id])->update([
+          'status' => 2,
+          'pay_time' => date('Y-m-d H:i:s'),
+        ]);
+        $Finish = new OrderController();//预约体检
+        $Finish->Finish($order_number);
+      }
+
       return \Yz::Return(true, "支付成功", ['id' => $order->id]);
     } else {
       return \Yz::echoError1("支付失败" . $res['data']['trade_state']);