gx

@@ -71,30 +71,32 @@ class RemainDay extends Command
                 if($item['type'] != Project::TYPE_THREE){
                 if($item['type'] != Project::TYPE_THREE){
                     $item->pause_days = $item->pause_days + 1;
                     $item->pause_days = $item->pause_days + 1;
                 }
                 }
-            }
-            if(in_array($item->id,$this->projectId)){//已开始优化的时间结算
-                $optimizeModel = new DeployOptimize();
-                $opInfo = $optimizeModel->read(['project_id'=>$item->id],['start_date']);
-                if($opInfo === false){
-                    continue;
-                }
-                $diff = time() - strtotime($opInfo['start_date'] ?? $item->uptime);
-                $remain_day = $item['deploy_build']['service_duration'] - floor($diff / (60 * 60 * 24));
             }else{
             }else{
-                if($item['type'] == Project::TYPE_TWO){
-                    $compliance_day  = ($item->finish_remain_day ?? 0);
-                    $remain_day = $item['deploy_build']['service_duration'] - $compliance_day;
+                if(in_array($item->id,$this->projectId)){//已开始优化的时间结算
+                    $optimizeModel = new DeployOptimize();
+                    $opInfo = $optimizeModel->read(['project_id'=>$item->id],['start_date']);
+                    if($opInfo === false){
+                        continue;
+                    }
+                    $diff = time() - strtotime($opInfo['start_date'] ?? $item->uptime);
+                    $remain_day = $item['deploy_build']['service_duration'] - floor($diff / (60 * 60 * 24));
                 }else{
                 }else{
-                    if($item->uptime){
-                        $diff = time() - strtotime($item->uptime);
-                        $item->finish_remain_day = floor($diff / (60 * 60 * 24));
-                        $remain_day = $item['deploy_build']['service_duration'] - floor($diff / (60 * 60 * 24));
+                    if($item['type'] == Project::TYPE_TWO){
+                        $compliance_day  = ($item->finish_remain_day ?? 0);
+                        $remain_day = $item['deploy_build']['service_duration'] - $compliance_day;
                     }else{
                     }else{
-                        $remain_day = $item['deploy_build']['service_duration'];
+                        if($item->uptime){
+                            $diff = time() - strtotime($item->uptime);
+                            $item->finish_remain_day = floor($diff / (60 * 60 * 24));
+                            $remain_day = $item['deploy_build']['service_duration'] - floor($diff / (60 * 60 * 24));
+                        }else{
+                            $remain_day = $item['deploy_build']['service_duration'];
+                        }
                     }
                     }
                 }
                 }
+                $item->remain_day = ($remain_day > 0 ? $remain_day : 0);
             }
             }
-            $item->remain_day = ($remain_day > 0 ? $remain_day : 0);
+            $item->save();
 //            if($item->remain_day == 0){
 //            if($item->remain_day == 0){
 //                $item->extend_type = Project::TYPE_FIVE;
 //                $item->extend_type = Project::TYPE_FIVE;
 //                $item->site_status = Project::TYPE_ONE;//关闭站点
 //                $item->site_status = Project::TYPE_ONE;//关闭站点
@@ -105,7 +107,6 @@ class RemainDay extends Command
 //                    curl_get('https://'.$domainInfos['domain'].'/api/stop_or_start_website/');
 //                    curl_get('https://'.$domainInfos['domain'].'/api/stop_or_start_website/');
 //                }
 //                }
 //            }
 //            }
-            $item->save();
         }
         }
     }
     }
 }
 }