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

Lyh server



查看合并请求 !1902

@@ -122,7 +122,8 @@ class RemainDay extends Command
             if($deploy_build['seo_service_duration'] != 0){
             if($deploy_build['seo_service_duration'] != 0){
                 if($item['uptime']){
                 if($item['uptime']){
                     $diff = time() - strtotime($item['uptime']);
                     $diff = time() - strtotime($item['uptime']);
-                    $seo_remain_day = $deploy_build['seo_service_duration'] - floor($diff / (60 * 60 * 24));
+                    $compliance_day  = floor($diff / (60 * 60 * 24));
+                    $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'];
                 }
                 }
@@ -130,7 +131,7 @@ class RemainDay extends Command
                     $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,'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']]);
                 }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']]);

@@ -142,6 +142,7 @@ class RenewProjectController extends BaseController
         if($item['type'] != Project::TYPE_ZERO){
         if($item['type'] != Project::TYPE_ZERO){
             $data = APublicModel::getNumByProjectId($item['id']);
             $data = APublicModel::getNumByProjectId($item['id']);
         }
         }
+        $plan = Project::planMap();
         $item = [
         $item = [
             'id' => $item['id'],
             'id' => $item['id'],
             'title' => $item['title'],
             'title' => $item['title'],
@@ -159,7 +160,7 @@ class RenewProjectController extends BaseController
             'optimize_tech' => $manageModel->getName($item['deploy_optimize']['tech_mid']), //售后技术
             'optimize_tech' => $manageModel->getName($item['deploy_optimize']['tech_mid']), //售后技术
             'type' => $item['type'],
             'type' => $item['type'],
             'test_domain' => $item['deploy_build']['test_domain'] ?? 0,
             'test_domain' => $item['deploy_build']['test_domain'] ?? 0,
-            'plan' =>Project::planMap()[$item['deploy_build']['plan']],
+            'plan' =>$plan[$item['deploy_build']['plan']] ?? '无版本信息',
             'plan_id' =>$item['deploy_build']['plan'],
             'plan_id' =>$item['deploy_build']['plan'],
             'domain' => !empty($item['deploy_optimize']['domain']) ?  $domainModel->getDomain($item['deploy_optimize']['domain']) : '',
             'domain' => !empty($item['deploy_optimize']['domain']) ?  $domainModel->getDomain($item['deploy_optimize']['domain']) : '',
             'created_at' => date('Y年m月d日', strtotime($item['created_at'])),
             'created_at' => date('Y年m月d日', strtotime($item['created_at'])),