From 5e08bda6c281521b26099c78155ad2766da0aff5 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 2 Jan 2020 11:52:25 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A1=8C=E4=B8=BA?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=8C=BA=E6=9C=8D=E5=90=8D=E7=A7=B0=E4=B8=BA?= =?UTF-8?q?=E5=8C=BA=E6=9C=8Did?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/BehaviorLogController.class.php | 6 ++---- Application/Admin/View/BehaviorLog/index.html | 12 ++++++------ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Application/Admin/Controller/BehaviorLogController.class.php b/Application/Admin/Controller/BehaviorLogController.class.php index 0643ada76..80c5fa79d 100644 --- a/Application/Admin/Controller/BehaviorLogController.class.php +++ b/Application/Admin/Controller/BehaviorLogController.class.php @@ -29,10 +29,8 @@ class BehaviorLogController extends ThinkController $game_id = ['in', array_column(getGameByName($params['game_name'], $params['sdk_version']), 'id')]; $map['game_id'] = $game_id; } - if (isset($params['server_name'])) { - $game_id = M('game', 'tab_')->where(['relation_game_name' => $params['game_name'],'sdk_version' => $params['sdk_version']])->getField('id'); - $server_id = M('server', 'tab_')->where(['server_name' => $params['server_name'], 'game_id' => $game_id])->getField('server_num'); - $map['server_id'] = $server_id; + if (isset($params['server_id'])) { + $map['server_id'] =$params['server_id']; } if (isset($params['game_player_name'])) { $map['game_player_name'] = $params['game_player_name']; diff --git a/Application/Admin/View/BehaviorLog/index.html b/Application/Admin/View/BehaviorLog/index.html index f2346001f..577f73f22 100644 --- a/Application/Admin/View/BehaviorLog/index.html +++ b/Application/Admin/View/BehaviorLog/index.html @@ -73,7 +73,7 @@
-
@@ -443,7 +443,7 @@ }); $("#promote_level").change(); - var game_server = "{:I('server_name')}"; + var game_server = "{:I('server_id')}"; $("#sdk_version").change(function(){ $.ajax({ url:"{:U('Ajax/getGmeServer')}", @@ -453,11 +453,11 @@ success:function(data){ str = ""; for (var i in data){ - str += "" + str += "" } - $("#server_name").empty(); - $("#server_name").append(str); - $("#server_name").select2(); + $("#server_id").empty(); + $("#server_id").append(str); + $("#server_id").select2(); } }) }); From 3bf288fa41b3f5e6d41becda4d617a4c5c4496ef Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 2 Jan 2020 11:54:32 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E9=99=86?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=8C=BA=E6=9C=8D=E5=90=8D=E7=A7=B0=E4=B8=BA?= =?UTF-8?q?=E5=8C=BA=E6=9C=8Did?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/MemberController.class.php | 6 +++--- Application/Admin/View/Member/login_record.html | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index f4ab7e9c2..8eede5401 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -1140,9 +1140,9 @@ class MemberController extends ThinkController $map['user_account'] = array('like', trim($_REQUEST['account']) . '%'); unset($_REQUEST['account']); } - if (isset($_REQUEST['server_name'])) { - $map['server_name'] = $_REQUEST['server_name']; - unset($_REQUEST['server_name']); + if (isset($_REQUEST['server_id'])) { + $map['server_id'] = $_REQUEST['server_id']; + unset($_REQUEST['server_id']); } // $promoteRoot = getPowerPromoteIds(); diff --git a/Application/Admin/View/Member/login_record.html b/Application/Admin/View/Member/login_record.html index cd1327b1a..4c127dc38 100644 --- a/Application/Admin/View/Member/login_record.html +++ b/Application/Admin/View/Member/login_record.html @@ -83,7 +83,7 @@
-
@@ -281,7 +281,7 @@ }) }); - var game_server = "{:I('server_name')}"; + var game_server = "{:I('server_id')}"; $("#game_type").change(function(){ $.ajax({ url:"{:U('Ajax/getGmeServer')}", @@ -291,11 +291,11 @@ success:function(data){ str = ""; for (var i in data){ - str += "" + str += "" } - $("#server_name").empty(); - $("#server_name").append(str); - $("#server_name").select2(); + $("#server_id").empty(); + $("#server_id").append(str); + $("#server_id").select2(); } }) }); From 0f7134c838583be1e647c6f810797773fc183495 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 2 Jan 2020 11:56:44 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E5=85=85=E5=80=BC=20?= =?UTF-8?q?=E5=8C=BA=E6=9C=8D=E5=90=8D=E7=A7=B0=E6=94=B9=E5=8C=BA=E6=9C=8D?= =?UTF-8?q?id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/SpendController.class.php | 6 +++--- Application/Admin/View/Spend/lists.html | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Application/Admin/Controller/SpendController.class.php b/Application/Admin/Controller/SpendController.class.php index a90a2a13f..ce71bec6c 100644 --- a/Application/Admin/Controller/SpendController.class.php +++ b/Application/Admin/Controller/SpendController.class.php @@ -43,9 +43,9 @@ class SpendController extends ThinkController if (isset($_REQUEST['game_type']) && $_REQUEST['game_type']) { $map['sdk_version'] = $_REQUEST['game_type']; } - if (isset($_REQUEST['server_name'])) { - $map['server_name'] = $_REQUEST['server_name']; - unset($_REQUEST['server_name']); + if (isset($_REQUEST['server_id'])) { + $map['server_id'] = $_REQUEST['server_id']; + unset($_REQUEST['server_id']); } if (isset($_REQUEST['pay_order_number'])) { $map['pay_order_number'] = array('like', trim($_REQUEST['pay_order_number'])); diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html index 39ac2ed7b..6f0014198 100644 --- a/Application/Admin/View/Spend/lists.html +++ b/Application/Admin/View/Spend/lists.html @@ -76,7 +76,7 @@
-
@@ -568,7 +568,7 @@ }); $("#promote_level").change(); - var game_server = "{:I('server_name')}"; + var game_server = "{:I('server_id')}"; $("#game_type").change(function(){ $.ajax({ url:"{:U('Ajax/getGmeServer')}", @@ -578,11 +578,11 @@ success:function(data){ str = ""; for (var i in data){ - str += "" + str += "" } - $("#server_name").empty(); - $("#server_name").append(str); - $("#server_name").select2(); + $("#server_id").empty(); + $("#server_id").append(str); + $("#server_id").select2(); } }) }); From 07f6e9919df2687c39c44d490647044d6d9621d5 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 2 Jan 2020 11:58:51 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=8C=BA=E6=9C=8D=E5=88=97=E8=A1=A8=20?= =?UTF-8?q?=E5=8C=BA=E6=9C=8D=E5=90=8D=E7=A7=B0=E6=94=B9=E5=8C=BA=E6=9C=8D?= =?UTF-8?q?id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/ServerController.class.php | 6 +++--- Application/Admin/View/Server/lists.html | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Application/Admin/Controller/ServerController.class.php b/Application/Admin/Controller/ServerController.class.php index 0af4e3057..15318d831 100644 --- a/Application/Admin/Controller/ServerController.class.php +++ b/Application/Admin/Controller/ServerController.class.php @@ -44,9 +44,9 @@ class ServerController extends ThinkController { unset($_REQUEST['game_name']); } } - if(isset($_REQUEST['server_name'])){ - $extend['server_name']=$_REQUEST['server_name']; - unset($_REQUEST['server_name']); + if(isset($_REQUEST['server_id'])){ + $extend['server_id']=$_REQUEST['server_id']; + unset($_REQUEST['server_id']); } if(empty($_GET['type']) || $_GET['type'] == 1) { $extend['developers'] = array('EQ',0); diff --git a/Application/Admin/View/Server/lists.html b/Application/Admin/View/Server/lists.html index 8eaf145c6..4bb159751 100644 --- a/Application/Admin/View/Server/lists.html +++ b/Application/Admin/View/Server/lists.html @@ -86,7 +86,7 @@
-
@@ -333,7 +333,7 @@ $(function(){ }); $("#server_version").change(); - var game_server = "{:I('server_name')}"; + var game_server = "{:I('server_id')}"; $("#game_name").change(function(){ $.ajax({ url:"{:U('Ajax/getGmeServer')}", @@ -343,11 +343,11 @@ $(function(){ success:function(data){ str = ""; for (var i in data){ - str += "" + str += "" } - $("#server_name").empty(); - $("#server_name").append(str); - $("#server_name").select2(); + $("#server_id").empty(); + $("#server_id").append(str); + $("#server_id").select2(); } }) }); From cc0f5a03c48f49c1e0ec4bc0c199ad13cd3e4d5f Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 2 Jan 2020 13:38:44 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=B7=A5=E4=BC=9A=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=86=85=E5=A4=96=E5=9B=A2=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/FinancePromoteController.class.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php index 25cf7c761..1ed9d4007 100644 --- a/Application/Admin/Controller/FinancePromoteController.class.php +++ b/Application/Admin/Controller/FinancePromoteController.class.php @@ -126,6 +126,7 @@ class FinancePromoteController extends AdminController data2csv($data,'公会统计',array( "company_name"=>"推广公司", "promote_account"=>"会长渠道", + "company_belong"=>"内外团", "cash_count"=>"游戏现金金额", "balance_coin_count"=>"平台币直充支出", "bind_coin_count"=>"内充支出", @@ -318,6 +319,7 @@ class FinancePromoteController extends AdminController data2csv($data,'渠道统计',array( "company_name"=>"推广公司", "promote_account"=>"推广员账号", + "company_belong"=>"内外团", "cash_count"=>"游戏现金金额", "balance_coin_count"=>"平台币直充支出", "bind_coin_count"=>"内充支出", From 836eccfa782c5ef1221055eeecebe8fd7af8fb5c Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 2 Jan 2020 14:15:06 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=AF=E4=BB=98=E6=B8=A0=E9=81=93=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/PayChannelController.class.php | 5 ++++- Application/Admin/View/PayChannel/index.html | 11 +++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Controller/PayChannelController.class.php b/Application/Admin/Controller/PayChannelController.class.php index 5137e6ebe..b9939f2aa 100644 --- a/Application/Admin/Controller/PayChannelController.class.php +++ b/Application/Admin/Controller/PayChannelController.class.php @@ -316,7 +316,10 @@ class PayChannelController extends ThinkController $this->assign('sumData',$sumData); $this->assign('channelData',$channelData); $this->assign('listdata',$data); - + //统计总额和比例 + $this->assign('channelData2',$channelData); + $moneyAllCount = array_sum(array_column($channelData, 'pay_amount')); + $this->assign('moneyAllCount',$moneyAllCount); $this->display(); } diff --git a/Application/Admin/View/PayChannel/index.html b/Application/Admin/View/PayChannel/index.html index 983f44e80..57bd324d6 100644 --- a/Application/Admin/View/PayChannel/index.html +++ b/Application/Admin/View/PayChannel/index.html @@ -238,6 +238,17 @@ + + 支付渠道占比 + + + {$channel.pay_way}: + + echo round($channel['pay_amount']*100/ $moneyAllCount,2) ."%        "; + + + + From 5343ef216288e4b66807600542cf6668eb8cf977 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 2 Jan 2020 14:15:28 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=B7=A5=E4=BC=9A=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=86=85=E5=A4=96=E5=9B=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinancePromoteController.class.php | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php index 1ed9d4007..c73b551ce 100644 --- a/Application/Admin/Controller/FinancePromoteController.class.php +++ b/Application/Admin/Controller/FinancePromoteController.class.php @@ -45,6 +45,7 @@ class FinancePromoteController extends AdminController $senddata[$v['p_id']] = $v; } +// dump($cash);die(); //内冲 $inside = self::getJoinPromoteData([],$istimeselect,"promote_coin"); foreach($inside as $k=>$v){ @@ -103,9 +104,13 @@ class FinancePromoteController extends AdminController "bind_coin_count"=>0, "inside_cash_count"=>0, ); +// dump($senddata);die(); foreach($senddata as $k=>$v){ - - $v['company_belong']?$v['company_belong']='外团':$v['company_belong']='内团'; + if ($v['company_belong']==1) { + $v['company_belong']='外团'; + } else { + $v['company_belong']='内团'; + } if(empty($v['company_name'])) $v['company_name']= "万盟天下科技"; if(empty($v['p_id'])) $v['p_id']= "0"; if(!array_key_exists('cash_count',$v)) $v['cash_count']=0; @@ -142,10 +147,10 @@ class FinancePromoteController extends AdminController $outBelong = 0; $insideBelong = 0; - +// dump($data);die(); foreach ($data as $key => $value) { - if ($value['company_belong']) { + if ($value['company_belong']=='外团') { $outBelong+=$value['allcount']; } else { $insideBelong+=$value['allcount']; @@ -154,9 +159,9 @@ class FinancePromoteController extends AdminController } //外团占比 - $this->assign('outBelong',$outBelong/$count['all_count']*100); + $this->assign('outBelong',number_format($outBelong/$count['all_count']*100,2,'.','')); //内团占比 - $this->assign('insideBelong',$insideBelong/$count['all_count']*100); + $this->assign('insideBelong',number_format($insideBelong/$count['all_count']*100,2,'.','')); $size = $row; $data = array_slice($data, ($arraypage - 1) * $size, $size); @@ -196,7 +201,7 @@ class FinancePromoteController extends AdminController SUM(CASE WHEN pay_way = 0 THEN pay_amount ELSE 0 END) as balance_coin_count, SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as bind_coin_count, IFNULL(if(substring_index(substring_index(promote.`chain`,'/',2),'/',-1)='',s.promote_id,substring_index(substring_index(promote.`chain`,'/',2),'/',-1)),0) p_id, - IFNULL(company_id,0) company_id,company_name,promote.company_belong"; + IFNULL(company_id,0) company_id,company_name,company_belong"; return M() ->table("tab_spend s") ->field($field) @@ -213,7 +218,7 @@ class FinancePromoteController extends AdminController $map['s.source_id']=0; $field= "SUM(CASE WHEN s.type = 1 THEN num ELSE 0 END) as pay_amount,SUM(CASE WHEN s.type = 2 THEN num ELSE 0 END) as back_amount,IFNULL(if(substring_index(substring_index(`chain`,'/',2),'/',-1)='', s.promote_id,substring_index(substring_index(`chain`,'/',2),'/',-1)),0) p_id, - IFNULL(company_id,0) company_id,company_name,promote.company_belong"; + IFNULL(company_id,0) company_id,company_name,company_belong"; return M("promote_coin s","tab_") ->field($field) ->where($map) @@ -363,7 +368,7 @@ class FinancePromoteController extends AdminController $field= "SUM(CASE WHEN pay_way > 0 THEN pay_amount ELSE 0 END) as cash_count, SUM(CASE WHEN pay_way = 0 THEN pay_amount ELSE 0 END) as balance_coin_count, SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as bind_coin_count, - IFNULL(company_id,0) company_id,company_name,promote_id,promote.account promote_account,promote.company_belong"; + IFNULL(company_id,0) company_id,company_name,promote_id,promote.account promote_account,company_belong"; return M() ->table("tab_spend s") ->field($field) @@ -379,7 +384,7 @@ class FinancePromoteController extends AdminController $map['s.status']=1; $map['s.source_id']=0; $field= "SUM(CASE WHEN s.type = 1 THEN num ELSE 0 END) as pay_amount,SUM(CASE WHEN s.type = 2 THEN num ELSE 0 END) as back_amount, - IFNULL(company_id,0) company_id,company_name,promote_id,promote.account promote_account,promote.company_belong"; + IFNULL(company_id,0) company_id,company_name,promote_id,promote.account promote_account,company_belong"; return M("promote_coin s","tab_") ->field($field) ->where($map)