From bbc75a419d8f7fa1d4389fd1c466f93b658c39be Mon Sep 17 00:00:00 2001
From: zyx <as123498@qq.com>
Date: Thu, 31 Oct 2019 21:01:19 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=AD=A3=EF=BC=8C=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/ExportController.class.php     | 63 ++++++++++--------
 .../Controller/FinanceController.class.php    | 65 +++++++++++--------
 .../Admin/Controller/device_data_foldline.txt |  2 +-
 .../Admin/View/Finance/gameFinance.html       | 54 +++++++++++++--
 .../Admin/View/Finance/gameFinanceDetail.html |  5 +-
 .../Admin/View/Finance/getRootUser.html       | 49 ++++++++++++--
 Application/Admin/View/Finance/index.html     | 52 +++++++++++++--
 7 files changed, 218 insertions(+), 72 deletions(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index 26a59d0d9..c542350bf 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -5765,38 +5765,49 @@ if ($key == 'model'){
                 $map['count_date'] = $date;
             }
 
-            $data = M('spend_count','tab_')
-                ->field('promote_id,promote_account, sum(cash_count) as cash_count,sum(balance_coin_count) as balance_coin_count,sum(inside_cash_count) as inside_cash_count, sum(cash_count+balance_coin_count) as all_count')
+            $data = M('spend_user_count','tab_')
+                ->field('promote_id,promote_account, sum(cash_count) as cash_count,sum(balance_coin_count) as balance_coin_count,sum(inside_cash_count) as inside_cash_count, sum(cash_count+balance_coin_count+inside_cash_count) as all_count')
                 ->where($map)->select();
 
-            $map['inside_cash_count'] = ['neq',0];
-            $insideData = D("spend_count")->getSpendCountData($map,"promote_id,inside_cash_count as count","promote_id,count_date");
-            unset($map['bind_coin_count']);
-            //内充流水与绑定流水数据
-            $insideDataSum = 0;
-            foreach ($insideData as $key => $value) {
-                if (isset($insideDataSum)) {
-                    $insideDataSum = $insideDataSum + $value['count'];
-                } else {
-                    $insideDataSum = $value['count'];
-                }
-            }
+            $map1['parent_id'] = $data[0]['promote_id'];
+            $map1['count_date'] = $date;
+            $sunData = M('spend_user_count','tab_')
+                ->field('promote_id,promote_account, sum(cash_count) as cash_count,sum(balance_coin_count) as balance_coin_count,sum(inside_cash_count) as inside_cash_count, sum(cash_count+balance_coin_count+inside_cash_count) as all_count')
+                ->where($map1)->find();
+
+            $data[0]['cash_count'] = number_format($data[0]['cash_count']-$sunData['cash_count'],2,'.','');
+            $data[0]['balance_coin_count'] = number_format($data[0]['balance_coin_count']-$sunData['balance_coin_count'],2,'.','');
+            $data[0]['inside_cash_count'] = number_format($data[0]['inside_cash_count']-$sunData['inside_cash_count'],2,'.','');
+            $data[0]['all_count'] = number_format($data[0]['all_count']-$sunData['all_count'],2,'.','');
+
+//            $map['inside_cash_count'] = ['neq',0];
+//            $insideData = D("spend_count")->getSpendCountData($map,"promote_id,inside_cash_count as count","promote_id,count_date");
+//            unset($map['bind_coin_count']);
+//            //内充流水与绑定流水数据
+//            $insideDataSum = 0;
+//            foreach ($insideData as $key => $value) {
+//                if (isset($insideDataSum)) {
+//                    $insideDataSum = $insideDataSum + $value['count'];
+//                } else {
+//                    $insideDataSum = $value['count'];
+//                }
+//            }
 
         }
 
 
