Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/services/create_watch_video_service.rb

@@ -23,7 +23,7 @@ class CreateWatchVideoService < ApplicationService
           watch_video_history.end_at = current_time
           watch_video_history.total_duration = params[:total_duration]
           watch_video_history.watch_duration = params[:watch_duration].to_f > watch_video_history.duration ? watch_video_history.duration : params[:watch_duration]
-          watch_video_history.is_finished = (watch_video_history.duration <= params[:watch_duration].to_f)
+          watch_video_history.is_finished = params[:ed].present?
           watch_video_history.save!
 
           watch_course_video = watch_video_history.watch_course_video
@@ -31,7 +31,9 @@ class CreateWatchVideoService < ApplicationService
           if watch_course_video.present? && !watch_course_video.is_finished && watch_course_video.watch_duration < params[:watch_duration].to_f
             # 更新课程视频的时长及是否看完状态
             watch_course_video.watch_duration = params[:watch_duration]
-            watch_course_video.is_finished = (watch_course_video.duration <= params[:watch_duration].to_f)
+            if params[:ed].present?
+              watch_course_video.is_finished = watch_course_video.watch_video_histories.sum(:total_duration) >= watch_course_video.duration
+            end
             watch_course_video.end_at = current_time
             watch_course_video.save!
           end

app/views/courses/attahcment_category_list.json.jbuilder

@@ -3,8 +3,11 @@ json.course_modules do
   json.array! @course_modules do |course_module|
     json.id course_module.id
     json.module_name course_module.module_name
-    json.course_second_categories do
-      json.array! course_module.course_second_categories, :id, :name
+    json.course_second_categories course_module.first_categories do |category|
+      json.(category, :id, :name)
+      json.course_third_categories category.children do |child|
+        json.(child, :id, :name)
+      end
     end
   end
 end