diff --git a/Application/Admin/Controller/PayChannelController.class.php b/Application/Admin/Controller/PayChannelController.class.php index 883c955d6..762c584a8 100644 --- a/Application/Admin/Controller/PayChannelController.class.php +++ b/Application/Admin/Controller/PayChannelController.class.php @@ -1022,6 +1022,14 @@ class PayChannelController extends ThinkController $coinMap['tab_deposit.user_account'] = $coinMap['user_account']; unset($coinMap['user_account']); + if(!$coinMap['tab_deposit.user_account']) { + unset($coinMap['tab_deposit.user_account']); + } + + if (!$map['user_account']) { + unset($map['user_account']); + } + unset($coinMap['pay_status']); unset($coinMap['pay_way']); @@ -1036,11 +1044,13 @@ class PayChannelController extends ThinkController ->join("inner join tab_deposit on tab_pay_info.order_id=tab_deposit.pay_order_number") ->join("inner join tab_test_white_list on tab_test_white_list.user_id=tab_pay_info.user_id") ->field("pay_order_number,tab_deposit.order_number,tab_deposit.user_account,tab_deposit.create_time as pay_time, - tab_pay_info.game_name,tab_pay_info.server_name,tab_pay_info.game_player_name,tab_pay_info.sdk_version,tab_deposit.pay_amount as cost, - tab_deposit.pay_amount,tab_deposit.pay_way as pay_type,tab_deposit.pay_way,'' as pay_game_status") + tab_pay_info.game_name,tab_pay_info.server_name,tab_pay_info.game_player_name,tab_deposit.pay_amount as cost, + tab_deposit.pay_amount,tab_deposit.pay_way as pay_type,tab_deposit.pay_way,'' as pay_game_status,tab_pay_info.sdk_version") ->where($coinMap) ->select(false); +// var_dump($coinData);die(); + $page = ($page-1) * $row; $count = "select count(*) as count from ({$data} UNION ALL {$coinData})t;"; @@ -1691,6 +1701,7 @@ class PayChannelController extends ThinkController $sumAllDataother['user_account'] = '------'; $sumAllDataother['pay_time'] = '------'; $sumAllDataother['game_name'] = '------'; + $sumAllDataother['sdk_version'] = '------'; $sumAllDataother['server_name'] = '------'; $sumAllDataother['game_player_name'] = '------'; $sumAllDataother['cost'] = $sumAllData['cost']; diff --git a/Application/Admin/Controller/PayChannelIntentionController.class.php b/Application/Admin/Controller/PayChannelIntentionController.class.php index 992aeb8b9..9dca97688 100644 --- a/Application/Admin/Controller/PayChannelIntentionController.class.php +++ b/Application/Admin/Controller/PayChannelIntentionController.class.php @@ -368,9 +368,14 @@ class PayChannelIntentionController extends AdminController $map = []; + if ($_REQUEST['pay_way']) { + $map['pay_ways'] = $_REQUEST['pay_way']; + } + if ($_REQUEST['pay_ways']) { $map['pay_ways'] = ['like',"%{$_REQUEST['pay_ways']}"]; } +// var_dump($map);die(); if ($_REQUEST['user_account']) { $map['user_account'] = $_REQUEST['user_account']; @@ -498,7 +503,7 @@ class PayChannelIntentionController extends AdminController $map = []; if ($_REQUEST['pay_ways']) { - $map['pay_ways'] = ['like',"%{$_REQUEST['pay_ways']}"]; + $map['pay_ways'] = $_REQUEST['pay_ways']; } if ($_REQUEST['user_account']) { diff --git a/Application/Admin/View/PayChannelIntention/index.html b/Application/Admin/View/PayChannelIntention/index.html index ab6142ef8..9aca51f10 100644 --- a/Application/Admin/View/PayChannelIntention/index.html +++ b/Application/Admin/View/PayChannelIntention/index.html @@ -304,11 +304,11 @@ 汇总(检索时间内所有数据的统计) - {$sum.success_invest_count} + {$sum.success_invest_count} {$sum.success_invest_amount} - {$sum.fail_invest_count} + {$sum.fail_invest_count} {$sum.fail_invest_amount} - {$sum.nothing_invest_count} + {$sum.nothing_invest_count} {$sum.nothing_invest_amount} @@ -367,12 +367,19 @@ $('.detail').click(function () { var pay_way = $(this).attr('data-way'); + var pay_ways = $(this).attr('data-ways'); if (pay_way) { - pay_way = 'pay_ways/' + pay_way + '/'; + pay_way = 'pay_way/' + pay_way + '/'; } else { pay_way = ''; } + if (pay_ways) { + pay_ways = 'pay_ways/' + pay_ways + '/'; + } else { + pay_ways = ''; + } + var pay_status = $(this).attr('data-status'); if (pay_status) { @@ -381,7 +388,7 @@ pay_status = ''; } - var url = "admin.php?s=/PayChannelIntention/detail/" + pay_way + pay_status; + var url = "admin.php?s=/PayChannelIntention/detail/"+ pay_ways + pay_way + pay_status; window.location.href = url;