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

@@ -130,8 +130,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 {
+        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);
@@ -155,11 +155,11 @@ class ProjectLogic extends BaseLogic
                 //创建站点
                 //创建站点
 //                $this->createSite($this->param);
 //                $this->createSite($this->param);
             }
             }
-//            DB::commit();
-//        }catch (\Exception $e){
-//            DB::rollBack();
-//            $this->fail('保存失败，请联系管理员');
-//        }
+            DB::commit();
+        }catch (\Exception $e){
+            DB::rollBack();
+            $this->fail('保存失败，请联系管理员');
+        }
         (new SyncService())->projectAcceptAddress($this->param['id']);
         (new SyncService())->projectAcceptAddress($this->param['id']);
         return $this->success();
         return $this->success();
     }
     }