-        if (!$data[0]['cash_count']&&!$data[0]['balance_coin_count']&&!$data[0]['inside_cash_count']&&!$data[0]['all_count']) {
-            $promoteData = M('promote','tab_')->field('account as promote_account')->where("id={$root_id}")->find();
-
-            $data[0]['promote_id'] = $root_id;
-            $data[0]['promote_account'] = $promoteData['promote_account'];
-            $data[0]['cash_count'] = number_format(0.00,2,'.','');
-            $data[0]['balance_coin_count'] = number_format(0.00,2,'.','');
-            $data[0]['inside_cash_count'] = number_format(0.00,2,'.','');
-            $data[0]['all_count'] = number_format(0.00,2,'.','');
-        }
-        $data[0]['inside_cash_count'] = number_format($insideDataSum,2,'.','');
-        $data[0]['all_count'] = number_format($insideDataSum+$data[0]['all_count'],2,'.','');
+//        if (!$data[0]['cash_count']&&!$data[0]['balance_coin_count']&&!$data[0]['inside_cash_count']&&!$data[0]['all_count']) {
+//            $promoteData = M('promote','tab_')->field('account as promote_account')->where("id={$root_id}")->find();
+//
+//            $data[0]['promote_id'] = $root_id;
+//            $data[0]['promote_account'] = $promoteData['promote_account'];
+//            $data[0]['cash_count'] = number_format(0.00,2,'.','');
+//            $data[0]['balance_coin_count'] = number_format(0.00,2,'.','');
+//            $data[0]['inside_cash_count'] = number_format(0.00,2,'.','');
+//            $data[0]['all_count'] = number_format(0.00,2,'.','');
+//        }
+//        $data[0]['inside_cash_count'] = number_format($insideDataSum,2,'.','');
+//        $data[0]['all_count'] = number_format($insideDataSum+$data[0]['all_count'],2,'.','');
 //        var_dump($data);die();
         return $data;
 
diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php
index e2e453ae1..0aaf253ed 100644
--- a/Application/Admin/Controller/FinanceController.class.php
+++ b/Application/Admin/Controller/FinanceController.class.php
@@ -278,7 +278,7 @@ class FinanceController extends ThinkController
             $map['user_account'] = array('like','%'.I("user_account").'%');
         }
         if (!empty(I('user_nickname'))) {
-            $map['user_nickname'] = array('like',I("user_nickname").'%');
+            $map['game_player_name'] = array('like',I("user_nickname").'%');
         }
 //        var_dump($map);die();
         $field = "pay_order_number,FROM_UNIXTIME(pay_time) as pay_time,user_account,user_nickname,game_name,promote_account,spend_ip,server_name,game_player_name,pay_amount,cost,pay_way";
@@ -543,38 +543,49 @@ class FinanceController extends ThinkController
                 $map['count_date'] = $date;
             }
 
-            $data = M('spend_count','tab_')
-                ->field('promote_id,promote_account, sum(cash_count) as cash_count,sum(balance_coin_count) as balance_coin_count,sum(inside_cash_count) as inside_cash_count, sum(cash_count+balance_coin_count) as all_count')
+            $data = M('spend_user_count','tab_')
+                ->field('promote_id,promote_account, sum(cash_count) as cash_count,sum(balance_coin_count) as balance_coin_count,sum(inside_cash_count) as inside_cash_count, sum(cash_count+balance_coin_count+inside_cash_count) as all_count')
                 ->where($map)->select();
 
-            $map['inside_cash_count'] = ['neq',0];
-            $insideData = D("spend_count")->getSpendCountData($map,"promote_id,inside_cash_count as count","promote_id,count_date");
-            unset($map['bind_coin_count']);
-            //内充流水与绑定流水数据
-            $insideDataSum = 0;
-            foreach ($insideData as $key => $value) {
-                if (isset($insideDataSum)) {
-                    $insideDataSum = $insideDataSum + $value['count'];
-                } else {
-                    $insideDataSum = $value['count'];
-                }
-            }
-
-        }
+            $map1['parent_id'] = $data[0]['promote_id'];
+            $map1['count_date'] = $date;
+            $sunData = M('spend_user_count','tab_')
+                ->field('promote_id,promote_account, sum(cash_count) as cash_count,sum(balance_coin_count) as balance_coin_count,sum(inside_cash_count) as inside_cash_count, sum(cash_count+balance_coin_count+inside_cash_count) as all_count')
+                ->where($map1)->find();
 
+            $data[0]['cash_count'] = number_format($data[0]['cash_count']-$sunData['cash_count'],2,'.','');
+            $data[0]['balance_coin_count'] = number_format($data[0]['balance_coin_count']-$sunData['balance_coin_count'],2,'.','');
+            $data[0]['inside_cash_count'] = number_format($data[0]['inside_cash_count']-$sunData['inside_cash_count'],2,'.','');
+            $data[0]['all_count'] = number_format($data[0]['all_count']-$sunData['all_count'],2,'.','');
 
