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

app/models/subject.rb

@@ -39,9 +39,10 @@ class Subject < ApplicationRecord
     courses.pluck(:end_date).max
   end
 
-  # 挑战过路径的成员数
+  # 挑战过路径的成员数(金课统计去重后的报名人数)
   def member_count
-    shixuns.pluck(:myshixuns_count).sum
+    excellent && CourseMember.where(role: 4, course_id: courses.pluck(:id)).pluck(:user_id).uniq.length > 0 ?
+      CourseMember.where(role: 4, course_id: courses.pluck(:id)).pluck(:user_id).uniq.length : shixuns.pluck(:myshixuns_count).sum
   end
 
   def all_score