正在显示
11 个修改的文件
包含
45 行增加
和
14 行删除
| @@ -2,8 +2,11 @@ | @@ -2,8 +2,11 @@ | ||
| 2 | 2 | ||
| 3 | namespace App\Console\Commands\DayCount; | 3 | namespace App\Console\Commands\DayCount; |
| 4 | 4 | ||
| 5 | +use App\Models\Projects\InquiryInfo; | ||
| 5 | use Carbon\Carbon; | 6 | use Carbon\Carbon; |
| 6 | use Illuminate\Console\Command; | 7 | use Illuminate\Console\Command; |
| 8 | +use Illuminate\Support\Facades\DB; | ||
| 9 | +use App\Models\Inquiry\InquiryCount as InquiryCountModel; | ||
| 7 | 10 | ||
| 8 | /** | 11 | /** |
| 9 | * @remark : | 12 | * @remark : |
| @@ -56,10 +59,23 @@ class InquiryCount extends Command | @@ -56,10 +59,23 @@ class InquiryCount extends Command | ||
| 56 | * @time :2023/7/14 16:21 | 59 | * @time :2023/7/14 16:21 |
| 57 | */ | 60 | */ |
| 58 | public function handle(){ | 61 | public function handle(){ |
| 62 | + $data = []; | ||
| 59 | //获取昨天的时间 | 63 | //获取昨天的时间 |
| 60 | $yesterday = Carbon::yesterday()->toDateString(); | 64 | $yesterday = Carbon::yesterday()->toDateString(); |
| 65 | + $inquiryInfoModel = new InquiryInfo(); | ||
| 61 | foreach ($this->status as $k){ | 66 | foreach ($this->status as $k){ |
| 62 | - | 67 | + $total = $inquiryInfoModel->formatQuery(['created_at'=>['between',[$yesterday.' 00:00:00',$yesterday.' 23:59:59']]])->count(); |
| 68 | + $untreated = $inquiryInfoModel->formatQuery(['created_at'=>['between',[$yesterday.' 00:00:00',$yesterday.' 23:59:59']],'status'=>1])->count(); | ||
| 69 | + $invalid = $inquiryInfoModel->formatQuery(['created_at'=>['between',[$yesterday.' 00:00:00',$yesterday.' 23:59:59']],'status'=>0])->count(); | ||
| 70 | + $data[] = [ | ||
| 71 | + 'status'=>$k, | ||
| 72 | + 'day'=>$yesterday, | ||
| 73 | + 'total'=>$total ?? 0, | ||
| 74 | + 'untreated'=>$untreated ?? 0, | ||
| 75 | + 'invalid'=>$invalid ?? 0 | ||
| 76 | + ]; | ||
| 63 | } | 77 | } |
| 78 | + $inquiryCount = new InquiryCountModel(); | ||
| 79 | + $inquiryCount->insert($data); | ||
| 64 | } | 80 | } |
| 65 | } | 81 | } |
| @@ -48,7 +48,6 @@ class InquiryDelay extends Command | @@ -48,7 +48,6 @@ class InquiryDelay extends Command | ||
| 48 | foreach ($arr_url as $v){ | 48 | foreach ($arr_url as $v){ |
| 49 | $data['url'] = $v; | 49 | $data['url'] = $v; |
| 50 | $this->inquiryForward($data); | 50 | $this->inquiryForward($data); |
| 51 | - Log::info('询盘转发记录'.json_encode($data)); | ||
| 52 | } | 51 | } |
| 53 | } | 52 | } |
| 54 | } | 53 | } |
| @@ -30,7 +30,8 @@ class Kernel extends ConsoleKernel | @@ -30,7 +30,8 @@ class Kernel extends ConsoleKernel | ||
| 30 | $schedule->command('sync_channel')->dailyAt('06:00')->withoutOverlapping(1); // 渠道信息,每周执行一次 | 30 | $schedule->command('sync_channel')->dailyAt('06:00')->withoutOverlapping(1); // 渠道信息,每周执行一次 |
| 31 | $schedule->command('sync_project')->everyMinute()->withoutOverlapping(1); //同步项目 | 31 | $schedule->command('sync_project')->everyMinute()->withoutOverlapping(1); //同步项目 |
| 32 | $schedule->command('month_count')->monthlyOn(1,'01:00')->withoutOverlapping(1);//没月月初1号执行月统计记录 | 32 | $schedule->command('month_count')->monthlyOn(1,'01:00')->withoutOverlapping(1);//没月月初1号执行月统计记录 |
| 33 | - $schedule->command('inquiry_delay')->everyMinute()->withoutOverlapping(1);//每分钟执行一次 | 33 | +// $schedule->command('inquiry_delay')->everyMinute()->withoutOverlapping(1);//每分钟执行一次 |
| 34 | + $schedule->command('inquiry_count')->dailyAt('01:00')->withoutOverlapping(1); // 询盘统计数据,每天凌晨执行一次 | ||
| 34 | // // 更新域名|证书结束时间,每天凌晨1点执行一次 | 35 | // // 更新域名|证书结束时间,每天凌晨1点执行一次 |
| 35 | // $schedule->command('domain_time')->dailyAt('01:00')->withoutOverlapping(1); | 36 | // $schedule->command('domain_time')->dailyAt('01:00')->withoutOverlapping(1); |
| 36 | // // B站 - 网站数据统计 | 37 | // // B站 - 网站数据统计 |
| @@ -9,7 +9,7 @@ use App\Http\Logic\Aside\Project\ProjectLogic; | @@ -9,7 +9,7 @@ use App\Http\Logic\Aside\Project\ProjectLogic; | ||
| 9 | use App\Http\Requests\Aside\Project\ProcessRecordsRequest; | 9 | use App\Http\Requests\Aside\Project\ProcessRecordsRequest; |
| 10 | use App\Http\Requests\Aside\Project\ProjectRequest; | 10 | use App\Http\Requests\Aside\Project\ProjectRequest; |
| 11 | use App\Models\City; | 11 | use App\Models\City; |
| 12 | -use App\Models\InquirySet; | 12 | +use App\Models\Inquiry\InquirySet; |
| 13 | use App\Models\Project\DeployBuild; | 13 | use App\Models\Project\DeployBuild; |
| 14 | use App\Models\Project\DeployOptimize; | 14 | use App\Models\Project\DeployOptimize; |
| 15 | use App\Models\Project\Payment; | 15 | use App\Models\Project\Payment; |
| @@ -200,9 +200,7 @@ class InquiryInfoController extends BaseController | @@ -200,9 +200,7 @@ class InquiryInfoController extends BaseController | ||
| 200 | * @time :2023/7/14 15:55 | 200 | * @time :2023/7/14 15:55 |
| 201 | */ | 201 | */ |
| 202 | public function getCount(InquiryInfoLogic $inquiryInfoLogic){ | 202 | public function getCount(InquiryInfoLogic $inquiryInfoLogic){ |
| 203 | - $yesterday = Carbon::yesterday()->toDateString(); | ||
| 204 | - var_dump($yesterday); | ||
| 205 | - die(); | 203 | + |
| 206 | // 获取30天前的时间 | 204 | // 获取30天前的时间 |
| 207 | // $thirtyDaysAgo = date("Y-m-d", strtotime("-30 days")); | 205 | // $thirtyDaysAgo = date("Y-m-d", strtotime("-30 days")); |
| 208 | // // 获取当前时间 | 206 | // // 获取当前时间 |
| @@ -10,8 +10,7 @@ use App\Http\Logic\Aside\Manage\ManageLogic; | @@ -10,8 +10,7 @@ use App\Http\Logic\Aside\Manage\ManageLogic; | ||
| 10 | use App\Models\Channel\Channel; | 10 | use App\Models\Channel\Channel; |
| 11 | use App\Models\Channel\User; | 11 | use App\Models\Channel\User; |
| 12 | use App\Models\Channel\Zone; | 12 | use App\Models\Channel\Zone; |
| 13 | -use App\Models\City; | ||
| 14 | -use App\Models\InquirySet; | 13 | +use App\Models\Inquiry\InquirySet; |
| 15 | use App\Models\Project\DeployBuild; | 14 | use App\Models\Project\DeployBuild; |
| 16 | use App\Models\Project\DeployOptimize; | 15 | use App\Models\Project\DeployOptimize; |
| 17 | use App\Models\Project\Payment; | 16 | use App\Models\Project\Payment; |
| @@ -3,11 +3,10 @@ | @@ -3,11 +3,10 @@ | ||
| 3 | namespace App\Http\Logic\Aside\Projects; | 3 | namespace App\Http\Logic\Aside\Projects; |
| 4 | 4 | ||
| 5 | use App\Http\Logic\Aside\BaseLogic; | 5 | use App\Http\Logic\Aside\BaseLogic; |
| 6 | -use App\Models\InquiryIP; | 6 | +use App\Models\Inquiry\InquiryIP; |
| 7 | use App\Models\Projects\InquiryInfo; | 7 | use App\Models\Projects\InquiryInfo; |
| 8 | use App\Models\Projects\InquiryUser; | 8 | use App\Models\Projects\InquiryUser; |
| 9 | use Illuminate\Support\Facades\DB; | 9 | use Illuminate\Support\Facades\DB; |
| 10 | -use Illuminate\Support\Facades\Log; | ||
| 11 | 10 | ||
| 12 | /** | 11 | /** |
| 13 | * @remark :询盘中心 | 12 | * @remark :询盘中心 |
| @@ -6,7 +6,6 @@ use App\Helper\Arr; | @@ -6,7 +6,6 @@ use App\Helper\Arr; | ||
| 6 | use App\Helper\FormGlobalsoApi; | 6 | use App\Helper\FormGlobalsoApi; |
| 7 | use App\Helper\Translate; | 7 | use App\Helper\Translate; |
| 8 | use App\Http\Logic\Aside\Project\ProjectLogic; | 8 | use App\Http\Logic\Aside\Project\ProjectLogic; |
| 9 | -use App\Models\InquirySet; | ||
| 10 | 9 | ||
| 11 | /** | 10 | /** |
| 12 | * Class InquiryLogic | 11 | * Class InquiryLogic |
app/Models/Inquiry/InquiryCount.php
0 → 100644
-
请 注册 或 登录 后发表评论