Merge branch 'feature/pay_channel_all' of wmtx/platform into release

支付渠道汇总跟测试订单顺序

Application/Admin/Controller/PayChannelController.class.php

@@ -302,8 +302,9 @@ class PayChannelController extends ThinkController
             $coinSum = number_format($coinSum + $offcialData['pay_amount'] + $spreadData['pay_amount']+$offcialTestCost,2,'.','');
         }
         $sum_pay_amount = M('test_order', 'tab_')->where($maptestorder)->field('sum(pay_amount) as sum_order_amount')->find();
-
-        $moneyAllCount  =  array_sum(array_column($channelData, 'pay_amount'));
+        $moneyAllCount  =  array_sum(array_column($channelData, 'sum_order_amount'));
+        $sumData['pay_amount'] += $sum_pay_amount["sum_order_amount"]; 
+        $sumData['sum'] += $sum_pay_amount["sum_order_amount"]; 
         if($_REQUEST['export'] == 1) {
 
             $title = array('产品名称','游戏现金金额','平台币直冲金额','测试金额','支付渠道内合计');
@@ -334,7 +335,6 @@ class PayChannelController extends ThinkController
             $testOrder['sum'] = $sum_pay_amount['sum_order_amount'] ?: "0";
 
 
-
             //充值方式统计
             $payTypeDataExport['game_name'] = '充值方式统计';
             foreach($payTypeData as $key => $value) {

Application/Admin/View/PayChannel/index.html

@@ -213,17 +213,6 @@
               </td>
             </tr>
           </if>
-          <tr>
-            <td><span>汇总</span></td>
-            <td></td>
-            <td ><span><if condition="$sumData.pay_amount neq ''">{$sumData['pay_amount']}<else/>0.00</if></span></td>
-            <td><span><if condition="$sumData.platform_coin neq ''">{$sumData['platform_coin']}<else/>0.00</if></span></td>
-            <td>{$sumData['test_coin']}</td>
-            <td><if condition="$sumData['sum'] neq ''">{$sumData['sum']}<else/>0.00</if></td>
-            <td>
-              <a href="#" >------</a>
-            </td>
-          </tr>
           <tr>
             <td><span>测试环境内外网平台</span></td>
             <td></td>
@@ -235,6 +224,17 @@
               <a href="{:U('TestOrder/lists',array_merge([],I('get.')))}" >订单查看</a>
             </td>
           </tr>
+          <tr>
+            <td><span>汇总</span></td>
+            <td></td>
+            <td ><span><if condition="$sumData.pay_amount neq ''">{$sumData['pay_amount']}<else/>0.00</if></span></td>
+            <td><span><if condition="$sumData.platform_coin neq ''">{$sumData['platform_coin']}<else/>0.00</if></span></td>
+            <td>{$sumData['test_coin']}</td>
+            <td><if condition="$sumData['sum'] neq ''">{$sumData['sum']}<else/>0.00</if></td>
+            <td>
+              <a href="#" >------</a>
+            </td>
+          </tr>
         </notemtpy>
         <tr>
           <td><span>充值方式统计</span></td>