Merge branch 'dev' into release-1.0.0

Application/Admin/Controller/AjaxController.class.php

@@ -77,6 +77,8 @@ class AjaxController extends ThinkController{
         $game_map = [];
         if ($game_name) {
             $game_map['relation_game_name'] = $game_name;
+        }else {
+            $this->AjaxReturn([]);
         }
         if ($sdk_version) {
             $map['server_version'] = $game_map['sdk_version'] = $sdk_version;

Application/Admin/Controller/BehaviorLogController.class.php

@@ -9,34 +9,27 @@ class BehaviorLogController extends ThinkController
     {
         $params = I('get.');
 
-        $ignoreData = ['p', 'row', 'timestart', 'timeend', 'promote_id'];
         $map        = [];
-        // if (isset($params['user_account'])) {
+        if (isset($params['user_account'])) {
-        //     $map['user_account'] = $params['user_account'];
+            $map['user_account'] = $params['user_account'];
-        // }
+        }
-        // if (isset($params['extend'])) {
+        if (isset($params['extend'])) {
-        //     $map['extend'] = $params['extend'];
+            $map['extend'] = $params['extend'];
-        // }
+        }
-        // if (isset($params['game_name'])) {
+        if (isset($params['game_name'])) {
-        //     $map['game_name'] = $params['game_name'];
+            $game_id = ['in', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')];
-        // }
+            $map['game_id'] = $game_id;
-        // if (isset($params['server_name'])) {
+        }
-        //     $map['server_name'] = $params['server_name'];
+        if (isset($params['server_name'])) {
-        // }
+            $map['server_name'] = $params['server_name'];
-        // if (isset($params['sdk_version'])) {
-        //     $map['sdk_version'] = $params['sdk_version'];
-        // }
-        // if (isset($params['user_nickname'])) {
-        //     $map['user_nickname'] = $params['user_nickname'];
-        // }
-        // if (isset($params['game_player_id'])) {
-        //     $map['game_player_id'] = $params['game_player_id'];
-        // }
-        foreach ($params as $k => $v) {
-            if (!in_array($k, $ignoreData)) {
-                $map[$k] = $v;
-            }
         }
+        if (isset($params['user_nickname'])) {
+            $map['user_nickname'] = $params['user_nickname'];
+        }
+        if (isset($params['game_player_id'])) {
+            $map['game_player_id'] = $params['game_player_id'];
+        }
+
 
         $p   = $params['p'] ? $params['p'] : 1;
         $row = $params['row'] ? $params['row'] : 10;
@@ -52,10 +45,8 @@ class BehaviorLogController extends ThinkController
             } else {
                 $promoteMap['chain'] = ['like', "%/$promoteId/%"];
                 $promoteIds          = M('Promote', 'tab_')->where($promoteMap)->getField('id', true);
-                if(empty($promoteIds)) {
+                $promoteIds[] = $promoteId;
-                	$promoteIds[] = $promoteIds;
+                $map['promote_id'] = ['in', $promoteIds];
-                }
-                $map['promote_id']   = ['in', $promoteIds];
             }
         }
         $data = M('pay_info', 'tab_')->where($map)->order('id DESC')->page($p, $row)->select();

Application/Admin/Controller/ExportController.class.php

@@ -1753,6 +1753,62 @@ class ExportController extends Controller
                         $xlsData[$key]['developers'] = get_developers_account($value['developers'],'account');
                     }
                     break;
+                case 21:
+                    $xlsCell = array(
+                        array('extend', 'CP订单号'),
+                        array('create_time', '充值时间'),
+                        array('user_account', '玩家账号'),
+                        array('game_name', '游戏名称'),
+                        array('server_name', '游戏区服'),
+                        array('promote_account', '所属推广员'),
+                        array('game_player_id', '角色ID'),
+                        array('game_player_name', '角色名称'),
+                        array('price', '订单金额'),
+                    );
+                     $params = I('get.');
+
+                    $map        = [];
+                    if (isset($params['user_account'])) {
+                        $map['user_account'] = $params['user_account'];
+                    }
+                    if (isset($params['extend'])) {
+                        $map['extend'] = $params['extend'];
+                    }
+                    if (isset($params['game_name'])) {
+                        $game_id = ['in', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')];
+                        $map['game_id'] = $game_id;
+                    }
+                    if (isset($params['server_name'])) {
+                        $map['server_name'] = $params['server_name'];
+                    }
+                    if (isset($params['user_nickname'])) {
+                        $map['user_nickname'] = $params['user_nickname'];
+                    }
+                    if (isset($params['game_player_id'])) {
+                        $map['game_player_id'] = $params['game_player_id'];
+                    }
+
+                    $startDate          = empty($params['timestart']) ? date('Y-m-d', strtotime('-6 day', time())) : $params['timestart'];
+                    $endDate            = empty($params['timeend']) ? date('Y-m-d') : $params['timeend'];
+                    $startTime          = strtotime($startDate);
+                    $endTime            = strtotime($endDate) + 86399;
+                    $map['create_time'] = array('BETWEEN', [$startTime, $endTime]);
+                    if ($promoteId = I('promote_id')) {
+                        if ($promoteId == 0) {
+                            $map['promote_id'] = 0;
+                        } else {
+                            $promoteMap['chain'] = ['like', "%/$promoteId/%"];
+                            $promoteIds          = M('Promote', 'tab_')->where($promoteMap)->getField('id', true);
+                            $promoteIds[] = $promoteId;
+                            $map['promote_id'] = ['in', $promoteIds];
+                        }
+                    }
+                    $xlsData = M('pay_info', 'tab_')->where($map)->order('id DESC')->select();
+                    foreach($xlsData as $k => $v) {
+                        $xlsData[$k]['create_time'] = date('Y-m-d H:i:s',$v['create_time']);
+                    }
+                    break;
+
             default:
             $xlsName = $xlsCell = $xlsData = [];
 

Application/Admin/View/BehaviorLog/index.html

@@ -169,7 +169,7 @@
         </div>
     </div>
     <div class="page">
-				<!-- <a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>7,'xlsname'=>'游戏订单_游戏充值'),I('get.')))}">导出</a> -->
+				<a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>21,'xlsname'=>'游戏充值预下单'),I('get.')))}">导出</a>
         {$_page|default=''}
     </div>
 

Application/Home/Controller/QueryController.class.php

@@ -21,7 +21,7 @@ class QueryController extends BaseController
         1 => '支付宝',
         2 => '微信',
         9 => '双乾支付',
-        15 => '双乾支付'
+        15 => '双乾支付-快捷'
     ];
 
     public static $payStatus = [
@@ -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']);
 

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);