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

独立分表项目关键词



查看合并请求 !678

@@ -30,6 +30,7 @@ use App\Models\Project\InquiryFilterConfig;
 use App\Models\Project\MinorLanguages;
 use App\Models\Project\MinorLanguages;
 use App\Models\Project\Payment;
 use App\Models\Project\Payment;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
+use App\Models\Project\ProjectKeyword;
 use App\Models\Project\ProjectRenew;
 use App\Models\Project\ProjectRenew;
 use App\Models\Project\WebTrafficConfig;
 use App\Models\Project\WebTrafficConfig;
 use App\Models\RankData\ExternalLinks;
 use App\Models\RankData\ExternalLinks;
@@ -71,7 +72,8 @@ class ProjectLogic extends BaseLogic
      * @time   :2023/7/28 17:11
      * @time   :2023/7/28 17:11
      */
      */
     public function getProjectInfo($id){
     public function getProjectInfo($id){
-        $info = $this->model->with(['payment', 'deploy_build', 'deploy_optimize', 'online_check', 'project_after','inquiry_filter_config','web_traffic_config'])->where(['id'=>$id])->first()->toArray();
+        $info = $this->model->with(['payment', 'deploy_build', 'deploy_optimize', 'online_check',
+            'project_after','inquiry_filter_config','web_traffic_config','project_keyword'])->where(['id'=>$id])->first()->toArray();
         $info['online_check']['name'] = (new Manage())->getName($info['online_check']['created_manage_id'] ?? 0);
         $info['online_check']['name'] = (new Manage())->getName($info['online_check']['created_manage_id'] ?? 0);
         $info['init_domain'] = $this->getInitDomain($info['serve_id'])['domain'];
         $info['init_domain'] = $this->getInitDomain($info['serve_id'])['domain'];
         if($info['extend_type'] != 0){
         if($info['extend_type'] != 0){
@@ -157,6 +159,8 @@ class ProjectLogic extends BaseLogic
             $this->saveProjectPayment($this->param['payment']);
             $this->saveProjectPayment($this->param['payment']);
             //保存优化信息
             //保存优化信息
             $this->saveProjectDeployOptimize($this->param['deploy_optimize']);
             $this->saveProjectDeployOptimize($this->param['deploy_optimize']);
+            //保存项目关键字
+            $this->saveProjectKeyword($this->param['project_keyword'] ?? [],$this->param['id']);
             //保存售后信息
             //保存售后信息
             $this->saveProjectAfter($this->param['project_after']);
             $this->saveProjectAfter($this->param['project_after']);
             //单独保存小语种配置
             //单独保存小语种配置
@@ -354,6 +358,30 @@ class ProjectLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
+     * @remark :保存项目关键字
+     * @name   :saveProjectKeyword
+     * @author :lyh
+     * @method :post
+     * @time   :2024/7/22 11:45
+     */
+    public function saveProjectKeyword($project_keyword,$project_id){
+        $projectKeywordModel = new ProjectKeyword();
+        $info = $projectKeywordModel->read(['project_id'=>$project_id]);
+        $data = [
+            'main_keyword'=>$project_keyword['main_keyword'] ?? '',
+            'customer_keywords'=>$project_keyword['customer_keywords'] ?? '',
+            'search_keywords'=>$project_keyword['search_keywords'] ?? '',
+        ];
+        if($info === false){
+            $data['project_id'] = $project_id;
+            $projectKeywordModel->addReturnId($data);
+        }else{
+            $projectKeywordModel->edit($data,['id'=>$info['id']]);
+        }
+        return $this->success();
+    }
+
+    /**
      * @remark :保存为售后部署
      * @remark :保存为售后部署
      * @name   :saveProjectAfter
      * @name   :saveProjectAfter
      * @author :lyh
      * @author :lyh

@@ -424,7 +424,7 @@ class BlogLogic extends BaseLogic
     public function copyBlogInfo(){
     public function copyBlogInfo(){
         $info = $this->model->read(['id'=>$this->param['id']]);
         $info = $this->model->read(['id'=>$this->param['id']]);
         $param = [
         $param = [
-            'name'=>$info['name']."-copy",
+            'name'=>$info['name']."-1",
             'status'=>0,
             'status'=>0,
             'sort'=>$info['sort'],
             'sort'=>$info['sort'],
             'category_id'=>$info['category_id'],
             'category_id'=>$info['category_id'],

@@ -462,7 +462,7 @@ class NewsLogic extends BaseLogic
     public function copyNewsInfo(){
     public function copyNewsInfo(){
         $info = $this->model->read(['id'=>$this->param['id']]);
         $info = $this->model->read(['id'=>$this->param['id']]);
         $param = [
         $param = [
-            'name'=>$info['name']."-copy",
+            'name'=>$info['name']."-1",
             'status'=>0,
             'status'=>0,
             'sort'=>$info['sort'],
             'sort'=>$info['sort'],
             'category_id'=>$info['category_id'],
             'category_id'=>$info['category_id'],

@@ -539,7 +539,7 @@ class ProductLogic extends  BaseLogic
     public function setProductParams($info){
     public function setProductParams($info){
         $param = [
         $param = [
             'project_id'=>$info['project_id'],
             'project_id'=>$info['project_id'],
-            'title'=>$info['title']."-copy",
+            'title'=>$info['title']."-1",
             'attrs'=>Arr::a2s($info['attrs']),
             'attrs'=>Arr::a2s($info['attrs']),
             'attr_id'=>Arr::arrToSet($info['attr_id']),
             'attr_id'=>Arr::arrToSet($info['attr_id']),
             'category_id'=>!empty($info['category_id']) ? ','.Arr::arrToSet($info['category_id']).',' : '',
             'category_id'=>!empty($info['category_id']) ? ','.Arr::arrToSet($info['category_id']).',' : '',

@@ -231,7 +231,17 @@ class Project extends Base
         return self::hasOne(After::class, 'project_id', 'id');
         return self::hasOne(After::class, 'project_id', 'id');
     }
     }
 
 
-
+    /**
+     * @remark :项目关键字
+     * @name   :project_keyword
+     * @author :lyh
+     * @method :post
+     * @time   :2024/7/22 11:38
+     */
+    public function project_keyword()
+    {
+        return self::hasOne(ProjectKeyword::class, 'project_id', 'id');
+    }
     /**
     /**
      * 询盘过滤配置
      * 询盘过滤配置
      * @return \Illuminate\Database\Eloquent\Relations\HasOne
      * @return \Illuminate\Database\Eloquent\Relations\HasOne

+<?php
+/**
+ * @remark :
+ * @name   :ProjectKeyword.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/7/22 11:35
+ */
+
+namespace App\Models\Project;
+
+use App\Models\Base;
+
+class ProjectKeyword extends Base
+{
+    //设置关联表名
+    protected $table = 'gl_project_keyword';
+}