From 7401bff48cf4db144cf6b8910ca7cb3b321f4388 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Thu, 21 Nov 2019 09:37:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E5=90=8D=E8=AE=A4=E8=AF=81=E3=80=81?=
 =?UTF-8?q?=E8=81=8C=E4=B8=9A=E8=AE=A4=E8=AF=81=E7=9A=84=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/application_controller.rb                  | 7 +++++++
 app/services/admins/identity_auths/refuse_apply_service.rb | 1 +
 .../admins/professional_auths/refuse_apply_service.rb      | 1 +
 app/services/users/apply_authentication_service.rb         | 2 +-
 app/services/users/apply_professional_auth_service.rb      | 4 ++--
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1bc2bad7d..f04d126f4 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -45,6 +45,13 @@ class ApplicationController < ActionController::Base
 			check_account
 			tip_exception(@course.excellent ? 410 : 409, "您没有权限进入")
 		end
+		if @user_course_identity == Course::STUDENT
+			# 实名认证和职业认证的身份判断
+			tip_exception(-2, "你的实名认证和职业认证审核未通过") if @course.authentication &&
+				@course.professional_certification && (!current_user.authentication && !current_user.professional_certification)
+			tip_exception(-2, "你的实名认证审核未通过") if @course.authentication && !current_user.authentication
+			tip_exception(-2, "你的职业认证审核未通过") if @course.professional_certification && !current_user.professional_certification
+		end
 		uid_logger("###############user_course_identity:#{@user_course_identity}")
 	end
 
diff --git a/app/services/admins/identity_auths/refuse_apply_service.rb b/app/services/admins/identity_auths/refuse_apply_service.rb
index 7ac2e6c38..dfc9168a9 100644
--- a/app/services/admins/identity_auths/refuse_apply_service.rb
+++ b/app/services/admins/identity_auths/refuse_apply_service.rb
@@ -10,6 +10,7 @@ class Admins::IdentityAuths::RefuseApplyService < ApplicationService
   def call
     ActiveRecord::Base.transaction do
       apply.update!(status: 2, remarks: reason)
+      user.update!(authentication: false)
 
       deal_tiding!
       apply.attachment&.destroy
diff --git a/app/services/admins/professional_auths/refuse_apply_service.rb b/app/services/admins/professional_auths/refuse_apply_service.rb
index a055488c3..014fbab0b 100644
--- a/app/services/admins/professional_auths/refuse_apply_service.rb
+++ b/app/services/admins/professional_auths/refuse_apply_service.rb
@@ -10,6 +10,7 @@ class Admins::ProfessionalAuths::RefuseApplyService < ApplicationService
   def call
     ActiveRecord::Base.transaction do
       apply.update!(status: 2, remarks: reason)
+      user.update!(professional_certification: false)
 
       deal_tiding!
       apply.attachment&.destroy
diff --git a/app/services/users/apply_authentication_service.rb b/app/services/users/apply_authentication_service.rb
index 1b9b02c91..b4aa8f496 100644
--- a/app/services/users/apply_authentication_service.rb
+++ b/app/services/users/apply_authentication_service.rb
@@ -18,7 +18,7 @@ class Users::ApplyAuthenticationService < ApplicationService
     user.show_realname = params[:show_realname].to_s == 'true' if params[:show_realname].to_s.present?
 
     ActiveRecord::Base.transaction do
-      user.authentication = false
+      user.authentication = true
       user.save!
 
       user.user_extension.update!(gender: params[:gender].to_i) if params[:gender].present?
diff --git a/app/services/users/apply_professional_auth_service.rb b/app/services/users/apply_professional_auth_service.rb
index 81cd11a4c..074f1cee7 100644
--- a/app/services/users/apply_professional_auth_service.rb
+++ b/app/services/users/apply_professional_auth_service.rb
@@ -14,13 +14,13 @@ class Users::ApplyProfessionalAuthService < ApplicationService
     Users::ApplyProfessionalAuthForm.new(params).validate!
     raise Error, '您已经申请过职业认证了' if ApplyUserAuthentication.professional_auth.processing.exists?(user_id: user.id)
 
-    user.professional_certification = false
-
     extension = user.user_extension
     extension.school_id     = params[:school_id]
     extension.department_id = params[:department_id]
     extension.identity      = params[:identity]
 
+    user.professional_certification = extension.identity != 0
+
     extra = params[:extra].to_s.strip.presence
     if extension.identity.to_s == 'student'
       extension.technical_title = nil