-        if (!$data[0]['cash_count']&&!$data[0]['balance_coin_count']&&!$data[0]['inside_cash_count']&&!$data[0]['all_count']) {
-            $promoteData = M('promote','tab_')->field('account as promote_account')->where("id={$root_id}")->find();
+//            $map['inside_cash_count'] = ['neq',0];
+//            $insideData = D("spend_count")->getSpendCountData($map,"promote_id,inside_cash_count as count","promote_id,count_date");
+//            unset($map['bind_coin_count']);
+//            //内充流水与绑定流水数据
+//            $insideDataSum = 0;
+//            foreach ($insideData as $key => $value) {
+//                if (isset($insideDataSum)) {
+//                    $insideDataSum = $insideDataSum + $value['count'];
+//                } else {
+//                    $insideDataSum = $value['count'];
+//                }
+//            }
 
-            $data[0]['promote_id'] = $root_id;
-            $data[0]['promote_account'] = $promoteData['promote_account'];
-            $data[0]['cash_count'] = number_format(0.00,2,'.','');
-            $data[0]['balance_coin_count'] = number_format(0.00,2,'.','');
-            $data[0]['inside_cash_count'] = number_format(0.00,2,'.','');
-            $data[0]['all_count'] = number_format(0.00,2,'.','');
         }
-        $data[0]['inside_cash_count'] = number_format($insideDataSum,2,'.','');
-        $data[0]['all_count'] = number_format($insideDataSum+$data[0]['all_count'],2,'.','');
+
+
+//        if (!$data[0]['cash_count']&&!$data[0]['balance_coin_count']&&!$data[0]['inside_cash_count']&&!$data[0]['all_count']) {
+//            $promoteData = M('promote','tab_')->field('account as promote_account')->where("id={$root_id}")->find();
+//
+//            $data[0]['promote_id'] = $root_id;
+//            $data[0]['promote_account'] = $promoteData['promote_account'];
+//            $data[0]['cash_count'] = number_format(0.00,2,'.','');
+//            $data[0]['balance_coin_count'] = number_format(0.00,2,'.','');
+//            $data[0]['inside_cash_count'] = number_format(0.00,2,'.','');
+//            $data[0]['all_count'] = number_format(0.00,2,'.','');
+//        }
+//        $data[0]['inside_cash_count'] = number_format($insideDataSum,2,'.','');
+//        $data[0]['all_count'] = number_format($insideDataSum+$data[0]['all_count'],2,'.','');
 //        var_dump($data);die();
         return $data;
 
