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_zyx

Browse Source
master
zhengyongxing 5 years ago
parent 4e3206a5c1 a2062684af
commit b5c06df195
10 changed files with 475 additions and 2400 deletions
Show Stats Download Patch File Download Diff File

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

@ -2049,6 +2049,9 @@ class ExportController extends Controller
if (isset($params['order_id'])) { if (isset($params['order_id'])) {
$map['tab_game_supersign.order_id'] = $params['order_id']; $map['tab_game_supersign.order_id'] = $params['order_id'];
} }
if (isset($params['pay_way'])) {
$map['tab_game_supersign.pay_way'] = $params['pay_way'];
}
if (isset($params['account'])) { if (isset($params['account'])) {
$map['tab_user.account'] = $params['account']; $map['tab_user.account'] = $params['account'];
} }
@ -2078,11 +2081,19 @@ class ExportController extends Controller
array('device_number', '设备号'), array('device_number', '设备号'),
array('game_name', '游戏'), array('game_name', '游戏'),
array('pay_time', '购买时间'), array('pay_time', '购买时间'),
array('super_money', '超级签金额'), array('pay_way', '支付方式'),
array('pay_price', '超级签金额'),
); );
$xlsData = M('game_supersign', 'tab_')->field('tab_game_supersign.id,tab_game_supersign.order_id,tab_user.account,tab_user.promote_account,tab_user.device_number,tab_game.game_name,tab_game_supersign.pay_time')->join('tab_user on tab_game_supersign.user_id = tab_user.id')->join('tab_game on tab_game_supersign.game_id = tab_game.id')->where($map)->order('id DESC')->select(); $xlsData = M('game_supersign', 'tab_')->field('tab_game_supersign.id,tab_game_supersign.pay_price,tab_game_supersign.pay_way,tab_game_supersign.order_id,tab_user.account,tab_user.promote_account,tab_user.device_number,tab_game.game_name,tab_game_supersign.pay_time')->join('tab_user on tab_game_supersign.user_id = tab_user.id')->join('tab_game on tab_game_supersign.game_id = tab_game.id')->where($map)->order('id DESC')->select();
foreach($xlsData as $k => $v) { foreach($xlsData as $k => $v) {
$xlsData[$k]['pay_time'] = date('Y-m-d H:i:s',$v['pay_time']); $xlsData[$k]['pay_time'] = date('Y-m-d H:i:s',$v['pay_time']);
if($v['pay_way'] == 0) {
$xlsData[$k]['pay_way'] = '未知';
}elseif ($v['pay_way'] == 1) {
$xlsData[$k]['pay_way'] = '支付宝';
}elseif ($v['pay_way'] == 2) {
$xlsData[$k]['pay_way'] = '微信';
}
} }
break; break;
case 24: case 24:
@ -2158,6 +2169,7 @@ class ExportController extends Controller
$map['tab_repair_pay.create_time'] = array('BETWEEN', [$startTime, $endTime]); $map['tab_repair_pay.create_time'] = array('BETWEEN', [$startTime, $endTime]);
} }
if(isset($params['type'])) { if(isset($params['type'])) {
$map['tab_repair_pay.type'] = $params['type']; $map['tab_repair_pay.type'] = $params['type'];
} }
@ -2456,8 +2468,8 @@ class ExportController extends Controller
setPowerPromoteIds($map2); setPowerPromoteIds($map2);
$data2 = $user->field('fgame_id,count(IF(register_time ' . $today . ',1,null)) as today, $data2 = $user->field('fgame_id,count(IF(register_time ' . $today . ',1,null)) as today,
count(IF(register_time ' . $week . ',1,null)) as week, count(IF(register_time ' . $week . ',1,null)) as week,
count(IF(register_time ' . $mounth . ',1,null)) as mounth') count(IF(register_time ' . $mounth . ',1,null)) as mounth')
->where($map2) ->where($map2)
->group('fgame_id') ->group('fgame_id')
->select(); ->select();
@ -2548,8 +2560,8 @@ class ExportController extends Controller
setPowerPromoteIds($map2); setPowerPromoteIds($map2);
$data2 = $spend $data2 = $spend
->field('game_id,sum(IF(pay_time ' . $today . ',pay_amount,0)) as today, ->field('game_id,sum(IF(pay_time ' . $today . ',pay_amount,0)) as today,
sum(IF(pay_time ' . $week . ',pay_amount,0)) as week, sum(IF(pay_time ' . $week . ',pay_amount,0)) as week,
sum(IF(pay_time ' . $mounth . ',pay_amount,0)) as mounth') sum(IF(pay_time ' . $mounth . ',pay_amount,0)) as mounth')
->where($map2) ->where($map2)
->group('game_id') ->group('game_id')
->select(); ->select();
@ -2642,8 +2654,8 @@ class ExportController extends Controller
$data2 = $user $data2 = $user
->field('register_way, ->field('register_way,
count(IF(register_time ' . $today . ',1,null)) as today, count(IF(register_time ' . $today . ',1,null)) as today,
count(IF(register_time ' . $week . ',1,null)) as week, count(IF(register_time ' . $week . ',1,null)) as week,
count(IF(register_time ' . $mounth . ',1,null)) as mounth') count(IF(register_time ' . $mounth . ',1,null)) as mounth')
->where($map2) ->where($map2)
->group('register_way') ->group('register_way')
->select(); ->select();
@ -2729,9 +2741,9 @@ class ExportController extends Controller
setPowerPromoteIds($map2); setPowerPromoteIds($map2);
$data2 = $spend $data2 = $spend
->field('pay_way, ->field('pay_way,
sum(IF(pay_time ' . $today . ',pay_amount,0)) as today, sum(IF(pay_time ' . $today . ',pay_amount,0)) as today,
sum(IF(pay_time ' . $week . ',pay_amount,0)) as week, sum(IF(pay_time ' . $week . ',pay_amount,0)) as week,
sum(IF(pay_time ' . $mounth . ',pay_amount,0)) as mounth') sum(IF(pay_time ' . $mounth . ',pay_amount,0)) as mounth')
->where($map2) ->where($map2)
->group('pay_way') ->group('pay_way')
->select(); ->select();
@ -2848,7 +2860,7 @@ class ExportController extends Controller
} }
//为数据权限添加 //为数据权限添加
setPowerPromoteIds($map, 'u.promote_id'); setPowerPromoteIds($map, 'u.promote_id');
$data = M('promote', 'tab_')->alias('tp1')->field('tp1.account as promote_account,tp1.id, date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time, count(u.id) as count, $data = M('promote', 'tab_')->alias('tp1')->field('tp1.account as promote_account,tp1.id, date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time, count(u.id) as count,
count(IF(register_time ' . $today . ',1,null)) as today, count(IF(register_time ' . $today . ',1,null)) as today,
count(IF(register_time ' . $week . ',1,null)) as week, count(IF(register_time ' . $week . ',1,null)) as week,
count(IF(register_time ' . $mounth . ',1,null)) as mounth') count(IF(register_time ' . $mounth . ',1,null)) as mounth')
@ -2868,7 +2880,7 @@ class ExportController extends Controller
//官方渠道数据添加 //官方渠道数据添加
$authorityData = M('user', 'tab_')->alias('u') $authorityData = M('user', 'tab_')->alias('u')
->field('date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time, ->field('date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time,
count(id) as count, count(id) as count,
count(IF(register_time ' . $today . ',1,null)) as today, count(IF(register_time ' . $today . ',1,null)) as today,
count(IF(register_time ' . $week . ',1,null)) as week, count(IF(register_time ' . $week . ',1,null)) as week,
count(IF(register_time ' . $mounth . ',1,null)) as mounth') count(IF(register_time ' . $mounth . ',1,null)) as mounth')
@ -3440,9 +3452,9 @@ class ExportController extends Controller
array('mau','MAU'), array('mau','MAU'),
); );
if (is_file(RUNTIME_PATH.'/access_data_user.txt')) { if (is_file(RUNTIME_PATH.'/access_data_user.txt')) {
$filetxt = file_get_contents(RUNTIME_PATH.'/access_data_user.txt'); $filetxt = file_get_contents(RUNTIME_PATH.'/access_data_user.txt');
$data = json_decode($filetxt,true); $data = json_decode($filetxt,true);
@ -3475,30 +3487,30 @@ class ExportController extends Controller
$this->exportExcel($xlsName, $xlsCell, $xlsData); $this->exportExcel($xlsName, $xlsCell, $xlsData);
} }
/** /**
* ltv统计 * ltv统计
* @author 鹿文学 * @author 鹿文学
*/ */
public function ltv($p=1, $start, $end) { public function ltv($p=1, $start, $end) {
$xlsName = $_REQUEST['xlsname']; $xlsName = $_REQUEST['xlsname'];
$xlsCell = array( $xlsCell = array(
array('date','日期'), array('date','日期'),
array('total_amt','充值金额'), array('total_amt','充值金额'),
array('user_count','活跃用户'), array('user_count','活跃用户'),
array('ltv_1','LTV1'), array('ltv_1','LTV1'),
array('ltv_2','LTV2'), array('ltv_2','LTV2'),
array('ltv_3','LTV3'), array('ltv_3','LTV3'),
array('ltv_4','LTV4'), array('ltv_4','LTV4'),
array('ltv_5','LTV5'), array('ltv_5','LTV5'),
array('ltv_6','LTV6'), array('ltv_6','LTV6'),
array('ltv_7','LTV7'), array('ltv_7','LTV7'),
array('ltv_14','LTV14'), array('ltv_14','LTV14'),
array('ltv_30','LTV30'), array('ltv_30','LTV30'),
); );
$start_time = $start = strtotime($start); $start_time = $start = strtotime($start);
$end_time = $end = strtotime($end) + 86400; $end_time = $end = strtotime($end) + 86400;
if (is_file(RUNTIME_PATH.'/access_data_ltv.txt')) { if (is_file(RUNTIME_PATH.'/access_data_ltv.txt')) {
$filetxt = file_get_contents(RUNTIME_PATH.'/access_data_ltv.txt'); $filetxt = file_get_contents(RUNTIME_PATH.'/access_data_ltv.txt');
@ -3869,21 +3881,21 @@ class ExportController extends Controller
$xlsName = $_REQUEST['xlsname']; $xlsName = $_REQUEST['xlsname'];
$xlsCell = array( $xlsCell = array(
// array('id','编号'), // array('id','编号'),
array('order_number','订单号'), array('order_number','订单号'),
array('title','商品信息'), array('title','商品信息'),
// array('game_name','游戏名称'), // array('game_name','游戏名称'),
// array('server_name','区服名称'), // array('server_name','区服名称'),
// array('small_account','小号账户'), // array('small_account','小号账户'),
// array('seller_account','卖家账号'), // array('seller_account','卖家账号'),
//// array('phone','卖家手机号'), //// array('phone','卖家手机号'),
array('buyer_account','交易用户'), array('buyer_account','交易用户'),
array('order_price','售价'), array('order_price','售价'),
array('poundage','手续费'), array('poundage','手续费'),
array('pay_status','状态'), array('pay_status','状态'),
array('order_time','下单时间'), array('order_time','下单时间'),
// array('pay_time','付款时间'), // array('pay_time','付款时间'),
// array('send_time','发货时间'), // array('send_time','发货时间'),
); );
if(!empty($_REQUEST['order_number'])) {$extend['order_number']=array('like','%'.$_REQUEST['order_number'].'%');} if(!empty($_REQUEST['order_number'])) {$extend['order_number']=array('like','%'.$_REQUEST['order_number'].'%');}
@ -3985,9 +3997,9 @@ class ExportController extends Controller
} }
if (is_file(RUNTIME_PATH.'/device_data_foldline.txt')) { if (is_file(RUNTIME_PATH.'/device_data_foldline.txt')) {
$filetxt = file_get_contents(RUNTIME_PATH.'/device_data_foldline.txt'); $filetxt = file_get_contents(RUNTIME_PATH.'/device_data_foldline.txt');
$xlsData = $data[$key]; $xlsData = $data[$key];
@ -4336,14 +4348,14 @@ class ExportController extends Controller
$xlsName = $_REQUEST['xlsname']; $xlsName = $_REQUEST['xlsname'];
// $xlsCell = array( // $xlsCell = array(
// array('user_account','玩家账号'), // array('user_account','玩家账号'),
// array('game_name','游戏名称'), // array('game_name','游戏名称'),
// array('server_name','游戏区服'), // array('server_name','游戏区服'),
// array('user_nickname','角色名'), // array('user_nickname','角色名'),
// array('login_time','登录时间'), // array('login_time','登录时间'),
// array('login_ip','最后登录ip'), // array('login_ip','最后登录ip'),
// ); // );
$xlsCell = array( $xlsCell = array(
'玩家账号', '玩家账号',
@ -4459,12 +4471,12 @@ class ExportController extends Controller
ob_flush(); ob_flush();
flush();//必须同时使用 ob_flush() 和flush() 函数来刷新输出缓冲。 flush();//必须同时使用 ob_flush() 和flush() 函数来刷新输出缓冲。
} }
// $xlsData = []; // $xlsData = [];
exit(); exit();
// $this->exportExcel($xlsName, $xlsCell, $xlsData); // $this->exportExcel($xlsName, $xlsCell, $xlsData);
} }
@ -5887,7 +5899,7 @@ class ExportController extends Controller
$xlsData = []; $xlsData = [];
// if(is_array($data)){ // if(is_array($data)){
if($_REQUEST['type']==2) { if($_REQUEST['type']==2) {
$data=$model $data=$model
->where($map) ->where($map)
@ -5936,9 +5948,9 @@ class ExportController extends Controller
$v['grand_account'] = $v['account']; $v['grand_account'] = $v['account'];
} }
$v['status'] = get_info_status($v['status'],3); $v['status'] = get_info_status($v['status'],3);
// $v['business_affairs'] = get_business_affairs_account($v['ba_id']); // $v['business_affairs'] = get_business_affairs_account($v['ba_id']);
// $v['grand_account'] = getTopPromote($v['id'])['id']; // $v['grand_account'] = getTopPromote($v['id'])['id'];
// $v['promote_levels'] = get_promote_levels($v['id']); // $v['promote_levels'] = get_promote_levels($v['id']);
switch ($v['ver_status']) { switch ($v['ver_status']) {
case '1': case '1':
@ -5985,7 +5997,7 @@ class ExportController extends Controller
} }
} }
// } // }
$this->exportExcel($xlsName, $xlsCell, $xlsData); $this->exportExcel($xlsName, $xlsCell, $xlsData);
@ -6233,15 +6245,15 @@ class ExportController extends Controller
$model = M('user','tab_'); $model = M('user','tab_');
// $xlsCell = array( // $xlsCell = array(
// array('account','玩家账号'), // array('account','玩家账号'),
// array('register_time','注册时间'), // array('register_time','注册时间'),
// array('login_time','最后登录时间'), // array('login_time','最后登录时间'),
// array('register_type','注册来源'), // array('register_type','注册来源'),
// array('register_ip','注册IP'), // array('register_ip','注册IP'),
// array('login_time','上次登录'), // array('login_time','上次登录'),
// array('top_promote','所属推广员'), // array('top_promote','所属推广员'),
// ); // );
$xlsCell = array( $xlsCell = array(
'玩家账号','注册时间','最后登录时间','注册来源','注册IP','上次登录','所属推广员', '玩家账号','注册时间','最后登录时间','注册来源','注册IP','上次登录','所属推广员',
); );
@ -6321,35 +6333,35 @@ class ExportController extends Controller
fclose($fp); fclose($fp);
exit(); exit();
// $data = M()->table("({$data}) as a") // $data = M()->table("({$data}) as a")
// ->field("a.account,a.register_time,a.login_time,a.register_type,a.register_ip,a.top_promote,a.promote_account") // ->field("a.account,a.register_time,a.login_time,a.register_type,a.register_ip,a.top_promote,a.promote_account")
// ->join("left join tab_promote on a.top_promote=tab_promote.id") // ->join("left join tab_promote on a.top_promote=tab_promote.id")
// ->order("a.id desc") // ->order("a.id desc")
// ->select(false); // ->select(false);
// var_dump($data);die(); // var_dump($data);die();
// $xlsData = []; // $xlsData = [];
// if(is_array($data)){ // if(is_array($data)){
// //
// foreach($data as $k => $v) { // foreach($data as $k => $v) {
// //
// $v['register_time'] = date('Y-m-d H:i:s',$v['register_time']); // $v['register_time'] = date('Y-m-d H:i:s',$v['register_time']);
// $v['login_time'] = $v['login_time']>0?date('Y-m-d H:i:s',$v['login_time']):'暂无登录'; // $v['login_time'] = $v['login_time']>0?date('Y-m-d H:i:s',$v['login_time']):'暂无登录';
// //
// $v['register_type'] = get_registertype($v['register_type']); // $v['register_type'] = get_registertype($v['register_type']);
// //
// $promote = get_parent_promoteto($v['promote_id']); // $promote = get_parent_promoteto($v['promote_id']);
// //
// $v['top_promote'] = $promote?($v['promote_account'] . get_parent_promoteto($v['promote_id'])):get_promote_name($v['promote_id']); // $v['top_promote'] = $promote?($v['promote_account'] . get_parent_promoteto($v['promote_id'])):get_promote_name($v['promote_id']);
// //
// $xlsData[] = $v; // $xlsData[] = $v;
// //
// } // }
// //
// //
// } // }
$this->exportExcel($xlsName, $xlsCell, $xlsData); $this->exportExcel($xlsName, $xlsCell, $xlsData);
@ -6656,22 +6668,22 @@ class ExportController extends Controller
$xlsName = $_REQUEST['xlsname']; $xlsName = $_REQUEST['xlsname'];
// $xlsCell = array( // $xlsCell = array(
// array('pay_order_number', "订单号"), // array('pay_order_number', "订单号"),
// array('pay_time', "充值时间"), // array('pay_time', "充值时间"),
// array('promote_account', L('Subordinate_channel')), // array('promote_account', L('Subordinate_channel')),
// array('parent_id', "上级推广员"), // array('parent_id', "上级推广员"),
// array('user_account', "玩家账号"), // array('user_account', "玩家账号"),
// array('game_name', "游戏名称"), // array('game_name', "游戏名称"),
// array('server_name', L('Game_area_clothing')), // array('server_name', L('Game_area_clothing')),
// array('game_player_name', "角色名"), // array('game_player_name', "角色名"),
// array('spend_ip', "充值ip"), // array('spend_ip', "充值ip"),
// array('pay_amount', "应付金额"), // array('pay_amount', "应付金额"),
// array('cost', "实付金额"), // array('cost', "实付金额"),
// array('pay_way', "充值方式"), // array('pay_way', "充值方式"),
// array('promote_id', '商务专员'), // array('promote_id', '商务专员'),
// array('is_check','对账状态') // array('is_check','对账状态')
// ); // );
$xlsCell = array( $xlsCell = array(
"订单号", "充值时间", L('Subordinate_channel'), "上线推广员", "玩家账号", "游戏名称", L('Game_area_clothing'), "订单号", "充值时间", L('Subordinate_channel'), "上线推广员", "玩家账号", "游戏名称", L('Game_area_clothing'),
@ -6861,22 +6873,22 @@ class ExportController extends Controller
/* 执行查询 */ /* 执行查询 */
->select(false); ->select(false);
// $xlsCell = array( // $xlsCell = array(
// array('pay_order_number', "订单号"), // array('pay_order_number', "订单号"),
// array('pay_time', "充值时间"), // array('pay_time', "充值时间"),
// array('promote_account', L('Subordinate_channel')), // array('promote_account', L('Subordinate_channel')),
// array('parent_id', "上级推广员"), // array('parent_id', "上级推广员"),
// array('user_account', "玩家账号"), // array('user_account', "玩家账号"),
// array('game_name', "游戏名称"), // array('game_name', "游戏名称"),
// array('server_name', L('Game_area_clothing')), // array('server_name', L('Game_area_clothing')),
// array('game_player_name', "角色名"), // array('game_player_name', "角色名"),
// array('spend_ip', "充值ip"), // array('spend_ip', "充值ip"),
// array('pay_amount', "应付金额"), // array('pay_amount', "应付金额"),
// array('cost', "实付金额"), // array('cost', "实付金额"),
// array('pay_way', "充值方式"), // array('pay_way', "充值方式"),
// array('promote_id', '商务专员'), // array('promote_id', '商务专员'),
// array('is_check','对账状态') // array('is_check','对账状态')
// ); // );
$xlsData = M()->table("({$xlsData}) as a") $xlsData = M()->table("({$xlsData}) as a")
->field("a.pay_order_number,a.pay_time,a.promote_account,tab_promote.account as parent_id, ->field("a.pay_order_number,a.pay_time,a.promote_account,tab_promote.account as parent_id,
@ -6890,9 +6902,9 @@ class ExportController extends Controller
if (!$value['account']) { if (!$value['account']) {
$value['account'] = "暂无"; $value['account'] = "暂无";
} }
// $xlsData[$key]['parent_id'] = get_top_promote($value['promote_id'], $value['parent_id']); // $xlsData[$key]['parent_id'] = get_top_promote($value['promote_id'], $value['parent_id']);
$xlsData[$key]['pay_way'] = get_pay_way($value['pay_way']); $xlsData[$key]['pay_way'] = get_pay_way($value['pay_way']);
// $xlsData[$key]['promote_id'] = get_promote_business_account($value['promote_id']); // $xlsData[$key]['promote_id'] = get_promote_business_account($value['promote_id']);
$xlsData[$key]['is_check'] = get_info_status($value['is_check'], 37); $xlsData[$key]['is_check'] = get_info_status($value['is_check'], 37);
$xlsData[$key]['pay_time'] = date('Y-m-d H:i:s', $value['pay_time']); $xlsData[$key]['pay_time'] = date('Y-m-d H:i:s', $value['pay_time']);
mb_convert_variables('GBK', 'UTF-8', $value); mb_convert_variables('GBK', 'UTF-8', $value);

2
Application/Admin/Controller/GameController.class.php
Unescape Escape View File

@ -302,7 +302,7 @@ class GameController extends ThinkController
if ($_POST['beta_status'] == 1 && empty($_POST['beta_url'])) { if ($_POST['beta_status'] == 1 && empty($_POST['beta_url'])) {
return $this->error("请在Beta按钮开启的情况填写Beta链接"); return $this->error("请在Beta按钮开启的情况填写Beta链接");
} }
if (!empty($_POST['beta_url']) && !preg_match("/^((https|http|ftp|rtsp|mms)?:\/\/)[^\s]+/i", $_POST['beta_url'])) { if (!empty($_POST['beta_url']) && !preg_match("/^((https|http|itms-beta)?:\/\/)[^\s]+/i", $_POST['beta_url'])) {
return $this->error("请填写正确的Beta链接"); return $this->error("请填写正确的Beta链接");
} }
/*if($_POST['apply_status']==0&&$_POST['game_status']==1){ /*if($_POST['apply_status']==0&&$_POST['game_status']==1){

155
Application/Admin/Controller/PlatformController.class.php
Unescape Escape View File

@ -58,8 +58,8 @@ class PlatformController extends ThinkController
->select(); ->select();
// dd($data); // dd($data);
$map2 = array(); $map2 = array();
$map['fgame_id'] = array('egt', 0); $map2['fgame_id'] = array('egt', 0);
$map['puid'] = 0; $map2['puid'] = 0;
setPowerPromoteIds($map2); setPowerPromoteIds($map2);
$data2 = $user->field('fgame_id,count(IF(register_time ' . $today . ',1,null)) as today, $data2 = $user->field('fgame_id,count(IF(register_time ' . $today . ',1,null)) as today,
@ -454,19 +454,67 @@ class PlatformController extends ThinkController
$data = M('promote', 'tab_')->alias('tp1') $data = M('promote', 'tab_')->alias('tp1')
->field('tp1.account as promote_account,tp1.id, ->field('tp1.account as promote_account,tp1.id,
date_format(FROM_UNIXTIME(register_time),"% ") AS time, date_format(FROM_UNIXTIME(register_time),"% ") AS time,
count(u.id) as count, count(u.id) as count')
->join("tab_promote AS tp2 ON tp2.`chain` LIKE CONCAT('%/', tp1.id, '/%') OR tp2.id = tp1.id", 'left')
->join("tab_user as u on tp2.id = u.promote_id", 'left')
->join($play_info_map ? "tab_user_play_info as upi on upi.user_id = u.id " . $play_info_map : false)
->where($map)
->group('tp1.id')
->order('count desc, register_time')
->select();
//今日/本周/本月不变
$tmap = $map;
if(isset($tmap['register_time'])){
//获取最大最小
$tweek = total(2,false);
$tmonth = total(3,false);
//获取最小
$tmin = 0;
if($tweek[1][0] < $tmonth[1][0]){
$tmin = $tweek[1][0];
}else{
$tmin = $tmonth[1][0];
}
$tmap['register_time'] = ['between', array($tmin,$tmonth[1][1])];
}
$tdata = M('promote', 'tab_')->alias('tp1')
->field('tp1.account as promote_account,tp1.id,
date_format(FROM_UNIXTIME(register_time),"% ") AS time,
count(IF(register_time ' . $today . ',1,null)) as today, count(IF(register_time ' . $today . ',1,null)) as today,
count(IF(register_time ' . $week . ',1,null)) as week, count(IF(register_time ' . $week . ',1,null)) as week,
count(IF(register_time ' . $mounth . ',1,null)) as mounth') count(IF(register_time ' . $mounth . ',1,null)) as mounth')
->join("tab_promote AS tp2 ON tp2.`chain` LIKE CONCAT('%/', tp1.id, '/%') OR tp2.id = tp1.id", 'left') ->join("tab_promote AS tp2 ON tp2.`chain` LIKE CONCAT('%/', tp1.id, '/%') OR tp2.id = tp1.id", 'left')
->join("tab_user as u on tp2.id = u.promote_id", 'left') ->join("tab_user as u on tp2.id = u.promote_id", 'left')
->join($play_info_map ? "tab_user_play_info as upi on upi.user_id = u.id " . $play_info_map : false) ->join($play_info_map ? "tab_user_play_info as upi on upi.user_id = u.id " . $play_info_map : false)
->where($map) ->where($tmap)
->group('tp1.id') ->group('tp1.id')
->order('count desc, register_time') ->order('register_time')
->select(); ->select();
$tmdata = [];
foreach($data as $k=>$v){
$v['today'] = 0;
$v['week'] = 0;
$v['mounth'] = 0;
$tmdata[$v['id']] = $v;
}
foreach ($tdata as $k => $v) {
$tmdata[$v['id']]['today'] = $v['today'];
$tmdata[$v['id']]['week'] = $v['week'];
$tmdata[$v['id']]['mounth'] = $v['mounth'];
}
$data = [];
foreach($tmdata as $k => $v){
$data[] = $v;
}
unset($map['tp1.id']); unset($map['tp1.id']);
unset($map['tp1.chain']); unset($map['tp1.chain']);
unset($tmap['tp1.chain']);
unset($tmap['tp1.chain']);
$map['promote_id'] = 0; $map['promote_id'] = 0;
$authorityData['count'] = 0; $authorityData['count'] = 0;
@ -475,13 +523,19 @@ class PlatformController extends ThinkController
if ($user_auth_promote_ids == 'all' || in_array('0', explode(",", $user_auth_promote_ids))) { if ($user_auth_promote_ids == 'all' || in_array('0', explode(",", $user_auth_promote_ids))) {
//官方渠道数据添加 //官方渠道数据添加
$authorityData = M('user', 'tab_')->alias('u') $authorityData = M('user', 'tab_')->alias('u')
->field('date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time, ->field('date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time,count(id) as count')
count(id) as count,
count(IF(register_time ' . $today . ',1,null)) as today,
count(IF(register_time ' . $week . ',1,null)) as week,
count(IF(register_time ' . $mounth . ',1,null)) as mounth')
->where($map) ->where($map)
->find(); ->find();
$tauthorityData = M('user', 'tab_')->alias('u')
->field('date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time,
count(IF(register_time ' . $today . ',1,null)) as today,
count(IF(register_time ' . $week . ',1,null)) as week,
count(IF(register_time ' . $mounth . ',1,null)) as mounth')
->where($tmap)
->find();
$authorityData['today'] = $tauthorityData['today'];
$authorityData['week'] = $tauthorityData['week'];
$authorityData['mounth'] = $tauthorityData['mounth'];
} }
$authorityData['promote_account'] = "官方渠道"; $authorityData['promote_account'] = "官方渠道";
$authorityData['id'] = "1"; $authorityData['id'] = "1";
@ -540,20 +594,18 @@ class PlatformController extends ThinkController
$map1['promote_id'] = $map['promote_id'] = array('egt', 0); $map1['promote_id'] = $map['promote_id'] = array('egt', 0);
$spend = M('Spend', 'tab_'); $spend = M('Spend', 'tab_');
if (!empty($_REQUEST['timestart']) && !empty($_REQUEST['timeend'])) { if (!empty($_REQUEST['timestart']) && !empty($_REQUEST['timeend'])) {
$map['create_time'] = ['between', array(strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399)]; $map['pay_time'] = ['between', array(strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399)];
$pay_time = " between " . strtotime($_REQUEST['timestart']) . " and " . (strtotime($_REQUEST['timeend']) + 86399) . " ";
unset($_REQUEST['timestart']); unset($_REQUEST['timestart']);
unset($_REQUEST['timeend']); unset($_REQUEST['timeend']);
} elseif (!empty($_REQUEST['timestart']) && empty($_REQUEST['timeend'])) { } elseif (!empty($_REQUEST['timestart']) && empty($_REQUEST['timeend'])) {
$map['create_time'] = ['between', array(strtotime($_REQUEST['timestart']), time())]; $map['pay_time'] = ['between', array(strtotime($_REQUEST['timestart']), time())];
$pay_time = " between " . strtotime($_REQUEST['timestart']) . " and " . time() . " ";
unset($_REQUEST['timestart']); unset($_REQUEST['timestart']);
} elseif (empty($_REQUEST['timestart']) && !empty($_REQUEST['timeend'])) { } elseif (empty($_REQUEST['timestart']) && !empty($_REQUEST['timeend'])) {
$map['create_time'] = ['elt', strtotime($_REQUEST['timeend']) + 86399]; $map['pay_time'] = ['elt', strtotime($_REQUEST['timeend']) + 86399];
$pay_time = " between 0 and " . (strtotime($_REQUEST['timeend']) + 86399) . " ";
unset($_REQUEST['timeend']); unset($_REQUEST['timeend']);
} else { } else {
$pay_time = " between 0 and " . time(); $map['pay_time'] = ['between', array(0, time())];
// $pay_time = " between 0 and " . time();
} }
$map1['pay_status'] = $map['pay_status'] = 1; $map1['pay_status'] = $map['pay_status'] = 1;
$today = total(1); $today = total(1);
@ -570,10 +622,21 @@ class PlatformController extends ThinkController
setPowerPromoteIds($map); setPowerPromoteIds($map);
$promote_map2 = array(); $promote_map2 = array();
setPowerPromoteIds($promote_map2, 'id'); setPowerPromoteIds($promote_map2, 'id');
$promote = M("promote","tab_")->field("id,account")->where($promote_map)->where($promote_map2)->select(); $promote = M("promote","tab_")->field("id,account")->page($page,$row)->where($promote_map)->where($promote_map2)->select();
$pcount = M("promote","tab_")->field("count(*) acount")->where($promote_map)->where($promote_map2)->find()['acount']; $pcount = M("promote","tab_")->field("count(*) acount")->where($promote_map)->where($promote_map2)->find()['acount'];
// var_dump( $promote); // var_dump( $promote);
$tweek = total(2,false);
$tmonth = total(3,false);
//获取最小
$tmin = 0;
if($tweek[1][0] < $tmonth[1][0]){
$tmin = $tweek[1][0];
}else{
$tmin = $tmonth[1][0];
}
$data =array(); $data =array();
for ($i=0; $i < count($promote); $i++) { for ($i=0; $i < count($promote); $i++) {
# code... # code...
@ -591,30 +654,29 @@ class PlatformController extends ThinkController
$map['server_name'] = $_REQUEST['server_id']; $map['server_name'] = $_REQUEST['server_id'];
unset($_REQUEST['server_id']); unset($_REQUEST['server_id']);
} }
$dbdata = $spend }
->field(' $dbdata = $spend
floor(sum(IF(pay_time ' . $pay_time . ',pay_amount,0))*100) as count, ->field('floor(sum(IF(pay_time ' . $pay_time . ',pay_amount,0))*100) as count')
floor(sum(IF(pay_time ' . $today . ',pay_amount,0))*100) as today, ->where($map)
floor(sum(IF(pay_time ' . $week . ',pay_amount,0))*100) as week, ->find();
floor(sum(IF(pay_time ' . $mounth . ',pay_amount,0))*100) as mounth') $tmap = $map;
->where($map) if(isset($map['pay_time'])){
->where("pay_time".$pay_time) $tmap['pay_time'] = ['between', array($tmin,$tmonth[1][1])];
->find();
$dbdata['promote_account'] = $promote[$i]['account'];
$dbdata['promote_id'] = $promote[$i]['id'];
} else {
$dbdata = $spend
->field('
floor(sum(IF(pay_time ' . $pay_time . ',pay_amount,0))*100) as count,
floor(sum(IF(pay_time ' . $today . ',pay_amount,0))*100) as today,
floor(sum(IF(pay_time ' . $week . ',pay_amount,0))*100) as week,
floor(sum(IF(pay_time ' . $mounth . ',pay_amount,0))*100) as mounth')
->where($map)
->where("pay_time".$pay_time)
->find();
$dbdata['promote_account'] = $promote[$i]['account'];
$dbdata['promote_id'] = $promote[$i]['id'];
} }
$tdbdata = $spend
->field('
floor(sum(IF(pay_time ' . $today . ',pay_amount,0))*100) as today,
floor(sum(IF(pay_time ' . $week . ',pay_amount,0))*100) as week,
floor(sum(IF(pay_time ' . $mounth . ',pay_amount,0))*100) as mounth')
->where($tmap)
->find();
$dbdata['today']= $tdbdata['today'];
$dbdata['week']= $tdbdata['week'];
$dbdata['mounth']= $tdbdata['mounth'];
$dbdata['promote_account'] = $promote[$i]['account'];
$dbdata['promote_id'] = $promote[$i]['id'];
$data[] = $dbdata; $data[] = $dbdata;
} }
$count = count($data); $count = count($data);
@ -641,11 +703,10 @@ class PlatformController extends ThinkController
$this->assign('userarpu_order_type', $data_order_type); $this->assign('userarpu_order_type', $data_order_type);
} }
$page = set_pagination($count, $row); $page = set_pagination($pcount, $row);
if ($page) { if ($page) {
$this->assign('_page', $page); $this->assign('_page', $page);
} }
$data = array_slice($data, ($arraypage - 1) * $row, $row);
$data = my_sort($data, $data_order_type, (int)$data_order); $data = my_sort($data, $data_order_type, (int)$data_order);
@ -759,10 +820,10 @@ class PlatformController extends ThinkController
$data[$key]['today']=$adata['today']==''?0:$adata['today']; $data[$key]['today']=$adata['today']==''?0:$adata['today'];
$data[$key]['week']=$adata['week']==''?0:$adata['week']; $data[$key]['week']=$adata['week']==''?0:$adata['week'];
$data[$key]['mounth']=$adata['mounth']==''?0:$adata['mounth']; */ $data[$key]['mounth']=$adata['mounth']==''?0:$adata['mounth']; */
// if ($data[$key]['promote_id'] == '0') { // if ($data[$key]['promote_id'] == '0') {
// unset($data[$key]); // unset($data[$key]);
// } // }
} }
$total = $this->data_total($data); $total = $this->data_total($data);
$this->assign('total', $total); $this->assign('total', $total);
if ($_REQUEST['data_order'] != '') { if ($_REQUEST['data_order'] != '') {

14
Application/Admin/Controller/SuperStatisticalController.class.php
Unescape Escape View File

@ -8,6 +8,12 @@ class SuperStatisticalController extends ThinkController
private $ticketList_url = 'https://app.ipa365.com/Kirin/OpenApi/TicketList'; private $ticketList_url = 'https://app.ipa365.com/Kirin/OpenApi/TicketList';
private $pay_way = [
0 => '未知',
1 => '支付宝',
2 => '微信',
];
public function index() { public function index() {
$params = I('get.'); $params = I('get.');
$startDate = empty($params['timestart']) ? '': $params['timestart']; $startDate = empty($params['timestart']) ? '': $params['timestart'];
@ -126,6 +132,9 @@ class SuperStatisticalController extends ThinkController
if (isset($params['order_id'])) { if (isset($params['order_id'])) {
$map['tab_game_supersign.order_id'] = $params['order_id']; $map['tab_game_supersign.order_id'] = $params['order_id'];
} }
if (isset($params['pay_way'])) {
$map['tab_game_supersign.pay_way'] = $params['pay_way'];
}
if (isset($params['account'])) { if (isset($params['account'])) {
$map['tab_user.account'] = $params['account']; $map['tab_user.account'] = $params['account'];
} }
@ -148,9 +157,12 @@ class SuperStatisticalController extends ThinkController
if(isset($params['game_id'])) { if(isset($params['game_id'])) {
$map['tab_game_supersign.game_id'] = $params['game_id']; $map['tab_game_supersign.game_id'] = $params['game_id'];
} }
$data = M('game_supersign', 'tab_')->field('tab_game_supersign.id,tab_game_supersign.order_id,tab_user.account,tab_user.promote_account,tab_user.device_number,tab_game.game_name,tab_game_supersign.pay_time,tab_game_supersign.pay_price')->join('tab_user on tab_game_supersign.user_id = tab_user.id')->join('tab_game on tab_game_supersign.game_id = tab_game.id')->where($map)->page($page,$row)->order('id DESC')->select(); $data = M('game_supersign', 'tab_')->field('tab_game_supersign.id,tab_game_supersign.pay_way,tab_game_supersign.order_id,tab_user.account,tab_user.promote_account,tab_user.device_number,tab_game.game_name,tab_game_supersign.pay_time,tab_game_supersign.pay_price')->join('tab_user on tab_game_supersign.user_id = tab_user.id')->join('tab_game on tab_game_supersign.game_id = tab_game.id')->where($map)->page($page,$row)->order('id DESC')->select();
$count = M('game_supersign', 'tab_')->field('tab_game_supersign.order_id,tab_user.account,tab_user.promote_account,tab_user.device_number,tab_game.game_name,tab_game_supersign.pay_time')->join('tab_user on tab_game_supersign.user_id = tab_user.id')->join('tab_game on tab_game_supersign.game_id = tab_game.id')->where($map)->count(); $count = M('game_supersign', 'tab_')->field('tab_game_supersign.order_id,tab_user.account,tab_user.promote_account,tab_user.device_number,tab_game.game_name,tab_game_supersign.pay_time')->join('tab_user on tab_game_supersign.user_id = tab_user.id')->join('tab_game on tab_game_supersign.game_id = tab_game.id')->where($map)->count();
foreach($data as $k => $v) {
$data[$k]['pay_way'] = $this->pay_way[$v['pay_way']];
}
$pay_price = M('game_supersign', 'tab_')->field('sum(pay_price) as pay_price')->where($map)->select(); $pay_price = M('game_supersign', 'tab_')->field('sum(pay_price) as pay_price')->where($map)->select();
$super_money_all = $pay_price[0]['pay_price'] == '' ? 0 : $pay_price[0]['pay_price']; $super_money_all = $pay_price[0]['pay_price'] == '' ? 0 : $pay_price[0]['pay_price'];
$page = set_pagination($count, $row); $page = set_pagination($count, $row);

2332
Application/Admin/View/Game/edit.html
View File

File diff suppressed because it is too large Load Diff

4
Application/Admin/View/SuperStatistical/index.html
Unescape Escape View File

@ -35,10 +35,12 @@
<div class="cf top_nav_list"> <div class="cf top_nav_list">
<!-- 高级搜索 --> <!-- 高级搜索 -->
<div class="jssearch fl cf search_list"> <div class="jssearch fl cf search_list">
<div class="input-list">
<a class="sch-btn" href="{:U('PayChannel/index')}" style="background:#fff;color: #000;border: #000 solid 1px;width: 100px">返回</a>
</div>
<div class="input-list search-title-box"> <div class="input-list search-title-box">
<label>搜索：</label> <label>搜索：</label>
</div> </div>
<div class="input-list"> <div class="input-list">
<input type="text" readonly id="time-start" name="timestart" class="" value="{$startDate}" <input type="text" readonly id="time-start" name="timestart" class="" value="{$startDate}"
placeholder="开始时间"/> placeholder="开始时间"/>

75
Application/Admin/View/SuperStatistical/superDetail.html
Unescape Escape View File

@ -96,6 +96,14 @@
</volist> </volist>
</select> </select>
</div> </div>
<div class="input-list search_item input-list-gamenoticestatus">
<select id='pay_way' name="pay_way" style="color:#444" class="select_gallery" >
<option value="">支付方式</option>
<volist name=":all_pay_way(1)" id="vo">
<option value="{$vo.key}" <?php echo isset($_GET['pay_way']) && $_GET['pay_way'] == $vo['key'] ?'selected':''; ?> >{$vo.value}</option>
</volist>
</select>
</div>
<input type="hidden" name="" value="" class="sortBy"> <input type="hidden" name="" value="" class="sortBy">
<div class="input-list search_item"> <div class="input-list search_item">
@ -116,6 +124,7 @@
<th>设备号</th> <th>设备号</th>
<th>游戏</th> <th>游戏</th>
<th>购买时间</th> <th>购买时间</th>
<th>支付方式</th>
<th>超级签金额</th> <th>超级签金额</th>
</tr> </tr>
</thead> </thead>
@ -129,6 +138,7 @@
<td>{$vo.device_number}</td> <td>{$vo.device_number}</td>
<td>{$vo.game_name}</td> <td>{$vo.game_name}</td>
<td>{$vo.pay_time|date='Y-m-d H:i:s',###}</td> <td>{$vo.pay_time|date='Y-m-d H:i:s',###}</td>
<td>{$vo.pay_way}</td>
<td>{$vo.pay_price}</td> <td>{$vo.pay_price}</td>
</tr> </tr>
</volist> </volist>
@ -139,6 +149,7 @@
<td>--</td> <td>--</td>
<td>--</td> <td>--</td>
<td>--</td> <td>--</td>
<td>--</td>
<td>{$super_money_all}</td> <td>{$super_money_all}</td>
</tr> </tr>
</tbody> </tbody>
@ -146,7 +157,7 @@
</div> </div>
</div> </div>
<div class="page"> <div class="page">
<a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>23,'xlsname'=>'超级签购买明细'),I('get.')))}">导出</a> <a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>23,'xlsname'=>'超级签购买明细'),I('get.')))}">导出</a>
{$_page|default=''} {$_page|default=''}
</div> </div>
</div> </div>
@ -163,10 +174,10 @@
<script src="__STATIC__/layer/layer.js" type="text/javascript"></script> <script src="__STATIC__/layer/layer.js" type="text/javascript"></script>
<script type="text/javascript"> <script type="text/javascript">
$(function(){ $(function(){
$(".select_gallery").select2(); $(".select_gallery").select2();
$("#search").click(function(){ $("#search").click(function(){
var url = $(this).attr('url'); var url = $(this).attr('url');
var query = $('.jssearch').find('input').serialize(); var query = $('.jssearch').find('input').serialize();
query += "&" + $('.jssearch').find('select').serialize(); query += "&" + $('.jssearch').find('select').serialize();
query = query.replace(/(&|^)(\w*?\d*?\-*?_*?)*?=?((?=&)|(?=$))/g,''); query = query.replace(/(&|^)(\w*?\d*?\-*?_*?)*?=?((?=&)|(?=$))/g,'');
@ -184,8 +195,8 @@
return false; return false;
} }
} }
window.location.href = url; window.location.href = url;
}); });
$('#time-start').datetimepicker({ $('#time-start').datetimepicker({
format: 'yyyy-mm-dd', format: 'yyyy-mm-dd',
language: "zh-CN", language: "zh-CN",
@ -219,30 +230,30 @@
} }
return false; return false;
}); });
var promote_id = "{:I('promote_id')}"; var promote_id = "{:I('promote_id')}";
$("#promote_level").change(function(){ $("#promote_level").change(function(){
$.ajax({ $.ajax({
url:"{:U('Ajax/getPromotersByLevel')}", url:"{:U('Ajax/getPromotersByLevel')}",
type:"get", type:"get",
data:{level:$("#promote_level option:selected").val()}, data:{level:$("#promote_level option:selected").val()},
dataType:'json', dataType:'json',
success:function(response){ success:function(response){
str = '<option value="">请选择推广员</option><option value="0"'+(promote_id && 0 == promote_id?'selected':'')+'>官方渠道</option><option value="UC"'+(promote_id && 'UC' == promote_id?'selected':'')+'>UC渠道</option>'; str = '<option value="">请选择推广员</option><option value="0"'+(promote_id && 0 == promote_id?'selected':'')+'>官方渠道</option><option value="UC"'+(promote_id && 'UC' == promote_id?'selected':'')+'>UC渠道</option>';
// $.each(response.data, function(index, item){ // $.each(response.data, function(index, item){
// console.log(item.id); // console.log(item.id);
// str += '<option value="'+item.id+' '+(promote_id && item.id == promote_id?'selected':'')+'">'+item.nickname+'</option>'; // str += '<option value="'+item.id+' '+(promote_id && item.id == promote_id?'selected':'')+'">'+item.nickname+'</option>';
// }); // });
data = response.data; data = response.data;
for (var i in data){ for (var i in data){
str += "<option value='"+data[i].id+"' "+(promote_id && data[i].id == promote_id?'selected':'')+">"+data[i].nickname+"</option>" str += "<option value='"+data[i].id+"' "+(promote_id && data[i].id == promote_id?'selected':'')+">"+data[i].nickname+"</option>"
} }
$("#promote_id").empty(); $("#promote_id").empty();
$("#promote_id").append(str); $("#promote_id").append(str);
$("#promote_id").select2(); $("#promote_id").select2();
} }
}) })
}); });
$("#promote_level").change(); $("#promote_level").change();
}) })
</script> </script>
</html> </html>

