gx

@@ -12,7 +12,6 @@ namespace App\Http\Controllers\Bside\Template;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\BTemplate\VisualizationLogic;
 use App\Http\Logic\Bside\BTemplate\VisualizationLogic;
-use App\Models\Visualization\Visualization;
 
 
 /**
 /**
  * @remark :定制项目处理
  * @remark :定制项目处理

@@ -402,16 +402,16 @@ class VisualizationLogic extends BaseLogic
                     'template_id' => $template_id,
                     'template_id' => $template_id,
                     'project_id' => $this->user['project_id']
                     'project_id' => $this->user['project_id']
                 ];
                 ];
-                if ($source == 2) {//产品页
+                if ($source == BTemplate::SOURCE_PRODUCT) {//产品页
                     if($source_id != 0){$data['type'] = 2;if ($pageInfo['product_details'] != 0) {$commonInfo = $commonTemplateModel->read($data);}}
                     if($source_id != 0){$data['type'] = 2;if ($pageInfo['product_details'] != 0) {$commonInfo = $commonTemplateModel->read($data);}}
                     else {$data['type'] = 3;if ($pageInfo['product_list'] != 0) {$commonInfo = $commonTemplateModel->read($data);}}}
                     else {$data['type'] = 3;if ($pageInfo['product_list'] != 0) {$commonInfo = $commonTemplateModel->read($data);}}}
-                if ($source == 3) {//博客页
+                if ($source == BTemplate::SOURCE_BLOG) {//博客页
                     if ($source_id != 0) {$data['type'] = 4;if ($pageInfo['blog_details'] != 0) {$commonInfo = $commonTemplateModel->read($data);}}
                     if ($source_id != 0) {$data['type'] = 4;if ($pageInfo['blog_details'] != 0) {$commonInfo = $commonTemplateModel->read($data);}}
                     else {$data['type'] = 5;if ($pageInfo['blog_list'] != 0) {$commonInfo = $commonTemplateModel->read($data);}}}
                     else {$data['type'] = 5;if ($pageInfo['blog_list'] != 0) {$commonInfo = $commonTemplateModel->read($data);}}}
-                if ($source == 4) {//新闻页
+                if ($source == BTemplate::SOURCE_NEWS) {//新闻页
                     if ($source_id != 0) {$data['type'] = 6;if ($pageInfo['news_details'] != 0) {$commonInfo = $commonTemplateModel->read($data);}}
                     if ($source_id != 0) {$data['type'] = 6;if ($pageInfo['news_details'] != 0) {$commonInfo = $commonTemplateModel->read($data);}}
                     else {$data['type'] = 7;if ($pageInfo['news_list'] != 0) {$commonInfo = $commonTemplateModel->read($data);}}}
                     else {$data['type'] = 7;if ($pageInfo['news_list'] != 0) {$commonInfo = $commonTemplateModel->read($data);}}}
-                if ($source == 5) {//聚合页
+                if ($source == BTemplate::SOURCE_KEYWORD) {//聚合页
                     $data['type'] = 8;if ($pageInfo['polymerization'] != 0) {$commonInfo = $commonTemplateModel->read($data);}}
                     $data['type'] = 8;if ($pageInfo['polymerization'] != 0) {$commonInfo = $commonTemplateModel->read($data);}}
             }
             }
         }
         }

@@ -51,8 +51,8 @@ class ProductLogic extends  BaseLogic
             $category_ids = $this->getLastCategoryArr($this->param['category_id']);
             $category_ids = $this->getLastCategoryArr($this->param['category_id']);
             $this->param['category_id'] = ','.implode(',',$category_ids).',';
             $this->param['category_id'] = ','.implode(',',$category_ids).',';
         }
         }
-//        DB::connection('custom_mysql')->beginTransaction();
-//        try {
+        DB::connection('custom_mysql')->beginTransaction();
+        try {
             if(isset($this->param['id']) && !empty($this->param['id'])){
             if(isset($this->param['id']) && !empty($this->param['id'])){
                 $id = $this->param['id'];
                 $id = $this->param['id'];
                 //查看路由是否更新
                 //查看路由是否更新
@@ -68,11 +68,11 @@ class ProductLogic extends  BaseLogic
             CategoryRelated::saveRelated($id, $category_ids);
             CategoryRelated::saveRelated($id, $category_ids);
             //保存扩展字段
             //保存扩展字段
             $this->saveExtendInfo($id,$extend);
             $this->saveExtendInfo($id,$extend);
-//            DB::connection('custom_mysql')->commit();
-//        }catch (\Exception $e){
-//            DB::connection('custom_mysql')->rollBack();
-//            $this->fail('系统错误请联系管理员');
-//        }
+            DB::connection('custom_mysql')->commit();
+        }catch (\Exception $e){
+            DB::connection('custom_mysql')->rollBack();
+            $this->fail('系统错误请联系管理员');
+        }
         //通知更新
         //通知更新
         $this->updateNotify(['project_id'=>$this->user['project_id'], 'type'=>RouteMap::SOURCE_PRODUCT, 'route'=>$this->param['route']]);
         $this->updateNotify(['project_id'=>$this->user['project_id'], 'type'=>RouteMap::SOURCE_PRODUCT, 'route'=>$this->param['route']]);
         return $this->success();
         return $this->success();

@@ -109,13 +109,6 @@ class RouteMap extends Base
         }
         }
         try {
         try {
             $route_map = self::where('project_id', $project_id)->where('source_id', $source_id)->where('source', $source)->first();
             $route_map = self::where('project_id', $project_id)->where('source_id', $source_id)->where('source', $source)->first();
-            //上线项目 不能修改链接了
-            if($route_map){
-                $project = ProjectLogic::instance()->getInfo($project_id);
-                if($project['type'] !== Project::STATUS_ONE){
-                    return $route_map->route;
-                }
-            }
             if(!$route_map){
             if(!$route_map){
                 $route_map = new self();
                 $route_map = new self();
                 $route_map->source = $source;
                 $route_map->source = $source;