Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0

Application/Admin/Controller/PlatformController.class.php

@@ -432,7 +432,7 @@ class PlatformController extends ThinkController
             unset($_REQUEST['game_name']);
         }
         if (isset($_REQUEST['server_id'])) {
-            $play_info_map .= " and upi.server_name = '{$_REQUEST['server_id']}' ";
+            $play_info_map .= " and upi.server_id = '{$_REQUEST['server_id']}' ";
         }
 
         $today = total(1);
@@ -489,6 +489,7 @@ class PlatformController extends ThinkController
             ->group('tp1.id')
             ->order('register_time')
             ->select();
+        // dd($tdata);die();
         
         $tmdata = [];
         foreach($data as $k=>$v){
@@ -497,19 +498,18 @@ class PlatformController extends ThinkController
             $v['mounth'] = 0;
             $tmdata[$v['id']] = $v;
         }
+        if(!empty($tdata)){
             foreach ($tdata as $k => $v) {
-
                 $tmdata[$v['id']]['today'] = $v['today'];
                 $tmdata[$v['id']]['week'] = $v['week'];
                 $tmdata[$v['id']]['mounth'] = $v['mounth'];
-
                 if (!$tmdata[$v['id']]['promote_account']) {
                     $tmdata[$v['id']]['promote_account'] = $v['promote_account'];
                     $tmdata[$v['id']]['count'] = 0;
                 }
-
-            
             }
+        }
+        
         $data = [];
         foreach($tmdata as $k => $v){
             $data[] = $v;
@@ -519,7 +519,8 @@ class PlatformController extends ThinkController
         unset($map['tp1.chain']);
         unset($tmap['tp1.chain']);
         unset($tmap['tp1.chain']);
-        $map['promote_id'] = 0;
+        $map['u.promote_id'] = 0;
+        $tmap['u.promote_id'] = 0;
         $authorityData['count'] = 0;
 
         //如果有官方渠道权限
@@ -527,7 +528,8 @@ class PlatformController extends ThinkController
         if ($user_auth_promote_ids == 'all' || in_array('0', explode(",", $user_auth_promote_ids))) {
             //官方渠道数据添加
             $authorityData = M('user', 'tab_')->alias('u')
-                ->field('date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time,count(id) as count')
+                ->field('date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time,count(u.id) as count')
+                ->join($play_info_map ? "tab_user_play_info as upi on upi.user_id = u.id " . $play_info_map : false)
                 ->where($map)
                 ->find();
             $tauthorityData = M('user', 'tab_')->alias('u')
@@ -536,6 +538,7 @@ class PlatformController extends ThinkController
                     count(IF(register_time ' . $week . ',1,null)) as week,
                     count(IF(register_time ' . $mounth . ',1,null)) as mounth')
             ->where($tmap)
+            ->join($play_info_map ? "tab_user_play_info as upi on upi.user_id = u.id " . $play_info_map : false)
             ->find();
             $authorityData['today'] = $tauthorityData['today'];
             $authorityData['week'] = $tauthorityData['week'];

Application/Admin/View/Platform/promote_statistics.html

@@ -286,14 +286,15 @@
 
             $("#game_id").change(function(){
                 $.ajax({
-                    url:"{:U('Ajax/getUserServer')}",
+                    url:"{:U('getSpendServer')}",
                     type:"post",
                     data:{game_id:$("#game_id option:selected").attr('game-id')},
                     dataType:'json',
                     success:function(data){
+                        console.log(data)
                         str = "<option value=''>请选择区服</option>";
                         for (var i in data){
-                            str += "<option value='"+data[i].server_name+"'>"+data[i].server_name+"</option>"
+                            str += "<option value='"+data[i].server_id+"'>"+data[i].server_name+"</option>"
                         }
                         $("#server_id").empty();
                         $("#server_id").append(str);
@@ -306,14 +307,15 @@
             var game_server = "{:I('server_id')}";
             if(game_id){
                 $.ajax({
-                    url:"{:U('Ajax/getUserServer')}",
+                    url:"{:U('getSpendServer')}",
                     type:"post",
-                    data:{game_id:game_id,type:2},
+                    data:{game_name:game_id},
                     dataType:'json',
                     success:function(data){
+                        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_id").empty();
                         $("#server_id").append(str);