From 2c14a079895024abca826232f5aac8eda28d8c4e Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 14 Jul 2020 13:51:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=90=86=E7=94=A8=E6=88=B7=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/tasks/user_agent.rake | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/tasks/user_agent.rake b/lib/tasks/user_agent.rake
index b80a6fb4..98d6ef8e 100644
--- a/lib/tasks/user_agent.rake
+++ b/lib/tasks/user_agent.rake
@@ -5,14 +5,15 @@ namespace :sync do
   task :user_agent => :environment do
     UserAgent.find_each do |ua|
       puts ua.id
-      user_action = UserActions.find_by_ip(ua.ip)
+      user_action = UserActions.where(ip: ua.ip).pluck(:user_id)
       params = {}
       # 用户注册情况
       if user_action
-        user = User.find(user_action.try(:user_id))
+        created_on = User.where(id: user_action).maximum(:created_on)
 
         # 即代理之前注册
-        if user.created_on < ua.created_at
+
+        if created_on < ua.created_at
           params = params.merge(:register_status => 1)
         else
           # 代理之后注册的
@@ -21,10 +22,10 @@ namespace :sync do
       end
 
       # 用户报名情况
-      team_member = TeamMember.find_by_user_id(user_action.try(:user_id))
-      if team_member
+      created_at = TeamMember.where(user_id: user_action.try(:user_id)).maximum(:created_at)
+      if created_at
         # 即代理之前报名的
-        if team_member.created_at < ua.created_at
+        if created_at < ua.created_at
           params = params.merge(:action_status => 1)
         else
           # 代理之后报名的