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

未续费项目增加搜索



查看合并请求 !2639

@@ -133,7 +133,18 @@ class AiBlogAutoPublish extends Command
         $result = $aiBlogService->createTask($keyword);
         if ($result['status'] == 200) {
             $aiBlogTaskModel = new AiBlogTaskModel();
-            $next_auto_date = date('Y-m-d', strtotime('+' . mt_rand($frequency[0],$frequency[1]) . 'days')); //每3-6天自动发布
+            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天自动发布
+            }
             $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);
             $aiBlogModel = new AiBlog();
@@ -141,7 +152,6 @@ class AiBlogAutoPublish extends Command
             $end = strtotime('16:00:00');
             $randomTimestamp = mt_rand($start, $end);
             $created_at = date("Y-m-d H:i:s", $randomTimestamp);
-
             $aiBlogModel->addReturnId(['keyword' => $keyword, 'status' => 1, 'task_id' => $result['data']['task_id'], 'project_id' => $project_id, 'created_at' => $created_at]);
             DB::disconnect('custom_mysql');
             $this->output("任务创建成功");