gx

@@ -57,7 +57,7 @@ class Count extends Command
             //服务达标天数
             //服务达标天数
             $arr['compliance_day'] = $this->compliance_day($yesterday);
             $arr['compliance_day'] = $this->compliance_day($yesterday);
             //剩余服务时常
             //剩余服务时常
-            $arr['service_day'] = (int)$v['service_duration'];
+            $arr['service_day'] = ((int)$v['service_duration'] - (int)$arr['compliance_day']);
             //项目id
             //项目id
             $arr['project_id'] = $v['project_id'];
             $arr['project_id'] = $v['project_id'];
             $arr['created_at'] = date('Y-m-d H:i:s');
             $arr['created_at'] = date('Y-m-d H:i:s');

@@ -44,7 +44,6 @@ class RenewProjectController extends BaseController
                 $map[] = [$this->param['search_type'], 'like', "%{$this->param['search']}%"];
                 $map[] = [$this->param['search_type'], 'like', "%{$this->param['search']}%"];
             }
             }
         }
         }
-
         $data = $logic->getList($map, $sort,['*'],$this->row);
         $data = $logic->getList($map, $sort,['*'],$this->row);
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }

@@ -138,8 +138,8 @@ class ProjectLogic extends BaseLogic
             if(!empty($param['deploy_build']['test_domain'])) unset($param['deploy_build']['test_domain']);
             if(!empty($param['deploy_build']['test_domain'])) unset($param['deploy_build']['test_domain']);
             if(!empty($param['deploy_build']['plan'])) unset($param['deploy_build']['plan']);
             if(!empty($param['deploy_build']['plan'])) unset($param['deploy_build']['plan']);
             if(!empty($param['deploy_optimize']['api_no'])) unset($param['deploy_optimize']['api_no']);
             if(!empty($param['deploy_optimize']['api_no'])) unset($param['deploy_optimize']['api_no']);
-            if($param['type'] == 6){
-                $param['extend_type'] == 6;
+            if($param['type'] == 5){
+                $param['extend_type'] == 5;
                 unset($param['type']);
                 unset($param['type']);
             }
             }
             $res = parent::save($param);
             $res = parent::save($param);

@@ -57,12 +57,12 @@ class ServiceLogic extends BaseLogic
      */
      */
     public function serviceSave(){
     public function serviceSave(){
         //删除以前的配置
         //删除以前的配置
-//        try {
+        try {
             $this->model->del(['type'=>1]);
             $this->model->del(['type'=>1]);
             $this->model->insert($this->param['data']);
             $this->model->insert($this->param['data']);
-//        }catch (\Exception $e){
-//            $this->fail('error');
-//        }
+        }catch (\Exception $e){
+            $this->fail('error');
+        }
         return $this->success();
         return $this->success();
     }
     }
 
 

@@ -45,10 +45,9 @@ class Project extends Base
             1 => '建站进程中',
             1 => '建站进程中',
             2 => '已完成–推广进程中',
             2 => '已完成–推广进程中',
             3 => '已完成-建站用户',
             3 => '已完成-建站用户',
-            4 => '续费记录单',
-            5 => '推广续网站',
-            6 => '未续费项目',
-            7 => '特殊推广项目'
+            4 => '推广续网站',
+            5 => '未续费项目',
+            6 => '特殊推广项目'
         ];
         ];
     }
     }