From fb934b8b85c4aee1cb37a3e30e2ff66968b88f12 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 4 Feb 2020 11:25:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=AF=BE=E5=A0=82?=
 =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 075777891..1864195f7 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -1146,6 +1146,7 @@ class CoursesController < ApplicationController
           if existing_student.present?
             # 如果在该课堂已经存在学生身份，且邀请码为分班邀请码，则将其直接加入分班
             existing_student.update!(course_group_id: course_group.id) if course_group.present?
+            message = "您已是课堂成员"
           else
             correspond_teacher_exist = current_user.none_admin_teacher_of_course? course
             new_student = CourseMember.new(user_id: current_user.id, course_id: course.id, role: 4)

From 2d97387356610e286dc27f44eb5061a273c78c42 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 4 Feb 2020 12:06:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=AF=BE?=
 =?UTF-8?q?=E5=A0=82=E9=82=80=E8=AF=B7=E9=A1=B5=E9=9D=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/weapps/courses_controller.rb      | 7 ++++++-
 app/views/weapps/courses/basic_info.json.jbuilder | 8 ++++++++
 config/routes.rb                                  | 1 +
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 app/views/weapps/courses/basic_info.json.jbuilder

diff --git a/app/controllers/weapps/courses_controller.rb b/app/controllers/weapps/courses_controller.rb
index 96dadcd12..357b2a503 100644
--- a/app/controllers/weapps/courses_controller.rb
+++ b/app/controllers/weapps/courses_controller.rb
@@ -1,6 +1,7 @@
 class Weapps::CoursesController < Weapps::BaseController
   before_action :require_login
-  before_action :set_course, :user_course_identity, except: [:create]
+  before_action :set_course, except: [:create]
+  before_action :user_course_identity, except: [:basic_info, :create]
   before_action :check_account, only: [:create]
   before_action :teacher_allowed, only: [:edit, :update]
   before_action :teacher_or_admin_allowed, only: [:change_member_roles, :delete_course_teachers]
@@ -15,6 +16,10 @@ class Weapps::CoursesController < Weapps::BaseController
     render_error(ex.message)
   end
 
+  def basic_info
+    @course = current_course
+  end
+
   def edit
     @course = current_course
   end
diff --git a/app/views/weapps/courses/basic_info.json.jbuilder b/app/views/weapps/courses/basic_info.json.jbuilder
new file mode 100644
index 000000000..09639072d
--- /dev/null
+++ b/app/views/weapps/courses/basic_info.json.jbuilder
@@ -0,0 +1,8 @@
+json.course do
+  json.(@course, :id, :name)
+  json.code_halt @course.invite_code_halt == 1
+  json.invite_code @course.invite_code_halt == 0 ? @course.generate_invite_code : ""
+  json.teacher_name @course.teacher.real_name
+  json.teacher_img url_to_avatar(@course.teacher)
+  json.teacher_school @course.school.try(:name)
+end
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 2b91375ff..fa405d846 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1029,6 +1029,7 @@ Rails.application.routes.draw do
           get :students
           delete :delete_course_students
           get :course_groups
+          get :basic_info
         end
       end