Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Application/Admin/Controller/RechargeSumController.class.php

@@ -48,7 +48,7 @@ class RechargeSumController extends ThinkController
                 }
 
                 //当天注册人数
-                $registerNum = D('User')->where(array_merge($rmap, array('puid' => 0)))->join("tab_user_play on tab_user.id = tab_user_play.user_id and tab_user.fgame_id = tab_user_play.game_id")->field("tab_user.id")->select();
+                $registerNum = D('User')->where(array_merge($rmap, array('puid' => 0)))->join("tab_user_play on tab_user.id = tab_user_play.user_id and tab_user.fgame_id = tab_user_play.game_id", 'left')->field("tab_user.id")->select();
                 $registerNum = $registerNum ? array_column($registerNum, 'id') : [];
 
                 //当天活跃人数

Application/Admin/Controller/SpendController.class.php

@@ -100,7 +100,6 @@ class SpendController extends ThinkController
             $map = '1 = 2';
             $map1 = $map;
         }
-        echo (D(self::model_name)->where($map1)->fetchSql(true)->sum('pay_amount'));
         $total = null_to_0(D(self::model_name)->where($map1)->sum('pay_amount'));
         $ttotal = null_to_0(D(self::model_name)->where('pay_time' . total(1))->where(array('pay_status' => 1))->sum('pay_amount'));
         $ytotal = null_to_0(D(self::model_name)->where('pay_time' . total(5))->where(array('pay_status' => 1))->sum('pay_amount'));

Application/Admin/Controller/ToolController.class.php

