Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -3,7 +3,9 @@
 namespace App\Console\Commands;
 namespace App\Console\Commands;
 
 
 use App\Helper\FormGlobalsoApi;
 use App\Helper\FormGlobalsoApi;
+use App\Models\Inquiry\InquiryOther;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
+use App\Services\ProjectServer;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
 
 
 /**
 /**
@@ -51,13 +53,19 @@ class LastInquiry extends Command
             }
             }
             $api = new FormGlobalsoApi();
             $api = new FormGlobalsoApi();
             $res = $api->getInquiryList($item['deploy_optimize']['domain']);
             $res = $api->getInquiryList($item['deploy_optimize']['domain']);
-            if($res && $res['status'] == 200){
-                if(empty($res['data']['data'][0])){
-                    continue;
-                }
-                $item->last_inquiry_time = $res['data']['data'][0]['submit_time'];
-                $item->save();
+            $last_time = $res['data']['data'][0] ?? '';
+            //其他询盘的最新时间
+            ProjectServer::useProject($item['id']);
+            $other_last_time = InquiryOther::orderBy('id', 'desc')->value('submit_time');
+
+            $last_inquiry_time = $last_time > $other_last_time ? $last_time : $other_last_time;
+
+            if(!$last_inquiry_time){
+                continue;
             }
             }
+
+            $item->last_inquiry_time = $last_inquiry_time;
+            $item->save();
         }
         }
     }
     }
 }
 }

@@ -6,7 +6,9 @@ use App\Helper\FormGlobalsoApi;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Models\HomeCount\Count;
 use App\Models\HomeCount\Count;
 use App\Models\HomeCount\MonthCount;
 use App\Models\HomeCount\MonthCount;
+use App\Models\Inquiry\InquiryOther;
 use App\Models\Project\DeployOptimize;
 use App\Models\Project\DeployOptimize;
+use App\Services\ProjectServer;
 use Carbon\Carbon;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
 
 
@@ -67,8 +69,8 @@ class MonthCountLogic extends BaseLogic
             //数据详情
             //数据详情
             $data = $inquiry_list['data']['data'] ?? '';
             $data = $inquiry_list['data']['data'] ?? '';
             $arr['month_total'] = 0;
             $arr['month_total'] = 0;
+            $countryArr = [];
             if(isset($data) && !empty($data)){
             if(isset($data) && !empty($data)){
-                $countryArr = [];
                 foreach ($data as $v){
                 foreach ($data as $v){
                     if(($startTime.' 00:00:00' <= $v['submit_time']) && $v['submit_time'] <= $endTime.' 23:59:59'){
                     if(($startTime.' 00:00:00' <= $v['submit_time']) && $v['submit_time'] <= $endTime.' 23:59:59'){
                         $arr['month_total']++;
                         $arr['month_total']++;
@@ -76,14 +78,28 @@ class MonthCountLogic extends BaseLogic
                     if(isset($countryArr[$v['country']])){
                     if(isset($countryArr[$v['country']])){
                         $countryArr[$v['country']]++;
                         $countryArr[$v['country']]++;
                     }else{
                     }else{
-                        $countryArr[$v['country']] = 0;
+                        $countryArr[$v['country']] = 1;
                     }
                     }
                 }
                 }
-                arsort($countryArr);
-                $top20 = array_slice($countryArr, 0, 15, true);
-                $arr['country'] = $top20;
             }
             }
         }
         }
+        //加上其他询盘
+        ProjectServer::useProject($this->user['project_id']);
+        $arr['total'] += InquiryOther::count();
+        $arr['month_total'] += InquiryOther::whereBetween('submit_time',[$startTime, $endTime])->count();
+        $countryData = InquiryOther::whereBetween('submit_time',[$startTime, $endTime])
+            ->select("country",DB::raw('COUNT(*) as count'))
+            ->groupBy('country')->get()->toArray();
+        foreach ($countryData as $v1){
+            if(isset($countryArr[$v1['country']])){
+                $countryArr[$v1['country']] += $v1['count'];
+            }else{
+                $countryArr[$v1['country']] = $v1['count'];
+            }
+        }
+        arsort($countryArr);
+        $top20 = array_slice($countryArr, 0, 15, true);
+        $arr['country'] = $top20;
         return $arr;
         return $arr;
     }
     }
 
 

@@ -60,6 +60,7 @@ class ProductLogic extends  BaseLogic
                 //查看路由是否更新
                 //查看路由是否更新
                 $this->editProductRoute($this->param['id'],$this->param['route']);
                 $this->editProductRoute($this->param['id'],$this->param['route']);
                 $this->model->edit($this->param,['id'=>$this->param['id']]);
                 $this->model->edit($this->param,['id'=>$this->param['id']]);
+                $id = $this->param['id'];
             }else{
             }else{
                 $this->param = $this->addHandleParam($this->param);
                 $this->param = $this->addHandleParam($this->param);
                 $id = $this->model->addReturnId($this->param);
                 $id = $this->model->addReturnId($this->param);
@@ -156,7 +157,7 @@ class ProductLogic extends  BaseLogic
         try {
         try {
             if(isset($this->param['route']) && !empty($this->param['route'])){
             if(isset($this->param['route']) && !empty($this->param['route'])){
                 $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $this->param['id'], $this->user['project_id']);
                 $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $this->param['id'], $this->user['project_id']);
-                $this->editProductRoute($this->param['route']);
+                $this->editProductRoute($this->param['id'],$this->param['route']);
             }
             }
             $this->model->edit($this->param,['id'=>$this->param['id']]);
             $this->model->edit($this->param,['id'=>$this->param['id']]);
         }catch (\Exception $e){
         }catch (\Exception $e){