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

修改翻译校队类型+分享重复发送问题



查看合并请求 !566

@@ -88,7 +88,9 @@ class AyrReleaseController extends BaseController
         //发送请求发布社交文章
         //发送请求发布社交文章
         $res = $ayrShare->post_send_msg($param,$share_info['profile_key']);
         $res = $ayrShare->post_send_msg($param,$share_info['profile_key']);
         //保存数据库
         //保存数据库
+        if($res){
             $ayrReleaseLogic->release_add($res);
             $ayrReleaseLogic->release_add($res);
+        }
         //保存返回的内容
         //保存返回的内容
         $this->response('success',Code::SUCCESS,json_decode($res));
         $this->response('success',Code::SUCCESS,json_decode($res));
     }
     }

@@ -259,12 +259,17 @@ class TranslateLogic extends BaseLogic
 //        try {
 //        try {
             $info = $this->model->read(['language_id'=>$this->param['language_id'],'url'=>$this->param['url'],'project_id'=>$this->user['project_id'],'type'=>$this->param['type']]);
             $info = $this->model->read(['language_id'=>$this->param['language_id'],'url'=>$this->param['url'],'project_id'=>$this->user['project_id'],'type'=>$this->param['type']]);
             if($info === false){
             if($info === false){
+                $data = $this->getRouteSource($this->param['url']);
                 $param = [
                 $param = [
                     'type'=>$this->param['type'],
                     'type'=>$this->param['type'],
                     'project_id'=>$this->user['project_id'],
                     'project_id'=>$this->user['project_id'],
                     'url'=>str_replace_url($this->param['url']),
                     'url'=>str_replace_url($this->param['url']),
                     'language_id'=>$this->param['language_id'],
                     'language_id'=>$this->param['language_id'],
                     'alias'=>$this->param['alias'],
                     'alias'=>$this->param['alias'],
+                    'source'=>$data['source'],
+                    'source_id'=>$data['source_id'],
+                    'is_list'=>$data['is_list'],
+                    'is_custom'=>$data['is_custom']
                 ];
                 ];
                 $param['data'] = json_encode($data,JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
                 $param['data'] = json_encode($data,JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
                 $rs = $this->model->add($param);
                 $rs = $this->model->add($param);
@@ -303,16 +308,63 @@ class TranslateLogic extends BaseLogic
         $route = basename($route);
         $route = basename($route);
         $routeModel = new RouteMap();
         $routeModel = new RouteMap();
         $routeInfo = $routeModel->read(['route'=>$route]);
         $routeInfo = $routeModel->read(['route'=>$route]);
+        return $this->resultData($routeInfo,$data);
+    }
+
+    /**
+     * @remark :返回数据
+     * @name   :resultData
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/20 11:54
+     */
+    public function resultData($routeInfo,$data){
         if($routeInfo['source'] == RouteMap::SOURCE_PAGE){
         if($routeInfo['source'] == RouteMap::SOURCE_PAGE){
             if($routeInfo['source_id']){
             if($routeInfo['source_id']){
                 $data = ['source'=>9,'source_id'=>$routeInfo['source_id'],'is_list'=>0,'is_custom'=>0];
                 $data = ['source'=>9,'source_id'=>$routeInfo['source_id'],'is_list'=>0,'is_custom'=>0];
             }
             }
         }
         }
-        if($routeInfo['source'] == RouteMap::SOURCE_PAGE){
+        if($routeInfo['source'] == RouteMap::SOURCE_PRODUCT){
             if($routeInfo['source_id']){
             if($routeInfo['source_id']){
-                $data = ['source'=>9,'source_id'=>$routeInfo['source_id'],'is_list'=>0,'is_custom'=>0];
+                $data = ['source'=>2,'source_id'=>$routeInfo['source_id'],'is_list'=>0,'is_custom'=>0];
+            }
+        }
+        if($routeInfo['source'] == RouteMap::SOURCE_PRODUCT_CATE){
+            if($routeInfo['source_id']){
+                $data = ['source'=>2,'source_id'=>$routeInfo['source_id'],'is_list'=>1,'is_custom'=>0];
+            }
+        }
+        if($routeInfo['source'] == RouteMap::SOURCE_BLOG){
+            if($routeInfo['source_id']){
+                $data = ['source'=>3,'source_id'=>$routeInfo['source_id'],'is_list'=>0,'is_custom'=>0];
+            }
+        }
+        if($routeInfo['source'] == RouteMap::SOURCE_BLOG_CATE){
+            if($routeInfo['source_id']){
+                $data = ['source'=>3,'source_id'=>$routeInfo['source_id'],'is_list'=>1,'is_custom'=>0];
+            }
+        }
+        if($routeInfo['source'] == RouteMap::SOURCE_NEWS){
+            if($routeInfo['source_id']){
+                $data = ['source'=>4,'source_id'=>$routeInfo['source_id'],'is_list'=>0,'is_custom'=>0];
+            }
+        }
+        if($routeInfo['source'] == RouteMap::SOURCE_NEWS_CATE){
+            if($routeInfo['source_id']){
+                $data = ['source'=>4,'source_id'=>$routeInfo['source_id'],'is_list'=>1,'is_custom'=>0];
             }
             }
         }
         }
+        if($routeInfo['source'] == RouteMap::SOURCE_MODULE){
+            if($routeInfo['source_id']){
+                $data = ['source'=>7,'source_id'=>$routeInfo['source_id'],'is_list'=>0,'is_custom'=>1];
+            }
+        }
+        if($routeInfo['source'] == RouteMap::SOURCE_MODULE_CATE){
+            if($routeInfo['source_id']){
+                $data = ['source'=>7,'source_id'=>$routeInfo['source_id'],'is_list'=>1,'is_custom'=>1];
+            }
+        }
+        return $data;
     }
     }
 
 
     /**
     /**

@@ -34,6 +34,9 @@ class AyrReleaseRequest extends FormRequest
     {
     {
         return [
         return [
             'name.required'=>'参数错误',
             'name.required'=>'参数错误',
+            'content.required'=>'内容不能为空',
+            'share_id.required'=>'参数错误',
+            'platforms.required'=>'参数错误',
         ];
         ];
     }
     }
 }
 }