From 464530d13073dcd0150510650ed6d20c269ce374 Mon Sep 17 00:00:00 2001 From: yanzai Date: Mon, 16 Sep 2024 15:40:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=AF=B9=E6=8E=A5=E6=80=9D?= =?UTF-8?q?=E4=B8=AA=E6=A3=80=E3=80=81=E5=9B=A2=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/API/H5/HomeController.php | 4 +- .../Controllers/API/H5/OrderController.php | 40 +++++++++++++++++-- 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/Laravel/app/Http/Controllers/API/H5/HomeController.php b/Laravel/app/Http/Controllers/API/H5/HomeController.php index 0e8c0f2..004d9a7 100644 --- a/Laravel/app/Http/Controllers/API/H5/HomeController.php +++ b/Laravel/app/Http/Controllers/API/H5/HomeController.php @@ -121,13 +121,13 @@ class HomeController extends Controller [ 'message' => '暂未开放', 'name' => '套餐预约', - 'url' => '/pages/main/order/order', + 'url' => '/pages/main/packageDetails/packageDetails', 'logo' => '/assets/h5/zhuyishixiang.png' ], [ 'message' => '暂未开放', 'name' => '项目自选', - 'url' => '/pages/main/optionalProject/optionalProject?hospital={hospital}', + 'url' => '/pages/main/optionalProject/optionalProject', 'logo' => '/assets/h5/zhuyishixiang.png' ] ]; diff --git a/Laravel/app/Http/Controllers/API/H5/OrderController.php b/Laravel/app/Http/Controllers/API/H5/OrderController.php index 95fc845..a6b9533 100644 --- a/Laravel/app/Http/Controllers/API/H5/OrderController.php +++ b/Laravel/app/Http/Controllers/API/H5/OrderController.php @@ -317,7 +317,8 @@ class OrderController extends Controller public function Finish_test() //删除!!! { - self::Finish('20240915183440999WMp2yu'); + $f=self::Finish('20240916144857398k3fL9K'); + dd($f); } //最后步骤,开始通知思信预约 @@ -344,7 +345,7 @@ class OrderController extends Controller '可选项目信息' => $item_arr, ]); if (count($item_check['data']) != 1) { - return \Yz::echoError1("体检系统提示:" . $item_check['message']); + return ['status' => false, 'msg' => "体检系统提示:" . $item_check['message']]; } } //如果是个检 @@ -378,7 +379,38 @@ class OrderController extends Controller 'status' => 2, 'pay_time' => date('Y-m-d H:i:s'), ]); - //先把状态更新为支付,然后再开始预约思信 - + //把状态更新为支付后,然后再开始预约思信 + $create_appointment = self::create_appointment($order_info->hospital_id, $cad); + + if(!isset($create_appointment['data'][0][0])) return ['status' => false, 'msg' => "体检预约,返回非预期结果"]; + + //预约完成后查询预约结果 + $appointment_info = self::appointment_info($order_info->hospital_id, [ + 'type' => $order_info->type, + "证件号码" => null, + "电话号码" => null, + "预约Id" => $create_appointment['data'][0][0], + ]); + DB::table('orders')->where(['order_number' => $order_number])->update([ + 'appointment_number' => $create_appointment['data'][0][0], + 'appointment_back_info'=> json_encode($appointment_info['data'][0], JSON_UNESCAPED_UNICODE) + ]); + return ['status' => true, 'msg' => "完成"]; + } + public function create_appointment($hospital, $data) + { + $peis = new PEISApiController(); + $url_code = $data['type'] == 1 ? '个检预约' : '团检预约'; + unset($data['type']); + $info = $peis::Post($url_code, $hospital, $data); + return $info; + } + public function appointment_info($hospital, $data) + { + $peis = new PEISApiController(); + $url_code = $data['type'] == 1 ? '个检预约查询' : '团检预约查询'; + unset($data['type']); + $info = $peis::Post($url_code, $hospital, $data); + return $info; } }