修改内容

Application/Home/Controller/QueryController.class.php

@@ -1731,7 +1731,7 @@ class QueryController extends BaseController
             $map['game_id'] = $gameId;
         }
         if ($serverId != 0) {
-            $map['serverId'] = $serverId;
+            $map['server_id'] = $serverId;
         }
         if ($roleName != '') {
             $map['role_name'] = ['like', '%' . $roleName . '%'];

Application/Home/Event/UserEvent.class.php

@@ -721,6 +721,15 @@ class UserEvent extends BaseEvent {
 
 
     public function arpu_analysis() {
+        $promote = M('promote', 'tab_')->where(['id' => session('promote_auth.pid')])->find();
+        $map = [
+            '_logic' => 'or',
+            'id' => $promote['id'],
+            'parent_id' => $promote['id'],
+            'grand_id' => $promote['id'],
+        ];
+        $ids = M('promote', 'tab_')->where($map)->getField('id', true);
+
         if (IS_POST && $_POST['time_start'] && $_POST['time_end']) {
             $request = $_REQUEST;
             $game_id = $request['game_id'];
@@ -761,19 +770,14 @@ class UserEvent extends BaseEvent {
                     $promote_id = PID.','.$id;
                 }
             } else {
-
                 if(PID == $promote_id) {
 
                 } else {
-
-
                     $pro_id1 = get_prmoote_chlid_account($promote_id);
                     $pro_arr = array_column($pro_id1,'id');
                     $pro_arr[] = $promote_id;
                     $promote_id=implode(',',$pro_arr);
                 }
-
-
             }
             $datelist = get_date_list($start,$end);
             $user  = D('User');
@@ -924,7 +928,6 @@ class UserEvent extends BaseEvent {
         //file_put_contents(dirname(__FILE__) . '/../Controller/arpu'.PID.'.txt',json_encode($data));
 
         $this->assign('list_data',$data);
-
         $this->display();
     }
 

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

@@ -28,7 +28,7 @@
               <select id="game-select" name="game_id" class="reselect select_gallery" style="width: 220px;" >
                 <option value="0">请选择游戏</option>
                 <volist name="games" id="game">
-                <option value="{$game.game_id}" <if condition="I('game_id') === $game['id']">selected</if>>{$game.game_name}</option>
+                <option value="{$game.game_id}" <if condition="I('game_id') === $game['game_id']">selected</if>>{$game.game_name}</option>
                 </volist>
               </select>
             </div>
@@ -47,22 +47,22 @@
                 <option value="2" <if condition="I('sdk_version') === '2'">selected</if>>IOS</option>
               </select>
             </div>
-            <if condition="$grand_id eq 0">
+            <if condition="$parent_id eq 0">
             <div class="form-group normal_space">
-              <select id="group-select" name="promote_id" class="reselect select_gallery" style="width: 220px;" >
+              <select id="group-select" name="headman_promote_id" class="reselect select_gallery" style="width: 220px;" >
-                <option value="0">请选择推广员</option>
+                <option value="0">请选择组长</option>
-                <volist name="promotes" id="promote">
+                <volist name="groupPromotes" id="promote">
-                <option ba-id="{$promote.id}" value="{$promote.id}">{$promote.account}</option>
+                <option ba-id="{$promote.id}" value="{$promote.id}" <if condition="I('headman_promote_id') == $promote['id']">selected</if>>{$promote.account}</option>
                 </volist>
               </select>
             </div>
             </if>
-            <if condition="$parent_id eq 0">
+            <if condition="$grand_id eq 0">
             <div class="form-group normal_space">
-              <select id="promote-select" name="headman_promote_id" class="reselect select_gallery" style="width: 220px;" >
+              <select id="promote-select" name="promote_id" class="reselect select_gallery" style="width: 220px;" >
-                <option value="0">请选择组长</option>
+                <option value="0">请选择推广员</option>
-                <volist name="groupPromotes" id="promote">
+                <volist name="promotes" id="promote">
-                <option ba-id="{$promote.id}" value="{$promote.id}">{$promote.account}</option>
+                <option ba-id="{$promote.id}" value="{$promote.id}" <if condition="I('promote_id') == $promote['id']">selected</if>>{$promote.account}</option>
                 </volist>
               </select>
             </div>

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

@@ -28,7 +28,7 @@
               <select id="game-select" name="game_id" class="reselect select_gallery" style="width: 220px;" >
                 <option value="0">请选择游戏</option>
                 <volist name="games" id="game">
-                <option value="{$game.game_id}" <if condition="I('game_id') === $game['id']">selected</if>>{$game.game_name}</option>
+                <option value="{$game.game_id}" <if condition="I('game_id') eq $game['game_id']">selected</if>>{$game.game_name}</option>
                 </volist>
               </select>
             </div>
@@ -58,7 +58,7 @@
               <select id="group-select" name="headman_promote_id" class="reselect select_gallery" style="width: 220px;" >
                 <option value="0">请选择组长</option>
                 <volist name="groupPromotes" id="promote">
-                <option ba-id="{$promote.id}" value="{$promote.id}" <if condition="I('promote_id') === $promote['id']">selected</if>>{$promote.account}</option>
+                <option ba-id="{$promote.id}" value="{$promote.id}" <if condition="I('headman_promote_id') == $promote['id']">selected</if>>{$promote.account}</option>
                 </volist>
               </select>
             </div>
@@ -68,7 +68,7 @@
               <select id="promote-select" name="promote_id" class="reselect select_gallery" style="width: 220px;" >
                 <option value="0">请选择推广员</option>
                 <volist name="promotes" id="promote">
-                <option ba-id="{$promote.id}" value="{$promote.id}" <if condition="I('promote_id') === $promote['id']">selected</if>>{$promote.account}</option>
+                <option ba-id="{$promote.id}" value="{$promote.id}" <if condition="I('promote_id') == $promote['id']">selected</if>>{$promote.account}</option>
                 </volist>
               </select>
             </div>