周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 b7536c730e8cc91edf6545dd4ee23ea2a908cb53 1 个父辈 a3dd8d69

gx

内嵌 并排对比
正在显示 1 个修改的文件 包含 4 行增加 和 8 行删除
@@ -86,7 +86,7 @@ class RemainDay extends Command @@ -86,7 +86,7 @@ class RemainDay extends Command
86 * @time :2025/4/2 10:48 86 * @time :2025/4/2 10:48
87 */ 87 */
88 public function saveRemainDay(){ 88 public function saveRemainDay(){
89 - $list = $this->project->list(['extend_type'=>Project::TYPE_ZERO,'type'=>['in',[Project::TYPE_TWO,Project::TYPE_THREE,Project::TYPE_FOUR]]],'id',['id','type','uptime','remain_day','is_remain_today','pause_days','finish_remain_day']); 89 + $list = $this->project->list(['extend_type'=>Project::TYPE_ZERO,'type'=>['in',[Project::TYPE_TWO,Project::TYPE_THREE,Project::TYPE_FOUR]]],'id',['id','type','uptime','remain_day','is_remain_today','pause_days','finish_remain_day','bm_finish_remain_day']);
90 foreach ($list as $item){ 90 foreach ($list as $item){
91 $deploy_build = $this->deployBuild->read(['project_id'=>$item['id']],['service_duration','seo_service_duration','plan','seo_plan']); 91 $deploy_build = $this->deployBuild->read(['project_id'=>$item['id']],['service_duration','seo_service_duration','plan','seo_plan']);
92 echo 'start->项目id:' . $item['id'] . '执行时间：'. date('Y-m-d H:i:s') . PHP_EOL; 92 echo 'start->项目id:' . $item['id'] . '执行时间：'. date('Y-m-d H:i:s') . PHP_EOL;
@@ -123,19 +123,15 @@ class RemainDay extends Command @@ -123,19 +123,15 @@ class RemainDay extends Command
123 //白帽版本的系统 123 //白帽版本的系统
124 if($deploy_build['seo_plan'] == 1){ 124 if($deploy_build['seo_plan'] == 1){
125 if($deploy_build['seo_service_duration'] != 0){ 125 if($deploy_build['seo_service_duration'] != 0){
126 - if($item['uptime']){  
127 - $diff = time() - strtotime($item['uptime']);  
128 - $compliance_day = floor($diff / (60 * 60 * 24)); 126 + if($item['bm_finish_remain_day']){
  127 + $compliance_day = (int)$item['bm_finish_remain_day'];
129 $seo_remain_day = $deploy_build['seo_service_duration'] - $compliance_day; 128 $seo_remain_day = $deploy_build['seo_service_duration'] - $compliance_day;
130 }else{ 129 }else{
131 $seo_remain_day = $deploy_build['seo_service_duration']; 130 $seo_remain_day = $deploy_build['seo_service_duration'];
132 } 131 }
133 -// if($seo_remain_day < 0){  
134 -// $seo_remain_day = 0;  
135 -// }  
136 if($deploy_build['plan'] == 0 && $seo_remain_day < 0 && $deploy_build['seo_service_duration'] != 0){//只有白帽版本的项目且剩余服务时常为0，放入未续费中 132 if($deploy_build['plan'] == 0 && $seo_remain_day < 0 && $deploy_build['seo_service_duration'] != 0){//只有白帽版本的项目且剩余服务时常为0，放入未续费中
137 // $this->project->edit(['seo_remain_day'=>$seo_remain_day,'finish_remain_day'=>$compliance_day ?? 0,'extend_type'=>Project::TYPE_FIVE],['id'=>$item['id']]); 133 // $this->project->edit(['seo_remain_day'=>$seo_remain_day,'finish_remain_day'=>$compliance_day ?? 0,'extend_type'=>Project::TYPE_FIVE],['id'=>$item['id']]);
138 - $this->project->edit(['seo_remain_day'=>$seo_remain_day,'finish_remain_day'=>$compliance_day ?? 0],['id'=>$item['id']]); 134 + $this->project->edit(['seo_remain_day'=>$seo_remain_day,'bm_finish_remain_day'=>$compliance_day ?? 0,'extend_type'=>Project::TYPE_FIVE],['id'=>$item['id']]);
139 }else{ 135 }else{
140 //同时包括白帽版本+默认版本的项目 136 //同时包括白帽版本+默认版本的项目
141 $this->project->edit(['seo_remain_day'=>$seo_remain_day],['id'=>$item['id']]); 137 $this->project->edit(['seo_remain_day'=>$seo_remain_day],['id'=>$item['id']]);