From 0132594ec8634f4900d117b3784298b43b5dbf7f Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Tue, 29 Oct 2024 21:21:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=BA=8B=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Http/Controllers/API/AspNetZhuanController.php   |  5 +++--
 .../app/Http/Controllers/API/H5/OrderController.php  | 12 +++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/AspNetZhuanController.php b/Laravel/app/Http/Controllers/API/AspNetZhuanController.php
index e92eaef..30b07f1 100644
--- a/Laravel/app/Http/Controllers/API/AspNetZhuanController.php
+++ b/Laravel/app/Http/Controllers/API/AspNetZhuanController.php
@@ -83,7 +83,7 @@ class AspNetZhuanController extends Controller
     return $res;
   }
   //获取指定日期医生排班
-  public static function GetDoctorDateList($data) 
+  public static function GetDoctorDateList($data)
   {
     $res= self::Post2(self::$BaseUrl . '/yisheng.aspx',$data,'医生排班');
     return $res;
@@ -125,7 +125,6 @@ class AspNetZhuanController extends Controller
   {
     self::RequestLog($url, $data, $mark, '.Net转发');
     $response = Http::post($url,$data);
-    Log::info($response);
     if ($response->successful()) {
       $res = $response->json();
       $res_string=json_encode($res, JSON_UNESCAPED_UNICODE);
@@ -139,9 +138,11 @@ class AspNetZhuanController extends Controller
       if ($res['code'] == "200") {
         return $res;
       } else {
+
         throw new HttpResponseException(\Yz::echoError1("调用".$mark."接口失败：" . $res['msg']));
       }
     } else {
+
       $status = $response->status();
       // 获取响应体作为字符串
       $body = $response->body();
diff --git a/Laravel/app/Http/Controllers/API/H5/OrderController.php b/Laravel/app/Http/Controllers/API/H5/OrderController.php
index ab579e6..032ba84 100644
--- a/Laravel/app/Http/Controllers/API/H5/OrderController.php
+++ b/Laravel/app/Http/Controllers/API/H5/OrderController.php
@@ -416,7 +416,7 @@ class OrderController extends Controller
       'created_at' => $now_datetime,
     ];
 
-    DB::beginTransaction();
+
     $insert = DB::table('orders')->insertGetId($data);
     $up_plan = DB::table('plans')->where(['id' => $plan->id, 'status' => 1])->update([
       'status' => 2
@@ -463,7 +463,7 @@ class OrderController extends Controller
     }
 
     if ($insert and $up_plan and $jifen_dikou_status and $yucunkuan_dikou_status and $youhuiquan_dikou_status) {
-      DB::commit();
+
       $action = false;
       if ($true_price == 0) {
         //如果是免费的，直接去预约
@@ -480,7 +480,13 @@ class OrderController extends Controller
       }
       return \Yz::return(true, "操作成功", ['action' => $action, 'orderid' => $insert]);
     } else {
-      DB::rollBack();
+      DB::table('orders')->where('id', $insert)->delete();
+      DB::table('plans')->where(['id' => $plan->id])->update([
+        'status' => 1
+      ]);
+      DB::table('questionnaires_logs')->where(['person_id' => $person->id, 'order_id' => $insert])->update([
+        'order_id' => 0,
+      ]);
       return \Yz::echoError1('操作失败');
     }
   }