diff --git a/Application/Admin/Controller/device_data_foldline.txt b/Application/Admin/Controller/device_data_foldline.txt
index 1c25c2cb1..3506b5f47 100644
--- a/Application/Admin/Controller/device_data_foldline.txt
+++ b/Application/Admin/Controller/device_data_foldline.txt
@@ -1 +1 @@
-{"average":{"news":0,"active":0},"sum":{"news":0,"active":0},"news":[{"time":"2019-09-28 00:00","count":0,"version":"ios"},{"time":"2019-09-28 01:00","count":0,"version":"ios"},{"time":"2019-09-28 02:00","count":0,"version":"ios"},{"time":"2019-09-28 03:00","count":0,"version":"ios"},{"time":"2019-09-28 04:00","count":0,"version":"ios"},{"time":"2019-09-28 05:00","count":0,"version":"ios"},{"time":"2019-09-28 06:00","count":0,"version":"ios"},{"time":"2019-09-28 07:00","count":0,"version":"ios"},{"time":"2019-09-28 08:00","count":0,"version":"ios"},{"time":"2019-09-28 09:00","count":0,"version":"ios"},{"time":"2019-09-28 10:00","count":0,"version":"ios"},{"time":"2019-09-28 11:00","count":0,"version":"ios"},{"time":"2019-09-28 12:00","count":0,"version":"ios"},{"time":"2019-09-28 13:00","count":0,"version":"ios"},{"time":"2019-09-28 14:00","count":0,"version":"ios"},{"time":"2019-09-28 15:00","count":0,"version":"ios"},{"time":"2019-09-28 16:00","count":0,"version":"ios"},{"time":"2019-09-28 17:00","count":0,"version":"ios"},{"time":"2019-09-28 18:00","count":0,"version":"ios"},{"time":"2019-09-28 19:00","count":0,"version":"ios"},{"time":"2019-09-28 20:00","count":0,"version":"ios"},{"time":"2019-09-28 21:00","count":0,"version":"ios"},{"time":"2019-09-28 22:00","count":0,"version":"ios"},{"time":"2019-09-28 23:00","count":0,"version":"ios"},{"time":"2019-09-28 00:00","count":0,"version":"android"},{"time":"2019-09-28 01:00","count":0,"version":"android"},{"time":"2019-09-28 02:00","count":0,"version":"android"},{"time":"2019-09-28 03:00","count":0,"version":"android"},{"time":"2019-09-28 04:00","count":0,"version":"android"},{"time":"2019-09-28 05:00","count":0,"version":"android"},{"time":"2019-09-28 06:00","count":0,"version":"android"},{"time":"2019-09-28 07:00","count":0,"version":"android"},{"time":"2019-09-28 08:00","count":0,"version":"android"},{"time":"2019-09-28 09:00","count":0,"version":"android"},{"time":"2019-09-28 10:00","count":0,"version":"android"},{"time":"2019-09-28 11:00","count":0,"version":"android"},{"time":"2019-09-28 12:00","count":0,"version":"android"},{"time":"2019-09-28 13:00","count":0,"version":"android"},{"time":"2019-09-28 14:00","count":0,"version":"android"},{"time":"2019-09-28 15:00","count":0,"version":"android"},{"time":"2019-09-28 16:00","count":0,"version":"android"},{"time":"2019-09-28 17:00","count":0,"version":"android"},{"time":"2019-09-28 18:00","count":0,"version":"android"},{"time":"2019-09-28 19:00","count":0,"version":"android"},{"time":"2019-09-28 20:00","count":0,"version":"android"},{"time":"2019-09-28 21:00","count":0,"version":"android"},{"time":"2019-09-28 22:00","count":0,"version":"android"},{"time":"2019-09-28 23:00","count":0,"version":"android"}],"active":[{"time":"2019-09-28 00:00","count":0,"version":"ios"},{"time":"2019-09-28 01:00","count":0,"version":"ios"},{"time":"2019-09-28 02:00","count":0,"version":"ios"},{"time":"2019-09-28 03:00","count":0,"version":"ios"},{"time":"2019-09-28 04:00","count":0,"version":"ios"},{"time":"2019-09-28 05:00","count":0,"version":"ios"},{"time":"2019-09-28 06:00","count":0,"version":"ios"},{"time":"2019-09-28 07:00","count":0,"version":"ios"},{"time":"2019-09-28 08:00","count":0,"version":"ios"},{"time":"2019-09-28 09:00","count":0,"version":"ios"},{"time":"2019-09-28 10:00","count":0,"version":"ios"},{"time":"2019-09-28 11:00","count":0,"version":"ios"},{"time":"2019-09-28 12:00","count":0,"version":"ios"},{"time":"2019-09-28 13:00","count":0,"version":"ios"},{"time":"2019-09-28 14:00","count":0,"version":"ios"},{"time":"2019-09-28 15:00","count":0,"version":"ios"},{"time":"2019-09-28 16:00","count":0,"version":"ios"},{"time":"2019-09-28 17:00","count":0,"version":"ios"},{"time":"2019-09-28 18:00","count":0,"version":"ios"},{"time":"2019-09-28 19:00","count":0,"version":"ios"},{"time":"2019-09-28 20:00","count":0,"version":"ios"},{"time":"2019-09-28 21:00","count":0,"version":"ios"},{"time":"2019-09-28 22:00","count":0,"version":"ios"},{"time":"2019-09-28 23:00","count":0,"version":"ios"},{"time":"2019-09-28 00:00","count":0,"version":"android"},{"time":"2019-09-28 01:00","count":0,"version":"android"},{"time":"2019-09-28 02:00","count":0,"version":"android"},{"time":"2019-09-28 03:00","count":0,"version":"android"},{"time":"2019-09-28 04:00","count":0,"version":"android"},{"time":"2019-09-28 05:00","count":0,"version":"android"},{"time":"2019-09-28 06:00","count":0,"version":"android"},{"time":"2019-09-28 07:00","count":0,"version":"android"},{"time":"2019-09-28 08:00","count":0,"version":"android"},{"time":"2019-09-28 09:00","count":0,"version":"android"},{"time":"2019-09-28 10:00","count":0,"version":"android"},{"time":"2019-09-28 11:00","count":0,"version":"android"},{"time":"2019-09-28 12:00","count":0,"version":"android"},{"time":"2019-09-28 13:00","count":0,"version":"android"},{"time":"2019-09-28 14:00","count":0,"version":"android"},{"time":"2019-09-28 15:00","count":0,"version":"android"},{"time":"2019-09-28 16:00","count":0,"version":"android"},{"time":"2019-09-28 17:00","count":0,"version":"android"},{"time":"2019-09-28 18:00","count":0,"version":"android"},{"time":"2019-09-28 19:00","count":0,"version":"android"},{"time":"2019-09-28 20:00","count":0,"version":"android"},{"time":"2019-09-28 21:00","count":0,"version":"android"},{"time":"2019-09-28 22:00","count":0,"version":"android"},{"time":"2019-09-28 23:00","count":0,"version":"android"}]}
\ No newline at end of file
+{"average":{"news":0,"active":0},"sum":{"news":0,"active":0},"news":[{"time":"2019-10-30 00:00","count":0,"version":"ios"},{"time":"2019-10-30 01:00","count":0,"version":"ios"},{"time":"2019-10-30 02:00","count":0,"version":"ios"},{"time":"2019-10-30 03:00","count":0,"version":"ios"},{"time":"2019-10-30 04:00","count":0,"version":"ios"},{"time":"2019-10-30 05:00","count":0,"version":"ios"},{"time":"2019-10-30 06:00","count":0,"version":"ios"},{"time":"2019-10-30 07:00","count":0,"version":"ios"},{"time":"2019-10-30 08:00","count":0,"version":"ios"},{"time":"2019-10-30 09:00","count":0,"version":"ios"},{"time":"2019-10-30 10:00","count":0,"version":"ios"},{"time":"2019-10-30 11:00","count":0,"version":"ios"},{"time":"2019-10-30 12:00","count":0,"version":"ios"},{"time":"2019-10-30 13:00","count":0,"version":"ios"},{"time":"2019-10-30 14:00","count":0,"version":"ios"},{"time":"2019-10-30 15:00","count":0,"version":"ios"},{"time":"2019-10-30 16:00","count":0,"version":"ios"},{"time":"2019-10-30 17:00","count":0,"version":"ios"},{"time":"2019-10-30 18:00","count":0,"version":"ios"},{"time":"2019-10-30 19:00","count":0,"version":"ios"},{"time":"2019-10-30 20:00","count":0,"version":"ios"},{"time":"2019-10-30 21:00","count":0,"version":"ios"},{"time":"2019-10-30 22:00","count":0,"version":"ios"},{"time":"2019-10-30 23:00","count":0,"version":"ios"},{"time":"2019-10-30 00:00","count":0,"version":"android"},{"time":"2019-10-30 01:00","count":0,"version":"android"},{"time":"2019-10-30 02:00","count":0,"version":"android"},{"time":"2019-10-30 03:00","count":0,"version":"android"},{"time":"2019-10-30 04:00","count":0,"version":"android"},{"time":"2019-10-30 05:00","count":0,"version":"android"},{"time":"2019-10-30 06:00","count":0,"version":"android"},{"time":"2019-10-30 07:00","count":0,"version":"android"},{"time":"2019-10-30 08:00","count":0,"version":"android"},{"time":"2019-10-30 09:00","count":0,"version":"android"},{"time":"2019-10-30 10:00","count":0,"version":"android"},{"time":"2019-10-30 11:00","count":0,"version":"android"},{"time":"2019-10-30 12:00","count":0,"version":"android"},{"time":"2019-10-30 13:00","count":0,"version":"android"},{"time":"2019-10-30 14:00","count":0,"version":"android"},{"time":"2019-10-30 15:00","count":0,"version":"android"},{"time":"2019-10-30 16:00","count":0,"version":"android"},{"time":"2019-10-30 17:00","count":0,"version":"android"},{"time":"2019-10-30 18:00","count":0,"version":"android"},{"time":"2019-10-30 19:00","count":0,"version":"android"},{"time":"2019-10-30 20:00","count":0,"version":"android"},{"time":"2019-10-30 21:00","count":0,"version":"android"},{"time":"2019-10-30 22:00","count":0,"version":"android"},{"time":"2019-10-30 23:00","count":0,"version":"android"}],"active":[{"time":"2019-10-30 00:00","count":0,"version":"ios"},{"time":"2019-10-30 01:00","count":0,"version":"ios"},{"time":"2019-10-30 02:00","count":0,"version":"ios"},{"time":"2019-10-30 03:00","count":0,"version":"ios"},{"time":"2019-10-30 04:00","count":0,"version":"ios"},{"time":"2019-10-30 05:00","count":0,"version":"ios"},{"time":"2019-10-30 06:00","count":0,"version":"ios"},{"time":"2019-10-30 07:00","count":0,"version":"ios"},{"time":"2019-10-30 08:00","count":0,"version":"ios"},{"time":"2019-10-30 09:00","count":0,"version":"ios"},{"time":"2019-10-30 10:00","count":0,"version":"ios"},{"time":"2019-10-30 11:00","count":0,"version":"ios"},{"time":"2019-10-30 12:00","count":0,"version":"ios"},{"time":"2019-10-30 13:00","count":0,"version":"ios"},{"time":"2019-10-30 14:00","count":0,"version":"ios"},{"time":"2019-10-30 15:00","count":0,"version":"ios"},{"time":"2019-10-30 16:00","count":0,"version":"ios"},{"time":"2019-10-30 17:00","count":0,"version":"ios"},{"time":"2019-10-30 18:00","count":0,"version":"ios"},{"time":"2019-10-30 19:00","count":0,"version":"ios"},{"time":"2019-10-30 20:00","count":0,"version":"ios"},{"time":"2019-10-30 21:00","count":0,"version":"ios"},{"time":"2019-10-30 22:00","count":0,"version":"ios"},{"time":"2019-10-30 23:00","count":0,"version":"ios"},{"time":"2019-10-30 00:00","count":0,"version":"android"},{"time":"2019-10-30 01:00","count":0,"version":"android"},{"time":"2019-10-30 02:00","count":0,"version":"android"},{"time":"2019-10-30 03:00","count":0,"version":"android"},{"time":"2019-10-30 04:00","count":0,"version":"android"},{"time":"2019-10-30 05:00","count":0,"version":"android"},{"time":"2019-10-30 06:00","count":0,"version":"android"},{"time":"2019-10-30 07:00","count":0,"version":"android"},{"time":"2019-10-30 08:00","count":0,"version":"android"},{"time":"2019-10-30 09:00","count":0,"version":"android"},{"time":"2019-10-30 10:00","count":0,"version":"android"},{"time":"2019-10-30 11:00","count":0,"version":"android"},{"time":"2019-10-30 12:00","count":0,"version":"android"},{"time":"2019-10-30 13:00","count":0,"version":"android"},{"time":"2019-10-30 14:00","count":0,"version":"android"},{"time":"2019-10-30 15:00","count":0,"version":"android"},{"time":"2019-10-30 16:00","count":0,"version":"android"},{"time":"2019-10-30 17:00","count":0,"version":"android"},{"time":"2019-10-30 18:00","count":0,"version":"android"},{"time":"2019-10-30 19:00","count":0,"version":"android"},{"time":"2019-10-30 20:00","count":0,"version":"android"},{"time":"2019-10-30 21:00","count":0,"version":"android"},{"time":"2019-10-30 22:00","count":0,"version":"android"},{"time":"2019-10-30 23:00","count":0,"version":"android"}]}
\ No newline at end of file
diff --git a/Application/Admin/View/Finance/gameFinance.html b/Application/Admin/View/Finance/gameFinance.html
index 2d2962da6..5722077ae 100644
--- a/Application/Admin/View/Finance/gameFinance.html
+++ b/Application/Admin/View/Finance/gameFinance.html
@@ -25,6 +25,47 @@
       height:26px;line-height:26px;font-size:12px;
     }
     .select2-results__option[aria-selected] {font-size:12px;}