11
Application/Home/Controller/DownloadController.class.php
Unescape Escape View File

@ -3233,15 +3233,20 @@ class DownloadController extends BaseController {
// ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id') // ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id')
->join('join tab_user as u on u.id = uc.user_id') ->join('join tab_user as u on u.id = uc.user_id')
->where($map) ->where($map)
->group('uc.game_player_id,uc.server_id,uc.game_id') ->group('uc.game_player_id,uc.server_id,uc.game_id,uc.user_id')
->buildSql(); ->buildSql();
$roles = M()->alias('record') $roles = M()->alias('record')
->table($subQuery) ->table($subQuery)
->select(); ->select();
$total = M('spend','tab_')->alias('uc') $total = M('spend', 'tab_')->alias('uc')
->field("$fieldS,$fieldToday as recharge_cost_today") ->field($fieldS)
->where($map) ->where($map)
->find(); ->find();
$map['uc.pay_time'] = $spendMap['today.pay_time'];
$total['recharge_cost_today'] = M('spend', 'tab_')->alias('uc')
->field('sum(uc.pay_amount) as recharge_cost_today')
->where($map)
->find()['recharge_cost_today'];
$total['recharge_cost_today'] = empty($total['recharge_cost_today']) ? '0.00' :$total['recharge_cost_today']; $total['recharge_cost_today'] = empty($total['recharge_cost_today']) ? '0.00' :$total['recharge_cost_today'];
$csvFileName = $xlsName.'.csv'; $csvFileName = $xlsName.'.csv';
//设置好告诉浏览器要下载excel文件的headers //设置好告诉浏览器要下载excel文件的headers

9
Application/Home/Controller/QueryController.class.php
Unescape Escape View File

@ -1863,7 +1863,7 @@ class QueryController extends BaseController
->field($field) ->field($field)
->join('join tab_user as u on u.id = s.user_id') ->join('join tab_user as u on u.id = s.user_id')
->where($map) ->where($map)
->group('s.game_player_id, s.server_id, s.game_id') ->group('s.game_player_id, s.server_id, s.game_id, s.user_id')
->having($having) ->having($having)
->buildSql(); ->buildSql();
$query = M()->alias('record') $query = M()->alias('record')
@ -1873,9 +1873,14 @@ class QueryController extends BaseController
list($records, $pagination, $count) = $this->paginate($query); list($records, $pagination, $count) = $this->paginate($query);
$total = M('spend', 'tab_')->alias('s') $total = M('spend', 'tab_')->alias('s')
->field("$fieldS, $fieldToday as recharge_cost_today") ->field($fieldS)
->where($map) ->where($map)
->find(); ->find();
$map['s.pay_time'] = $spendMap['today.pay_time'];
$total['recharge_cost_today'] = M('spend', 'tab_')->alias('s')
->field('sum(s.pay_amount) as recharge_cost_today')
->where($map)
->find()['recharge_cost_today'];
$total['recharge_cost_today'] = empty($total['recharge_cost_today']) ? '0.00' : $total['recharge_cost_today']; $total['recharge_cost_today'] = empty($total['recharge_cost_today']) ? '0.00' : $total['recharge_cost_today'];
if (!empty($records)) { if (!empty($records)) {

21
Application/Home/View/default/Home/landingPage.html
Unescape Escape View File

@ -467,7 +467,7 @@
<div class="register-forget"> <div class="register-forget">
<div> <div>
<div style="color:#292929;font-size: 0.22rem;">注册即表示同意</div> <div style="color:#292929;font-size: 0.22rem;">注册即表示同意</div>
<span>《用户协议》</span> <span><a href="/mobile.php?s=/News/protocol.html">《用户协议》</a></span>
</div> </div>
<div class="phoneCut"> <div class="phoneCut">
<img src="__IMG__/20191225/qiehuan.png" alt=""> <img src="__IMG__/20191225/qiehuan.png" alt="">
@ -501,7 +501,7 @@
<div class="register-forget"> <div class="register-forget">
<div> <div>
<div style="color:#292929;font-size: 0.22rem;">注册即表示同意</div> <div style="color:#292929;font-size: 0.22rem;">注册即表示同意</div>
<span>《用户协议》</span> <span><a href="/mobile.php?s=/News/protocol.html">《用户协议》</a></span>
</div> </div>
<div class="commonCut"> <div class="commonCut">
<img src="__IMG__/20191225/qiehuan.png" alt=""> <img src="__IMG__/20191225/qiehuan.png" alt="">
@ -525,7 +525,7 @@
<div class="one-contain"> <div class="one-contain">
首次安装必须<span>打开应用</span>，并点击<span>“继续”</span>按钮后，才可进行第二步操作 首次安装必须<span>打开应用</span>，并点击<span>“继续”</span>按钮后，才可进行第二步操作
</div> </div>
<a href="#" class="mounting-btn">点击安装TestFlight平台</a> <a href="https://itunes.apple.com/cn/app/testflight/id899247664?mt=8" target="_blank" class="mounting-btn">点击安装TestFlight平台</a>
<div class="title-two">第二步：点击下方按钮安装游戏</div> <div class="title-two">第二步：点击下方按钮安装游戏</div>
<a id="beta-url" href="#" class="mounting-btn">点击安装游戏</a> <a id="beta-url" href="#" class="mounting-btn">点击安装游戏</a>
</div> </div>
@ -724,8 +724,7 @@ var PhoneObj = {
success: function (result) { success: function (result) {
if (result.code == '0000') { if (result.code == '0000') {
$(".phone").hide(); $(".phone").hide();
$('.mounting').show(); showMounting()
$('#beta-url').attr('href', $('[name=betaUrl]').val())
} else { } else {
alert(result.msg) alert(result.msg)
} }
@ -733,6 +732,12 @@ var PhoneObj = {
}) })
}) })
function showMounting()
{
$('.mounting').show();
$('#beta-url').attr('href', $('[name=betaUrl]').val())
}
$("#loginBtn").on("click",function() { $("#loginBtn").on("click",function() {
var box = $('#login-box') var box = $('#login-box')
var account = box.find('[name=account]').val() var account = box.find('[name=account]').val()
@ -772,8 +777,7 @@ var PhoneObj = {
success: function (result) { success: function (result) {
if (result.code == '0000') { if (result.code == '0000') {
$('.login').hide(); $('.login').hide();
$('.mounting').show(); showMounting()
$('#beta-url').attr('href', $('[name=betaUrl]').val())
} else { } else {
alert(result.msg); alert(result.msg);
} }
@ -819,8 +823,7 @@ var PhoneObj = {
success: function (result) { success: function (result) {
if (result.code == '0000') { if (result.code == '0000') {
$(".common").hide(); $(".common").hide();
$('.mounting').show(); showMounting()
$('#beta-url').attr('href', $('[name=betaUrl]').val())
} else { } else {
alert(result.msg) alert(result.msg)
} }

Write Preview
Loading…
Cancel
Save