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

@@ -35,7 +35,7 @@ class Temp extends Command
 
 
     public function handle()
     public function handle()
     {
     {
-        $this->change_cname_projects_240();
+        $this->check_server_main_site();
     }
     }
 
 
     /**
     /**
@@ -418,8 +418,8 @@ class Temp extends Command
      */
      */
     public function check_server_main_site()
     public function check_server_main_site()
     {
     {
-        $server_id = 15;
-        $server_name = '美服1';
+        $server_id = 20;
+        $server_name = '硅谷建站服务器';
 
 
         $server_ip_model = new ServersIp();
         $server_ip_model = new ServersIp();
 
 

@@ -32,14 +32,14 @@ class InquiryForwardController extends BaseController
             $this->map['message'] = ['like', '%' . $this->map['message'] . '%'];
             $this->map['message'] = ['like', '%' . $this->map['message'] . '%'];
         }
         }
         if (isset($this->param['start_date']) && isset($this->param['end_date'])) {
         if (isset($this->param['start_date']) && isset($this->param['end_date'])) {
-            $this->map['inquiry_date'] = ['between', [$this->map['start_date'], $this->map['end_date']]];
+            $this->map['inquiry_date'] = ['between', [$this->map['start_date'] . ' 00:00:00', $this->map['end_date'] . ' 23:59:59']];
             unset($this->map['start_date']);
             unset($this->map['start_date']);
             unset($this->map['end_date']);
             unset($this->map['end_date']);
         } elseif (isset($this->param['start_date'])) {
         } elseif (isset($this->param['start_date'])) {
-            $this->map['inquiry_date'] = ['>=', $this->map['start_date']];
+            $this->map['inquiry_date'] = ['>=', $this->map['start_date'] . ' 00:00:00'];
             unset($this->map['start_date']);
             unset($this->map['start_date']);
         } elseif (isset($this->param['end_date'])) {
         } elseif (isset($this->param['end_date'])) {
-            $this->map['inquiry_date'] = ['<=', $this->map['end_date']];
+            $this->map['inquiry_date'] = ['<=', $this->map['end_date'] . ' 23:59:59'];
             unset($this->map['end_date']);
             unset($this->map['end_date']);
         }
         }
         $lists = $inquiryForwardLogic->getInquiryLists($this->map, $this->page, $this->row, $this->order);
         $lists = $inquiryForwardLogic->getInquiryLists($this->map, $this->page, $this->row, $this->order);

@@ -258,7 +258,7 @@ class InquiryForwardLogic extends BaseLogic
         if (count($re_route) > 0) {
         if (count($re_route) > 0) {
             //根据项目id查询项目，并根据询盘量排序
             //根据项目id查询项目，并根据询盘量排序
             $project_ids = array_column($re_route, 'project_id');
             $project_ids = array_column($re_route, 'project_id');
-            $re_project = InquiryProject::select(['id', 'project', 'channel', 'domain'])->whereIn('id', $project_ids)->orderBy('recent_inquiry', 'asc')->get();
+            $re_project = InquiryProject::select(['id', 'project', 'channel', 'domain', 'recent_inquiry', 'remark', 'version'])->whereIn('id', $project_ids)->orderBy('recent_inquiry', 'asc')->get();
 
 
             if ($re_project->count() > 0) {
             if ($re_project->count() > 0) {
                 //根据代理商去重
                 //根据代理商去重
@@ -289,7 +289,10 @@ class InquiryForwardLogic extends BaseLogic
                         $lists[] = [
                         $lists[] = [
                             'id' => $vp->id,
                             'id' => $vp->id,
                             'project' => $vp->project,
                             'project' => $vp->project,
-                            'route' => $vp->domain . $route
+                            'route' => $vp->domain . $route,
+                            'recent_inquiry' => $vp->recent_inquiry,
+                            'remark' => $vp->remark ?: '',
+                            'version' => $vp->version
                         ];
                         ];
                     }
                     }
                 }
                 }