+
+    .tooltip {
+      position: relative;
+      display: inline-block;
+      color: #056dae;
+    }
+
+    .tooltip .tooltiptext {
+      visibility: hidden;
+      width: 200px;
+      background-color: #fff;
+      color: #fff;
+      text-align: center;
+      border-radius: 6px;
+      padding: 5px 0;
+      position: absolute;
+      z-index: 1;
+      bottom: 80%;
+      left: 0;
+      margin-left: -50px;
+      border: #000 solid 1px;
+    }
+
+    .tooltip .tooltiptext::after {
+      content: "";
+      position: absolute;
+      top: 100%;
+      left: 50%;
+      margin-left: -5px;
+      border-width: 5px;
+      border-style: solid;
+      border-color: black transparent transparent transparent;
+    }
+
+    .tooltip:hover .tooltiptext {
+
+      color: #000;
+      visibility: visible;
+      line-height: 20px;
+    }
+
   </style>
 
 
@@ -58,6 +99,7 @@
       <input type="hidden" name="count_date" value="{$_GET['count_date']}"/>
       <input type="hidden" name="parent_id" value="{$_GET['parent_id']}"/>
       <input type="hidden" name="root_id" value="{$_GET['root_id']}"/>
+      <input type="hidden" name="promote_id" value="{$_GET['promote_id']}"/>
       <input type="hidden" name="sign" value="{$_GET['sign']}"/>
       <input type="hidden" name="from" value="{$_GET['from']}"/>
       <div class="input-list">
