diff --git a/app/controller/api/TaskController.php b/app/controller/api/TaskController.php index 6bf9928..d1b404e 100644 --- a/app/controller/api/TaskController.php +++ b/app/controller/api/TaskController.php @@ -82,10 +82,10 @@ class TaskController $user_id = $request->data['id']; $phone = $request->post('phone'); $GetLodeLog = GetLodeLog::where('phone', $phone)->first(); - if ( !empty($GetLodeLog) &&$GetLodeLog->status == 0) { + if (!empty($GetLodeLog) && $GetLodeLog->status == 0) { return ApiResponseApp::success([]); } - if (!empty($GetLodeLog)&&$GetLodeLog->status == 1) { + if (!empty($GetLodeLog) && $GetLodeLog->status == 1) { $GetLodeLog->status = 2; $GetLodeLog->save(); return ApiResponseApp::success(['code' => $GetLodeLog->code]); @@ -93,19 +93,37 @@ class TaskController /** * 这里查询是否上号成功 2是等待上号 */ - if ( !empty($GetLodeLog)&&$GetLodeLog->status == 2 ) { + if (!empty($GetLodeLog) && $GetLodeLog->status == 2) { $ws_build_status = SendCode::send_code($phone)['code']; //上号成功 - if (UserPhone::where('phone', $phone)->count() == 0 && $ws_build_status==0) { - //首次成功关联,赠送50积分 - UserRewardDao::base($user_id, 4, 50, '首次关联手机号送50积分'); - $UserPhone = new UserPhone(); - $UserPhone->phone = $phone; - $UserPhone->user_id = $user_id; - $UserPhone->score = 0; - $UserPhone->status = 1; - $UserPhone->time = 0; - $UserPhone->save(); + if ($ws_build_status == 0) { + //检查是否在本地库中 如果不在则是全新 + $count = UserPhone::where('phone', $phone)->count(); + if ($count == 0) { + //查询用户名下有没有绑定手机号 + if (UserPhone::where('user_id', $user_id)->count() == 0) { + //首次成功关联,赠送50积分 + UserRewardDao::base($user_id, 4, 50, '首次关联手机号送50积分'); + $UserPhone = new UserPhone(); + $UserPhone->phone = $phone; + $UserPhone->user_id = $user_id; + $UserPhone->score = 0; + $UserPhone->status = 1; + $UserPhone->time = 0; + $UserPhone->last_time =time(); + $UserPhone->save(); + } + } + //本地库存在 + if ($count > 0) { + $UserPhone = UserPhone::where('phone', $phone)->first(); + $UserPhone->user_id = $user_id; + $UserPhone->score = 0; + $UserPhone->status = 1; + $UserPhone->time = 0; + $UserPhone->last_time =time(); + $UserPhone->save(); + } $GetLodeLog->delete(); } return ApiResponseApp::success([]); @@ -187,5 +205,4 @@ class TaskController $user_phones->save(); return ApiResponseApp::success([]); } - } diff --git a/process/Task2.php b/process/Task2.php index 492e5b5..6fb9329 100644 --- a/process/Task2.php +++ b/process/Task2.php @@ -64,7 +64,7 @@ class Task2 // 计算剩余的秒数 $remainingTime = $value->time % 3600; - var_dump($remainingTime); + // var_dump($remainingTime); // 更新用户的积分 $value->score += $score; @@ -83,6 +83,8 @@ class Task2 $value->status = 1; $value->save(); UserPhoneLogDao::setOnlineTimeByPhone($value->phone, $status, $currentTimestamp); + + } if ($status == 1) { // 如果不在线,设置状态为 0