Merge branch 'dev'

Application/Admin/Controller/RechargeSumController.class.php

@@ -44,7 +44,7 @@ class RechargeSumController extends ThinkController{
 					$map['pay_way'] = array('egt',0);
 				}
 
-				if(!empty($_REQUEST['promote_id'])){
+				if(isset($_REQUEST['promote_id'])){
 					// switch ($_REQUEST['promote_id']) {
 					// 	case 'GUANFANG':
 					// 		$map['promote_id'] = 0;
@@ -59,8 +59,12 @@ class RechargeSumController extends ThinkController{
                     //         $rmap['promote_id'] = $_REQUEST['promote_id'];
 					// 		break;
 					// }
-					$promoter_ids = D("Promote")->where("parent_id={$_REQUEST['promote_id']} or grand_id={$_REQUEST['promote_id']} or id={$_REQUEST['promote_id']}")->field('id')->select();
-					$promoter_ids ? $rmap['promote_id'] = $map['promote_id'] = ['in', implode(',', array_column($promoter_ids, 'id'))] : null;
+					if ($_REQUEST['promote_id'] > 0) {
+						$promoter_ids = D("Promote")->where("parent_id={$_REQUEST['promote_id']} or grand_id={$_REQUEST['promote_id']} or id={$_REQUEST['promote_id']}")->field('id')->select();
+						$promoter_ids ? $rmap['promote_id'] = $map['promote_id'] = ['in', implode(',', array_column($promoter_ids, 'id'))] : null;
+					} else {
+						$rmap['promote_id'] = $map['promote_id'] = 0;
+					}
 				}
 
 		    	//当天注册人数
@@ -88,6 +92,9 @@ class RechargeSumController extends ThinkController{
 					case 'GUANFANG':
 						$data[$key]['promote_id'] = "官方渠道";
 						break;
+					case 0:
+						$data[$key]['promote_id'] = "官方渠道";
+						break;
 					case 'PROMOTE':
 						$data[$key]['promote_id'] = "推广渠道";
 						break;

Application/Admin/Controller/SpendController.class.php

@@ -71,7 +71,11 @@ class SpendController extends ThinkController {
             unset($_REQUEST['pay_game_status']);
         }
         if(isset($_REQUEST['promote_id'])) {
-            $map['_complex'] = ['tp.parent_id'=>$_REQUEST['promote_id'], 'tp.grand_id'=>$_REQUEST['promote_id'], 'tp.id'=>$_REQUEST['promote_id'], '_logic' => 'or'];
+            if ($_REQUEST['promote_id'] == 0) {
+                $map['promote_id'] = 0;
+            } else {
+                $map['_complex'] = ['tp.parent_id'=>$_REQUEST['promote_id'], 'tp.grand_id'=>$_REQUEST['promote_id'], 'tp.id'=>$_REQUEST['promote_id'], '_logic' => 'or'];
+            }
             $tab_promote_join = "left join tab_promote as tp on tp.id = tab_spend.promote_id";
             //unset($_REQUEST['promote_id']);
         } else {

Application/Admin/Controller/UserController.class.php

@@ -570,8 +570,14 @@ function think_ucenter_md5($str, $key = 'ThinkUCenter'){
             unset($_REQUEST['role_name']);
         }
         if (isset($_REQUEST['promote_id'])) {
-            $promoter_ids = D("Promote")->where("parent_id={$_REQUEST['promote_id']} or grand_id={$_REQUEST['promote_id']} or id={$_REQUEST['promote_id']}")->field('id')->select();
-            $promoter_ids ? $map['promote_id'] = ['in', implode(',', array_column($promoter_ids, 'id'))] : null;
+            $queryStr = '';
+            if ($_REQUEST['promote_id'] == 0) {
+                $map['promote_id'] = '0';
+            } else {
+                $queryStr = "parent_id={$_REQUEST['promote_id']} or grand_id={$_REQUEST['promote_id']} or id={$_REQUEST['promote_id']}";
+                $promoter_ids = D("Promote")->where($queryStr)->field('id')->select();
+                $promoter_ids ? $map['promote_id'] = ['in', implode(',', array_column($promoter_ids, 'id'))] : null;
+            }
             
         }
         empty(I('user_account')) || $map['user_account'] = ['like',"%".I('user_account')."%"];

Application/Admin/View/Member/user_info.html

@@ -406,7 +406,7 @@ $(function(){
              data:{level:$("#promote_level option:selected").val()},
              dataType:'json',
              success:function(response){
-                str = '<option value="">请选择推广员</option><option value="0"'+(promote_id && 0 == promote_id?'selected':'')+'>官方渠道</option><option value="UC" '+(promote_id && 'UC' == promote_id?'selected':'')+'>UC用户</option>';
+                str = '<option value="">请选择推广员</option><option value="0"'+(promote_id && 0 == promote_id?'selected':'')+'>官方渠道</option>';
                 //  $.each(response.data, function(index, item){
                 //      console.log(item.id);
                 //     str += '<option value="'+item.id+' '+(promote_id && item.id == promote_id?'selected':'')+'">'+item.nickname+'</option>';

Application/Admin/View/RechargeSum/summation.html

@@ -292,7 +292,7 @@ $(function(){
              data:{level:$("#promote_level option:selected").val()},
              dataType:'json',
              success:function(response){
-                str = "<option value=''>请选择推广员</option>";
+                str = '<option value="">请选择推广员</option><option value="0"'+(promote_id && 0 == promote_id?'selected':'')+'>官方渠道</option>';
                 //  $.each(response.data, function(index, item){
                 //      console.log(item.id);
                 //     str += '<option value="'+item.id+' '+(promote_id && item.id == promote_id?'selected':'')+'">'+item.nickname+'</option>';

Application/Admin/View/Spend/lists.html

@@ -487,7 +487,7 @@
              data:{level:$("#promote_level option:selected").val()},
              dataType:'json',
              success:function(response){
-                str = "<option value=''>请选择推广员</option>";
+                str = '<option value="">请选择推广员</option><option value="0"'+(promote_id && 0 == promote_id?'selected':'')+'>官方渠道</option>';
                 //  $.each(response.data, function(index, item){
                 //      console.log(item.id);
                 //     str += '<option value="'+item.id+' '+(promote_id && item.id == promote_id?'selected':'')+'">'+item.nickname+'</option>';

Application/Admin/View/User/rolelist.html

@@ -101,7 +101,8 @@
         <th class="">游戏区服</th>
         <th class="">角色ID</th>
 		<th class="">角色名</th>
-		<th class="">游戏等级</th>
+        <th class="">游戏等级</th>
+        <th class="">所属推广员</th>
         <th class="">最后登录时间</th>
 		<th class="">最后登录IP</th>
 		<!-- <th class="">操作</th> -->
@@ -121,7 +122,8 @@
             <td><notempty name="servername">{$servername}<else />空</notempty></td>
             <td><span class="badge">{$data['role_id']}</span></td>
 			<td><notempty name="rolename">{$rolename}<else />空</notempty></td>
-			<td>{$data.role_level}</td>
+            <td>{$data.role_level}</td>
+            <td>{$data.promote_account}</td>
             <td><?= date('Y-m-d H:i:s', $data['play_time']) ?></td>
 			<td>{$data.play_ip}</td>
 			<!-- <td><a class="ajax-get" href="{:U('user_update',['ids'=>$data['id']])}">更新</a></td> -->
@@ -246,7 +248,7 @@ $(".select_gallery").select2();
              data:{level:$("#promote_level option:selected").val()},
              dataType:'json',
              success:function(response){
-                str = '<option value="">请选择推广员</option>';
+                str = '<option value="">请选择推广员</option><option value="0"'+(promote_id && 0 == promote_id?'selected':'')+'>官方渠道</option>';
                 //  $.each(response.data, function(index, item){
                 //      console.log(item.id);
                 //     str += '<option value="'+item.id+' '+(promote_id && item.id == promote_id?'selected':'')+'">'+item.nickname+'</option>';

Application/Home/Controller/QueryController.class.php

@@ -1154,34 +1154,37 @@ class QueryController extends BaseController
                 ->select());//创角用户
 
             $newUserNumData = $userPlayInfoModel
-                ->field('tab_user_play_info.create_time,count(distinct tab_user_play_info.user_id) as num')
+                ->field('tab_user_play_info.create_time')
                 ->join($join)
                 ->where($userPlayInfoWhere2)
                 ->where($map)
-                ->having('tab_user_play_info.create_time between ' . $begTime . ' and ' . ($endTime + 86399))
+                ->group('tab_user_play_info.user_id')
+                ->having('tab_user_play_info.create_time between ' . $thisDateTime . ' and ' . ($thisDateTime + 86399))
                 ->order('tab_user_play_info.id')
-                ->find();
-            $list['new_user_num'] = empty($newUserNumData['num']) ? 0 : $newUserNumData['num'];//新创角用户
+                ->select();
+            $list['new_user_num'] = count($newUserNumData);//新创角用户
 
             $newDeviceData = $userPlayInfoModel
-                ->field('tab_user_play_info.create_time,count(distinct tab_user_play_info.create_device_number) as num')
+                ->field('tab_user_play_info.create_time')
                 ->join($join)
                 ->where($userPlayInfoWhere2)
                 ->where($map)
-                ->having('tab_user_play_info.create_time between ' . $begTime . ' and ' . ($endTime + 86399))
+                ->group('tab_user_play_info.create_device_number')
+                ->having('tab_user_play_info.create_time between ' . $thisDateTime . ' and ' . ($thisDateTime + 86399))
                 ->order('tab_user_play_info.id')
-                ->find();
-            $list['new_device_num'] = empty($newDeviceData['num']) ? 0 : $newDeviceData['num'];//新创角设备
+                ->select();
+            $list['new_device_num'] = count($newDeviceData);//新创角设备
 
             $newIpNumData = $userPlayInfoModel
-                ->field('tab_user_play_info.create_time,count(distinct tab_user_play_info.create_ip) as num')
+                ->field('tab_user_play_info.create_time')
                 ->join($join)
                 ->where($userPlayInfoWhere2)
                 ->where($map)
-                ->having('tab_user_play_info.create_time between ' . $begTime . ' and ' . ($endTime + 86399))
+                ->group('tab_user_play_info.create_ip')
+                ->having('tab_user_play_info.create_time between ' . $thisDateTime . ' and ' . ($thisDateTime + 86399))
                 ->order('tab_user_play_info.id')
-                ->find();
-            $list['new_ip_num'] = empty($newIpNumData['num']) ? 0 : $newIpNumData['num'];//新增创角IP
+                ->select();
+            $list['new_ip_num'] = count($newIpNumData);//新增创角IP
 
             $list['login_user_num'] = count(M('UserGameLoginRecord', 'tab_')
                 ->join($join)
@@ -1451,28 +1454,31 @@ class QueryController extends BaseController
                     ->count('distinct tab_user_play_info.user_id');//创角用户
 
                 $newUserNumData = $userPlayInfoModel
-                    ->field('tab_user_play_info.create_time,count(distinct tab_user_play_info.user_id) as num')
+                    ->field('tab_user_play_info.create_time')
                     ->where($userPlayInfoMap2)
+                    ->group('tab_user_play_info.user_id')
                     ->having('tab_user_play_info.create_time between ' . $begTime . ' and ' . ($endTime + 86399))
                     ->order('tab_user_play_info.id')
-                    ->find();
-                $list['new_user_num'] = empty($newUserNumData['num']) ? 0 : $newUserNumData['num'];//新创角用户
+                    ->select();
+                $list['new_user_num'] = count($newUserNumData);//新创角用户
 
                 $newDeviceData = $userPlayInfoModel
-                    ->field('tab_user_play_info.create_time,count(distinct tab_user_play_info.create_device_number) as num')
+                    ->field('tab_user_play_info.create_time')
                     ->where($userPlayInfoMap2)
+                    ->group('tab_user_play_info.create_device_number')
                     ->having('tab_user_play_info.create_time between ' . $begTime . ' and ' . ($endTime + 86399))
                     ->order('tab_user_play_info.id')
-                    ->find();
-                $list['new_device_num'] = empty($newDeviceData['num']) ? 0 : $newDeviceData['num'];//新创角设备
+                    ->select();
+                $list['new_device_num'] = count($newDeviceData);//新创角设备
 
                 $newIpData = $userPlayInfoModel
-                    ->field('tab_user_play_info.create_time,count(distinct tab_user_play_info.create_ip) as num')
+                    ->field('tab_user_play_info.create_time')
                     ->where($userPlayInfoMap2)
+                    ->group('tab_user_play_info.create_ip')
                     ->having('tab_user_play_info.create_time between ' . $begTime . ' and ' . ($endTime + 86399))
                     ->order('tab_user_play_info.id')
-                    ->find();
-                $list['new_ip_num'] = empty($newIpData['num']) ? 0 : $newIpData['num'];//新增创角IP
+                    ->select();
+                $list['new_ip_num'] = count($newIpData);//新增创角IP
 
                 $list['login_user_num'] = $userGameLoginModel
                     ->where($userGameLoginMap)

Application/Home/View/default/Promote/index.html

@@ -44,7 +44,7 @@
                 <div class="fxui-tab">
                     <div class="fxui-tab-hand">
                         <span class="fxui-tab-tit"><a href="#;">公告</a>
-                            <if condition="$gg_count neq 0">
+                            <if condition="$gg_count gt 0">
                                 <span style="width: 25px;height: 25px;float: left;position: relative;bottom:50px;left:55px;text-align: center;background: rgba(255, 0, 0, 1);border-radius:15px">
                                     <a style="line-height: 25px;padding: 0px;color: #fff">{$gg_count}</a>
                                 </span>
@@ -59,14 +59,14 @@
 <!--                            </if>-->
                         </span>
                         <span class="fxui-tab-tit"><a href="#;">游戏活动</a>
-                            <if condition="$zx_count neq 0">
+                            <if condition="$zx_count gt 0">
                                 <span style="width: 25px;height: 25px;float: left;position: relative;bottom:50px;left:83px;text-align: center;background: rgba(255, 0, 0, 1);border-radius:15px">
                                     <a style="line-height: 25px;padding: 0px;color: #fff">{$zx_count}</a>
                                 </span>
                             </if>
                         </span>
                         <span class="fxui-tab-tit"><a href="#;">资源号异常日志</a>
-                            <if condition="$rz_count neq 0">
+                            <if condition="$rz_count gt 0">
                                 <span style="width: 25px;height: 25px;float: left;position: relative;bottom:50px;left:125px;text-align: center;background: rgba(255, 0, 0, 1);border-radius:15px">
                                     <a style="line-height: 25px;padding: 0px;color: #fff">{$rz_count}</a>
                                 </span>

Application/Home/View/default/Query/dailySummary.html

@@ -94,7 +94,7 @@
                   <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
                 </volist>
               </notempty>
-              <if condition="$_GET['team_leader_id'] gt 0">
+              <if condition="($_GET['team_leader_id'] gt 0 or $thisParentPromoteId gt 0) or ($_GET['team_leader_id'] eq 0 and $thisParentPromoteId gt 0)">
                 <volist name=":getAllPromoteListByType(3,false,empty(I('team_leader_id'))?PID:I('team_leader_id'))" id="vo">
                   <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
                 </volist>

Application/Home/View/default/Query/recharge.html

@@ -85,7 +85,7 @@
                   <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
                 </volist>
               </notempty>
-              <if condition="$_GET['team_leader_id'] gt 0">
+              <if condition="($_GET['team_leader_id'] gt 0 or $thisParentPromoteId gt 0) or ($_GET['team_leader_id'] eq 0 and $thisParentPromoteId gt 0)">
                 <volist name=":getAllPromoteListByType(3,false,empty(I('team_leader_id'))?PID:I('team_leader_id'))" id="vo">
                   <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
                 </volist>

Application/Home/View/default/Query/register.html

@@ -56,7 +56,7 @@
                   <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
                 </volist>
               </notempty>
-              <if condition="$_GET['team_leader_id'] gt 0">
+              <if condition="($_GET['team_leader_id'] gt 0 or $thisParentPromoteId gt 0) or ($_GET['team_leader_id'] eq 0 and $thisParentPromoteId gt 0)">
                 <volist name=":getAllPromoteListByType(3,false,empty(I('team_leader_id'))?PID:I('team_leader_id'))" id="vo">
                   <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
                 </volist>

Application/Home/View/default/Query/summary.html

@@ -84,7 +84,7 @@
                   <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
                 </volist>
               </notempty>
-              <if condition="$_GET['team_leader_id'] gt 0">
+              <if condition="($_GET['team_leader_id'] gt 0 or $thisParentPromoteId gt 0) or ($_GET['team_leader_id'] eq 0 and $thisParentPromoteId gt 0)">
                 <volist name=":getAllPromoteListByType(3,false,empty(I('team_leader_id'))?PID:I('team_leader_id'))" id="vo">
                   <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
                 </volist>