@@ -85,13 +127,13 @@
 
           <th>合作方</th>
 
-          <th >游戏现金流水</th>
+          <th ><div class="tooltip">游戏现金流水<span class="tooltiptext"><span style="margin-left: -10px">第三方支付（微信，支付宝，快捷）。</span></span></div></th>
 
-          <th >平台币流水</th>
+          <th ><div class="tooltip">平台币流水<span class="tooltiptext"><span style="margin-left: -10px">平台币所支付的流水</span></span></div></th>
 
-          <th >内充消耗</th>
+          <th ><div class="tooltip">内充消耗<span class="tooltiptext"><span style="margin-left: -10px">内充流水：平台直接下放给公会（平台币订单-后台发放（推广员））的平台币</span></span></div></th>
 
-          <th >总流水</th>
+          <th ><div class="tooltip">总流水<span class="tooltiptext"><span style="margin-left: -10px">现金流水+平台币流水+内充流水</span></span></div></th>
 
           <th >操作</th>
         </tr>
@@ -120,7 +162,7 @@
               <td >
                 <a href="{:U('Finance/gameFinanceDetail',
                 array('count_date'=>$_REQUEST['count_date'],'game_id'=>$data['game_id'],
-                'game_name'=>$_REQUEST['game_id']?$data['game_name']:'','root_id'=>$_REQUEST['root_id'],
+                'game_name'=>$data['game_name'],'root_id'=>$_REQUEST['root_id'],
                 'parent_id'=>$_REQUEST['parent_id'],'promote_id'=>$_REQUEST['promote_id'],'sign'=>$_REQUEST['sign'],'from'=>$_REQUEST['from']))}" >查看</a>
               </td>
             </tr>
