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

版本控制



查看合并请求 !2481

@@ -15,6 +15,7 @@ use App\Models\News\News;
 use App\Models\Product\Category;
 use App\Models\Product\Category;
 use App\Models\Project\AggregateKeywordAffix;
 use App\Models\Project\AggregateKeywordAffix;
 use App\Models\Project\AiBlogTask;
 use App\Models\Project\AiBlogTask;
+use App\Models\Project\DeployBuild;
 use App\Models\Project\KeywordPrefix;
 use App\Models\Project\KeywordPrefix;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\Project\ProjectAiSetting;
 use App\Models\Project\ProjectAiSetting;
@@ -45,9 +46,27 @@ class lyhDemo extends Command
     protected $description = '更新路由';
     protected $description = '更新路由';
 
 
     public function handle(){
     public function handle(){
-        $api = new OaGlobalsoApi();
-        $data = $api->order_info('12551');
-        dd($data);
+        $projectModel = new Project();
+        $lists = $projectModel->list(['delete_status' => 0,'project_type'=>0,'extend_type'=>0,'type'=>['in',[1,2,3,4,6]]], 'id', ['id','created_at']);
+        $buildModel = new DeployBuild();
+        foreach ($lists as $item){
+            echo date('Y-m-d H:i:s') . '开始--项目的id:'. $item['id'] . PHP_EOL;
+            $buildInfo = $buildModel->read(['project_id'=>$item['id']],['plan','seo_plan']);
+            if($buildInfo['seo_plan'] != 0){
+                $projectModel->edit(['version_id'=>7],['id'=>$item['id']]);
+                continue;
+            }
+            if(in_array($buildInfo['plan'],[4,5,15,16,17])){
+                $projectModel->edit(['version_id'=>0],['id'=>$item['id']]);
+            }else{
+                if($item['created_at'] > '2025-04-12 00:00:00'){
+                    $projectModel->edit(['version_id'=>7],['id'=>$item['id']]);
+                }else{
+                    $projectModel->edit(['version_id'=>6],['id'=>$item['id']]);
+                }
+            }
+        }
+        return true;
     }
     }
 
 
     /**
     /**

@@ -203,6 +203,7 @@ class SyncProject extends Command
      */
      */
     public function sync($param,$is_update = 0){
     public function sync($param,$is_update = 0){
         //TODO::4月12日 之前的项目都是v6
         //TODO::4月12日 之前的项目都是v6
+
         $version = (($is_update == 1) ? Project::VERSION_SIX : (empty($param['version']) ? Project::VERSION_SEVEN : $param['version']));
         $version = (($is_update == 1) ? Project::VERSION_SIX : (empty($param['version']) ? Project::VERSION_SEVEN : $param['version']));
         $title = date('Ymd') . '-' . $param['company_name'];
         $title = date('Ymd') . '-' . $param['company_name'];
         $data = [
         $data = [
@@ -225,7 +226,7 @@ class SyncProject extends Command
                 'notice_order_id' => $param['id'],
                 'notice_order_id' => $param['id'],
                 'type' => $is_update,
                 'type' => $is_update,
                 'is_upgrade'=>$is_update,
                 'is_upgrade'=>$is_update,
-                'version'=>$version
+                'version_id'=>$version
             ],
             ],
             'deploy_build' => [
             'deploy_build' => [
                 'login_mobile'=>$param['principal_mobile'],
                 'login_mobile'=>$param['principal_mobile'],
@@ -251,6 +252,9 @@ class SyncProject extends Command
         }
         }
         DB::beginTransaction();
         DB::beginTransaction();
         try {
         try {
+            if(isset($data['deploy_build']['plan']) && in_array($data['deploy_build']['plan'],[4,5,15,16,17])){
+                $data['project']['version_id'] = 0;
+            }
             if(isset($data['deploy_build']['seo_plan']) && ($data['deploy_build']['seo_plan'] == 1)){
             if(isset($data['deploy_build']['seo_plan']) && ($data['deploy_build']['seo_plan'] == 1)){
                 $data['project']['project_type'] = 1;//白帽版本
                 $data['project']['project_type'] = 1;//白帽版本
             }
             }