From f4495f93a92eef0d1ea5cd6ca0352e6623e4ee73 Mon Sep 17 00:00:00 2001
From: yulingwei <2436953959@qq.com>
Date: Fri, 27 Dec 2019 14:40:30 +0800
Subject: [PATCH] =?UTF-8?q?ltv=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/ExportController.class.php    |  8 ++++----
 .../Controller/StatisticsController.class.php      |  8 ++++----
 Application/Admin/View/Statistics/ltv.html         | 14 +++++++-------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index e07184e31..93b94e43f 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -3519,13 +3519,13 @@ class ExportController extends Controller
             // }
             $map = " 1=1 ";
             $game_map = "";
-            if (isset($_REQUEST['game_name']) && isset($_REQUEST['server_name'])) {
+            if (isset($_REQUEST['game_name']) && isset($_REQUEST['server_id'])) {
                 $game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id'));
                 $map .= " AND game_id in ({$game_ids})";
                 $game_map = " AND EXISTS (SELECT upi.user_id FROM  tab_user_play_info as upi where upi.game_id in ({$game_ids}) AND upi.user_id = u.id ";
-                if (isset($_REQUEST['server_name'])) {
-                    $game_map .= " AND upi.server_name = '{$_REQUEST['server_name']}' ";
-                    $map .= " AND server_name = '{$_REQUEST['server_name']}' ";
+                if (isset($_REQUEST['server_id'])) {
+                    $game_map .= " AND upi.server_id = '{$_REQUEST['server_id']}' ";
+                    $map .= " AND server_id = '{$_REQUEST['server_id']}' ";
                 };
                 $game_map .= ") ";
             } else if (isset($_REQUEST['game_name'])) {
diff --git a/Application/Admin/Controller/StatisticsController.class.php b/Application/Admin/Controller/StatisticsController.class.php
index 38a81eb00..467be7f9c 100644
--- a/Application/Admin/Controller/StatisticsController.class.php
+++ b/Application/Admin/Controller/StatisticsController.class.php
@@ -1035,13 +1035,13 @@ class StatisticsController extends ThinkController {
 
 		$map = " 1=1 ";
 		$game_map = "";
-		if (isset($_REQUEST['game_name']) && isset($_REQUEST['server_name'])) {
+		if (isset($_REQUEST['game_name']) && isset($_REQUEST['server_id'])) {
 			$game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id'));
 			$map .= " AND game_id in ({$game_ids})";
 			$game_map = " AND EXISTS (SELECT upi.user_id FROM  tab_user_play_info as upi where upi.game_id in ({$game_ids}) AND upi.user_id = u.id ";
-			if (isset($_REQUEST['server_name'])) {
-				$game_map .= " AND upi.server_name = '{$_REQUEST['server_name']}' ";
-				$map .= " AND server_name = '{$_REQUEST['server_name']}' ";
+			if (isset($_REQUEST['server_id'])) {
+				$game_map .= " AND upi.server_id = '{$_REQUEST['server_id']}' ";
+				$map .= " AND server_id = '{$_REQUEST['server_id']}' ";
 			};
 			$game_map .= ") ";
 		} else if (isset($_REQUEST['game_name'])) {
diff --git a/Application/Admin/View/Statistics/ltv.html b/Application/Admin/View/Statistics/ltv.html
index 21d660723..fe5a31fd4 100644
--- a/Application/Admin/View/Statistics/ltv.html
+++ b/Application/Admin/View/Statistics/ltv.html
@@ -64,7 +64,7 @@
                 </select>   
             </div>
             <div class="input-list input-list-server search_label_rehab">
-                <select id="server_name" name="server_name" class="select_gallery" >
+                <select id="server_id" name="server_id" class="select_gallery" >
                     <option value="">区服名称</option>
                 </select>
             </div>
@@ -128,7 +128,7 @@
                     'end'=>I('end',date('Y-m-d',strtotime('-1 day'))),
                     'game_name'=>I('game_name'),
                     'game_type'=>I('game_type'),
-                    'server_name'=>I('server_name'),
+                    'server_id'=>I('server_id'),
 					'xlsname'=>'统计_ltv统计'
                 ),false)}">导出</a>
 			{$_page|default=''}
@@ -222,7 +222,7 @@ $(function(){
         pickerPosition:'bottom-right'
     });
 
-    var game_server = "{:I('server_name')}";
+    var game_server = "{:I('server_id')}";
     $("#game_type").change(function(){
         console.log({sdk_version:$("#game_type option:selected").val(), game_name:$("#game_name option:selected").val()})
          $.ajax({
@@ -234,11 +234,11 @@ $(function(){
                  console.log(data)
                  str = "<option value=''>请选择区服</option>";
                  for (var i in data){
-                     str += "<option value='"+data[i].server_name+"' "+(game_server && data[i].server_name == game_server?'selected':'')+">"+data[i].server_name+"</option>"
+                     str += "<option value='"+data[i].server_id+"' "+(game_server && data[i].server_id == game_server?'selected':'')+">"+data[i].server_name+"</option>"
                  }
-                 $("#server_name").empty();
-                 $("#server_name").append(str);
-                 $("#server_name").select2();
+                 $("#server_id").empty();
+                 $("#server_id").append(str);
+                 $("#server_id").select2();
              }
          })
      });