@@ -134,7 +176,7 @@
             <td>
               <a href="{:U('Finance/gameFinanceDetail',
                 array('count_date'=>$_REQUEST['count_date'],'root_id'=>$_GET['root_id'],'partner_id'=>$_REQUEST['partner_id'],
-                'parent_id'=>$_REQUEST['parent_id'],'promote_id'=>$_REQUEST['promote_id'],'game_id'=>$_REQUEST['game_id'],'game_name'=>'1',
+                'parent_id'=>$_REQUEST['parent_id'],'promote_id'=>$_REQUEST['promote_id'],'game_id'=>$_REQUEST['game_id'],'game_name'=>'全部游戏',
                 'sign'=>$_REQUEST['sign'],'from'=>$_REQUEST['from']))}" >查看</a>
             </td>
           </tr>
diff --git a/Application/Admin/View/Finance/gameFinanceDetail.html b/Application/Admin/View/Finance/gameFinanceDetail.html
index 273c77cf4..ec04e0d26 100644
--- a/Application/Admin/View/Finance/gameFinanceDetail.html
+++ b/Application/Admin/View/Finance/gameFinanceDetail.html
@@ -54,7 +54,7 @@
       </div>
       <div class="input-list">
 
-        <input type="text"  name="user_nickname" placeholder="请输入玩家昵称搜索" class="" value="{:I('user_nickname')}"/>&nbsp;
+        <input type="text"  name="user_nickname" placeholder="请输入角色名称搜索" class="" value="{:I('user_nickname')}"/>&nbsp;
       </div>
       <div class="input-list">
 
@@ -78,8 +78,6 @@
 
           <th >玩家账号</th>
 
-          <th >玩家昵称</th>
-
           <th >游戏名称</th>
 
           <th >所属推广员</th>
@@ -115,7 +113,6 @@
               <td >{$data.pay_order_number}</td>
               <td >{$data.pay_time}</td>
               <td >{$data.user_account}</td>
-              <td >{$data.user_nickname}</td>
               <td >{$data.game_name}</td>
               <td >{$data.promote_account}</td>
               <td >{$data.spend_ip}</td>
diff --git a/Application/Admin/View/Finance/getRootUser.html b/Application/Admin/View/Finance/getRootUser.html
index 15d35b482..d7fa1df5e 100644
--- a/Application/Admin/View/Finance/getRootUser.html
+++ b/Application/Admin/View/Finance/getRootUser.html
@@ -25,6 +25,47 @@
       height:26px;line-height:26px;font-size:12px;
     }
     .select2-results__option[aria-selected] {font-size:12px;}
