Merge branch 'dev_statistics' into dev

Application/Admin/Controller/PayChannelController.class.php

@@ -354,19 +354,18 @@ class PayChannelController extends ThinkController
 
         $bindMap['pay_status'] = 1;
         $bindMap['pay_way'] = array('egt',1);
-        $bindMap['game_id'] =$_REQUEST['game_id'];
+        if($_REQUEST['game_id']) {
+            $bindMap['game_id'] =$_REQUEST['game_id'];
+        }
         if ($map['pay_time']) {
             $bindMap['create_time'] = $map['pay_time'];
         }
 
         $bindRechargeData = M('bind_recharge','tab_')
             ->field('sum(real_amount) as pay_amount,pay_way')
-            ->where(array('pay_status'=>1,'pay_way'=>array('egt',1),'game_id'=>$_REQUEST['game_id'],'create_time'=>$map['pay_time']))
+            ->where($bindMap)
             ->select(false);
 
-
-//        var_dump($spreadDataPay);die();
-
         //将语句整合起来查询
         $channelData = "select sum(pay_amount) as pay_amount,pay_way from ({$channelData} UNION ALL {$depositData} UNION ALL {$superSignDataPay} UNION ALL {$spreadDataPay} UNION ALL {$bindRechargeData})t group by pay_way;";
 //        var_dump($channelData);die();