Merge remote-tracking branch 'origin/master' into akun

@@ -47,6 +47,7 @@ use App\Services\ProjectServer;
 use App\Services\SyncService;
 use App\Services\SyncService;
 use App\Utils\LogUtils;
 use App\Utils\LogUtils;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Http;
 
 
 /**
 /**
@@ -144,32 +145,39 @@ class ProjectLogic extends BaseLogic
      * @time   :2023/8/30 11:57
      * @time   :2023/8/30 11:57
      */
      */
     public function projectSave(){
     public function projectSave(){
-        if($this->param['type'] == Project::TYPE_SEVEN){
-            //错误单直接返回,单独处理
-            $this->setTypeSevenEdit($this->param);
-        }else{
-            //初始化项目
-            $this->createProjectData($this->param);
-            //双向绑定服务器,需放到保存项目的上方
-            $this->setServers($this->param['serve_id'],$this->param['id']);
-            //保存项目信息
-            $this->saveProject($this->param);
-            //保存建站部署信息
-            $this->saveProjectDeployBuild($this->param['deploy_build']);
-            //保存付费信息
-            $this->saveProjectPayment($this->param['payment']);
-            //保存优化信息
-            $this->saveProjectDeployOptimize($this->param['deploy_optimize']);
-            //保存项目关键字
-            $this->saveProjectKeyword($this->param['project_keyword'] ?? [],$this->param['id']);
-            //保存售后信息
-            $this->saveProjectAfter($this->param['project_after']);
-            //单独保存小语种配置
-            $this->saveMinorLanguages($this->param['minor_languages'] ?? [],$this->param['id']);
-            //同步图片文件
-            $this->syncImageFile($this->param['project_location'],$this->param['id']);
-            //同步信息表
-            (new SyncService())->projectAcceptAddress($this->param['id']);
+        DB::beginTransaction();
+        try {
+            if($this->param['type'] == Project::TYPE_SEVEN){
+                //错误单直接返回,单独处理
+                $this->setTypeSevenEdit($this->param);
+            }else{
+                //初始化项目
+                $this->createProjectData($this->param);
+                //双向绑定服务器,需放到保存项目的上方
+                $this->setServers($this->param['serve_id'],$this->param['id']);
+                //保存项目信息
+                $this->saveProject($this->param);
+                //保存建站部署信息
+                $this->saveProjectDeployBuild($this->param['deploy_build']);
+                //保存付费信息
+                $this->saveProjectPayment($this->param['payment']);
+                //保存优化信息
+                $this->saveProjectDeployOptimize($this->param['deploy_optimize']);
+                //保存项目关键字
+                $this->saveProjectKeyword($this->param['project_keyword'] ?? [],$this->param['id']);
+                //保存售后信息
+                $this->saveProjectAfter($this->param['project_after']);
+                //单独保存小语种配置
+                $this->saveMinorLanguages($this->param['minor_languages'] ?? [],$this->param['id']);
+                //同步图片文件
+                $this->syncImageFile($this->param['project_location'],$this->param['id']);
+                //同步信息表
+                (new SyncService())->projectAcceptAddress($this->param['id']);
+            }
+            DB::commit();
+        }catch (\Exception $e){
+            DB::rollBack();
+            $this->fail('保存失败，请联系管理员');
         }
         }
         return $this->success();
         return $this->success();
     }
     }