合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !2386

@@ -86,7 +86,7 @@ class RemainDay extends Command
      * @time   :2025/4/2 10:48
      * @time   :2025/4/2 10:48
      */
      */
     public function saveRemainDay(){
     public function saveRemainDay(){
-        $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']);
+        $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']);
         foreach ($list as $item){
         foreach ($list as $item){
             $deploy_build = $this->deployBuild->read(['project_id'=>$item['id']],['service_duration','seo_service_duration','plan','seo_plan']);
             $deploy_build = $this->deployBuild->read(['project_id'=>$item['id']],['service_duration','seo_service_duration','plan','seo_plan']);
             echo 'start->项目id:' . $item['id'] . '执行时间：'. date('Y-m-d H:i:s') . PHP_EOL;
             echo 'start->项目id:' . $item['id'] . '执行时间：'. date('Y-m-d H:i:s') . PHP_EOL;
@@ -123,19 +123,15 @@ class RemainDay extends Command
         //白帽版本的系统
         //白帽版本的系统
         if($deploy_build['seo_plan'] == 1){
         if($deploy_build['seo_plan'] == 1){
             if($deploy_build['seo_service_duration'] != 0){
             if($deploy_build['seo_service_duration'] != 0){
-                if($item['uptime']){
-                    $diff = time() - strtotime($item['uptime']);
-                    $compliance_day  = floor($diff / (60 * 60 * 24));
+                if($item['bm_finish_remain_day']){
+                    $compliance_day  = (int)$item['bm_finish_remain_day'];
                     $seo_remain_day = $deploy_build['seo_service_duration'] - $compliance_day;
                     $seo_remain_day = $deploy_build['seo_service_duration'] - $compliance_day;
                 }else{
                 }else{
                     $seo_remain_day = $deploy_build['seo_service_duration'];
                     $seo_remain_day = $deploy_build['seo_service_duration'];
                 }
                 }
-//                if($seo_remain_day < 0){
-//                    $seo_remain_day = 0;
-//                }
                 if($deploy_build['plan'] == 0 && $seo_remain_day < 0 && $deploy_build['seo_service_duration'] != 0){//只有白帽版本的项目且剩余服务时常为0，放入未续费中
                 if($deploy_build['plan'] == 0 && $seo_remain_day < 0 && $deploy_build['seo_service_duration'] != 0){//只有白帽版本的项目且剩余服务时常为0，放入未续费中
 //                    $this->project->edit(['seo_remain_day'=>$seo_remain_day,'finish_remain_day'=>$compliance_day ?? 0,'extend_type'=>Project::TYPE_FIVE],['id'=>$item['id']]);
 //                    $this->project->edit(['seo_remain_day'=>$seo_remain_day,'finish_remain_day'=>$compliance_day ?? 0,'extend_type'=>Project::TYPE_FIVE],['id'=>$item['id']]);
-                    $this->project->edit(['seo_remain_day'=>$seo_remain_day,'finish_remain_day'=>$compliance_day ?? 0],['id'=>$item['id']]);
+                    $this->project->edit(['seo_remain_day'=>$seo_remain_day,'bm_finish_remain_day'=>$compliance_day ?? 0],['id'=>$item['id']]);
                 }else{
                 }else{
                     //同时包括白帽版本+默认版本的项目
                     //同时包括白帽版本+默认版本的项目
                     $this->project->edit(['seo_remain_day'=>$seo_remain_day],['id'=>$item['id']]);
                     $this->project->edit(['seo_remain_day'=>$seo_remain_day],['id'=>$item['id']]);