From 6d85bf37f14c3ffc4f68fd67b07049975595415a Mon Sep 17 00:00:00 2001
From: lingling <1077478963@qq.com>
Date: Tue, 18 Feb 2025 20:28:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E5=8A=A0=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 process/Task2.php | 23 +++++++++++++++--------
 process/Task3.php |  3 +--
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/process/Task2.php b/process/Task2.php
index 6f5895a..ac55fa3 100644
--- a/process/Task2.php
+++ b/process/Task2.php
@@ -55,15 +55,22 @@ class Task2
                 if ($status == 0) {
                     // 如果在线时长超过 3600 秒
                     if ($value->time > 3600) {
-                        $div = intdiv($value->time, 3600);
-                        $score = $div * 20;
-                        $time_tmp = $value->time - ($div * 3600);
-
-                        // 更新积分
+                        // 计算超过 1 小时的完整小时数
+                        $hours = intdiv($value->time, 3600);
+                        
+                        // 根据每小时 20 分积分计算总积分
+                        $score = $hours * 20;
+                    
+                        // 计算剩余的秒数
+                        $remainingTime = $value->time - ($hours * 3600);
+                        var_dump($remainingTime);
+                        // 更新用户的积分
                         $value->score += $score;
-                        $value->time = $time_tmp;
-
-                        // 保存用户收益
+                    
+                        // 更新用户的在线时长为剩余时间
+                        $value->time = $remainingTime;
+                    
+                        // 保存用户收益到 UserReward 表
                         UserRewardDao::Onhookincome($value->user_id, $score);
                     }
 
diff --git a/process/Task3.php b/process/Task3.php
index 26a99e3..dda66b2 100644
--- a/process/Task3.php
+++ b/process/Task3.php
@@ -50,7 +50,7 @@ class Task3
         new Crontab('0 */5 * * * *', function () {
             //获取今天在线时间超过6小时的用户
             $today = date('Y-m-d');
-            $UserPhone = UserPhone::where('time', '>=', 3600)::where('time', '<', 4200)::where('created_at','>=',$today)->get();
+            $UserPhone = UserPhone::where('score', '>=', 120)->where('time', '<',140)->get();
             //判断用户绑定Whatsapp首次登录
             foreach ($UserPhone as $key => $value) {
                 $user_id = $value->user_id;
@@ -60,7 +60,6 @@ class Task3
                 }
                 //获取该用户的父级
                 $parent = User::find($user->f_id);
-                var_dump($parent);
                 //满足则加80积分
                 UserRewardDao::base($parent->id, 5, 80, '推广收益');
                 //vip_id等级加1,并更新数据库