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

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

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

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