elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0

Browse Source
master
ELF 5 years ago
parent 67caddeef0 f4495f93a9
commit 6297ff7011
4 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File

4
Application/Admin/Controller/BehaviorLogController.class.php
Unescape Escape View File

@ -130,13 +130,13 @@ class BehaviorLogController extends ThinkController
$show_data = []; $show_data = [];
foreach($data as $k => $v) { foreach($data as $k => $v) {
if($v['tab'] == 'spend') { if($v['tab'] == 'spend') {
$order_detail = M('spend', 'tab_')->field('order_number,pay_time,user_account,promote_account,game_name,pay_amount,pay_way')->where(['pay_order_number' => $v['pay_order_number']])->find(); $order_detail = M('spend', 'tab_')->field('extend,pay_time,user_account,promote_account,game_name,pay_amount,pay_way')->where(['pay_order_number' => $v['pay_order_number']])->find();
$re_data['pay_time'] = $order_detail['pay_time']; $re_data['pay_time'] = $order_detail['pay_time'];
} elseif($v['tab'] == 'deposit') { } elseif($v['tab'] == 'deposit') {
$order_detail = M('deposit', 'tab_')->field('order_number,create_time,user_account,promote_account,pay_amount,pay_way')->where(['pay_order_number' => $v['pay_order_number']])->find(); $order_detail = M('deposit', 'tab_')->field('order_number,create_time,user_account,promote_account,pay_amount,pay_way')->where(['pay_order_number' => $v['pay_order_number']])->find();
$re_data['pay_time'] = $order_detail['create_time']; $re_data['pay_time'] = $order_detail['create_time'];
} }
$re_data['order_number'] = !empty($order_detail['order_number']) ? $order_detail['order_number'] : '-'; $re_data['order_number'] = isset($order_detail['extend']) ? $order_detail['extend'] : '-';
$re_data['user_account'] = $order_detail['user_account']; $re_data['user_account'] = $order_detail['user_account'];
$re_data['promote_account'] = $order_detail['promote_account']; $re_data['promote_account'] = $order_detail['promote_account'];
$re_data['game_name'] = !empty($order_detail['game_name']) ? $order_detail['game_name'] : '-'; $re_data['game_name'] = !empty($order_detail['game_name']) ? $order_detail['game_name'] : '-';

7
Application/Admin/Controller/ExportController.class.php
Unescape Escape View File

@ -3519,11 +3519,14 @@ class ExportController extends Controller
// } // }
$map = " 1=1 "; $map = " 1=1 ";
$game_map = ""; $game_map = "";
if (isset($_REQUEST['game_name']) && isset($_REQUEST['server_name'])) { if (isset($_REQUEST['game_name']) && isset($_REQUEST['server_id'])) {
$game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')); $game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id'));
$map .= " AND game_id in ({$game_ids})"; $map .= " AND game_id in ({$game_ids})";
$game_map = " AND EXISTS (SELECT upi.user_id FROM tab_user_play_info as upi where upi.game_id in ({$game_ids}) AND upi.user_id = u.id "; $game_map = " AND EXISTS (SELECT upi.user_id FROM tab_user_play_info as upi where upi.game_id in ({$game_ids}) AND upi.user_id = u.id ";
if (isset($_REQUEST['server_name'])) $game_map .= " AND upi.server_name = '{$_REQUEST['server_name']}' "; if (isset($_REQUEST['server_id'])) {
$game_map .= " AND upi.server_id = '{$_REQUEST['server_id']}' ";
$map .= " AND server_id = '{$_REQUEST['server_id']}' ";
};
$game_map .= ") "; $game_map .= ") ";
} else if (isset($_REQUEST['game_name'])) { } else if (isset($_REQUEST['game_name'])) {
$game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')); $game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id'));

7
Application/Admin/Controller/StatisticsController.class.php
Unescape Escape View File

@ -1035,11 +1035,14 @@ class StatisticsController extends ThinkController {
$map = " 1=1 "; $map = " 1=1 ";
$game_map = ""; $game_map = "";
if (isset($_REQUEST['game_name']) && isset($_REQUEST['server_name'])) { if (isset($_REQUEST['game_name']) && isset($_REQUEST['server_id'])) {
$game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')); $game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id'));
$map .= " AND game_id in ({$game_ids})"; $map .= " AND game_id in ({$game_ids})";
$game_map = " AND EXISTS (SELECT upi.user_id FROM tab_user_play_info as upi where upi.game_id in ({$game_ids}) AND upi.user_id = u.id "; $game_map = " AND EXISTS (SELECT upi.user_id FROM tab_user_play_info as upi where upi.game_id in ({$game_ids}) AND upi.user_id = u.id ";
if (isset($_REQUEST['server_name'])) $game_map .= " AND upi.server_name = '{$_REQUEST['server_name']}' "; if (isset($_REQUEST['server_id'])) {
$game_map .= " AND upi.server_id = '{$_REQUEST['server_id']}' ";
$map .= " AND server_id = '{$_REQUEST['server_id']}' ";
};
$game_map .= ") "; $game_map .= ") ";
} else if (isset($_REQUEST['game_name'])) { } else if (isset($_REQUEST['game_name'])) {
$game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')); $game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id'));

14
Application/Admin/View/Statistics/ltv.html
Unescape Escape View File

@ -64,7 +64,7 @@
</select> </select>
</div> </div>
<div class="input-list input-list-server search_label_rehab"> <div class="input-list input-list-server search_label_rehab">
<select id="server_name" name="server_name" class="select_gallery" > <select id="server_id" name="server_id" class="select_gallery" >
<option value="">区服名称</option> <option value="">区服名称</option>
</select> </select>
</div> </div>
@ -128,7 +128,7 @@
'end'=>I('end',date('Y-m-d',strtotime('-1 day'))), 'end'=>I('end',date('Y-m-d',strtotime('-1 day'))),
'game_name'=>I('game_name'), 'game_name'=>I('game_name'),
'game_type'=>I('game_type'), 'game_type'=>I('game_type'),
'server_name'=>I('server_name'), 'server_id'=>I('server_id'),
'xlsname'=>'统计_ltv统计' 'xlsname'=>'统计_ltv统计'
),false)}">导出</a> ),false)}">导出</a>
{$_page|default=''} {$_page|default=''}
@ -222,7 +222,7 @@ $(function(){
pickerPosition:'bottom-right' pickerPosition:'bottom-right'
}); });
var game_server = "{:I('server_name')}"; var game_server = "{:I('server_id')}";
$("#game_type").change(function(){ $("#game_type").change(function(){
console.log({sdk_version:$("#game_type option:selected").val(), game_name:$("#game_name option:selected").val()}) console.log({sdk_version:$("#game_type option:selected").val(), game_name:$("#game_name option:selected").val()})
$.ajax({ $.ajax({
@ -234,11 +234,11 @@ $(function(){
console.log(data) console.log(data)
str = "<option value=''>请选择区服</option>"; str = "<option value=''>请选择区服</option>";
for (var i in data){ for (var i in data){
str += "<option value='"+data[i].server_name+"' "+(game_server && data[i].server_name == game_server?'selected':'')+">"+data[i].server_name+"</option>" str += "<option value='"+data[i].server_id+"' "+(game_server && data[i].server_id == game_server?'selected':'')+">"+data[i].server_name+"</option>"
} }
$("#server_name").empty(); $("#server_id").empty();
$("#server_name").append(str); $("#server_id").append(str);
$("#server_name").select2(); $("#server_id").select2();
} }
}) })
}); });

Write Preview
Loading…
Cancel
Save