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/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php
index 25cf7c761..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;
@@ -126,6 +131,7 @@ class FinancePromoteController extends AdminController
data2csv($data,'公会统计',array(
"company_name"=>"推广公司",
"promote_account"=>"会长渠道",
+ "company_belong"=>"内外团",
"cash_count"=>"游戏现金金额",
"balance_coin_count"=>"平台币直充支出",
"bind_coin_count"=>"内充支出",
@@ -141,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'];
@@ -153,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);
@@ -195,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)
@@ -212,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)
@@ -318,6 +324,7 @@ class FinancePromoteController extends AdminController
data2csv($data,'渠道统计',array(
"company_name"=>"推广公司",
"promote_account"=>"推广员账号",
+ "company_belong"=>"内外团",
"cash_count"=>"游戏现金金额",
"balance_coin_count"=>"平台币直充支出",
"bind_coin_count"=>"内充支出",
@@ -361,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)
@@ -377,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)
diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php
index 48ec8ed1a..6a04fe8ec 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/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/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/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/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();
}
})
});
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();
}
})
});
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) ."% ";
+
+
+ |
+
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();
}
})
});
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();
}
})
});