Merge remote-tracking branch 'origin/master' into akun

@@ -28,7 +28,7 @@ class RemainDay extends Command
      * @var 按上线时间统计
      */
     protected $projectId = [
-        1434,1812,276
+        1434,1812,276,596
     ];//需要单独处理的项目
 
     /**

@@ -161,28 +161,28 @@ class countProject extends Command
             if($data[$v]['month_create_project_count'] != 0){
                 $data[$v]['month_project_online_rate'] = round($data[$v]['month_project_go_online_count'] / $data[$v]['month_create_project_count'],2);//比例
             }
-        $data[$v]['count'] = $projectModel->counts(['delete_status'=>0]);//所有项目总数
-        $data[$v]['go_online_count'] = $projectModel->counts(['uptime'=>['!=',null],'delete_status'=>0]);//上线项目总数
-        $data[$v]['promotion_web_count'] = $projectModel->counts(['type'=>3,'delete_status'=>0,'created_at'=>['between',[$start_time,$end_time]]]);//推广项目总数
-        $data[$v]['create_web_count'] = $projectModel->counts(['type'=>2,'delete_status'=>0,'created_at'=>['between',[$start_time,$end_time]]]);//建站项目总数
-        $data[$v]['no_go_oline_count'] = $projectModel->counts(['uptime'=>null,'delete_status'=>0,'created_at'=>['between',[$start_time,$end_time]]]);//未上线项目数量
-        $data[$v]['delete_project_count'] = $projectModel->counts(['delete_status'=>1,'created_at'=>['between',[$start_time,$end_time]]]);//删除
-        $min_info = $projectModel->select('*')
-            ->selectRaw('DATEDIFF(STR_TO_DATE(uptime, "%Y-%m-%d"), STR_TO_DATE(created_at, "%Y-%m-%d")) AS diff')
-            ->whereNotNull('uptime')   // 确保 uptime 字段不为空
-            ->where('created_at','<=',$end_time)
-            ->whereBetween('created_at', [$start_time,$end_time])
-            ->orderByRaw('diff ASC')
-            ->first();
-        $data[$v]['min_project_count'] = $min_info['diff'];
-        $max_info = $projectModel->select('*')
-            ->selectRaw('DATEDIFF(STR_TO_DATE(uptime, "%Y-%m-%d"), STR_TO_DATE(created_at, "%Y-%m-%d")) AS diff')
-            ->whereNotNull('uptime')   // 确保 uptime 字段不为空
-            ->whereBetween('created_at', [$start_time,$end_time])
-            ->orderByRaw('diff DESC')
-            ->first();
-        $data[$v]['max_project_count'] = $max_info['diff'];
-        $data[$v]['average'] = ceil(($max_info['diff'] + $min_info['diff']) / 2);
+            $data[$v]['count'] = $projectModel->counts(['delete_status'=>0]);//所有项目总数
+            $data[$v]['go_online_count'] = $projectModel->counts(['uptime'=>['!=',null],'delete_status'=>0]);//上线项目总数
+            $data[$v]['promotion_web_count'] = $projectModel->counts(['type'=>3,'delete_status'=>0,'created_at'=>['between',[$start_time,$end_time]]]);//推广项目总数
+            $data[$v]['create_web_count'] = $projectModel->counts(['type'=>2,'delete_status'=>0,'created_at'=>['between',[$start_time,$end_time]]]);//建站项目总数
+            $data[$v]['no_go_oline_count'] = $projectModel->counts(['uptime'=>null,'delete_status'=>0,'created_at'=>['between',[$start_time,$end_time]]]);//未上线项目数量
+            $data[$v]['delete_project_count'] = $projectModel->counts(['delete_status'=>1,'created_at'=>['between',[$start_time,$end_time]]]);//删除
+            $min_info = $projectModel->select('*')
+                ->selectRaw('DATEDIFF(STR_TO_DATE(uptime, "%Y-%m-%d"), STR_TO_DATE(created_at, "%Y-%m-%d")) AS diff')
+                ->whereNotNull('uptime')   // 确保 uptime 字段不为空
+                ->where('created_at','<=',$end_time)
+                ->whereBetween('created_at', [$start_time,$end_time])
+                ->orderByRaw('diff ASC')
+                ->first();
+            $data[$v]['min_project_count'] = $min_info['diff'];
+            $max_info = $projectModel->select('*')
+                ->selectRaw('DATEDIFF(STR_TO_DATE(uptime, "%Y-%m-%d"), STR_TO_DATE(created_at, "%Y-%m-%d")) AS diff')
+                ->whereNotNull('uptime')   // 确保 uptime 字段不为空
+                ->whereBetween('created_at', [$start_time,$end_time])
+                ->orderByRaw('diff DESC')
+                ->first();
+            $data[$v]['max_project_count'] = $max_info['diff'];
+            $data[$v]['average'] = ceil(($max_info['diff'] + $min_info['diff']) / 2);
         }
         return $data;
     }

@@ -167,7 +167,7 @@ class RenewProjectController extends BaseController
             'optimist_status'=>$item['online_check']['optimist_status'] ?? 0,
             'qa_status'=>$item['online_check']['qa_status'] ?? 0,
             'service_day'=>$item['remain_day'] ?? 0,
-            'site_status'=>$item['site_status'],
+            'site_status'=>$item['site_status'] ?? 0,
         ];
         return $item;
     }

@@ -67,7 +67,7 @@ class InquiryForm extends Base
      * @author zbj
      * @date 2023/12/4
      */
-    public static function getFromId($data){
+    public static function getFromId($data, $project_id){
         unset($data['globalso-domain_host_url']);
         unset($data['globalso-domain']);
         unset($data['globalso-edition']);
@@ -76,7 +76,7 @@ class InquiryForm extends Base
         foreach ($data as $k => $v){
             if(in_array($k, ['name', 'email', 'message']) && empty($v)){
                 //特殊处理1986的表单
-                if($k == 'message' && $data['project_id'] == 1986){
+                if($k == 'message' && $project_id == 1986){
                     continue;
                 }
                 unset($data[$k]);

@@ -149,7 +149,7 @@ class SyncSubmitTaskService
             }
         }
 
-        $form_id = InquiryForm::getFromId($data['data']);
+        $form_id = InquiryForm::getFromId($data['data'], $data['project_id']);
 
         $data['referer'] = $this->handle_referer($data['referer']);