@@ -339,6 +339,15 @@ class ToolController extends ThinkController {
         $data[$name] = $config;
         $configs=array_merge($configs,$data);
         $result = file_put_contents($config_file, "<?php\treturn " . var_export($configs, true) . ";");
+
+        $ageConfigJson = json_encode($config);
+        M('tool', 'tab_')->where([
+            'name' => $name
+        ])->save([
+            'config' => $ageConfigJson,
+            'type' => 1,
+            'status' => $config['status'] ? $config['status'] : $config['bat'];
+        ]);
     }
 
     public function ios_game(){ 

Application/Admin/View/Game/add.html

@@ -448,7 +448,7 @@
                                 <span class="notice-text">此处比例为开发者结算时的分成比例</span>
                             </td>
                         </tr>
-                        <tr>
+                        <!-- <tr>
                             <td class="l noticeinfo">会长代充折扣比例</td>
                             <td class="r">
                                 <input type="text" class="txt table_text_input" name="discount" value="10" placeholder="请输入0-10之间的数字"><span class="form_unit">折</span>
@@ -461,7 +461,7 @@
                                 <input type="text" class="txt table_text_input" name="bind_recharge_discount" value="10" placeholder="请输入0-10数字"><span class="form_unit">折</span>
                                 <span class="notice-text">设置APP游戏的绑币统一折扣，APP充值时绑币时使用</span>
                             </td>
-                        </tr>
+                        </tr> -->
                         <tr>
                             <td class="l noticeinfo">扶持额度</td>
                             <td class="r">

Application/Admin/View/Game/edit.html

@@ -495,7 +495,7 @@
                                 <span class="notice-text">此处比例为开发者结算时的分成比例</span>
                             </td>
                         </tr>
-                        <tr>
+                        <!-- <tr>
                             <td class="l noticeinfo">会长代充折扣比例</td>
                             <td class="r">
                                 <input type="text" class="txt table_text_input" name="discount" value="{$data['discount']}" placeholder="请输入0-10之间的数字"><span class="form_unit">折</span>
@@ -508,7 +508,7 @@
                                 <input type="text" class="txt table_text_input" name="bind_recharge_discount" value="{$data['bind_recharge_discount']}" placeholder="请输入0-10数字"><span class="form_unit">折</span>
                                 <span class="notice-text">设置APP游戏的绑币统一折扣，APP充时绑币时使用</span>
                             </td>
-                        </tr>
+                        </tr> -->
                         <tr>
                             <td class="l noticeinfo">扶持额度</td>
                             <td class="r">

Application/Admin/View/Member/user_info.html

@@ -224,8 +224,8 @@
                         <th>注册方式</th>
                         </if>
                         <th  >注册时间</th>
+                        <th  >注册IP</th>
                         <th  >最后登录时间</th>
-                        <th  >最后登录IP</th>
                         <th  >设备号</th>
                         <th  >账号状态</th>
                         <th  >拉黑状态</th>
@@ -276,6 +276,7 @@
                             </if>
                             
                             <td >{$data.register_time|date='Y-m-d H:i:s',###}</td>
+                            <td >{$data.register_ip}</td>
                             <td >
                                 <if condition="$data.login_time eq null">
                                     空
@@ -283,7 +284,6 @@
                                 <span class="login_old">{$data['login_time']|date='Y-m-d H:i:s',###}</span>
                                 </if>
                             </td>
-                            <td >{$data.register_ip}</td>
                             <td >{$data.device_number}</td>
 
                             <if condition="get_info_status($data['lock_status'],4) eq 锁定">

Application/Home/Controller/DownloadController.class.php

@@ -1420,7 +1420,9 @@ class DownloadController extends BaseController {
             'basicPromotes' => json_encode($basicPromotes,FALSE),
         ];
         $map['promotes'] =  json_encode($data,FALSE);
-         $map['ids'] = $ids;
+        $map['parentsinfo'] = json_encode($parent,FALSE);;
+        $map['currentDisplay'] = $currentDisplay;
+        $map['ids'] = $ids;
         if ($gameId > 0) {
             $params['game_id'] = $gameId;
         }
@@ -1812,7 +1814,7 @@ class DownloadController extends BaseController {
         array('create_time','创建时间'),
 	     );
         $model = M('user_play_info','tab_');
-        $data = $model->field('user_account,promote_account,game_name,server_name,role_name,role_level')->where($map)->order('create_time desc')->select();
+        $data = $model->field('user_account,promote_account,game_name,server_name,role_name,role_level,create_time')->where($map)->order('create_time desc')->select();
         $xlsData = [];
         foreach ($data as $key1 => $value1) {
            $value1['user_account'] = $this->encryption($value1['user_account']);
@@ -1873,7 +1875,7 @@ class DownloadController extends BaseController {
             ->join($serverJoin)//关联区服表
             ->where($map)
             ->group('tab_apply.game_id')
-            ->order('g.sort desc,tab_apply.id desc')
+            ->order('g.sort desc,g.id desc')
             ->select();
         $records = [];
          if (!empty($data)) {  
@@ -2666,15 +2668,14 @@ class DownloadController extends BaseController {
         array('create_role_count','创角数'),
 		array('create_role_user_count','创角用户'),
 		array('new_create_role_user_count','新创角用户'),
-		array('new_create_role_device_count','新创角设备'),
         array('new_create_role_ip_count','新创角ip'),          
         array('login_user_count','登陆用户数'),
-        array('recharge_count','充值人数'),
+        array('recharge_user_count','充值人数'),
-        array('recharge_user_count','充值次数'),
+        array('recharge_count','充值次数'),
         array('recharge_amount','充值总额'),
-        array('recharge_by_ban_coin','现金充值'),
+        array('recharge_by_ban_coin','绑定币充值'),
         array('recharge_by_coin','通用币充值'),
-        array('recharge_by_cash','绑定币充值'),
+        array('recharge_by_cash','现金充值'),
             
              
 	    );
@@ -2694,6 +2695,15 @@ class DownloadController extends BaseController {
         if(!empty($map['lock_status'])) {
             $params['lock_status'] = $map["lock_status"];
         }
+
+        if(!empty($map['parentsinfo'])) {
+            $parent = json_decode($map['parentsinfo'],TRUE);
+            unset($map['parentsinfo']);
+        }
+        if(!empty($map['currentDisplay'])) {
+            $currentDisplay = $map['currentDisplay'];
+            unset($map['currentDisplay']);
+        }
         $params['begin_time'] = $map['begin_time'];
         $params['end_time'] = $map['end_time'];
 
@@ -2708,6 +2718,39 @@ class DownloadController extends BaseController {
         $rechargeUserCountList = $promoteRepository->getRechargeUserCountByIds($ids, $params);
         $rechargeAmountList = $promoteRepository->getRechargeAmountByIds($ids, $params);
         $records = [];
+        if (I('p', 1) == 1) {
+            $selfParams = $params;
+            $selfParams['isContainSubs'] = false;
+            $selfCreateRoleCountList = $promoteRepository->getCreateRoleCountByIds([$parent['id']], $selfParams);
+            $selfCreateRoleUserCountList = $promoteRepository->getCreateRoleUserCountByIds([$parent['id']], $selfParams);
+            $selfNewCreateRoleUserCountList = $promoteRepository->getNewCreateRoleUserCountByIds([$parent['id']], $selfParams);
+            // $selfNewCreateRoleDeviceCountList = $promoteRepository->getNewCreateRoleDeviceCountByIds([$parent['id']], $selfParams);
+            $selfNewCreateRoleIpCountList = $promoteRepository->getNewCreateRoleIpCountByIds([$parent['id']], $selfParams);
+
+            $selfLoginUserCountList = $promoteRepository->getLoginUserCountByIds([$parent['id']], $selfParams);
+            $selfRechargeCountList = $promoteRepository->getRechargeCountByIds([$parent['id']], $selfParams);
+            $selfRechargeUserCountList = $promoteRepository->getRechargeUserCountByIds([$parent['id']], $selfParams);
+            $selfRechargeAmountList = $promoteRepository->getRechargeAmountByIds([$parent['id']], $selfParams);
+            $records[] = [
+                'id' => $parent['id'],
+                'account' => $parent['account'],
+                'real_name' => $parent['real_name'],
+                'level' => $parent['level'],
+                'create_role_count' => $selfCreateRoleCountList[$parent['id']],
+                'create_role_user_count' => $selfCreateRoleUserCountList[$parent['id']],
+                'new_create_role_user_count' => $selfNewCreateRoleUserCountList[$parent['id']],
+                // 'new_create_role_device_count' => $selfNewCreateRoleDeviceCountList[$parent['id']],
+                'new_create_role_ip_count' => $selfNewCreateRoleIpCountList[$parent['id']],
+                'login_user_count' => $selfLoginUserCountList[$parent['id']],
+                'recharge_count' => $selfRechargeCountList[$parent['id']],
+                'recharge_user_count' => $selfRechargeUserCountList[$parent['id']],
+                'recharge_amount' => $selfRechargeAmountList[$parent['id']]['ban_coin'] + $selfRechargeAmountList[$parent['id']]['coin'] + $selfRechargeAmountList[$parent['id']]['cash'],
+                'recharge_by_ban_coin' => $selfRechargeAmountList[$parent['id']]['ban_coin'],
+                'recharge_by_coin' => $selfRechargeAmountList[$parent['id']]['coin'],
+                'recharge_by_cash' => $selfRechargeAmountList[$parent['id']]['cash'],
+                'current_display' => $currentDisplay,
+            ];
+        }
         foreach ($promotes as $promote) {
             $id = $promote['id'];
             $records[] = [
@@ -2770,7 +2813,9 @@ class DownloadController extends BaseController {
        $subMap['create_time'] = ['between', [$map['begintime'], $map['endtime'] - 1]];
         $roleIdMap = $subMap;
        $roleIds = M('user_play_data_count', 'tab_')->where($roleIdMap)->group('role_id')->getField('role_id', true);
-       $map['role_id'] = ['in', $roleIds];
+        if (count($roleIds) > 0) {
+            $map['role_id'] = ['in', $roleIds];
+        }
         if ($costBegin != '' || $costEnd != '') {
             $having = '';
             if ($costBegin != '' && $costEnd != '') {

Application/Home/Controller/QueryController.class.php

@@ -1772,7 +1772,9 @@ class QueryController extends BaseController
             $subMap['create_time'] = ['between', [$begTime, $endTime - 1]];
             $roleIdMap = $subMap;
             $roleIds = M('user_play_data_count', 'tab_')->where($roleIdMap)->group('role_id')->getField('role_id', true);
-            $map['role_id'] = ['in', $roleIds];
+            if (count($roleIds) > 0) {
+                $map['role_id'] = ['in', $roleIds];
+            }
             if ($costBegin != '' || $costEnd != '') {
                 $having = '';
                 if ($costBegin != '' && $costEnd != '') {

Application/Home/View/default/PromoteCoin/promote_games.html

@@ -9,6 +9,7 @@
         <div class="trunk-content article">
             <div class="trunk-search clearfix" style="margin-bottom: 10px;">
                 <form action="{:U('PromoteCoin/promoteGames', array('row'=>I('get.row')))}" method="post" class="clearfix">
+                    <input type="hidden" name="promote_id" value="{:I('promote_id', 0)}">
                     <div class="form-group normal_space fr">
                     <input type="submit" class="submit" value="查询">
                     </div>

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

@@ -159,22 +159,22 @@
                   <if condition="I('game_id', 0) gt 0">
                     <th>游戏名称</th>
                   <else/>
-                  <th>付费游戏数</th>
+                  <th title="当日有产生付费的游戏(区分 Android与ios)">付费游戏数</th>
                   </if>
                   <if condition="I('promote_id', 0) gt 0 or I('sub_promote_id', 0) gt 0">
                     <th>所属渠道</th>
                   </if>
-                  <th>活跃用户</th>
+                  <th title="当日在线的推广玩家">活跃用户</th>
-                  <th>新增用户</th>
+                  <th title="当日新注册用户付费用户:当日游戏充值用户">新增用户</th>
-                  <th>付费用户</th>
+                  <th title="当日游戏充值用户">付费用户</th>
-                  <th>新增付费用户</th>
+                  <th title="注册以来首次充值的用户">新增付费用户</th>
-                  <th>付费总额</th>
+                  <th title="当日充值总额">付费总额</th>
-                  <th>付费率</th>
+                  <th title="单日在线玩家充值率">付费率</th>
-                  <th>新增付费额</th>
+                  <th title="新增注册用户充值总额">新增付费额</th>
-                  <th>累计付费用户</th>
+                  <th title="历史累计付费注册用户(去重)">累计付费用户</th>
                   <!-- <th>1日留存</th> -->
-                  <th>ARPU</th>
+                  <th title="即每个用户平均收入">ARPU</th>
-                  <th>ARPPU</th>
+                  <th title="每付费用户平均收益">ARPPU</th>
                   <if condition="I('game_id', 0) eq 0">
                   <th>详情</th>
                   </if>