|
@@ -84,9 +84,7 @@ class Course extends Api{
|
|
|
// 用户是否点赞和推荐
|
|
|
$courseData['thumb'] = $courseData['thumb'] ? path_compat($courseData['thumb']) : '';
|
|
|
// 获取用户学习进度
|
|
|
- $courseData['inittime'] = 0;//(int)$LearnRecord->query()->where([['course_id','=',$id],['custom_uid','=',$uid],['status','=',0]])->orderByDesc('id')->value('video_lasttime');
|
|
|
- // 查询是不是有记录在使用中
|
|
|
- $oldRecordId = $LearnRecord->query()->where([['custom_uid','=',$uid],['course_id','=',$id],['status','=',0]])->value('id');
|
|
|
+ $courseData['inittime'] = (int)$LearnRecord->query()->where([['course_id','=',$id],['custom_uid','=',$uid],['status','=',0]])->orderByDesc('id')->value('video_lasttime');
|
|
|
// 查询课程数据
|
|
|
$questionList = $LearnQuestion->getList($id);
|
|
|
// 以时间排序
|
|
@@ -115,7 +113,7 @@ class Course extends Api{
|
|
|
// 习题列表
|
|
|
$courseData['question_list'] = array_values($questionList);
|
|
|
// 学习状态
|
|
|
- $courseData['learn_status'] = (int)$LearnRecord->query()->where([['custom_uid','=',$uid],['course_id','=',$id]])->value(DB::raw('max(`status`) as status'));
|
|
|
+ $courseData['learn_status'] = (int)$LearnRecord->query()->where([['custom_uid','=',$uid],['course_id','=',$id]])->max('status');
|
|
|
// 接收参数
|
|
|
$data['custom_uid'] = $uid;
|
|
|
$data['course_id'] = $id;
|
|
@@ -123,8 +121,10 @@ class Course extends Api{
|
|
|
$data['video_inittime'] = $courseData['inittime'];
|
|
|
$data['video_lasttime'] = $courseData['inittime'];
|
|
|
$data['question_total'] = count($questionList);
|
|
|
+ // 查询是不是有记录在使用中
|
|
|
+ // $oldRecordId = $LearnRecord->query()->where([['custom_uid','=',$uid],['course_id','=',$id],['status','=',0]])->value('id');
|
|
|
// 新增记录
|
|
|
- $courseData['record_id'] = $oldRecordId ? $LearnRecord->edit($oldRecordId,$data) : $LearnRecord->add($data);
|
|
|
+ $courseData['record_id'] = $LearnRecord->add($data); //$oldRecordId ? $LearnRecord->edit($oldRecordId,$data) :
|
|
|
// 如果记录失败
|
|
|
if( !$courseData['record_id'] ) return json_send(['code'=>'error','msg'=>'获取详情失败,请重试']);
|
|
|
// 返回结果
|