|
@@ -274,16 +274,6 @@ class Taxi extends ApiController
|
|
|
*/
|
|
*/
|
|
|
public function waitOrder()
|
|
public function waitOrder()
|
|
|
{
|
|
{
|
|
|
- $param = $this->request->param();
|
|
|
|
|
- // 数据校验
|
|
|
|
|
- $valid = $this->validate($param, [
|
|
|
|
|
- 'order_id' => 'require',
|
|
|
|
|
- ]);
|
|
|
|
|
- // 错误
|
|
|
|
|
- if (true !== $valid) {
|
|
|
|
|
- return $this->ApiJson(-1, $valid);
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
$info = model('common/TaxiOrder')->with(['paylog','user','taxi','taxiUser'])
|
|
$info = model('common/TaxiOrder')->with(['paylog','user','taxi','taxiUser'])
|
|
|
->where(['user_id' => $this->auth->user()['id']])
|
|
->where(['user_id' => $this->auth->user()['id']])
|
|
|
->whereIn('status',[2,3])
|
|
->whereIn('status',[2,3])
|