diff --git a/Application/Admin/Controller/BehaviorLogController.class.php b/Application/Admin/Controller/BehaviorLogController.class.php index 126aa25e9..87f299ebb 100644 --- a/Application/Admin/Controller/BehaviorLogController.class.php +++ b/Application/Admin/Controller/BehaviorLogController.class.php @@ -11,25 +11,25 @@ class BehaviorLogController extends ThinkController $map = []; if (isset($params['user_account'])) { - $map['user_account'] = $params['user_account']; + $map['tab_pay_info.user_account'] = $params['user_account']; } if (isset($params['extend'])) { - $map['extend'] = $params['extend']; + $map['tab_pay_info.extend'] = $params['extend']; } if (isset($params['game_name'])) { $game_id = ['in', array_column(getGameByName($params['game_name'], $params['sdk_version']), 'id')]; - $map['game_id'] = $game_id; + $map['tab_pay_info.game_id'] = $game_id; } if (isset($params['server_name'])) { $game_id = M('game', 'tab_')->where(['relation_game_name' => $params['game_name'],'sdk_version' => $params['sdk_version']])->getField('id'); $server_id = M('server', 'tab_')->where(['server_name' => $params['server_name'], 'game_id' => $game_id])->getField('server_num'); - $map['server_id'] = $server_id; + $map['tab_pay_info.server_id'] = $server_id; } if (isset($params['game_player_name'])) { - $map['game_player_name'] = $params['game_player_name']; + $map['tab_pay_info.game_player_name'] = $params['game_player_name']; } if (isset($params['game_player_id'])) { - $map['game_player_id'] = $params['game_player_id']; + $map['tab_pay_info.game_player_id'] = $params['game_player_id']; } @@ -40,7 +40,7 @@ class BehaviorLogController extends ThinkController $endDate = empty($params['timeend']) ? date('Y-m-d') : $params['timeend']; $startTime = strtotime($startDate); $endTime = strtotime($endDate) + 86399; - $map['create_time'] = array('BETWEEN', [$startTime, $endTime]); + $map['tab_pay_info.create_time'] = array('BETWEEN', [$startTime, $endTime]); if (isset($params['promote_id'])) { $promoteId = $params['promote_id']; if ($promoteId == 0) { @@ -52,7 +52,7 @@ class BehaviorLogController extends ThinkController $map['promote_id'] = ['in', $promoteIds]; } } - $data = M('pay_info', 'tab_')->where($map)->order('id DESC')->page($p, $row)->select(); + $data = M('pay_info', 'tab_')->join('tab_server on tab_pay_info.server_id = tab_server.server_num AND tab_pay_info.game_id = tab_server.game_id')->where($map)->order('tab_pay_info.id DESC')->page($p, $row)->select(); foreach($data as $k => $v) { if(empty($v['extend'])) {