Merge branch 'hotfix/market_percentage' of wmtx/platform into release

支付渠道跳转增加

Application/Admin/Controller/PayChannelController.class.php

@@ -540,7 +540,12 @@ class PayChannelController extends ThinkController
             ->where($bindMap)
             ->select(false);
         $testMap['pay_status'] = 1;
+
+
         $testMap['pay_way'] = array('egt',1);
+        if ($map['pay_way']) {
+            $testMap['pay_way'] = $map['pay_way'];
+        }
         
         $testorderData = M('test_order', 'tab_')->field('sum(pay_amount) as pay_amount,pay_way')->where($testMap)->group('pay_way')->select(false);
         if(!$_REQUEST['game_id']) {

Application/Admin/Controller/PayMerchantController.class.php

@@ -68,13 +68,13 @@ class PayMerchantController extends ThinkController
             ->select(false);
 
         //平台币充值金额计算
-        $coinData = M('pay_info','tab_')
-            ->join("inner join tab_deposit on tab_pay_info.order_id=tab_deposit.pay_order_number")
-            ->join("left join tab_test_white_list on tab_test_white_list.user_id=tab_pay_info.user_id")
+        $coinData = M('deposit','tab_')
+//            ->join("inner join tab_deposit on tab_pay_info.order_id=tab_deposit.pay_order_number")
+            ->join("left join tab_test_white_list on tab_test_white_list.user_id=tab_deposit.user_id")
             ->join("left join tab_payment_merchant merchant on merchant.id=tab_deposit.merchant_id")
             ->field("0 cash_amount,SUM(CASE WHEN merchant.id is not null and pay_source=2 and tab_test_white_list.user_id is not null THEN pay_amount ELSE 0 END) as test_amount,
             SUM(CASE WHEN merchant.id is not null and tab_test_white_list.user_id is null and pay_source=2 THEN pay_amount ELSE 0 END) as coin_amount,
-            0 offcial_amount,0 spread_amount,0 supersign_amount,0 test_order_amount,merchant_id,name,channel,identifier,payed_time,game_id,main_name,merchant_way,merchant.account,tab_deposit.pay_way")
+            0 offcial_amount,0 spread_amount,0 supersign_amount,0 test_order_amount,merchant_id,name,channel,identifier,payed_time,0 game_id,main_name,merchant_way,merchant.account,tab_deposit.pay_way")
             ->where(['pay_status'=>1,'tab_deposit.pay_way'=>['egt',1],'merchant.status'=>1,'merchant.type'=>1])
             ->where($map)
             ->group("merchant_id,merchant_way")
@@ -193,13 +193,15 @@ class PayMerchantController extends ThinkController
         $sum['coin_amount'] = round ($sum['coin_amount'],2);
         $sum['offcial_amount'] = round ($sum['offcial_amount'],2);
         $sum['spread_amount'] = round ($sum['spread_amount'],2);
-        $sum['offcial_amount'] = round ($sum['supersign_amount'],2);
+        $sum['supersign_amount'] = round ($sum['supersign_amount'],2);
         $sum['test_order_amount'] = round ($sum['test_order_amount'],2);
 
 
         $sum['sum'] = $sum['cash_amount']+$sum['test_amount']+$sum['coin_amount']+$sum['offcial_amount']
             +$sum['spread_amount']+$sum['supersign_amount']+$sum['test_order_amount'];
 
+//        dump($sum);die();
+
         $sum_merchant = M()->table("({$sql})a")
             ->field("sum(cash_amount+test_amount+coin_amount+offcial_amount+spread_amount+supersign_amount+test_order_amount) sum_amount,
             merchant_id,name,merchant_way")
@@ -220,7 +222,7 @@ class PayMerchantController extends ThinkController
             $data[$key]['coin_amount'] = number_format ($value['coin_amount'],2,'.','');
             $data[$key]['offcial_amount'] = number_format ($value['offcial_amount'],2,'.','');
             $data[$key]['spread_amount'] = number_format ($value['spread_amount'],2,'.','');
-            $data[$key]['offcial_amount'] = number_format ($value['supersign_amount'],2,'.','');
+            $data[$key]['supersign_amount'] = number_format ($value['supersign_amount'],2,'.','');
             $data[$key]['test_order_amount'] = number_format ($value['test_order_amount'],2,'.','');
 
             if ($value['merchant_way'] == self::WAY_ALIPAY) {