diff --git a/Application/Admin/Controller/PayChannelController.class.php b/Application/Admin/Controller/PayChannelController.class.php index b076bb96d..effe09071 100644 --- a/Application/Admin/Controller/PayChannelController.class.php +++ b/Application/Admin/Controller/PayChannelController.class.php @@ -65,6 +65,7 @@ class PayChannelController extends ThinkController //平台币充值金额计算 $coinMap['pay_source'] = 2; $coinMap['extend'] = array('eq',''); + $coinMap['tab_deposit.pay_way'] = array('egt',1); // setPowerPromoteIds($coinMap,'tab_deposit.promote_id'); $coinData = M('pay_info','tab_') @@ -388,18 +389,24 @@ class PayChannelController extends ThinkController ->group('pay_way') ->select(false); if ($_REQUEST['game_id']) { - $map['tab_deposit.pay_way'] = $map['pay_way']; - $map['tab_deposit.create_time'] = $map['create_time']; + if ($map['pay_way']) { + $map['tab_deposit.pay_way'] = $map['pay_way']; + unset($map['pay_way']); + } + if ($map['create_time']) { + $map['tab_deposit.create_time'] = $map['create_time']; + unset($map['create_time']); + } $map['tab_deposit.pay_source'] = 2; $map['tab_pay_info.extend'] = ''; - unset($map['pay_way']); - unset($map['create_time']); + $depositData = M('pay_info','tab_') ->join("inner join tab_deposit on tab_pay_info.order_id=tab_deposit.pay_order_number") ->field('sum(pay_amount) as pay_amount,tab_deposit.pay_way as pay_way') ->where($map) ->group('tab_deposit.pay_way') ->select(false); +// var_dump($depositData);die(); } $bindMap['pay_status'] = 1;