diff --git a/Application/Admin/Controller/PayChannelController.class.php b/Application/Admin/Controller/PayChannelController.class.php index c55501b9f..6a87672a9 100644 --- a/Application/Admin/Controller/PayChannelController.class.php +++ b/Application/Admin/Controller/PayChannelController.class.php @@ -51,7 +51,7 @@ class PayChannelController extends ThinkController $map['pay_status'] = $coinMap['pay_status'] = 1; $map['pay_way'] = array('egt',1); - setPowerPromoteIds($map,'promote_id'); +// setPowerPromoteIds($map,'promote_id'); //游戏币计算 $data = M('spend','tab_') @@ -64,7 +64,7 @@ class PayChannelController extends ThinkController //平台币充值金额计算 $coinMap['pay_source'] = 2; $coinMap['extend'] = array('eq',''); - setPowerPromoteIds($coinMap,'tab_deposit.promote_id'); +// setPowerPromoteIds($coinMap,'tab_deposit.promote_id'); $coinData = M('pay_info','tab_') ->join("inner join tab_deposit on tab_pay_info.order_id=tab_deposit.pay_order_number") @@ -124,7 +124,7 @@ class PayChannelController extends ThinkController } $superMap = $map; - unset($superMap['promote_id']); +// unset($superMap['promote_id']); //超级签数据 $superSignData = M('game_supersign','tab_') ->field("0 as game_name,sum(pay_price) as pay_amount,0 as platform_coin,0 as test_coin") @@ -143,7 +143,7 @@ class PayChannelController extends ThinkController $offcialmap['pay_status'] = 1; $offcialmap['pay_way'] = array('egt',1); $offcialmap['pay_source'] = 0; - setPowerPromoteIds($offcialmap,'promote_id'); +// setPowerPromoteIds($offcialmap,'promote_id'); $offcialData = M('deposit','tab_') ->field("id as game_name,sum(pay_amount) as pay_amount,0 as platform_coin,0 as test_coin") @@ -158,7 +158,7 @@ class PayChannelController extends ThinkController $bindMap['pay_status'] = 1; $bindMap['pay_way'] = array('egt',1); - setPowerPromoteIds($bindMap,'promote_id'); +// setPowerPromoteIds($bindMap,'promote_id'); $bindRechargeData = M('bind_recharge','tab_') ->field('sum(real_amount) as pay_amount') @@ -173,7 +173,7 @@ class PayChannelController extends ThinkController $spreadMap['order_status'] = array('egt',1); $spreadMap['pay_way'] = array('egt',1); - setPowerPromoteIds($spreadMap,'promote_id'); +// setPowerPromoteIds($spreadMap,'promote_id'); //推广后台 $spreadData = M("coin_pay_order","tab_") ->field("0 as game_name,sum(real_amount) as pay_amount,0 as platform_coin,id as test_coin") @@ -352,7 +352,7 @@ class PayChannelController extends ThinkController if($map['pay_time']) { $spreadMap['create_time'] = $map['pay_time']; } - $spreadMap['promote_id'] = $map['promote_id']; +// $spreadMap['promote_id'] = $map['promote_id']; //推广后台 $spreadDataPay = M("coin_pay_order","tab_") ->field("sum(pay_amount) as pay_amount,pay_way") @@ -378,7 +378,7 @@ class PayChannelController extends ThinkController if ($map['pay_time']) { $bindMap['create_time'] = $map['pay_time']; } - $bindMap['promote_id'] = $map['promote_id']; +// $bindMap['promote_id'] = $map['promote_id']; $bindRechargeData = M('bind_recharge','tab_') ->field('sum(real_amount) as pay_amount,pay_way') @@ -451,8 +451,8 @@ class PayChannelController extends ThinkController $page = $p ? $p : 1; //默认显示第一页数据 - setPowerPromoteIds($map,'promote_id'); - setPowerPromoteIds($coinMap,'tab_deposit.promote_id'); +// setPowerPromoteIds($map,'promote_id'); +// setPowerPromoteIds($coinMap,'tab_deposit.promote_id'); $spendData = M('spend','tab_') ->field("pay_order_number,pay_time,user_account,game_name,promote_account,spend_ip,server_name,game_player_name,cost,pay_amount,pay_way") @@ -469,7 +469,7 @@ class PayChannelController extends ThinkController ->select(false); $spreadMap['order_status'] = array('egt',1); - setPowerPromoteIds($spreadMap,'promote_id'); +// setPowerPromoteIds($spreadMap,'promote_id'); // $spreadMap['pay_way'] = array('egt',1); $coin_pay_order = M('coin_pay_order','tab_') ->field("pay_order_number,create_time as pay_time,promote_account,pay_amount as cost,real_amount as pay_amount,pay_way") @@ -479,7 +479,7 @@ class PayChannelController extends ThinkController //官网数据 $offcialmap['pay_status'] = 1; $offcialmap['pay_source'] = 0; - setPowerPromoteIds($offcialmap,'promote_id'); +// setPowerPromoteIds($offcialmap,'promote_id'); $offcialData = M('deposit','tab_') ->field("pay_order_number,create_time as pay_time,user_account,promote_account,pay_ip as spend_ip,pay_amount as cost,pay_amount,pay_way") @@ -495,7 +495,7 @@ class PayChannelController extends ThinkController unset($map['pay_order_number']); } - unset($map['promote_id']); +// unset($map['promote_id']); //超级签数据 $superSignData = M('game_supersign','tab_') ->field("order_id as pay_order_number,pay_time,tab_user.account as user_account,tab_user.promote_account,pay_price as cost,pay_price as pay_amount,pay_way") @@ -620,8 +620,8 @@ class PayChannelController extends ThinkController $_REQUEST['game_id']?$coinMap['game_id'] = $_REQUEST['game_id']:false; $map['pay_status'] = 1; - setPowerPromoteIds($map,'promote_id'); - setPowerPromoteIds($coinMap,'tab_deposit.promote_id'); +// setPowerPromoteIds($map,'promote_id'); +// setPowerPromoteIds($coinMap,'tab_deposit.promote_id'); // $_REQUEST['model']?$model= $_REQUEST['model']:false; if ($_REQUEST['model']) { @@ -643,7 +643,7 @@ class PayChannelController extends ThinkController ->select(false); $spreadMap['order_status'] = array('egt',1); - setPowerPromoteIds($spreadMap,'promote_id'); +// setPowerPromoteIds($spreadMap,'promote_id'); $coin_pay_order = M('coin_pay_order','tab_') ->field("pay_order_number,create_time as pay_time,promote_account,pay_amount as cost,real_amount as pay_amount,pay_way") @@ -653,7 +653,7 @@ class PayChannelController extends ThinkController //官网数据 $offcialmap['pay_status'] = 1; $offcialmap['pay_source'] = 0; - setPowerPromoteIds($offcialmap,'promote_id'); +// setPowerPromoteIds($offcialmap,'promote_id'); $offcialData = M('deposit','tab_') ->field("pay_order_number,create_time as pay_time,user_account,promote_account,pay_ip as spend_ip,pay_amount as cost,pay_amount,pay_way") @@ -669,7 +669,7 @@ class PayChannelController extends ThinkController unset($map['pay_order_number']); } - unset($map['promote_id']); +// unset($map['promote_id']); //超级签数据 $superSignData = M('game_supersign','tab_') ->field("order_id as pay_order_number,pay_time,tab_user.account as user_account,tab_user.promote_account,pay_price as cost,pay_price as pay_amount,pay_way") @@ -820,7 +820,7 @@ class PayChannelController extends ThinkController if ($_REQUEST['game_id']) { $map['game_id'] = $_REQUEST['game_id']; } - setPowerPromoteIds($map,'promote_id'); +// setPowerPromoteIds($map,'promote_id'); $data = M('spend','tab_') ->field("pay_order_number,order_number,user_account,pay_time,game_name,server_name,game_player_name,cost,pay_amount,pay_way as pay_type,pay_way,pay_game_status") ->join('inner join tab_test_white_list on tab_spend.user_id=tab_test_white_list.user_id') @@ -833,10 +833,12 @@ class PayChannelController extends ThinkController } $coinMap = $map; - $coinMap['tab_deposit.create_time'] = $map['pay_time']; - unset($coinMap['pay_time']); - unset($coinMap['promote_id']); - setPowerPromoteIds($coinMap,'tab_deposit.promote_id'); + if ($map['pay_time']) { + $coinMap['tab_deposit.create_time'] = $map['pay_time']; + unset($coinMap['pay_time']); + } +// unset($coinMap['promote_id']); +// setPowerPromoteIds($coinMap,'tab_deposit.promote_id'); $coinData = M('pay_info','tab_') ->join("inner join tab_deposit on tab_pay_info.order_id=tab_deposit.pay_order_number") @@ -846,6 +848,7 @@ class PayChannelController extends ThinkController tab_deposit.pay_amount,tab_deposit.pay_way as pay_type,tab_deposit.pay_way,'' as pay_game_status") ->where($coinMap) ->select(false); + $page = ($page-1) * $row; $count = "select count(*) as count from ({$data} UNION ALL {$coinData})t;"; @@ -963,7 +966,7 @@ class PayChannelController extends ThinkController $map['create_time'] = $map['pay_time']; unset($map['pay_time']); } - setPowerPromoteIds($map,'tab_deposit.promote_id'); +// setPowerPromoteIds($map,'tab_deposit.promote_id'); $data = M('deposit','tab_') ->field("pay_order_number,order_number,user_account,create_time as pay_time,pay_amount as cost,pay_amount,pay_way as pay_type,pay_way") ->join('inner join tab_test_white_list on tab_deposit.user_id=tab_test_white_list.user_id') @@ -1123,7 +1126,7 @@ class PayChannelController extends ThinkController if ($_REQUEST['game_id']) { $map['game_id'] = $_REQUEST['game_id']; } - setPowerPromoteIds($map,'promote_id'); +// setPowerPromoteIds($map,'promote_id'); $data = M('spend','tab_') ->field("pay_order_number,order_number,user_account,pay_time,game_name,server_name,game_player_name,cost,pay_amount,pay_way as pay_type,pay_way,pay_game_status") @@ -1138,10 +1141,13 @@ class PayChannelController extends ThinkController $coinMap = $map; - $coinMap['tab_deposit.create_time'] = $map['pay_time']; - unset($coinMap['pay_time']); - unset($coinMap['promote_id']); - setPowerPromoteIds($coinMap,'tab_deposit.promote_id'); + if($map['pay_time']) { + $coinMap['tab_deposit.create_time'] = $map['pay_time']; + unset($coinMap['pay_time']); + } + +// unset($coinMap['promote_id']); +// setPowerPromoteIds($coinMap,'tab_deposit.promote_id'); $coinData = M('pay_info','tab_') ->join("inner join tab_deposit on tab_pay_info.order_id=tab_deposit.pay_order_number") @@ -1312,7 +1318,7 @@ class PayChannelController extends ThinkController $map['create_time'] = $map['pay_time']; unset($map['pay_time']); } - setPowerPromoteIds($map,'tab_deposit.promote_id'); +// setPowerPromoteIds($map,'tab_deposit.promote_id'); $accessNum = M('deposit','tab_') ->field("pay_order_number,order_number,user_account,create_time as pay_time,pay_amount as cost,pay_amount,pay_way as pay_type,pay_way")