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

Application/Admin/Controller/MemberController.class.php

@@ -812,20 +812,13 @@ class MemberController extends ThinkController
             $map['server_name'] = $_REQUEST['server_name'];
             unset($_REQUEST['server_name']);
         }
-        if (isset($_REQUEST['promote_id'])) {
-            $map['promote_id'] = $_REQUEST['promote_id'];
-            unset($_REQUEST['promote_id']);
-        }
         // $map['type'] = 1;
         // $map['login_time'] = ['exp', 'login_time<>0'];
         $extend = array();
         $extend['map'] = $map;
-        $count = M('UserLoginRecord','tab_')->field('user_id')->where($extend['map'])->group('user_id')->select(false);
-        $sql = "select count(user_id) as count from ({$count})t";
-        $count = M('UserLoginRecord','tab_')->query($sql);
+
 
         $this->m_title = '登录记录';
-        $this->assign('user_count',$count[0]['count']);
         $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'Member/login_record', 'status' => 1])->find());
 
         parent::lists("UserLoginRecord", $p, $extend['map']);

Application/Admin/View/Spend/lists.html

@@ -169,7 +169,7 @@
                 <!-- 列表 -->
                 <tbody>
                 <empty name="list_data">
-                    <td colspan="15" class="text-center">aOh! 暂时还没有内容!</td>
+                    <td colspan="17" class="text-center">aOh! 暂时还没有内容!</td>
                     <else/>
                     <volist name="list_data" id="data">
                         <tr>
@@ -212,7 +212,6 @@
                                 </if>
                             </td>
                             <td style="text-indent:0;">
-
                                 <if condition="$data['pay_game_status'] eq 0 and $data['pay_status'] eq 1">
                                     <a class=" budan" href="javascript:void(0);"
                                        href-data="{$data.pay_order_number}" href-hhh="{:U('Repair/repairEdit')}" style="width:100%;">补单</a>
@@ -227,19 +226,17 @@
                     </volist>
                 </empty>
                 <tr class="data_summary">
-
-
                     <td>汇总</td>
-                    <td colspan="6">
+                    <td colspan="16">
                         当页充值：{:null_to_0(array_sum(array_column(array_status2value('pay_status','',$list_data),'pay_amount')))}
-                        今日充值：{$ttotal}
-                        昨日充值：{$ytotal}
+                       <!-- 今日充值：{$ttotal}-->
+                       <!-- 昨日充值：{$ytotal}-->
                         累计充值：{$total}（此处只汇总充值成功的订单）
                     </td>
-                    <td colspan="99" style="color: #a9a9a9;">
+                    <!--<td colspan="99" style="color: #a9a9a9;">
                         今日充值：今日平台所有推广员的累计充值（包括官方渠道）/
                         昨日充值：昨日平台所有推广员的累计充值（包括官方渠道）
-                    </td>
+                    </td>-->
                 </tr>
                 </tbody>
             </table>

Application/Home/Controller/QueryController.class.php

@@ -174,6 +174,7 @@ class QueryController extends BaseController
                         break;
                 }
                 $list['user_account'] = substr($list['user_account'], 0, 2) . '******' . substr($list['user_account'], 8);
+                $list['pay_time'] = ($list['pay_status'] == 1) ? date('Y-m-d H:i:s', $list['pay_time']) : '--';
                 $list['pay_status'] = isset(QueryController::$payStatus[$list['pay_status']]) ? QueryController::$payStatus[$list['pay_status']] : '未知状态';
                 $list['sdk_version'] = getSDKTypeName($list['sdk_version']);
 
@@ -1856,7 +1857,7 @@ class QueryController extends BaseController
             }
 
             $map['uc.create_time'] = ['between', [$begTime, $endTime - 1]];
-            $fieldUC = "sum(uc.recharge_cost) recharge_cost,sum(uc.recharge_count) recharge_count,sum(if(uc.create_time = {$nowTime},uc.recharge_cost,0)) as recharge_cost_today";
+            $fieldUC = "sum(uc.recharge_cost) recharge_cost,sum(uc.recharge_count) recharge_count,sum(if(uc.create_time = {$nowTime},uc.recharge_cost,0)) as recharge_cost_today,uc.user_id";
             $fieldUI = "ui.user_account,ui.game_name,ui.role_name,ui.role_level,ui.server_name,ui.play_time,ui.play_ip,ui.promote_account,ui.sdk_version,ui.create_time";
 
             $loginRecordMap['lr.create_time'] = $map['uc.create_time'];
@@ -1884,6 +1885,10 @@ class QueryController extends BaseController
             list($records, $pagination, $count) = $this->paginate($query);
 
             foreach ($records as &$list) {
+                if (empty($list['user_account']) ) {
+                    $list['user_account'] = M('user', 'tab_')->where("id = {$list['user_id']}")->getField('account');
+                    $list['user_account'] = empty($list['user_account']) ? '--' : encryption($list['user_account']);
+                }
                 $list['user_account'] = empty($list['user_account']) ? '--' : encryption($list['user_account']);
                 $list['game_name'] = empty($list['game_name']) ? '--' : $list['game_name'];
                 $list['sdk_version'] = empty($list['sdk_version']) ? '--' : getSDKTypeName($list['sdk_version']);

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

@@ -216,7 +216,7 @@
                   <td>{$vo.p_p_pro_account}({$vo.p_p_pro_real_name})</td>
                   <td>{$vo.p_pro_account}({$vo.p_pro_real_name})</td>
                   <td>{$vo.pro_account}({$vo.pro_real_name})</td>
-                  <td>{$vo.pay_time|date='Y-m-d H:i:s',###}</td>
+                  <td>{$vo.pay_time}</td>
 <!--                  <td>-->
 <!--                    <a href="{:U('Query/viewSpendDetailed',array('id'=>$vo['id']))}" style="cursor: pointer"-->
 <!--                       class="chakan">查看详细</a>-->

Data/update.sql

@@ -696,5 +696,12 @@ ALTER TABLE `tab_pay_info` ADD COLUMN `promote_id` int(11) NOT NULL DEFAULT '0'
 ALTER TABLE `tab_pay_info` ADD COLUMN `game_player_id` varchar(30) DEFAULT '0' COMMENT '玩家游戏内id';
 ALTER TABLE `tab_pay_info` ADD COLUMN `sdk_version` tinyint(2) DEFAULT '1' COMMENT '区别sdk版本1安卓 2苹果 ';
 ALTER TABLE `tab_pay_info` ADD COLUMN `promote_account` varchar(30) DEFAULT '' COMMENT '推广员账号';
+
+ALTER TABLE `tab_pay_info`
+MODIFY COLUMN `game_player_id`  varchar(255) NULL DEFAULT '0' COMMENT '玩家游戏内id' AFTER `promote_id`;
+ALTER TABLE `tab_pay_info`
+ADD COLUMN `ip`  varchar(255) NOT NULL DEFAULT '0' AFTER `promote_account`,
+ADD COLUMN `pay_way`  int NOT NULL DEFAULT 0 AFTER `ip`;
+
 -- 菜单(游戏充值预下单)
 INSERT INTO `sys_menu`(`title`, `pid`, `sort`, `url`, `hide`, `tip`, `group`, `is_dev`, `status`) VALUES ('游戏充值预下单', 16, 0, 'BehaviorLog/game', 0, '', '行为日志', 0, 1);