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,6 +145,8 @@ class ProjectLogic extends BaseLogic
      * @time   :2023/8/30 11:57
      * @time   :2023/8/30 11:57
      */
      */
     public function projectSave(){
     public function projectSave(){
+        DB::beginTransaction();
+        try {
             if($this->param['type'] == Project::TYPE_SEVEN){
             if($this->param['type'] == Project::TYPE_SEVEN){
                 //错误单直接返回,单独处理
                 //错误单直接返回,单独处理
                 $this->setTypeSevenEdit($this->param);
                 $this->setTypeSevenEdit($this->param);
@@ -171,6 +174,11 @@ class ProjectLogic extends BaseLogic
                 //同步信息表
                 //同步信息表
                 (new SyncService())->projectAcceptAddress($this->param['id']);
                 (new SyncService())->projectAcceptAddress($this->param['id']);
             }
             }
+            DB::commit();
+        }catch (\Exception $e){
+            DB::rollBack();
+            $this->fail('保存失败，请联系管理员');
+        }
         return $this->success();
         return $this->success();
     }
     }