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

app/services/users/apply_authentication_service.rb

@@ -10,7 +10,7 @@ class Users::ApplyAuthenticationService < ApplicationService
     raise Error, '请先完善基本信息' unless user.profile_completed?
 
     Users::ApplyAuthenticationForm.new(params).validate!
-    raise Error, '您已经申请过实名认证了' if ApplyUserAuthentication.real_name_auth.processing.exists?(user_id: user.id)
+    # raise Error, '您已经申请过实名认证了' if ApplyUserAuthentication.real_name_auth.processing.exists?(user_id: user.id)
 
     user.lastname  = params[:name].to_s.strip
     user.firstname = ''
@@ -18,6 +18,8 @@ class Users::ApplyAuthenticationService < ApplicationService
     user.show_realname = params[:show_realname].to_s == 'true' if params[:show_realname].to_s.present?
 
     ActiveRecord::Base.transaction do
+      ApplyUserAuthentication.real_name_auth.processing.where(user_id: user.id).destroy_all
+
       user.authentication = true
       user.save!
 

app/services/users/apply_professional_auth_service.rb

@@ -12,14 +12,14 @@ class Users::ApplyProfessionalAuthService < ApplicationService
     raise Error, '请先完善基本信息' unless user.profile_completed?
 
     Users::ApplyProfessionalAuthForm.new(params).validate!
-    raise Error, '您已经申请过职业认证了' if ApplyUserAuthentication.professional_auth.processing.exists?(user_id: user.id)
+    # raise Error, '您已经申请过职业认证了' if ApplyUserAuthentication.professional_auth.processing.exists?(user_id: user.id)
 
     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
+    user.professional_certification = params[:identity] != "teacher"
 
     extra = params[:extra].to_s.strip.presence
     if extension.identity.to_s == 'student'
@@ -31,6 +31,7 @@ class Users::ApplyProfessionalAuthService < ApplicationService
     end
 
     ActiveRecord::Base.transaction do
+      ApplyUserAuthentication.professional_auth.processing.where(user_id: user.id).destroy_all
       user.save!
       extension.save!