| xqd
@@ -78,10 +78,7 @@ class AppiontController extends Controller
|
|
|
$defaulRes['tip_msg'] = '请输入sig签名';
|
|
|
exit(json_encode($defaulRes));
|
|
|
}
|
|
|
-// if(empty($data['secretKey']) || $data['secretKey'] !== '2018'){
|
|
|
-// $defaulRes['tip_msg'] = 'secretKey秘钥错误';
|
|
|
-// exit(json_encode($defaulRes));
|
|
|
-// }
|
|
|
+
|
|
|
if(empty($data['st']) ){
|
|
|
$defaulRes['tip_msg'] = '请输入时间信息';
|
|
|
exit(json_encode($defaulRes));
|
| xqd
@@ -112,18 +109,9 @@ class AppiontController extends Controller
|
|
|
->select('id','order_sn','user_id','patient_id','is_ticket')
|
|
|
->with('orderPatient:order_id,appoint_start_time,appoint_end_time,name');
|
|
|
|
|
|
-// if($data['st']){
|
|
|
-// $order = $order->whereHas('orderPatient',function ($query) use ($data){
|
|
|
-// $query->where('appoint_start_time','<=',$data['st']);
|
|
|
-// $query->where('appoint_end_time','>=',$data['st']);
|
|
|
-// });
|
|
|
-// }
|
|
|
-// echo date('Y-m-d H:i:s',1614149564844);
|
|
|
-// dd(time());
|
|
|
-//dd(strtotime('2021-01-21 12:00:00'));
|
|
|
if($data['st']){
|
|
|
$order = $order->whereHas('orderPatient',function ($query) use ($data){
|
|
|
- $query->where('appoint_end_time','>=',intval($data['st']/1000));
|
|
|
+ $query->where('appoint_end_time','>=',time());
|
|
|
});
|
|
|
}
|
|
|
|
| xqd
@@ -142,7 +130,7 @@ 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']) ){
|
|
|
+ if($end < time() ){
|
|
|
$defaulRes['tip_msg'] = '预约已过期,您预约的时间为:'.$date.' '.date('H:i',$start).'~'.date('H:i',$end);
|
|
|
exit(json_encode($defaulRes));
|
|
|
}
|