Merge branch 'hotfix/pay_channel_modify' of wmtx/platform into master

支付渠道bug修改

Application/Admin/Controller/PayChannelController.class.php

@@ -449,19 +449,23 @@ class PayChannelController extends ThinkController
             ->group('pay_way')
             ->select(false);
 
-
+        $superMap = $map;
+        if ($map['payed_time']){
+            $superMap['pay_time'] = $map['payed_time'];
+            unset($superMap['payed_time']);
+        }
         //超级签数据
         $superSignDataPay = M('game_supersign','tab_')
             ->field("sum(pay_price) as pay_amount,pay_way")
-            ->where($map)
+            ->where($superMap)
             ->group('pay_way')
             ->select(false);
 
         //推广后台充值数据
         $spreadMap['order_status'] = array('egt',1);
         $spreadMap['pay_way'] = array('egt',1);
-        if($map['pay_time']) {
+        if($map['payed_time']) {
-            $spreadMap['create_time'] = $map['pay_time'];
+            $spreadMap['pay_time'] = $map['payed_time'];
         }
 //        $spreadMap['promote_id'] = $map['promote_id'];
         //推广后台
@@ -470,9 +474,9 @@ class PayChannelController extends ThinkController
             ->where($spreadMap)
             ->select(false);
 
-        if ($map['pay_time']) {
+        if ($map['payed_time']) {
-            $map['create_time'] = $map['pay_time'];
+//            $map['payed_time'] = $map['payed_time'];
-            $testMap['pay_time'] = $map['pay_time'];
+            $testMap['pay_time'] = $map['payed_time'];
             unset($map['pay_time']);
         }
         //充值平台币数据
@@ -486,10 +490,10 @@ class PayChannelController extends ThinkController
                 $map['tab_deposit.pay_way'] = $map['pay_way'];
                 unset($map['pay_way']);
             }
-            if ($map['create_time']) {
+//            if ($map['create_time']) {
-                $map['tab_deposit.create_time'] = $map['create_time'];
+//                $map['tab_deposit.create_time'] = $map['create_time'];
-                unset($map['create_time']);
+//                unset($map['create_time']);
-            }
+//            }
             $map['tab_deposit.pay_source'] = 2;
             $map['tab_pay_info.extend'] = '';
 
@@ -530,6 +534,9 @@ class PayChannelController extends ThinkController
         //将语句整合起来查询
         $channelData = "select sum(pay_amount) as pay_amount,pay_way from ({$sql})t group by pay_way;";
 //        var_dump($channelData);die();
+
+//        $channelData = M()->table("({$channelData})a")->where()->select();
+
         $channelData = M()->query($channelData);
 
         return $channelData;