签名修改

app/Http/Controllers/AppiontController.php

@@ -42,7 +42,6 @@ class AppiontController extends Controller
 
        // 响应头设置
        header('Access-Control-Allow-Headers:x-requested-with,Content-Type,X-CSRF-Token,authorization');
-
        $data = request()->all();
        $defaulRes = [
            'server_handle_result'=>'0',
@@ -91,7 +90,7 @@ class AppiontController extends Controller
 
            $sign = md5($data['id'].$data['telephone'].$data['barcode'].$data['st'].$data['area'].'2018');
            if($data['sig'] != $sign){
-               $defaulRes['sig'] = '签名验证失败';
+               $defaulRes['tip_msg'] = '签名验证失败';
                exit(json_encode($defaulRes));
            }
 
@@ -106,9 +105,9 @@ class AppiontController extends Controller
                exit(json_encode($defaulRes));
            }
 
-           DB::enableQueryLog();
+//           DB::enableQueryLog();
            $order = Order::where('user_id',$user_id)->where('organization_id',$data['area'])->select('id','order_sn','user_id','patient_id','is_ticket')->with('orderPatient:order_id,appoint_start_time,appoint_end_time');
-
+          //dd(DB::getQueryLog());
 //           if($data['st']){
 //               $order = $order->whereHas('orderPatient',function ($query) use ($data){
 //                   $query->where('appoint_start_time','<=',$data['st']);
@@ -121,6 +120,7 @@ class AppiontController extends Controller
                    $query->where('appoint_start_time','>=',$data['st']);
                });
            }
+
            $order_list =$order->first();
            if(empty($order_list)){
                $defaulRes['tip_msg'] = '无预约';
@@ -135,7 +135,11 @@ class AppiontController extends Controller
                $end = intval($order['order_patient']['appoint_end_time']);
                $date = date('Y-m-d',intval($order['order_patient']['appoint_start_time']));
 
-               if($end < intval($data['st']) || intval($data['st']) < time()){
+//               if(intval($data['st']) < time()){
+//                   $defaulRes['tip_msg'] = '请选择时间';
+//                   exit(json_encode($defaulRes));
+//               }
+               if($end < intval($data['st']) ){
                    $defaulRes['tip_msg'] = '预约已过期，您预约的时间为：'.$date.' '.date('H:i',$start).'~'.date('H:i',$end);
                    exit(json_encode($defaulRes));
                }