From 4d116096834bf5b158870f151f7777e519fca9a4 Mon Sep 17 00:00:00 2001 From: yanzai Date: Mon, 7 Oct 2024 23:25:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E6=94=B9=E7=BA=A6=E3=80=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=99=90=E5=88=B6=E4=B8=8D=E8=83=BD=E9=80=89?= =?UTF-8?q?=E5=90=8C=E4=B8=80=E4=BB=BD=E6=8A=A5=E5=91=8A=EF=BC=8C=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Laravel/app/Http/Controllers/API/H5/FenzhenController.php | 1 + Laravel/app/Http/Controllers/API/H5/OrderController.php | 3 +++ Laravel/app/Http/Controllers/API/H5/ReportController.php | 2 ++ h5/pages/main/order/src/order.vue | 4 ++-- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php index d35134a..2ce8ec9 100644 --- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php +++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php @@ -11,6 +11,7 @@ class FenzhenController extends Controller public function abandon() { // 这里放 弃检逻辑 + return \Yz::Return(true, "弃检成功"); } diff --git a/Laravel/app/Http/Controllers/API/H5/OrderController.php b/Laravel/app/Http/Controllers/API/H5/OrderController.php index 9b3e469..c83615d 100644 --- a/Laravel/app/Http/Controllers/API/H5/OrderController.php +++ b/Laravel/app/Http/Controllers/API/H5/OrderController.php @@ -28,6 +28,9 @@ class OrderController extends Controller $datetime = new DateTime($list->created_at); $timestamp = $datetime->getTimestamp(); $list->end_time = $timestamp + (60 * $WaitingPaymentTime); + if(time() > $list->end_time){ + $list->status=3; + } } } diff --git a/Laravel/app/Http/Controllers/API/H5/ReportController.php b/Laravel/app/Http/Controllers/API/H5/ReportController.php index ca43b1b..b238648 100644 --- a/Laravel/app/Http/Controllers/API/H5/ReportController.php +++ b/Laravel/app/Http/Controllers/API/H5/ReportController.php @@ -41,6 +41,7 @@ class ReportController extends Controller foreach ($report_list as $key => $report) { $report_list[$key]['is_read']=0; + $report_list[$key]['登记时间']= explode('T', $report_list[$key]['登记时间'])[0]; if($report['体检状态']=='报告已出' || $report['体检状态']=='总检完成'){ $cha=DB::table('report_l1_records')->where(['体检号' => $report['体检号']])->first(); if(!!$cha and $cha->is_read==1){ @@ -261,6 +262,7 @@ class ReportController extends Controller { $ids = $request->post('tj_numbers'); if(count($ids)<>2) return \Yz::echoError1("请选择两份报告"); + if($ids[0]==$ids[1]) return \Yz::echoError1('不能选择相同的报告'); sort($ids); $report1=DB::table('report_l1_records as a')->leftJoin('report_l2_items as b' ,'a.id','=','b.reprort_l1_id')->where('a.体检号',$ids[0])->whereIn('体检状态',['报告已出','总检完成'])->get(); $report2=DB::table('report_l1_records as a')->leftJoin('report_l2_items as b' ,'a.id','=','b.reprort_l1_id')->where('a.体检号',$ids[1])->whereIn('体检状态',['报告已出','总检完成'])->get(); diff --git a/h5/pages/main/order/src/order.vue b/h5/pages/main/order/src/order.vue index 45a7624..b2f9356 100644 --- a/h5/pages/main/order/src/order.vue +++ b/h5/pages/main/order/src/order.vue @@ -162,8 +162,8 @@ 继续付款 - - 改约 + 退款