Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -173,8 +173,7 @@ class ServerConfigLogic extends BaseLogic
     public function updateAllTable($param){
     public function updateAllTable($param){
         DevopsTask::addTask($param['sql']);
         DevopsTask::addTask($param['sql']);
         //执行命令行
         //执行命令行
-        $process = new Process(['php', 'artisan', 'devops_task']);
-        $process->start();
+        Artisan::call('php artisan devops_task');
         return $this->success();
         return $this->success();
     }
     }
 }
 }

@@ -259,28 +259,32 @@ class ProjectLogic extends BaseLogic
      * @time   :2023/9/12 11:20
      * @time   :2023/9/12 11:20
      */
      */
     public function setTypeSevenEdit($param){
     public function setTypeSevenEdit($param){
-        //删除原始项目
-        $this->edit(['delete_status' => 1], ['id' => $param['id']]);
+        $info = $this->model->read(['id'=>$param['id']]);
+
+        if($info['delete_status'] == 0){
+            //删除原始项目
+            $this->edit(['delete_status' => 1], ['id' => $param['id']]);
 
 
-        //添加到续费单
-        $data = [
-            'title' => '【续费单】' . $param['title'],
-            'company' => $param['company'],
-            'lead_name' => $param['lead_name'],
-            'mobile' => $param['mobile'],
-            'qq' => $param['qq'],
-            'channel' => json_encode($param['channel']),
-            'requirement' => $param['requirement'],
-            'cooperate_date' => $param['cooperate_date'],
-            'service_duration' => $param['deploy_build']['service_duration'],
-            'plan' => $param['deploy_build']['plan'],
+            //添加到续费单
+            $data = [
+                'title' => '【续费单】' . $param['title'],
+                'company' => $param['company'],
+                'lead_name' => $param['lead_name'],
+                'mobile' => $param['mobile'],
+                'qq' => $param['qq'],
+                'channel' => json_encode($param['channel']),
+                'requirement' => $param['requirement'],
+                'cooperate_date' => $param['cooperate_date'],
+                'service_duration' => $param['deploy_build']['service_duration'],
+                'plan' => $param['deploy_build']['plan'],
 //            'api_no' => $param['id'],  //改手动填
 //            'api_no' => $param['id'],  //改手动填
-            'amount' => $param['payment']['amount'],
-            'contract' => json_encode($param['payment']['contract']),
-            'bill' => json_encode($param['payment']['bill']),
-        ];
-        $renewModel = new ProjectRenew();
-        $renewModel->add($data);
+                'amount' => $param['payment']['amount'],
+                'contract' => json_encode($param['payment']['contract']),
+                'bill' => json_encode($param['payment']['bill']),
+            ];
+            $renewModel = new ProjectRenew();
+            $renewModel->add($data);
+        }
 
 
         return $this->success();
         return $this->success();
     }
     }