diff --git a/app/controllers/weapps/sessions_controller.rb b/app/controllers/weapps/sessions_controller.rb index d586b38f5..2dbab7aa7 100644 --- a/app/controllers/weapps/sessions_controller.rb +++ b/app/controllers/weapps/sessions_controller.rb @@ -17,10 +17,11 @@ class Weapps::SessionsController < Weapps::BaseController # session[:wechat_user_extra].delete(:nickName) # 绑定微信号 - open_user = OpenUsers::Wechat.find_by(uid: session_unionid) - if open_user.present? && open_user.user_id.nil? - open_user.update!(user_id: user.id) - elsif user.wechat_open_user.blank? + # open_user = OpenUsers::Wechat.find_by(uid: session_unionid) + # if open_user.present? && open_user.user_id.nil? + # open_user.update!(user_id: user.id) + # els + if user.wechat_open_user.blank? OpenUsers::Wechat.create!(user: user, uid: session_unionid) end diff --git a/app/controllers/weapps/unbind_accounts_controller.rb b/app/controllers/weapps/unbind_accounts_controller.rb index 4698108e3..53c8d8478 100644 --- a/app/controllers/weapps/unbind_accounts_controller.rb +++ b/app/controllers/weapps/unbind_accounts_controller.rb @@ -7,7 +7,8 @@ class Weapps::UnbindAccountsController < Weapps::BaseController def destroy open_user = OpenUsers::Wechat.find_by!(user_id: current_user.id) - open_user.update!(user_id: nil) + session[:unionid] = open_user.uid + open_user.destroy! UserAction.create(action_id: current_user.id, action_type: "UnbindWechat", user_id: current_user.id, :ip => request.remote_ip) logout_user render_ok diff --git a/app/views/weapps/unbind_accounts/show.json.jbuilder b/app/views/weapps/unbind_accounts/show.json.jbuilder index 057823247..c4223a021 100644 --- a/app/views/weapps/unbind_accounts/show.json.jbuilder +++ b/app/views/weapps/unbind_accounts/show.json.jbuilder @@ -1 +1 @@ -json.user_account @user.phone.present? ? @user.phone : @user.mail +json.user_account @user.phone.present? ? @user.phone : (@user.mail.present? ? @user.mail : @user.login)