From 75ab3578fdc7243eaade117675bf4c39f950310e Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Thu, 21 Nov 2019 16:54:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E5=90=8D/=E8=81=8C=E4=B8=9A=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E9=87=8D=E6=96=B0=E8=AE=A4=E8=AF=81=E6=97=B6=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E5=B7=B2=E7=94=B3=E8=AF=B7=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/users/apply_authentication_service.rb    | 4 +++-
 app/services/users/apply_professional_auth_service.rb | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/services/users/apply_authentication_service.rb b/app/services/users/apply_authentication_service.rb
index b4aa8f496..a6b02f431 100644
--- a/app/services/users/apply_authentication_service.rb
+++ b/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!
 
diff --git a/app/services/users/apply_professional_auth_service.rb b/app/services/users/apply_professional_auth_service.rb
index 074f1cee7..c64c07cdd 100644
--- a/app/services/users/apply_professional_auth_service.rb
+++ b/app/services/users/apply_professional_auth_service.rb
@@ -12,7 +12,7 @@ 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]
@@ -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!