diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php index 704ccb456..85e9e6c70 100644 --- a/app/api/controller/TaskController.php +++ b/app/api/controller/TaskController.php @@ -225,12 +225,12 @@ class TaskController extends BaseApiController return $this->fail('定位不存在'); } $res = App(RemoteController::class)->calculateDistance($task['extend']['terminus']['lnglat'][0],$task['extend']['terminus']['lnglat'][1], $parmas['terminus']['lnglat'][0], $parmas['terminus']['lnglat'][1]); - if($res>100){ - return $this->fail('定位坐标大于100米,请重新打卡。'.$res.'米'); + if($res>200){ + return $this->fail('定位坐标大于200米,请重新打卡。'.$res.'米'); } $res = App(RemoteController::class)->coordinate($datas, $parmas['terminus']['lnglat'][0], $parmas['terminus']['lnglat'][1]); if($res===false){ - return $this->fail('定位不存在|或GPS无轨迹'); + return $this->fail('GPS无轨迹'); } $task['extend']['update']['terminus'] = $parmas['terminus']; } @@ -239,24 +239,24 @@ class TaskController extends BaseApiController return $this->fail('定位不存在'); } $res = App(RemoteController::class)->calculateDistance($task['extend']['transfer']['lnglat'][0],$task['extend']['transfer']['lnglat'][1], $parmas['transfer']['lnglat'][0], $parmas['transfer']['lnglat'][1]); - if($res>100){ + if($res>200){ return $this->fail('定位坐标大于100米,请重新打卡。'.$res.'米'); } $res = App(RemoteController::class)->coordinate($datas, $parmas['transfer']['lnglat'][0], $parmas['transfer']['lnglat'][1]); if($res===false){ - return $this->fail('定位不存在|或GPS无轨迹'); + return $this->fail('GPS无轨迹'); } $task['extend']['update']['transfer'] = $parmas['transfer']; } if (isset($task['extend']['update']['terminus']) && isset($task['extend']['update']['transfer'])) { $data['status'] = 3; } - if($res<100){ + if($res<200){ $data['extend'] = json_encode($task['extend']); Task::where('id', $parmas['id'])->update($data); return $this->success('更新成功'); } - return $this->fail('定位坐标大于100米,请重新打卡。'.$res.'米'); + return $this->fail('定位坐标大于200米,请重新打卡。'.$res.'米'); } public function informationg_list()