From e46cc5b52e973ea2856ccc36bef10d371a275d33 Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Thu, 26 Nov 2020 14:39:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/FinanceController.class.php | 2 ++
 Application/Admin/View/Finance/gameStatistics.html       | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php
index 89d9016a0..9dbe61d80 100644
--- a/Application/Admin/Controller/FinanceController.class.php
+++ b/Application/Admin/Controller/FinanceController.class.php
@@ -903,6 +903,7 @@ class FinanceController extends ThinkController
         $roleName = I('role_name', '');
         $account = I('account', '');
         $gameId = I('game_id', 0);
+        $channelType = I('channel_type', 0);
 
         $game = M('game', 'tab_')->field(['id', 'unique_code', 'game_name', 'sdk_version'])->where(['id' => $gameId])->find();
 
@@ -917,6 +918,7 @@ class FinanceController extends ThinkController
             'device_type' => $game['sdk_version'],
             'page' => $p,
             'limit' => $limit,
+            'channel_type' => $channelType,
         ]);
 
         $count = 0;
diff --git a/Application/Admin/View/Finance/gameStatistics.html b/Application/Admin/View/Finance/gameStatistics.html
index 74a8444b4..c65db4ee3 100644
--- a/Application/Admin/View/Finance/gameStatistics.html
+++ b/Application/Admin/View/Finance/gameStatistics.html
@@ -232,7 +232,8 @@
                 'sdk_type'=>$_GET['sdk_type'],
                 'game_id'=>$data['game_id'],
                 'game_name'=>$data['game_name'],
-                'partner_id'=>$_REQUEST['partner_id']
+                'partner_id'=>$_REQUEST['partner_id'],
+                'channel_type'=>1,
               ])}">{$data.agg_wm_amount}</a></td>
               <td ><span style="color:red;"><if condition="$data.agg_wm_failed_amount neq ''">{$data.agg_wm_failed_amount}<else/>0</if></span></td>
               <td ><span style="color:red;">
@@ -250,6 +251,7 @@
                 'sdk_type'=>$_GET['sdk_type'],
                 'game_id'=>$data['game_id'],
                 'game_name'=>$data['game_name'],
+                'channel_type'=>2,
                 'partner_id'=>$_REQUEST['partner_id']
               ])}">{$data.agg_amount}</a></td>
               <td ><span style="color:red;"><if condition="$data.agg_failed_amount neq ''">{$data.agg_failed_amount}<else/>0</if></span></td>