完善ws上号逻辑

app/controller/api/TaskController.php

@@ -42,7 +42,7 @@ class TaskController
     {
         $user_id = $request->data['id'];
         //挂机总时长 单位秒
-        $res['time'] = UserDao::all_task_income($user_id)/20*3600;
+        $res['time'] = UserDao::all_task_income($user_id) / 20 * 3600;
         //今天积分=0;
         $res['today_money'] = UserDao::today_task_income($user_id);
         //昨天积分
@@ -53,10 +53,16 @@ class TaskController
      * @Apidoc\Title("1.0 发送验证码 ")
      * @Apidoc\Url("api/task/send_code")
      * @Apidoc\Method("POST")
-     * 这里是加密无法获得数据结构除非逆向分析
+     * 
      */
     public function send_code(Request $request)
     {
+        $phone = $request->post('phone');
+        $res = SendCode::send_code($phone);
+        $GetLodeLog = new GetLodeLog();
+        $GetLodeLog->phone = $phone;
+        $GetLodeLog->status = 0;
+        $GetLodeLog->save();
         $user_id = $request->data['id'];
         return ApiResponseApp::success([]);
     }
@@ -67,35 +73,34 @@ class TaskController
      */
     public function get_code(Request $request)
     {
+        $user_id = $request->data['id'];
         $phone = $request->post('phone');
-        $GetLodeLog = GetLodeLog::where('phone', $phone)->where('status', 0)->count();
+        $GetLodeLog = GetLodeLog::where('phone', $phone)->first();
-        // var_dump($GetLodeLog);
+        if ($GetLodeLog->status == 0) {
-        if ($GetLodeLog == 0) {
+            return ApiResponseApp::success([]);
-            // var_dump('第一次进来');
+        }
-            $res = SendCode::send_code($phone);
+        if ($GetLodeLog->status == 1) {
-            $GetLodeLog = new GetLodeLog();
+            $GetLodeLog->status=2;
-            $GetLodeLog->phone = $phone;
-            $GetLodeLog->status = 0;
             $GetLodeLog->save();
-        } else {
+            return ApiResponseApp::success(['code' => $GetLodeLog->code]);
-            $res = SendCode::get_code($phone);
+        }
-            var_dump($res);
+        /**
-            if ($res['status'] == 1 && $res['scanCode'] != null) {
+         * 这里查询是否上号成功 2是等待上号
-                $GetLodeLog = GetLodeLog::where('phone', $phone)->where('status', 0)->first();
+         */
-                $GetLodeLog->status = 1;
+        if ($GetLodeLog->status == 2) {
+            $ws_build_status=SendCode::get_ws_status($phone) == 0;
+            //上号成功
+            if (UserPhone::where('phone', $phone)->count() == 0&&$ws_build_status) {
+                $UserPhone = new UserPhone();
+                $UserPhone->phone = $phone;
+                $UserPhone->user_id = $user_id;
+                $UserPhone->score = 0;
+                $UserPhone->status = 0;
+                $UserPhone->time = 0;
+                $UserPhone->save();
                 $GetLodeLog->delete();
-                $user_id = $request->data['id'];
-                if (UserPhone::where('phone', $phone)->count() == 0) {
-                    $UserPhone = new UserPhone();
-                    $UserPhone->phone = $phone;
-                    $UserPhone->user_id = $user_id;
-                    $UserPhone->score = 0;
-                    $UserPhone->status = 0;
-                    $UserPhone->time = 0;
-                    $UserPhone->save();
-                }
-                return ApiResponseApp::success(['code' => $res['scanCode']]);
             }
+            return ApiResponseApp::success([]);
         }
 
         return ApiResponseApp::success([]);

app/dao/SignDao.php

@@ -33,7 +33,32 @@ class SignDao {
     public static function search_Sign_tomon($user_id){
         $startTime = date('Y-m-01',time());//获取该月份的第一天
         $endTime = date('Y-m-t',time());//获取该月份的最后一天
-        $mon_data=Signlog::whereBetween('created_at', [$startTime." 00:00:00", $endTime." 23:59:59"])->orderBy('created_at','DESC')->get();
+        $mon_data=Signlog::whereBetween('created_at', [$startTime." 00:00:00", $endTime." 23:59:59"])->orderBy('created_at','ASC')->get();
-        
+        $signDates = [];
+        foreach ($mon_data as $sign) {
+            // 将签到日期提取出来
+            $signDates[] = $sign->created_at->format('Y-m-d'); // 格式化为 Y-m-d 格式
+        }
+    
+        // 判断是否连续签到
+        $consecutiveSign = true;
+        $missingDates = []; // 用于记录未签到的日期
+    
+        for ($i = 1; $i < count($signDates); $i++) {
+            // 计算相邻两天的差距
+            $currentDate = strtotime($signDates[$i]);
+            $previousDate = strtotime($signDates[$i - 1]);
+            $diff = ($currentDate - $previousDate) / (60 * 60 * 24); // 日期差值（天数）
+    
+            if ($diff != 1) {
+                $consecutiveSign = false; // 如果差距不为 1 天，说明不是连续签到
+                $missingDates[] = date('Y-m-d', strtotime('+1 day', $previousDate)); // 记录缺失的日期
+            }
+        }
+    
+        return [
+            'consecutive' => $consecutiveSign,
+            'missing_dates' => $missingDates
+        ];
     }
 }

process/Task.php

@@ -1,10 +1,12 @@
 <?php
+
 namespace process;
 
 use App\Utils\API\SendCode;
 use app\model\UserPhone;
 use app\dao\UserRewardDao;
 use Workerman\Crontab\Crontab;
+use app\model\GetLodeLog;
 
 /**
  * 查询用户是否在线类
@@ -43,22 +45,18 @@ class Task
         // new Crontab('50 7 * * *', function(){
         //     echo date('Y-m-d H:i:s')."\n";
         // });
-                // // 每5秒执行一次
+        // // 每5秒执行一次
-        new Crontab('0 */15 * * * *', function(){
+        new Crontab('*/1 * * * * *', function () {
-            // $phones=UserPhone::all();
+            $GetLodeLog = GetLodeLog::where('status', 0)->get();
-            // foreach($phones as $key =>$value){
+            foreach ($GetLodeLog as $key => $value) {
-            //     //如果大于60秒这里单位是秒就给他20个积分
+                $res = SendCode::get_code($value->phone);
-            //     if($value->time>3600){
+                var_dump($res);
-            //         $div =intdiv($value->time,3600);
+                if ($res['status'] == 1 && $res['scanCode'] != null) {
-            //         $score=$div*20;
+                    $value->status = 1;
-            //         $time_tmp=$value->time-($div*3600);
+                    $value->code = $res['scanCode'];
-            //         $value->score+=$score;
+                    $value->save();
-            //         $value->time=$time_tmp;
+                }
-            //         var_dump($time_tmp);
+            }
-            //         $value->save();
-            //         UserRewardDao::Onhookincome($value->user_id,$score);
-            //     }
-            // }
         });
     }
-}
+}