合并分支 'lyh-server' 到 'master'

变更数据



查看合并请求 !3113

@@ -170,6 +170,15 @@ class TicketUploadDataLogic extends BaseLogic
         return $this->success($data);
         return $this->success($data);
     }
     }
 
 
+    public function setProductSort($mdoel){
+        $info = $mdoel->orderBy('sort','desc')->first();
+        if(empty($info)){
+            return 1;
+        }
+        $sort = $info['sort']+1;
+        return $sort;
+    }
+
     /**
     /**
      * @remark :保存数据详情
      * @remark :保存数据详情
      * @name   :saveData
      * @name   :saveData
@@ -196,6 +205,7 @@ class TicketUploadDataLogic extends BaseLogic
         }
         }
         try {
         try {
             $productModel = new Product();
             $productModel = new Product();
+            $sort = $this->setProductSort($productModel);
             $data = [
             $data = [
                 'project_id' => $info['project_id'],
                 'project_id' => $info['project_id'],
                 'title' => $info['text']['title'],
                 'title' => $info['text']['title'],
@@ -205,6 +215,7 @@ class TicketUploadDataLogic extends BaseLogic
                 'category_id'=>$category_id ?? '',
                 'category_id'=>$category_id ?? '',
                 'keyword_id'=>$keyword_id ?? '',
                 'keyword_id'=>$keyword_id ?? '',
                 'status'=>1,
                 'status'=>1,
+                'sort'=>$sort,
             ];
             ];
             $id = $productModel->addReturnId($data);
             $id = $productModel->addReturnId($data);
             CategoryRelated::saveRelated($id, $info['text']['category_id'] ?? []);//分类关联
             CategoryRelated::saveRelated($id, $info['text']['category_id'] ?? []);//分类关联
@@ -237,6 +248,8 @@ class TicketUploadDataLogic extends BaseLogic
         if(isset($info['text']['image'])){
         if(isset($info['text']['image'])){
             $info['text']['image'] = str_replace_url($info['text']['image'] ?? '');
             $info['text']['image'] = str_replace_url($info['text']['image'] ?? '');
         }
         }
+        $blogModel = new Blog();
+        $sort = $this->setProductSort($blogModel);
         $data = [
         $data = [
             'project_id' => $info['project_id'],
             'project_id' => $info['project_id'],
             'name' => $info['text']['title'],
             'name' => $info['text']['title'],
@@ -245,9 +258,10 @@ class TicketUploadDataLogic extends BaseLogic
             'remark'=>$info['text']['intro'] ?? '',
             'remark'=>$info['text']['intro'] ?? '',
             'category_id'=>$category_id ?? '',
             'category_id'=>$category_id ?? '',
             'status'=>1,
             'status'=>1,
+            'sort'=>$sort,
         ];
         ];
         try {
         try {
-            $blogModel = new Blog();
+
             $id = $blogModel->addReturnId($data);
             $id = $blogModel->addReturnId($data);
             $route = RouteMap::setRoute($data['name'],RouteMap::SOURCE_BLOG,$id,$info['project_id']);
             $route = RouteMap::setRoute($data['name'],RouteMap::SOURCE_BLOG,$id,$info['project_id']);
             $blogModel->edit(['url'=>$route],['id'=>$id]);
             $blogModel->edit(['url'=>$route],['id'=>$id]);
@@ -272,6 +286,8 @@ class TicketUploadDataLogic extends BaseLogic
         if(isset($info['text']['image'])){
         if(isset($info['text']['image'])){
             $info['text']['image'] = str_replace_url($info['text']['image'] ?? '');
             $info['text']['image'] = str_replace_url($info['text']['image'] ?? '');
         }
         }
+        $newsModel = new News();
+        $sort = $this->setProductSort($newsModel);
         $data = [
         $data = [
             'project_id' => $info['project_id'],
             'project_id' => $info['project_id'],
             'name' => $info['text']['title'],
             'name' => $info['text']['title'],
@@ -280,9 +296,10 @@ class TicketUploadDataLogic extends BaseLogic
             'remark'=>$info['text']['intro'] ?? '',
             'remark'=>$info['text']['intro'] ?? '',
             'category_id'=>$category_id ?? '',
             'category_id'=>$category_id ?? '',
             'status'=>1,
             'status'=>1,
+            'sort'=>$sort,
         ];
         ];
         try {
         try {
-            $newsModel = new News();
+
             $id = $newsModel->addReturnId($data);
             $id = $newsModel->addReturnId($data);
             $route = RouteMap::setRoute($data['name'],RouteMap::SOURCE_NEWS,$id,$info['project_id']);
             $route = RouteMap::setRoute($data['name'],RouteMap::SOURCE_NEWS,$id,$info['project_id']);
             $newsModel->edit(['url'=>$route],['id'=>$id]);
             $newsModel->edit(['url'=>$route],['id'=>$id]);