未续费项目增加搜索

@@ -110,7 +110,18 @@ class AiBlogAutoPublish extends Command
                         }
                         }
                     }
                     }
                 } else {
                 } else {
-                    $this->createTask($keywords, $project->id, $frequency);
+                    if($frequency[0] == '1/2'){//一天2篇
+                        $aiBlogTaskModel = new AiBlogTaskModel();
+                        $frequency = explode('/', $frequency[0]);
+                        //查询当前已发布几篇
+                        $count = $aiBlogTaskModel->counts(['next_auto_date' => date('Y-m-d'),'project_id' => $project->id]);
+                        while ($count < ($frequency[1] ?? 2)){
+                            $this->createTask($keywords, $project->id, [0,1]);
+                            $count++;
+                        }
+                    }else{
+                        $this->createTask($keywords, $project->id, $frequency);
+                    }
                 }
                 }
             }catch (\Exception $e){
             }catch (\Exception $e){
                 (new DingService())->handle([
                 (new DingService())->handle([
@@ -133,18 +144,7 @@ class AiBlogAutoPublish extends Command
         $result = $aiBlogService->createTask($keyword);
         $result = $aiBlogService->createTask($keyword);
         if ($result['status'] == 200) {
         if ($result['status'] == 200) {
             $aiBlogTaskModel = new AiBlogTaskModel();
             $aiBlogTaskModel = new AiBlogTaskModel();
-            if($frequency[0] == '1/2'){//一天2篇
-                $frequency = explode('/', $frequency[0]);
-                //查询当前已发布几篇
-                $count = $aiBlogTaskModel->counts(['next_auto_date' => date('Y-m-d'),'project_id' => $project_id]);
-                if($count < ($frequency[1] ?? 2)){
-                    $next_auto_date = date('Y-m-d'); //当天未发送固定数量，继续执行
-                }else{
-                    $next_auto_date = date('Y-m-d',strtotime('+' . ($frequency[0] ?? 1) . 'days')); //每3-6天自动发布
-                }
-            }else {
-                $next_auto_date = date('Y-m-d', strtotime('+' . mt_rand($frequency[0] ?? 3, $frequency[1] ?? 6) . 'days')); //每3-6天自动发布
-            }
+            $next_auto_date = date('Y-m-d', strtotime('+' . mt_rand($frequency[0] ?? 3, $frequency[1] ?? 6) . 'days')); //每3-6天自动发布
             $aiBlogTaskModel->addReturnId(['project_id' => $project_id, 'type' => 2, 'task_id' => $result['data']['task_id'], 'status' => 1, 'next_auto_date' => $next_auto_date]);
             $aiBlogTaskModel->addReturnId(['project_id' => $project_id, 'type' => 2, 'task_id' => $result['data']['task_id'], 'status' => 1, 'next_auto_date' => $next_auto_date]);
             ProjectServer::useProject($project_id);
             ProjectServer::useProject($project_id);
             $aiBlogModel = new AiBlog();
             $aiBlogModel = new AiBlog();

@@ -79,6 +79,7 @@ class Project extends Base
             3=>'2-4',
             3=>'2-4',
             4=>'3-5',
             4=>'3-5',
             5=>'5-7',
             5=>'5-7',
+            6=>'1/2'
         ];
         ];
         if($val){
         if($val){
             return $arr[$val] ?? '';
             return $arr[$val] ?? '';