gx

@@ -4,6 +4,7 @@ namespace App\Console\Commands\DayCount;
 
 
 use App\Helper\Common;
 use App\Helper\Common;
 use App\Helper\FormGlobalsoApi;
 use App\Helper\FormGlobalsoApi;
+use App\Models\Domain\DomainInfo;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\DeployOptimize;
 use App\Models\Project\DeployOptimize;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
@@ -47,10 +48,14 @@ class Count extends Command
                 $list = $list->toArray();
                 $list = $list->toArray();
                 $data = [];
                 $data = [];
                 $yesterday = Carbon::yesterday()->toDateString();
                 $yesterday = Carbon::yesterday()->toDateString();
+                $domainInfo = new DomainInfo();
                 foreach ($list as $v){
                 foreach ($list as $v){
                     $v = (array)$v;
                     $v = (array)$v;
-                    if($v['domain'] != ''){
-                        $v['test_domain'] = $v['domain'];
+                    if(!empty($v['domain'])){
+                        $info = $domainInfo->read(['id'=>$v['domain']]);
+                        if($info !== false){
+                            $v['test_domain'] = $info['domain'];
+                        }
                     }
                     }
                     $arr = [];
                     $arr = [];
                     //统计时间
                     //统计时间

@@ -3,6 +3,7 @@
 namespace App\Console\Commands\MonthlyCount;
 namespace App\Console\Commands\MonthlyCount;
 
 
 use App\Helper\FormGlobalsoApi;
 use App\Helper\FormGlobalsoApi;
+use App\Models\Domain\DomainInfo;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use Carbon\Carbon;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
@@ -42,11 +43,15 @@ class InquiryMonthlyCount extends Command
         $startTime = Carbon::now()->subMonth()->startOfMonth()->toDateString();
         $startTime = Carbon::now()->subMonth()->startOfMonth()->toDateString();
         // 获取上个月的结束时间
         // 获取上个月的结束时间
         $endTime = Carbon::now()->subMonth()->endOfMonth()->toDateString();
         $endTime = Carbon::now()->subMonth()->endOfMonth()->toDateString();
+        $domainInfo = new DomainInfo();
         foreach ($list as  $value){
         foreach ($list as  $value){
             $value = (array)$value;
             $value = (array)$value;
-            if($value['domain'] != ''){
+            if(!empty($value['domain'])){
+                $info = $domainInfo->read(['id'=>$value['domain']]);
+                if($info !== false){
                     $value['test_domain'] = $value['domain'];
                     $value['test_domain'] = $value['domain'];
                 }
                 }
+            }
             $arr = [];
             $arr = [];
             //按月统计询盘记录
             //按月统计询盘记录
             $arr = $this->inquiryCount($arr,$startTime,$endTime,$value['test_domain']);
             $arr = $this->inquiryCount($arr,$startTime,$endTime,$value['test_domain']);