From 64e2517b937b7df18dc0d100674054c74fe8ecae Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Wed, 2 Sep 2020 11:45:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=B8=A0=E9=81=93=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/FinanceController.class.php    | 23 +++++++++++++++++++
 .../Admin/View/Finance/payTypeStatistics.html |  4 ++--
 Application/Admin/View/PayChannel/index.html  |  8 +++----
 Application/Admin/View/PayMerchant/index.html |  4 ++--
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php
index 516b47bb0..4ecf1027c 100644
--- a/Application/Admin/Controller/FinanceController.class.php
+++ b/Application/Admin/Controller/FinanceController.class.php
@@ -1388,6 +1388,29 @@ class FinanceController extends ThinkController
             $cashStatistics[$value['pay_way']]['balance'] += $value['pay_amount'];//别表的平台币充值
         }
 
+        $testOrderData = M('test_order', 'tab_')
+            ->where([
+                'pay_way'=>['egt',1],
+                'pay_time'=>$time
+            ])
+            ->field('pay_way,sum(pay_amount) as pay_amount')
+            ->group("pay_way")
+            ->select();
+        foreach ($testOrderData as $key => $value) {
+
+            if ($value['pay_way'] == NULL&&$value['pay_amount'] == NULL) {
+                continue;
+            }
+
+            if (!array_key_exists($value['pay_way'], $cashStatistics)) {
+                $cashStatistics[$value['pay_way']] = $value;
+                $cashStatistics[$value['pay_way']]['pay_type'] = getPayType($value['pay_way']);//充值方式文字影视
+                $cashStatistics[$value['pay_way']]['pay_amount'] = '0.00';
+                $cashStatistics[$value['pay_way']]['balance'] = 0;//别表的平台币充值
+            }
+            $cashStatistics[$value['pay_way']]['balance'] += $value['pay_amount'];//别表的平台币充值
+        }
+
         foreach ($cashStatistics as $key => $value) {
             $cashStatistics[$key]['pay_rate'] = '';
             $cashStatistics[$key]['total'] = $value['pay_amount'] + $value['balance'];//添加列表合计
diff --git a/Application/Admin/View/Finance/payTypeStatistics.html b/Application/Admin/View/Finance/payTypeStatistics.html
index a4ec034f3..0febbec2f 100644
--- a/Application/Admin/View/Finance/payTypeStatistics.html
+++ b/Application/Admin/View/Finance/payTypeStatistics.html
@@ -71,12 +71,12 @@
 
   <div class="cf main-place top_nav_list navtab_list">
 
-    <h3 class="page_title">{$_REQUEST['count_date']}平台统计</h3>
+    <h3 class="page_title">{$_REQUEST['count_date']}充值方式统计</h3>
     <p class="description_text"></p>
     <div class="fr">
       <a class="" href="{:U('PayChannel/index')}">游戏充值统计</a>
       <a class="tabchose" href="">充值方式统计</a>
-      <a href="{:U('PayMerchant/index')}">支付方式统计</a>
+      <a href="{:U('PayMerchant/index')}">支付商户统计</a>
 
     </div>
   </div>
diff --git a/Application/Admin/View/PayChannel/index.html b/Application/Admin/View/PayChannel/index.html
index b702c54b0..b45ad9642 100644
--- a/Application/Admin/View/PayChannel/index.html
+++ b/Application/Admin/View/PayChannel/index.html
@@ -70,12 +70,12 @@
 
   <div class="cf main-place top_nav_list navtab_list">
 
-    <h3 class="page_title">支付渠道统计</h3>
+    <h3 class="page_title">游戏充值统计</h3>
     <p class="description_text">说明：平台币直充金额2019.12.18以前sdk新包数据及sdk旧包数据，无法对应相关游戏无法计入以上平台币列表中，<span style="color:red">充值方式统计</span>一栏统计<span style="color:red">平台币直充总金额</span></p>
     <div class="fr">
       <a class="tabchose" href="">游戏充值统计</a>
       <a class="" href="{:U('Finance/payTypeStatistics')}">充值方式统计</a>
-      <a class="" href="{:U('PayMerchant/index')}">支付方式统计</a>
+      <a class="" href="{:U('PayMerchant/index')}">支付商户统计</a>
     </div>
   </div>
 
@@ -252,7 +252,7 @@
             平台币直充总金额<span style="color: red">(2019.12.18号以前的无法对应游戏记录不显示在列表中，此项也不计入充值方式统计)</span>：<if condition="$coinSum neq ''">{$coinSum}<else/>0.00</if>
           </td>
         </tr>
-        <tr>
+        <tr style="display: none">
           <td><span>支付渠道</span></td>
           <td colspan="6">
             <volist name="channelData" id="channelData">
@@ -260,7 +260,7 @@
             </volist>
           </td>
         </tr>
-        <tr>
+        <tr style="display: none">
           <td><span>支付渠道占比</span></td>
           <td colspan="6">
             <volist name="channelData2" id="channel">
diff --git a/Application/Admin/View/PayMerchant/index.html b/Application/Admin/View/PayMerchant/index.html
index ce401e232..8b28cb7e4 100644
--- a/Application/Admin/View/PayMerchant/index.html
+++ b/Application/Admin/View/PayMerchant/index.html
@@ -70,12 +70,12 @@
 
   <div class="cf main-place top_nav_list navtab_list">
 
-    <h3 class="page_title">支付方式统计</h3>
+    <h3 class="page_title">支付商户统计</h3>
 <!--    <p class="description_text">说明：平台币直充金额2019.12.18以前sdk新包数据及sdk旧包数据，无法对应相关游戏无法计入以上平台币列表中，<span style="color:red">充值方式统计</span>一栏统计<span style="color:red">平台币直充总金额</span></p>-->
     <div class="fr">
       <a href="{:U('PayChannel/index')}">游戏充值统计</a>
       <a class="" href="{:U('Finance/payTypeStatistics')}">充值方式统计</a>
-      <a class="tabchose">支付方式统计</a>
+      <a class="tabchose">支付商户统计</a>
     </div>
   </div>