合并分支 'akun' 到 'master'

update



查看合并请求 !988

@@ -1012,6 +1012,30 @@ class ProductLogic extends  BaseLogic
                     'status' => Product::STATUS_ON
                     'status' => Product::STATUS_ON
                 ]
                 ]
             );
             );
+            //更新路由
+            if($route){
+                $route_map = RouteMap::where('project_id', $project_id)->where('source', RouteMap::SOURCE_PRODUCT)->where('source_id', $id)->first();
+                if (!$route_map) {
+                    $route_map = new RouteMap();
+                    $route_map->project_id = $project_id;
+                    $route_map->source = RouteMap::SOURCE_PRODUCT;
+                    $route_map->source_id = $id;
+                    $route_map->route = $route;
+
+                    $route_map->save();
+                }
+            }else{
+                $route = RouteMap::setRoute($data[0], RouteMap::SOURCE_PRODUCT, $id, $project_id);
+            }
+            $this->edit(['route' => $route], ['id' => $id]);
+            //关联分类
+            if($category_arr){
+                CategoryRelated::saveRelated($id, $category_arr);
+            }
+            //关联关键词
+            if($keyword_id){
+                KeywordRelated::saveRelated($id, $keyword_id);
+            }
             if(!empty($content)){
             if(!empty($content)){
                 $data = [
                 $data = [
                     'product_id'=>$id,
                     'product_id'=>$id,
@@ -1047,30 +1071,6 @@ class ProductLogic extends  BaseLogic
                     $detailModel->insert($dataS);
                     $detailModel->insert($dataS);
                 }
                 }
             }
             }
-            //更新路由
-            if($route){
-                $route_map = RouteMap::where('project_id', $project_id)->where('source', RouteMap::SOURCE_PRODUCT)->where('source_id', $id)->first();
-                if (!$route_map) {
-                    $route_map = new RouteMap();
-                    $route_map->project_id = $project_id;
-                    $route_map->source = RouteMap::SOURCE_PRODUCT;
-                    $route_map->source_id = $id;
-                    $route_map->route = $route;
-
-                    $route_map->save();
-                }
-            }else{
-                $route = RouteMap::setRoute($data[0], RouteMap::SOURCE_PRODUCT, $id, $project_id);
-            }
-            $this->edit(['route' => $route], ['id' => $id]);
-            //关联分类
-            if($category_arr){
-                CategoryRelated::saveRelated($id, $category_arr);
-            }
-            //关联关键词
-            if($keyword_id){
-                KeywordRelated::saveRelated($id, $keyword_id);
-            }
             return true;
             return true;
         }
         }
         return false;
         return false;