diff --git a/app/controller/api/UserController.php b/app/controller/api/UserController.php index cdd0db7..8195bd0 100644 --- a/app/controller/api/UserController.php +++ b/app/controller/api/UserController.php @@ -9,6 +9,7 @@ use App\Utils\Random; use Tinywan\Jwt\JwtToken; use App\model\User; +use App\model\ActiveUsers; use App\Utils\ApiResponseApp; use App\dao\UserDao; use app\dao\UserPhoneLogDao; @@ -176,7 +177,9 @@ class UserController * @Apidoc\Url("api/user/active_user") * @Apidoc\Method("POST") */ - public function active_user(){ - return ApiResponseApp::success([],''); + public function active_user(Request $request){ + $user_id=$request->data['id']; + $activeUsers = ActiveUsers::where('user_id',$user_id)->get(); + return ApiResponseApp::success($activeUsers); } } diff --git a/process/Task2.php b/process/Task2.php index 6fb9329..20c9fb3 100644 --- a/process/Task2.php +++ b/process/Task2.php @@ -67,7 +67,7 @@ class Task2 // var_dump($remainingTime); // 更新用户的积分 $value->score += $score; - + $value->day_score += $score; // 更新用户的在线时长为剩余时间 $value->time = $remainingTime; diff --git a/process/Task3.php b/process/Task3.php index 9fb20de..453a9ae 100644 --- a/process/Task3.php +++ b/process/Task3.php @@ -2,12 +2,11 @@ namespace process; -use App\Utils\API\SendCode; + use app\model\UserPhone; -use App\model\UserReward; +use app\model\ActiveUsers; use app\dao\UserRewardDao; use Workerman\Crontab\Crontab; -use app\model\GetLodeLog; use app\model\User; /** @@ -70,6 +69,13 @@ class Task3 $parent->today_num += 1; $parent->today_team_income+=80; $parent->save(); + // ActiveUsers.c + $activeUsers = ActiveUsers::create([ + 'user_id' => $parent->id, + 'phome' => $UserPhone->phone, + 'income' => $UserPhone->day_score, + ]); + //判定有没有父级的父级 这里父级没有默认是0 if($parent->f_id==0){ diff --git a/process/Task4.php b/process/Task4.php index f3099c4..57fd196 100644 --- a/process/Task4.php +++ b/process/Task4.php @@ -3,11 +3,11 @@ namespace process; use App\Utils\API\SendCode; -use app\model\UserPhone; use app\dao\UserRewardDao; use Workerman\Crontab\Crontab; use app\model\GetLodeLog; use app\model\User; +use app\model\UserPhone; /** * 查询用户是否在线类 @@ -52,6 +52,7 @@ class Task4 //把user里所有数据的today_num全部变成0 User::where('today_num','>',0)->update(['today_num'=>0]); User::where('active_figures','>',0)->update(['active_figures'=>0]); + UserPhone::all()->update(['day_score'=>0]); }); } }