Merge branch 'dev_aliyun' into develop

5 years ago · a115f8db9d
parent 108603230a 208716a5bd
commit a115f8db9d
1 changed files with 2 additions and 2 deletions
--- a/app/services/create_watch_video_service.rb
+++ b/app/services/create_watch_video_service.rb
@ -52,9 +52,9 @@ class CreateWatchVideoService < ApplicationService
              if params[:ed].present? || (watch_course_video.duration >= 300 && (watch_course_video.duration - params[:point].to_i) <= 20)
                video_duration = watch_video_history.video.duration.to_i
                if video_duration > 0
-                  watch_course_video.is_finished = watch_course_video.total_duration >= video_duration
+                  watch_course_video.is_finished = watch_course_video.total_duration.to_i >= video_duration
                else
-                  watch_course_video.is_finished = watch_course_video.total_duration >= watch_course_video.duration
+                  watch_course_video.is_finished = watch_course_video.total_duration.to_i >= watch_course_video.duration.to_i
                end
              end
            end