Merge branch 'dev_aliyun' into dev_daiao

app/controllers/competitions/competitions_controller.rb

@@ -143,7 +143,7 @@ class Competitions::CompetitionsController < Competitions::BaseController
         }
       end
     else
-      @records = @records.includes(:team_members, competition_prize_users: :competition_prize, user: :user_extension).limit(@competition.awards_count)
+      @records = @records.includes(:team_members, competition_prize_users: :competition_prize, user: :user_extension).limit(@competition.charts_count)
     end
   end
 

app/controllers/courses_controller.rb

@@ -633,6 +633,9 @@ class CoursesController < ApplicationController
         teacher_member = course_members.where(role: %i[CREATOR]).take
       elsif (params[:roles].include?("PROFESSOR") || params[:roles].include?("ASSISTANT_PROFESSOR")) && !course_members.exists?(role: %i[PROFESSOR ASSISTANT_PROFESSOR])
         teacher_member = CourseMember.create!(course_id: @course.id, user_id: params[:user_id], role: params[:roles].include?("PROFESSOR") ? 2 : 3)
+        # 如果有未审批的申请教师/助教的记录，则修改状态为已审批
+        apply_teacher = CourseMessage.where(course_id: @course.id, course_message_id: params[:user_id], status: 0).last
+        apply_teacher.update!(status: 1, apply_user_id: current_user.id)
       elsif course_members.exists?(role: %i[PROFESSOR ASSISTANT_PROFESSOR])
         teacher_member = course_members.where(role: %i[PROFESSOR ASSISTANT_PROFESSOR]).take
         if params[:roles].include?("PROFESSOR") || params[:roles].include?("ASSISTANT_PROFESSOR")
@@ -796,18 +799,15 @@ class CoursesController < ApplicationController
         if approval == 1
           course_message.pass!
 
-          new_teacher = CourseMember.new(course_id: @course.id, user_id: applier_user.id)
           content = course_message.content.to_i
-          if content == 3 || content == 7
-            tip_exception("已存在教师/助教身份") if CourseMember.where(course_id: @course.id, user_id: applier_user.id, role: 3).any?
-            new_teacher.ASSISTANT_PROFESSOR!
-          elsif content == 2 || content == 9
-            tip_exception("已存在教师/助教身份") if CourseMember.where(course_id: @course.id, user_id: applier_user.id, role: 2).any?
-            new_teacher.PROFESSOR!
+          role = (content == 3 || content == 7) ? 3 : ((content == 2 || content == 9) ? 2 : nil)
+          if role
+            tip_exception("已存在教师/助教身份") if CourseMember.where(course_id: @course.id, user_id: applier_user.id, role: [1, 2 ,3]).any?
           else
             tip_exception("申请角色错误")
           end
 
+          new_teacher = CourseMember.new(course_id: @course.id, user_id: applier_user.id, role: role)
           new_teacher.save!
 
           # 课堂管理员才有分配权限，且课堂分班数大于0
@@ -830,7 +830,7 @@ class CoursesController < ApplicationController
         normal_status(0, "操作成功")
       rescue => e
         uid_logger_error(e.message)
-        tip_exception("操作失败")
+        tip_exception(e.message)
         raise ActiveRecord::Rollback
       end
     end

app/controllers/weapps/courses_controller.rb

@@ -1,5 +1,5 @@
 class Weapps::CoursesController < Weapps::BaseController
-  # before_action :require_wechat_login!
+  before_action :require_login
   before_action :teacher_allowed, except: [:create, :show, :shixun_homework_category]
 
   def create

app/controllers/weapps/homes_controller.rb

@@ -1,5 +1,5 @@
 class Weapps::HomesController < Weapps::BaseController
-  before_action :require_wechat_login!
+  before_action :require_login
 
   def show
     # banner

app/models/competition.rb

@@ -149,9 +149,9 @@ class Competition < ApplicationRecord
     competition_stages.map(&:max_end_time).max
   end
 
-  # def awards_count
-  #   competition_awards.pluck(:num)&.sum > 0 ? competition_awards.pluck(:num)&.sum : 20
-  # end
+  def charts_count
+    competition_prizes&.pluck(:num).sum.to_i > 0 ? competition_prizes&.pluck(:num).sum.to_i : awards_count
+  end
 
   def manager?(user)
     user && competition_managers.exists?(user_id: user.id)