diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php
index 4c08cd04f..0140f1f6b 100644
--- a/Application/Admin/Controller/FinancePromoteController.class.php
+++ b/Application/Admin/Controller/FinancePromoteController.class.php
@@ -63,10 +63,11 @@ class FinancePromoteController extends AdminController
$inside = self::getJoinPromoteData([],$istimeselect,"promote_coin");
foreach($inside as $k=>$v){
if(array_key_exists($v['p_id'],$senddata)){
- $senddata[$v['p_id']]['inside_cash_count']= $v['pay_amount'];
+ $senddata[$v['p_id']]['inside_cash_count']= $v['pay_amount']-$v['back_amount'];
}else{
- $v['inside_cash_count'] = $v['pay_amount'];
+ $v['inside_cash_count'] = $v['pay_amount']-$v['back_amount'];
unset($v['pay_amount']);
+ unset($v['back_amount']);
$senddata[$v['p_id']] = $v;
};
}
@@ -147,8 +148,7 @@ class FinancePromoteController extends AdminController
}
$map['s.status']=1;
$map['s.source_id']=0;
- $map['s.type']=1;
- $field= "sum(num) pay_amount,IFNULL(if(substring_index(substring_index(`chain`,'/',2),'/',-1)='',s.promote_id,substring_index(substring_index(`chain`,'/',2),'/',-1)),0) p_id";
+ $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";
return M("promote_coin s","tab_")
->field($field)
->where($map)
@@ -564,7 +564,9 @@ class FinancePromoteController extends AdminController
if (!empty(I("game_id"))) {
$map['tab_spend.game_id'] = I("game_id");
}
-
+ if (isset($_REQUEST['game_name']) || isset($_REQUEST['game_type'])) {
+ $map["tab_spend.game_id"] = array("in",implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')) );
+ }
if (isset($_REQUEST['time_start']) && isset($_REQUEST['time_end'])) {
$map['pay_time'] = ['between', [strtotime($_REQUEST['time_start']), strtotime($_REQUEST['time_end']) + 86399]];
@@ -585,24 +587,6 @@ class FinancePromoteController extends AdminController
}
}
- // if (!empty(I("promote_id"))) {
- // $promote_id[] = I("promote_id");
- // }
-
- // if (!empty(I("root_id"))) {
- // $root_id = I("root_id");
- // $promote_id = $this->getPromoteList($root_id);
- // array_push($promote_id, $root_id);
- // }
-
- // if ($_REQUEST['root_id']=='0') {
- // $map['tab_spend.promote_id'] = $_REQUEST['root_id'];
- // }
-
- // $promote_id = implode(',',$promote_id);
- // if ($promote_id) {
- // $map['tab_spend.promote_id'] = ['in',$promote_id];
- // }
$page = intval($p);
$page = $page ? $page : 1; //默认显示第一页数据
@@ -657,5 +641,23 @@ class FinancePromoteController extends AdminController
$this->assign('data',$data);
$this->display();
}
+ //平台币内充弹框
+ public function insideCoinDetail($p = 1)
+ {
+ $isgf = false;//是否事官方渠道
+ if ($_REQUEST['promote_id'] != '') {
+ if($_REQUEST['promote_id'] == 0){
+ $isgf = true;
+ }
+ $map['tab_spend.promote_id'] = $_REQUEST['promote_id'];
+ }
+ //
+ if($isgf){
+
+
+ }
+
+
+ }
}
\ No newline at end of file
diff --git a/Application/Admin/View/FinancePromote/index.html b/Application/Admin/View/FinancePromote/index.html
index f6d2aad3a..c56995c34 100644
--- a/Application/Admin/View/FinancePromote/index.html
+++ b/Application/Admin/View/FinancePromote/index.html
@@ -38,11 +38,13 @@
.select2-results__option[aria-selected] {
font-size: 12px;
}
+
.tooltip {
position: relative;
/* display: block; */
/* color: #056dae; */
}
+
.tooltip .tooltiptext {
display: none;
width: 100%;
@@ -68,10 +70,11 @@
border-style: solid;
border-color: black transparent transparent transparent;
}
+
.tooltip:hover .tooltiptext {
color: #333;
display: block;
-
+
}
@@ -187,7 +190,8 @@
平台币内充
管理后台直接下放给会长的平台币
- 渠道游戏内充值合计 游戏现金金额（游戏现金流水+平台币支出+公会内充支出=总流水 |
+ 渠道游戏内充值合计 游戏现金金额（游戏现金流水+平台币支出+公会内充支出=总流水
+ |
操作 |
@@ -202,9 +206,12 @@
{:get_promote_name($data['p_id'])} |
{$data.cash_count} |
- {$data.balance_coin_count} |
- {$data.bind_coin_count}
+ |
+ {$data.balance_coin_count}
+ |
+
+ {$data.bind_coin_count}
+ |
{$data.inside_cash_count} |
@@ -212,8 +219,10 @@
- 游戏查看
- 渠道查看
+ 游戏查看
+ 渠道查看
|
@@ -226,9 +235,10 @@
{$all_count['inside_cash_count']} |
{$all_count['all_count']} |
- 游戏查看
- 渠道查看
- |
+ 游戏查看
+ 渠道查看
+
@@ -280,6 +290,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | 支付订单号 |
+ 充值时间 |
+ 玩家账号 |
+ 游戏名称 |
+ 游戏区服 |
+ 角色名称 |
+ 订单金额 |
+ 实付金额 |
+ 充值方式 |
+
+ 绑定币余额平台币余额 |
+
+
+
+
+
+
+
+ | {$data.pay_order_number} |
+ {$data.pay_time} |
+ {$data.user_account} |
+ {$data.game_name} |
+ {$data.server_name} |
+ {$data.game_player_name} |
+ {$data.cost} |
+ {$data.pay_amount} |
+ {$data.pay_way} |
+
+ {$data.bind_balance} |
+
+ {$data.balance} |
+
+
+
+
+
+ | 总计 |
+ {$total_cost}0 |
+ {$total_pay_amount}0 |
+ |
+
+
+
+
+
+
+ {$_page}
+
+
+