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

Lyh server



查看合并请求 !2423

@@ -99,7 +99,7 @@ class GeoQuestionRes extends Command
                                 $data = $geo_service->getDeepSeekResult($question);
                                 $data = $geo_service->getDeepSeekResult($question);
                                 $result = $this->dealDeepSeek($data);
                                 $result = $this->dealDeepSeek($data);
                                 break;
                                 break;
-                            case 'gpt-4o-mini':
+                            case 'openai-not-network':
                                 $data = $geo_service->getDeepSeekResult($question,'gpt-4o-mini');
                                 $data = $geo_service->getDeepSeekResult($question,'gpt-4o-mini');
                                 $result = $this->dealDeepSeek($data,'gpt-4o-mini');
                                 $result = $this->dealDeepSeek($data,'gpt-4o-mini');
                                 break;
                                 break;

@@ -151,12 +151,13 @@ class SyncProject extends Command
             'contract' => json_encode($param['files']),
             'contract' => json_encode($param['files']),
             'bill' => json_encode($param['images']),
             'bill' => json_encode($param['images']),
         ];
         ];
-        if($param['plan_marketing'] == '白帽SEO方案'){
-            $data['seo_service_duration'] =  $param['years'] ?? 0;
-            $data['seo_plan'] = 1;
-        }else{
-            $data['service_duration'] =  $param['years'] ?? 0;
-            $data['plan'] = $this->versionData($param['plan_marketing']);
+        $seoPlan = Project::seoMap();
+        if (in_array($param['plan_marketing'], $seoPlan)) {
+            $data['deploy_build']['seo_service_duration'] =  $param['years'] ?? 0;
+            $data['deploy_build']['seo_plan'] = $this->versionSeoData($param['plan_marketing'],$seoPlan);
+        } else {
+            $data['deploy_build']['service_duration'] =  $param['years'] ?? 0;
+            $data['deploy_build']['plan'] = $this->versionData($param['plan_marketing']);
         }
         }
         $renewModel = new ProjectRenew();
         $renewModel = new ProjectRenew();
         $rs = $renewModel->add($data);
         $rs = $renewModel->add($data);
@@ -183,8 +184,7 @@ class SyncProject extends Command
         }
         }
     }
     }
 
 
-    public function versionSeoData($param){
-        $data = Project::seoMap();
+    public function versionSeoData($param,$data){
         $data = array_flip($data);
         $data = array_flip($data);
         if(isset($data[$param])){
         if(isset($data[$param])){
             return $data[$param];
             return $data[$param];
@@ -240,10 +240,11 @@ class SyncProject extends Command
                 'bill'=>$param['images']
                 'bill'=>$param['images']
             ],
             ],
         ];
         ];
-        if($param['plan_marketing'] == '白帽SEO方案'){
+        $seoPlan = Project::seoMap();
+        if (in_array($param['plan_marketing'], $seoPlan)) {
             $data['deploy_build']['seo_service_duration'] =  $param['years'] ?? 0;
             $data['deploy_build']['seo_service_duration'] =  $param['years'] ?? 0;
-            $data['deploy_build']['seo_plan'] = $this->versionSeoData($param['plan_marketing']);
-        }else{
+            $data['deploy_build']['seo_plan'] = $this->versionSeoData($param['plan_marketing'],$seoPlan);
+        } else {
             $data['deploy_build']['service_duration'] =  $param['years'] ?? 0;
             $data['deploy_build']['service_duration'] =  $param['years'] ?? 0;
             $data['deploy_build']['plan'] = $this->versionData($param['plan_marketing']);
             $data['deploy_build']['plan'] = $this->versionData($param['plan_marketing']);
         }
         }

@@ -117,21 +117,4 @@ class GeoQuestionResController extends BaseController
         $data = $this->logic->getSearchDate();
         $data = $this->logic->getSearchDate();
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }
-
-    /**
-     * @remark :获取搜索列表
-     * @name   :getSearchList
-     * @author :lyh
-     * @method :post
-     * @time   :2025/7/21 16:47
-     */
-    public function getSearchList(){
-        $this->request->validate([
-            'created_at'=>'required',
-        ],[
-            'created_at.required' => 'created_at不能为空',
-        ]);
-        $data = $this->logic->getSearchList($this->map,$this->page,$this->row);
-        $this->response('success',Code::SUCCESS,$data);
-    }
 }
 }

@@ -652,7 +652,10 @@ class ProductController extends BaseController
         }
         }
         if(isset($this->map['title']) && !empty($this->map['title'])){
         if(isset($this->map['title']) && !empty($this->map['title'])){
             $this->map['title'] = str_replace('+',' ',$this->map['title']);
             $this->map['title'] = str_replace('+',' ',$this->map['title']);
-            $query = $query->where('title','like','%'.$this->map['title'].'%');
+            $query->where(function ($subQuery) {
+                $subQuery->where('title','like','%'.$this->map['title'].'%')
+                    ->orwhere('route','like','%'.$this->map['title'].'%');
+            });
         }
         }
         if(isset($this->map['keyword_title']) && !empty($this->map['keyword_title'])){
         if(isset($this->map['keyword_title']) && !empty($this->map['keyword_title'])){
             $keywordModel = new Keyword();
             $keywordModel = new Keyword();