master
cody 4 months ago
parent f44be9402d
commit 85805fd13a

@ -544,9 +544,7 @@ class CourseController extends CommonController
* @OA\Get( * @OA\Get(
* path="/api/mobile/course/content-check-list", * path="/api/mobile/course/content-check-list",
* tags={"小程序-课程"}, * tags={"小程序-课程"},
* summary="获取签到记录和距离", * summary="获取签到记录",
* @OA\Parameter(name="longitude", in="query", @OA\Schema(type="string"), required=false, description="longitude"),
* @OA\Parameter(name="latitude", in="query", @OA\Schema(type="string"), required=false, description="latitude"),
* @OA\Parameter(name="course_content_id", in="query", @OA\Schema(type="string"), required=false, description="课表id"), * @OA\Parameter(name="course_content_id", in="query", @OA\Schema(type="string"), required=false, description="课表id"),
* @OA\Response( * @OA\Response(
* response=200, * response=200,
@ -558,13 +556,9 @@ class CourseController extends CommonController
{ {
$all = \request()->all(); $all = \request()->all();
$messages = [ $messages = [
'longitude.required' => '经度必填',
'latitude.required' => '纬度必填',
'course_content_id.required' => '课程id必填', 'course_content_id.required' => '课程id必填',
]; ];
$validator = Validator::make($all, [ $validator = Validator::make($all, [
'longitude' => 'required',
'latitude' => 'required',
'course_content_id' => 'required' 'course_content_id' => 'required'
], $messages); ], $messages);
if ($validator->fails()) { if ($validator->fails()) {
@ -572,13 +566,11 @@ class CourseController extends CommonController
} }
// 获取打卡范围,千米 // 获取打卡范围,千米
$content_check_range = Config::getValueByKey('content_check_range'); $content_check_range = Config::getValueByKey('content_check_range');
$courseContent = CourseContent::find($all['course_content_id']);
$distance = getDistance($courseContent->longitude, $courseContent->latitude, $all['longitude'], $all['latitude']);
$list = CourseContentCheck::where('course_content_id', $all['course_content_id']) $list = CourseContentCheck::where('course_content_id', $all['course_content_id'])
->where('user_id', $this->getUserId()) ->where('user_id', $this->getUserId())
->orderBy('created_at', 'desc') ->orderBy('created_at', 'desc')
->get(); ->get();
return $this->success(compact('list', 'content_check_range', 'distance')); return $this->success(compact('list', 'content_check_range'));
} }
/** /**

Loading…
Cancel
Save