+
+    .tooltip {
+      position: relative;
+      display: inline-block;
+      color: #056dae;
+    }
+
+    .tooltip .tooltiptext {
+      visibility: hidden;
+      width: 200px;
+      background-color: #fff;
+      color: #fff;
+      text-align: center;
+      border-radius: 6px;
+      padding: 5px 0;
+      position: absolute;
+      z-index: 1;
+      bottom: 80%;
+      left: 0;
+      margin-left: -50px;
+      border: #000 solid 1px;
+    }
+
+    .tooltip .tooltiptext::after {
+      content: "";
+      position: absolute;
+      top: 100%;
+      left: 50%;
+      margin-left: -5px;
+      border-width: 5px;
+      border-style: solid;
+      border-color: black transparent transparent transparent;
+    }
+
+    .tooltip:hover .tooltiptext {
+
+      color: #000;
+      visibility: visible;
+      line-height: 20px;
+    }
+
   </style>
 
 
@@ -70,13 +111,13 @@
         <tr>
           <th >会长渠道</th>
 
-          <th>游戏现金流水</th>
+          <th><div class="tooltip">游戏现金流水<span class="tooltiptext"><span style="margin-left: -10px">第三方支付（微信，支付宝，快捷）。</span></span></div></th>
 
-          <th >平台币流水</th>
+          <th ><div class="tooltip">平台币流水<span class="tooltiptext"><span style="margin-left: -10px">平台币所支付的流水</span></span></div></th>
 
-          <th >内充发放</th>
+          <th ><div class="tooltip">内充发放<span class="tooltiptext"><span style="margin-left: -10px">内充流水：平台直接下放给公会（平台币订单-后台发放（推广员））的平台币</span></span></th>
 
-          <th >总流水</th>
+          <th ><div class="tooltip">总流水<span class="tooltiptext"><span style="margin-left: -10px">现金流水+平台币流水+内充流水</span></span></div></th>
 
           <th >操作</th>
 
diff --git a/Application/Admin/View/Finance/index.html b/Application/Admin/View/Finance/index.html
index 80c636d87..01cd3346e 100644
--- a/Application/Admin/View/Finance/index.html
+++ b/Application/Admin/View/Finance/index.html
@@ -25,6 +25,47 @@
       height:26px;line-height:26px;font-size:12px;
     }
     .select2-results__option[aria-selected] {font-size:12px;}
+
+    .tooltip {
+      position: relative;
+      display: inline-block;
+      color: #056dae;
+    }
+
+    .tooltip .tooltiptext {
+      visibility: hidden;
+      width: 200px;
+      background-color: #fff;
+      color: #fff;
+      text-align: center;
+      border-radius: 6px;
+      padding: 5px 0;
+      position: absolute;
+      z-index: 1;
+      bottom: 80%;
+      left: 0;
+      margin-left: -50px;
+      border: #000 solid 1px;
+    }
+
+    .tooltip .tooltiptext::after {
+      content: "";
+      position: absolute;
+      top: 100%;
+      left: 50%;
+      margin-left: -5px;
+      border-width: 5px;
+      border-style: solid;
+      border-color: black transparent transparent transparent;
+    }
+
+    .tooltip:hover .tooltiptext {
+
+      color: #000;
+      visibility: visible;
+      line-height: 20px;
+    }
+
   </style>
 
 
@@ -90,13 +131,13 @@
           </th> -->
           <th >月份</th>
 
-          <th >游戏现金流水</th>
+          <th ><div class="tooltip">游戏现金流水<span class="tooltiptext"><span style="margin-left: -10px">第三方支付（微信，支付宝，快捷）</span></span></div></th>
 
-          <th >平台币流水</th>
+          <th ><div class="tooltip">平台币流水<span class="tooltiptext"><span style="margin-left: -10px">平台币所支付的流水</span></span></div></th>
 
-          <th >内充流水</th>
+          <th ><div class="tooltip">内充流水<span class="tooltiptext"><span style="margin-left: -10px">内充流水：平台直接下放给公会（平台币订单-后台发放（推广员））的平台币</span></span></div></th>
 
-          <th >总流水</th>
+          <th ><div class="tooltip">总流水<span class="tooltiptext"><span style="margin-left: -10px">现金流水+平台币流水+内充流水</span></span></div></th>
 
           <th >操作</th>
         </tr>
@@ -168,6 +209,9 @@
     </volist>
   </script>
   <script type="text/javascript">
+
+
+
     //导航高亮
     highlight_subnav('{:U('Finance/index')}');
     $(function(){