From b1844a0082e342391c62fee7ab7e989429526d95 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Thu, 26 Dec 2019 16:20:40 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=90=BD=E5=9C=B0?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/View/default/Home/landingPage.html | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index 5b863dbf6..71b228d51 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -520,7 +520,7 @@
第一步:下载苹果官方TestFlight - +
首次安装必须打开应用,并点击“继续”按钮后,才可进行第二步操作 @@ -724,8 +724,7 @@ var PhoneObj = { success: function (result) { if (result.code == '0000') { $(".phone").hide(); - $('.mounting').show(); - $('#beta-url').attr('href', $('[name=betaUrl]').val()) + showMounting() } else { alert(result.msg) } @@ -733,6 +732,12 @@ var PhoneObj = { }) }) + function showMounting() + { + $('.mounting').show(); + $('#beta-url').attr('href', $('[name=betaUrl]').val()) + } + $("#loginBtn").on("click",function() { var box = $('#login-box') var account = box.find('[name=account]').val() @@ -772,8 +777,7 @@ var PhoneObj = { success: function (result) { if (result.code == '0000') { $('.login').hide(); - $('.mounting').show(); - $('#beta-url').attr('href', $('[name=betaUrl]').val()) + showMounting() } else { alert(result.msg); } @@ -819,8 +823,7 @@ var PhoneObj = { success: function (result) { if (result.code == '0000') { $(".common").hide(); - $('.mounting').show(); - $('#beta-url').attr('href', $('[name=betaUrl]').val()) + showMounting() } else { alert(result.msg) } From e40b92a0d7a2d493cfe37a6a9e595f695ddd46c2 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Thu, 26 Dec 2019 16:23:44 +0800 Subject: [PATCH 02/19] =?UTF-8?q?=E4=BC=98=E5=8C=96-=E3=80=90=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E3=80=91-=E3=80=90=E5=B9=B3=E5=8F=B0=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E3=80=91-=E3=80=90=E6=B8=B8=E6=88=8F=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E3=80=91=E3=80=81=E3=80=90=E6=B8=B8=E6=88=8F=E5=85=85?= =?UTF-8?q?=E5=80=BC=E7=BB=9F=E8=AE=A1=E3=80=91=E3=80=81=E3=80=90=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E6=96=B9=E5=BC=8F=E7=BB=9F=E8=AE=A1=E3=80=91=E5=92=8C?= =?UTF-8?q?=E3=80=90=E5=85=85=E5=80=BC=E6=96=B9=E5=BC=8F=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E3=80=91=E7=9A=84=E4=BB=8A=E6=97=A5=E5=85=85=E5=80=BC=E3=80=81?= =?UTF-8?q?=E6=9C=AC=E5=91=A8=E5=85=85=E5=80=BC=E3=80=81=E6=9C=AC=E6=9C=88?= =?UTF-8?q?=E5=85=85=E5=80=BC=E4=B8=8D=E6=A0=B9=E6=8D=AE=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=94=B9=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/ExportController.class.php | 167 ++++++++++++------ .../Controller/PlatformController.class.php | 100 ++++++++--- 2 files changed, 190 insertions(+), 77 deletions(-) diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 8205764a9..931b8da20 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -2438,30 +2438,43 @@ class ExportController extends Controller $map['fgame_name'] =$_REQUEST['game_name']; unset($_REQUEST['fgame_name']); } - $today=total(1); - $week=total(2); - $mounth=total(3); + $today = total(1); + $week = total(2); + $mounth = total(3); //为数据权限添加 setPowerPromoteIds($map); - $data=$user - ->field('fgame_name,fgame_id,date_format(FROM_UNIXTIME( register_time),"%Y-%m-%d") AS time, 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') + $data = $user + ->field('fgame_name,fgame_id,date_format(FROM_UNIXTIME( register_time),"%Y-%m-%d") AS time, count(id) as count') ->where($map) ->group('fgame_id') ->order('count desc,register_time') ->select(); - - $count=count($data); +// dd($data); + $map2 = array(); + $map2['fgame_id'] = array('egt', 0); + $map2['puid'] = 0; + setPowerPromoteIds($map2); + + $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 ' . $mounth . ',1,null)) as mounth') + ->where($map2) + ->group('fgame_id') + ->select(); + $data2 = array_column($data2, null, 'fgame_id'); +// dd($data2); + $count = count($data); foreach ($data as $key => $value) { - static $i=0; + static $i = 0; $i++; - $data[$key]['rand']=$i; + $data[$key]['rand'] = $i; if ($data[$key]['fgame_id'] == 0) { $data[$key]['fgame_name'] = '其他注册'; } + $data[$key]['today'] = $data2[$value['fgame_id']]['today']; + $data[$key]['week'] = $data2[$value['fgame_id']]['week']; + $data[$key]['mounth'] = $data2[$value['fgame_id']]['mounth']; } $total=A('Platform')->data_total($data); if($_REQUEST['data_order']!=''){ @@ -2517,26 +2530,39 @@ class ExportController extends Controller $map['game_id'] =$_REQUEST['game_name']; unset($_REQUEST['game_name']); } - $map['pay_status']=1; - $today=total(1); - $week=total(2); - $mounth=total(3); - //为数据权限添加 - setPowerPromoteIds($map); - $data=$spend - ->field('game_name,game_id,date_format(FROM_UNIXTIME(pay_time),"%Y-%m-%d") AS time, sum(pay_amount) as count, - sum(IF(pay_time '.$today.',pay_amount,0)) as today, - sum(IF(pay_time '.$week.',pay_amount,0)) as week, - sum(IF(pay_time '.$mounth.',pay_amount,0)) as mounth') + $map['pay_status'] = 1; + $today = total(1); + $week = total(2); + $mounth = total(3); + + + $data = $spend + ->field('game_name,game_id,date_format(FROM_UNIXTIME(pay_time),"%Y-%m-%d") AS time, sum(pay_amount) as count') ->where($map) ->where($map) ->group('game_id') - ->order('count desc') + ->order('count desc,pay_time') ->select(); - $count=count($data); + //今日、本周、本月不随搜索条件而变动 + $map2['pay_status'] = 1; + $map2['game_id'] = array('gt', 0); + setPowerPromoteIds($map2); + $data2 = $spend + ->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 ' . $mounth . ',pay_amount,0)) as mounth') + ->where($map2) + ->group('game_id') + ->select(); + $data2 = array_column($data2, null, 'game_id'); + $count = count($data); foreach ($data as $key => $value) { - static $i=0; + static $i = 0; $i++; - $data[$key]['rand']=$i; + $data[$key]['rand'] = $i; + //加入今日、本周、本月数据 + $data[$key]['today'] = $data2[$value['game_id']]['today']; + $data[$key]['week'] = $data2[$value['game_id']]['week']; + $data[$key]['mounth'] = $data2[$value['game_id']]['mounth']; } $total=A('Platform')->data_total($data); $this->assign('total',$total); @@ -2583,7 +2609,8 @@ class ExportController extends Controller $page = $page ? $page : 1; //默认显示第一页数据 $arraypage=$page; $row = 10; - $user=M('User','tab_');$map['puid'] = 0; + $user=M('User','tab_'); + $map['puid'] = 0; if(isset($_REQUEST['timestart'])&&isset($_REQUEST['timeend'])){ $map['register_time'] =array('BETWEEN',array(strtotime($_REQUEST['timestart']),strtotime($_REQUEST['timeend'])+24*60*60-1)); unset($_REQUEST['timestart']);unset($_REQUEST['timeend']); @@ -2596,26 +2623,41 @@ class ExportController extends Controller $map['register_way'] =$_REQUEST['register_way']; unset($_REQUEST['register_way']); } - $today=total(1); - $week=total(2); - $mounth=total(3); - //为数据权限添加 + setPowerPromoteIds($map); - $data=$user - ->field('register_way,date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time, 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') + + $today = total(1); + $week = total(2); + $mounth = total(3); + $data = $user + ->field('register_way,date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time, count(id) as count') ->where($map) ->group('register_way') - ->order('count desc') + ->order('count desc,register_time') + ->select(); + + $map2 = array(); + $map2['puid'] = 0; + setPowerPromoteIds($map2); + $data2 = $user + ->field('register_way, + 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($map2) + ->group('register_way') ->select(); - $count=count($data); + $data2 = array_column($data2, null, 'register_way'); + $count = count($data); foreach ($data as $key => $value) { - static $i=0; + static $i = 0; $i++; - $data[$key]['rand']=$i; + $data[$key]['rand'] = $i; + $data[$key]['today'] = $data2[$value['register_way']]['today']; + $data[$key]['week'] = $data2[$value['register_way']]['week']; + $data[$key]['mounth'] = $data2[$value['register_way']]['mounth']; } + $total=A('Platform')->data_total($data); if($_REQUEST['data_order']!=''){ $data_order=reset(explode(',',$_REQUEST['data_order'])); @@ -2669,27 +2711,42 @@ class ExportController extends Controller $map['pay_way'] = array('in',$_REQUEST['pay_way']) ; unset($_REQUEST['pay_way']); } - $map['pay_status']=1; - $today=total(1); - $week=total(2); - $mounth=total(3); - //为数据权限添加 setPowerPromoteIds($map); - $data=$spend - ->field('pay_way,date_format(FROM_UNIXTIME(pay_time),"%Y-%m-%d") AS time, sum(pay_amount) as count, - sum(IF(pay_time '.$today.',pay_amount,0)) as today, - sum(IF(pay_time '.$week.',pay_amount,0)) as week, - sum(IF(pay_time '.$mounth.',pay_amount,0)) as mounth') + + $map['pay_status'] = 1; + $today = total(1); + $week = total(2); + $mounth = total(3); + $data = $spend + ->field('pay_way,date_format(FROM_UNIXTIME(pay_time),"%Y-%m-%d") AS time, sum(pay_amount) as count') ->where($map) ->group('pay_way') - ->order('count desc') + ->order('count desc,pay_time') ->select(); - $count=count($data); + + $map2 = array(); + $map2['pay_status'] = 1; + setPowerPromoteIds($map2); + $data2 = $spend + ->field('pay_way, + sum(IF(pay_time ' . $today . ',pay_amount,0)) as today, + sum(IF(pay_time ' . $week . ',pay_amount,0)) as week, + sum(IF(pay_time ' . $mounth . ',pay_amount,0)) as mounth') + ->where($map2) + ->group('pay_way') + ->select(); + $data2 = array_column($data2, null, 'pay_way'); + + $count = count($data); foreach ($data as $key => $value) { - static $i=0; + static $i = 0; $i++; - $data[$key]['rand']=$i; + $data[$key]['rand'] = $i; + $data[$key]['today'] = $data2[$value['pay_way']]['today']; + $data[$key]['week'] = $data2[$value['pay_way']]['week']; + $data[$key]['mounth'] = $data2[$value['pay_way']]['mounth']; } + $total = A('Platform')->data_total($data); $this->assign('total',$total); if($_REQUEST['data_order']!=''){ diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php index 64efba111..cdbf674c5 100644 --- a/Application/Admin/Controller/PlatformController.class.php +++ b/Application/Admin/Controller/PlatformController.class.php @@ -44,21 +44,32 @@ class PlatformController extends ThinkController $map['fgame_name'] = $_REQUEST['game_name']; unset($_REQUEST['fgame_name']); } - //为数据权限添加 - setPowerPromoteIds($map); $today = total(1); $week = total(2); $mounth = total(3); + //为数据权限添加 + setPowerPromoteIds($map); $data = $user - ->field('fgame_name,fgame_id,date_format(FROM_UNIXTIME( register_time),"%Y-%m-%d") AS time, 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') + ->field('fgame_name,fgame_id,date_format(FROM_UNIXTIME( register_time),"%Y-%m-%d") AS time, count(id) as count') ->where($map) ->group('fgame_id') ->order('count desc,register_time') ->select(); +// dd($data); + $map2 = array(); + $map2['fgame_id'] = array('egt', 0); + $map2['puid'] = 0; + setPowerPromoteIds($map2); + + $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 ' . $mounth . ',1,null)) as mounth') + ->where($map2) + ->group('fgame_id') + ->select(); + $data2 = array_column($data2, null, 'fgame_id'); +// dd($data2); $count = count($data); foreach ($data as $key => $value) { static $i = 0; @@ -68,6 +79,9 @@ class PlatformController extends ThinkController if ($data[$key]['fgame_id'] == 0) { $data[$key]['fgame_name'] = '其他注册'; } + $data[$key]['today'] = $data2[$value['fgame_id']]['today']; + $data[$key]['week'] = $data2[$value['fgame_id']]['week']; + $data[$key]['mounth'] = $data2[$value['fgame_id']]['mounth']; } $total = $this->data_total($data); @@ -110,8 +124,6 @@ class PlatformController extends ThinkController $spend = M('Spend', 'tab_'); $deposit = M('Deposit', "tab_"); - $map['game_id'] = array('gt', 0); - if (!empty($_REQUEST['timestart']) && !empty($_REQUEST['timeend'])) { $map['pay_time'] = ['between', array(strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399)]; unset($_REQUEST['timestart']); @@ -132,24 +144,40 @@ class PlatformController extends ThinkController $map['game_id'] = $_REQUEST['game_name']; unset($_REQUEST['game_name']); } + $map['game_id'] = array('gt', 0); $map['pay_status'] = 1; $today = total(1); $week = total(2); $mounth = total(3); + $data = $spend - ->field('game_name,game_id,date_format(FROM_UNIXTIME(pay_time),"%Y-%m-%d") AS time, sum(pay_amount) as count, - sum(IF(pay_time ' . $today . ',pay_amount,0)) as today, - sum(IF(pay_time ' . $week . ',pay_amount,0)) as week, - sum(IF(pay_time ' . $mounth . ',pay_amount,0)) as mounth') + ->field('game_name,game_id,date_format(FROM_UNIXTIME(pay_time),"%Y-%m-%d") AS time, sum(pay_amount) as count') ->where($map) ->where($map) ->group('game_id') ->order('count desc,pay_time') ->select(); + + //今日、本周、本月不随搜索条件而变动 + $map2['pay_status'] = 1; + $map2['game_id'] = array('gt', 0); + setPowerPromoteIds($map2); + $data2 = $spend + ->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 ' . $mounth . ',pay_amount,0)) as mounth') + ->where($map2) + ->group('game_id') + ->select(); + $data2 = array_column($data2, null, 'game_id'); $count = count($data); foreach ($data as $key => $value) { static $i = 0; $i++; $data[$key]['rand'] = $i; + //加入今日、本周、本月数据 + $data[$key]['today'] = $data2[$value['game_id']]['today']; + $data[$key]['week'] = $data2[$value['game_id']]['week']; + $data[$key]['mounth'] = $data2[$value['game_id']]['mounth']; } $total = $this->data_total($data); $this->assign('total', $total); @@ -219,20 +247,34 @@ class PlatformController extends ThinkController $week = total(2); $mounth = total(3); $data = $user - ->field('register_way,date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time, 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') + ->field('register_way,date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time, count(id) as count') ->where($map) ->group('register_way') ->order('count desc,register_time') ->select(); + + $map2 = array(); + $map2['puid'] = 0; + setPowerPromoteIds($map2); + $data2 = $user + ->field('register_way, + 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($map2) + ->group('register_way') + ->select(); + $data2 = array_column($data2, null, 'register_way'); $count = count($data); foreach ($data as $key => $value) { static $i = 0; $i++; $data[$key]['rand'] = $i; + $data[$key]['today'] = $data2[$value['register_way']]['today']; + $data[$key]['week'] = $data2[$value['register_way']]['week']; + $data[$key]['mounth'] = $data2[$value['register_way']]['mounth']; } + $total = $this->data_total($data); if ($_REQUEST['data_order'] != '') { $data_order = reset(explode(',', $_REQUEST['data_order'])); @@ -302,20 +344,35 @@ class PlatformController extends ThinkController $week = total(2); $mounth = total(3); $data = $spend - ->field('pay_way,date_format(FROM_UNIXTIME(pay_time),"%Y-%m-%d") AS time, sum(pay_amount) as count, + ->field('pay_way,date_format(FROM_UNIXTIME(pay_time),"%Y-%m-%d") AS time, sum(pay_amount) as count') + ->where($map) + ->group('pay_way') + ->order('count desc,pay_time') + ->select(); + + $map2 = array(); + $map2['pay_status'] = 1; + setPowerPromoteIds($map2); + $data2 = $spend + ->field('pay_way, sum(IF(pay_time ' . $today . ',pay_amount,0)) as today, sum(IF(pay_time ' . $week . ',pay_amount,0)) as week, sum(IF(pay_time ' . $mounth . ',pay_amount,0)) as mounth') - ->where($map) + ->where($map2) ->group('pay_way') - ->order('count desc,pay_time') ->select(); + $data2 = array_column($data2, null, 'pay_way'); + $count = count($data); foreach ($data as $key => $value) { static $i = 0; $i++; $data[$key]['rand'] = $i; + $data[$key]['today'] = $data2[$value['pay_way']]['today']; + $data[$key]['week'] = $data2[$value['pay_way']]['week']; + $data[$key]['mounth'] = $data2[$value['pay_way']]['mounth']; } + $total = $this->data_total($data); $this->assign('total', $total); if ($_REQUEST['data_order'] != '') { @@ -513,7 +570,7 @@ class PlatformController extends ThinkController setPowerPromoteIds($map); $promote_map2 = array(); 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']; // var_dump( $promote); @@ -584,11 +641,10 @@ class PlatformController extends ThinkController $this->assign('userarpu_order_type', $data_order_type); } - $page = set_pagination($count, $row); + $page = set_pagination($pcount, $row); if ($page) { $this->assign('_page', $page); } - $data = array_slice($data, ($arraypage - 1) * $row, $row); $data = my_sort($data, $data_order_type, (int)$data_order); From 65ed103d3ac8cfd297de24d5a5645d2b6affaa63 Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Thu, 26 Dec 2019 16:49:01 +0800 Subject: [PATCH 03/19] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbeta=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/GameController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/GameController.class.php b/Application/Admin/Controller/GameController.class.php index b71f7a1dd..58e9496b7 100644 --- a/Application/Admin/Controller/GameController.class.php +++ b/Application/Admin/Controller/GameController.class.php @@ -301,7 +301,7 @@ class GameController extends ThinkController if ($_POST['beta_status'] == 1 && empty($_POST['beta_url'])) { 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链接"); } /*if($_POST['apply_status']==0&&$_POST['game_status']==1){ From 153c397cf67d7ebc5aa7c99676b1ba94b09b5173 Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Thu, 26 Dec 2019 17:19:39 +0800 Subject: [PATCH 04/19] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AD=BE=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/ExportController.class.php | 12 ++++++++++-- .../Controller/SuperStatisticalController.class.php | 11 ++++++++++- .../Admin/View/SuperStatistical/superDetail.html | 3 +++ 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index c6d331b20..105483f44 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -2078,11 +2078,19 @@ class ExportController extends Controller array('device_number', '设备号'), array('game_name', '游戏'), 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) { $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; case 24: diff --git a/Application/Admin/Controller/SuperStatisticalController.class.php b/Application/Admin/Controller/SuperStatisticalController.class.php index 7e1484ed8..19a44ca51 100644 --- a/Application/Admin/Controller/SuperStatisticalController.class.php +++ b/Application/Admin/Controller/SuperStatisticalController.class.php @@ -8,6 +8,12 @@ class SuperStatisticalController extends ThinkController private $ticketList_url = 'https://app.ipa365.com/Kirin/OpenApi/TicketList'; + private $pay_way = [ + 0 => '未知', + 1 => '支付宝', + 2 => '微信', + ]; + public function index() { $params = I('get.'); $startDate = empty($params['timestart']) ? '': $params['timestart']; @@ -148,9 +154,12 @@ class SuperStatisticalController extends ThinkController if(isset($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(); + 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(); $super_money_all = $pay_price[0]['pay_price'] == '' ? 0 : $pay_price[0]['pay_price']; $page = set_pagination($count, $row); diff --git a/Application/Admin/View/SuperStatistical/superDetail.html b/Application/Admin/View/SuperStatistical/superDetail.html index cd1885c21..f3c9a31f1 100644 --- a/Application/Admin/View/SuperStatistical/superDetail.html +++ b/Application/Admin/View/SuperStatistical/superDetail.html @@ -116,6 +116,7 @@ 设备号 游戏 购买时间 + 支付方式 超级签金额 @@ -129,6 +130,7 @@ {$vo.device_number} {$vo.game_name} {$vo.pay_time|date='Y-m-d H:i:s',###} + {$vo.pay_way} {$vo.pay_price} @@ -139,6 +141,7 @@ -- -- -- + -- {$super_money_all} From 244e036a21d5097055b4e0404fe47a956dfbb824 Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Thu, 26 Dec 2019 17:20:40 +0800 Subject: [PATCH 05/19] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AD=BE=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/ExportController.class.php | 252 +- Application/Admin/View/Game/edit.html | 2332 ++--------------- .../View/SuperStatistical/superDetail.html | 67 +- 3 files changed, 313 insertions(+), 2338 deletions(-) diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 931b8da20..5f1d4568b 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -2078,11 +2078,19 @@ class ExportController extends Controller array('device_number', '设备号'), array('game_name', '游戏'), 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) { $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; case 24: @@ -2451,13 +2459,13 @@ class ExportController extends Controller ->select(); // dd($data); $map2 = array(); - $map2['fgame_id'] = array('egt', 0); - $map2['puid'] = 0; + $map['fgame_id'] = array('egt', 0); + $map['puid'] = 0; setPowerPromoteIds($map2); $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 ' . $mounth . ',1,null)) as mounth') + count(IF(register_time ' . $week . ',1,null)) as week, + count(IF(register_time ' . $mounth . ',1,null)) as mounth') ->where($map2) ->group('fgame_id') ->select(); @@ -2548,8 +2556,8 @@ class ExportController extends Controller setPowerPromoteIds($map2); $data2 = $spend ->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 ' . $mounth . ',pay_amount,0)) as mounth') + sum(IF(pay_time ' . $week . ',pay_amount,0)) as week, + sum(IF(pay_time ' . $mounth . ',pay_amount,0)) as mounth') ->where($map2) ->group('game_id') ->select(); @@ -2642,8 +2650,8 @@ class ExportController extends Controller $data2 = $user ->field('register_way, 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') + count(IF(register_time ' . $week . ',1,null)) as week, + count(IF(register_time ' . $mounth . ',1,null)) as mounth') ->where($map2) ->group('register_way') ->select(); @@ -2729,9 +2737,9 @@ class ExportController extends Controller setPowerPromoteIds($map2); $data2 = $spend ->field('pay_way, - sum(IF(pay_time ' . $today . ',pay_amount,0)) as today, - sum(IF(pay_time ' . $week . ',pay_amount,0)) as week, - sum(IF(pay_time ' . $mounth . ',pay_amount,0)) as mounth') + sum(IF(pay_time ' . $today . ',pay_amount,0)) as today, + sum(IF(pay_time ' . $week . ',pay_amount,0)) as week, + sum(IF(pay_time ' . $mounth . ',pay_amount,0)) as mounth') ->where($map2) ->group('pay_way') ->select(); @@ -2848,7 +2856,7 @@ class ExportController extends Controller } //为数据权限添加 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 ' . $week . ',1,null)) as week, count(IF(register_time ' . $mounth . ',1,null)) as mounth') @@ -2868,7 +2876,7 @@ class ExportController extends Controller //官方渠道数据添加 $authorityData = M('user', 'tab_')->alias('u') ->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') @@ -3440,9 +3448,9 @@ class ExportController extends Controller 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); @@ -3475,30 +3483,30 @@ class ExportController extends Controller $this->exportExcel($xlsName, $xlsCell, $xlsData); } - /** - * ltv统计 - * @author 鹿文学 - */ - public function ltv($p=1, $start, $end) { - - $xlsName = $_REQUEST['xlsname']; - - $xlsCell = array( - array('date','日期'), - array('total_amt','充值金额'), - array('user_count','活跃用户'), - array('ltv_1','LTV1'), - array('ltv_2','LTV2'), - array('ltv_3','LTV3'), - array('ltv_4','LTV4'), - array('ltv_5','LTV5'), - array('ltv_6','LTV6'), - array('ltv_7','LTV7'), - array('ltv_14','LTV14'), - array('ltv_30','LTV30'), - ); - - $start_time = $start = strtotime($start); + /** + * ltv统计 + * @author 鹿文学 + */ + public function ltv($p=1, $start, $end) { + + $xlsName = $_REQUEST['xlsname']; + + $xlsCell = array( + array('date','日期'), + array('total_amt','充值金额'), + array('user_count','活跃用户'), + array('ltv_1','LTV1'), + array('ltv_2','LTV2'), + array('ltv_3','LTV3'), + array('ltv_4','LTV4'), + array('ltv_5','LTV5'), + array('ltv_6','LTV6'), + array('ltv_7','LTV7'), + array('ltv_14','LTV14'), + array('ltv_30','LTV30'), + ); + + $start_time = $start = strtotime($start); $end_time = $end = strtotime($end) + 86400; if (is_file(RUNTIME_PATH.'/access_data_ltv.txt')) { $filetxt = file_get_contents(RUNTIME_PATH.'/access_data_ltv.txt'); @@ -3869,21 +3877,21 @@ class ExportController extends Controller $xlsName = $_REQUEST['xlsname']; $xlsCell = array( -// array('id','编号'), +// array('id','编号'), array('order_number','订单号'), array('title','商品信息'), -// array('game_name','游戏名称'), -// array('server_name','区服名称'), -// array('small_account','小号账户'), -// array('seller_account','卖家账号'), - //// array('phone','卖家手机号'), +// array('game_name','游戏名称'), +// array('server_name','区服名称'), +// array('small_account','小号账户'), +// array('seller_account','卖家账号'), + //// array('phone','卖家手机号'), array('buyer_account','交易用户'), array('order_price','售价'), array('poundage','手续费'), array('pay_status','状态'), array('order_time','下单时间'), -// array('pay_time','付款时间'), -// array('send_time','发货时间'), +// array('pay_time','付款时间'), +// array('send_time','发货时间'), ); if(!empty($_REQUEST['order_number'])) {$extend['order_number']=array('like','%'.$_REQUEST['order_number'].'%');} @@ -3985,9 +3993,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]; @@ -4336,14 +4344,14 @@ class ExportController extends Controller $xlsName = $_REQUEST['xlsname']; -// $xlsCell = array( -// array('user_account','玩家账号'), -// array('game_name','游戏名称'), -// array('server_name','游戏区服'), -// array('user_nickname','角色名'), -// array('login_time','登录时间'), -// array('login_ip','最后登录ip'), -// ); +// $xlsCell = array( +// array('user_account','玩家账号'), +// array('game_name','游戏名称'), +// array('server_name','游戏区服'), +// array('user_nickname','角色名'), +// array('login_time','登录时间'), +// array('login_ip','最后登录ip'), +// ); $xlsCell = array( '玩家账号', @@ -4459,12 +4467,12 @@ class ExportController extends Controller ob_flush(); flush();//必须同时使用 ob_flush() 和flush() 函数来刷新输出缓冲。 } -// $xlsData = []; +// $xlsData = []; exit(); -// $this->exportExcel($xlsName, $xlsCell, $xlsData); +// $this->exportExcel($xlsName, $xlsCell, $xlsData); } @@ -5887,7 +5895,7 @@ class ExportController extends Controller $xlsData = []; -// if(is_array($data)){ +// if(is_array($data)){ if($_REQUEST['type']==2) { $data=$model ->where($map) @@ -5936,9 +5944,9 @@ class ExportController extends Controller $v['grand_account'] = $v['account']; } $v['status'] = get_info_status($v['status'],3); -// $v['business_affairs'] = get_business_affairs_account($v['ba_id']); -// $v['grand_account'] = getTopPromote($v['id'])['id']; -// $v['promote_levels'] = get_promote_levels($v['id']); +// $v['business_affairs'] = get_business_affairs_account($v['ba_id']); +// $v['grand_account'] = getTopPromote($v['id'])['id']; +// $v['promote_levels'] = get_promote_levels($v['id']); switch ($v['ver_status']) { case '1': @@ -5985,7 +5993,7 @@ class ExportController extends Controller } } -// } +// } $this->exportExcel($xlsName, $xlsCell, $xlsData); @@ -6233,15 +6241,15 @@ class ExportController extends Controller $model = M('user','tab_'); -// $xlsCell = array( -// array('account','玩家账号'), -// array('register_time','注册时间'), -// array('login_time','最后登录时间'), -// array('register_type','注册来源'), -// array('register_ip','注册IP'), -// array('login_time','上次登录'), -// array('top_promote','所属推广员'), -// ); +// $xlsCell = array( +// array('account','玩家账号'), +// array('register_time','注册时间'), +// array('login_time','最后登录时间'), +// array('register_type','注册来源'), +// array('register_ip','注册IP'), +// array('login_time','上次登录'), +// array('top_promote','所属推广员'), +// ); $xlsCell = array( '玩家账号','注册时间','最后登录时间','注册来源','注册IP','上次登录','所属推广员', ); @@ -6321,35 +6329,35 @@ class ExportController extends Controller fclose($fp); 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") // ->join("left join tab_promote on a.top_promote=tab_promote.id") // ->order("a.id desc") // ->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['login_time'] = $v['login_time']>0?date('Y-m-d H:i:s',$v['login_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['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); @@ -6656,22 +6664,22 @@ class ExportController extends Controller $xlsName = $_REQUEST['xlsname']; -// $xlsCell = array( -// array('pay_order_number', "订单号"), -// array('pay_time', "充值时间"), -// array('promote_account', L('Subordinate_channel')), -// array('parent_id', "上级推广员"), -// array('user_account', "玩家账号"), -// array('game_name', "游戏名称"), -// array('server_name', L('Game_area_clothing')), -// array('game_player_name', "角色名"), -// array('spend_ip', "充值ip"), -// array('pay_amount', "应付金额"), -// array('cost', "实付金额"), -// array('pay_way', "充值方式"), -// array('promote_id', '商务专员'), -// array('is_check','对账状态') -// ); +// $xlsCell = array( +// array('pay_order_number', "订单号"), +// array('pay_time', "充值时间"), +// array('promote_account', L('Subordinate_channel')), +// array('parent_id', "上级推广员"), +// array('user_account', "玩家账号"), +// array('game_name', "游戏名称"), +// array('server_name', L('Game_area_clothing')), +// array('game_player_name', "角色名"), +// array('spend_ip', "充值ip"), +// array('pay_amount', "应付金额"), +// array('cost', "实付金额"), +// array('pay_way', "充值方式"), +// array('promote_id', '商务专员'), +// array('is_check','对账状态') +// ); $xlsCell = array( "订单号", "充值时间", L('Subordinate_channel'), "上线推广员", "玩家账号", "游戏名称", L('Game_area_clothing'), @@ -6861,22 +6869,22 @@ class ExportController extends Controller /* 执行查询 */ ->select(false); - // $xlsCell = array( -// array('pay_order_number', "订单号"), -// array('pay_time', "充值时间"), -// array('promote_account', L('Subordinate_channel')), -// array('parent_id', "上级推广员"), -// array('user_account', "玩家账号"), -// array('game_name', "游戏名称"), -// array('server_name', L('Game_area_clothing')), -// array('game_player_name', "角色名"), -// array('spend_ip', "充值ip"), -// array('pay_amount', "应付金额"), -// array('cost', "实付金额"), -// array('pay_way', "充值方式"), -// array('promote_id', '商务专员'), -// array('is_check','对账状态') -// ); + // $xlsCell = array( +// array('pay_order_number', "订单号"), +// array('pay_time', "充值时间"), +// array('promote_account', L('Subordinate_channel')), +// array('parent_id', "上级推广员"), +// array('user_account', "玩家账号"), +// array('game_name', "游戏名称"), +// array('server_name', L('Game_area_clothing')), +// array('game_player_name', "角色名"), +// array('spend_ip', "充值ip"), +// array('pay_amount', "应付金额"), +// array('cost', "实付金额"), +// array('pay_way', "充值方式"), +// array('promote_id', '商务专员'), +// array('is_check','对账状态') +// ); $xlsData = M()->table("({$xlsData}) as a") ->field("a.pay_order_number,a.pay_time,a.promote_account,tab_promote.account as parent_id, @@ -6890,9 +6898,9 @@ class ExportController extends Controller if (!$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]['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]['pay_time'] = date('Y-m-d H:i:s', $value['pay_time']); mb_convert_variables('GBK', 'UTF-8', $value); diff --git a/Application/Admin/View/Game/edit.html b/Application/Admin/View/Game/edit.html index f35767f1f..19a44ca51 100644 --- a/Application/Admin/View/Game/edit.html +++ b/Application/Admin/View/Game/edit.html @@ -1,2208 +1,172 @@ - - - - - - - - - - + - +namespace Admin\Controller; - -
- + private $ticketList_url = 'https://app.ipa365.com/Kirin/OpenApi/TicketList'; -
- -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - + private $pay_way = [ + 0 => '未知', + 1 => '支付宝', + 2 => '微信', + ]; - - - - + public function index() { + $params = I('get.'); + $startDate = empty($params['timestart']) ? '': $params['timestart']; + $endDate = empty($params['timeend']) ? '' : $params['timeend']; + $startTime = strtotime($startDate); + $endTime = strtotime($endDate) + 86399; + if(!empty($startDate)) { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
游戏名称: - - -
游戏类型: - - -
运营平台 - - - - - - - 显示该游戏所适用的平台,一般为安卓平台和苹果平台 -
混服设置 - - - - -
开放类型 - - - - - 显示当前游戏的开放状态,一般为公测,删档内测,不删档内测等。主要APP上显示 -
显示状态 - - - - 设置该游戏是否在各个站点显示 -
显示站点 - - - - - 控制游戏在不同平台上是否进行展示,可多选,默认为全部站点显示。取消选择后,对应站点上不显示该游戏的所有数据(含礼包与开服信息) -
推荐状态 - - - - - - 设置游戏的推荐类型,更改此游戏在网站所属的推荐板块; -
游戏排序: - -
游戏下载数: - - 点击修改 -
游戏评分: - -
游戏首字母: - -
一句话简介: - -
一句话简介: - -
游戏开发商: - -
合作方: - -
游戏简介: - -
游戏资料中心: - - {:hook('adminArticleEdit', array('name'=>'content','value'=>$field['value']))} -
游戏ICON - - - -
-
-
-
上传图标
-
-
- -
- -
-
-
- 尺寸不得小于125*125px,大小不得超过50K -
游戏素材包 - -
-
-
上传素材包
-
- -
- - - -
-

{$name}删除

-
-
-
-
- -
- 此处可上传该游戏的素材包,必须为压缩包形式,用于渠道后台下载推广 -
游戏推荐图 - - - - - -
-
-
-
上传图片
-
-
- -
- -
-
-
- -
- 470*350px(用于官网首屏推荐游戏位展示) -
游戏截图 - - - -
-
-
-
上传图片
-
-
- -
- -
-
-
- 建议尺寸:750*1334,图片大小不超过3M -
落地页图片 - - -
-
-
上传图片
-
- -
- -
-
-
- 横版游戏建议尺寸:16:9,1280*720px及以上;竖版游戏建议尺寸:9:16,720*1280px及以上,用于游戏详情页内展示 -
落地页视频 - -
-
-
上传视频
-
- -
- - - -
-

{$name}删除

- -
-
-
-
- -
- 视频大小不能超过20M,支持格式:mp4,3gp,wmv,asf,asx,mov,m4v,avi,flv,qlv -
落地页视频封面 - - -
-
-
-
上传封面
-
-
- -
-
-
-
- 安卓视频封面 图片大小不得超过1M 图片比例:610 * 343 -
ios视频是否置顶: - - - - - - - -
Beta版本链接: - -
Beta版本是否开启 - - - - - -
知识产权 - -
-
- -
-
-
-
-
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
游戏名称: - -
运营平台: - - - - - - -
下载状态: - - - - - - - -
下载端口: - - - - - 选择“第三方链接”后推广员后台-游戏列表-申请游戏页面将不显示该游戏,推广员无法进行申请。 -
* - 第三方下载地址(安卓) - - - - -
* - 第三方原包大小 -
超级签Token: - -
超级签URL: - -
超级签状态: - - - - - - - -
-
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
推广充值CPS比例 - % - 此处比例为推广结算时CPS模式的分成比例 -
推广注册CPA单价 - - 此处数值为推广结算时CPA模式的注册单价 -
开发者分成比例 - % - 此处比例为开发者结算时的分成比例 -
扶持额度 - -   设置游戏扶持额度 -
扶持比例 - % - 设置游戏扶持比例 -
ios版支付方式 - - - - iOS上架版游戏内支付方式的配置开关,二选一,默认是第三方支付;非上架版在系统-扩展工具-支付设置内进行配置(同Android版) - -
支付宝 - - - -
微信 - - - -
快捷支付 - - - -
是否开启强更 - - - - 开启强更后,若后台原包更新,则用户必须重新下载才可以进入游戏 -
游戏标示 - - 苹果游戏分包时需填写的游戏标示,格式无特别要求 -
游戏key - - 游戏支付通知时的加密key,可自由设置,长度不得超过32位字符串,设置完必须提供给CP方进行同步 -
游戏支付通知地址 - - 此处功能为平台用户游戏充值时,通知CP方所用,该地址由CP方提供 -
访问秘钥 - - SDK访问服务器时加密key,可自由设置,长度不得超过20位字符串 -
威富通商户号 - - 威富通申请成功以后,威富通方提供的商户号,在此处添加(需要删除,在支付配置里设置即可) - -
威富通秘钥 - - 威富通申请成功以后,威富通方提供的秘钥,在此处添加(需要删除,在支付配置里设置即可) - -
游戏支付appid - - 使用微信支付时需要的appid,需要到微信开放平台申请创建,包括官方微信支付和威富通里的微信支付(需要删除,在支付配置里设置即可) -
游戏合作id - - 游戏对接时需要的合作id,此id由CP方提供(此功能根据不同游戏CP确定是否需要使用) -
游戏包名 - - 在微信开放平台申请创建的应用包名(app.webchat.payment.agree),若无此项可不填写(待定) - -
游戏签名 - - 在微信开放平台申请创建的应用签名(fd0e6a444fd988bf23ce8a1818623b58),若无此项可不填写(待定) - - -
客服QQ - - 在游戏里遇到问题点击联系QQ - -
-
- -
-
-

功能说明:H5分享页面,每个游戏按需如下要求进行配置;推广员申请渠道包时,自动生成对应的H5下载页面,便于推广员进行快速推广。

-

例如:{$_SERVER['HTTP_HOST']}{:str_ireplace(_PHP_FILE_,'/Index.php',U('Home/Index/game_view'))}

-
- - - - - - - - - - - - - - - - - - - - - -
页面标题: - -
- 分享游戏图标 - - - - -
- -
-
-
-
- 512*512px -
- 分享背景图片 - - - - -
- -
-
-
-
- 720*1280px及以上 -
-
-
- - - - - - - - - - - - - - - - - - - -
游戏名称: - {$data['relation_game_name']} -
等级档位一: - 第一个框输入等级名称,如:用户一级;第二个框输入玩家达到该等级所需达到的游戏账号级别数,如:10 -
等级档位二: - 第一个框输入等级名称,如:用户二级;第二个框输入玩家达到该等级所需达到的游戏账号级别数,如:20 -
等级档位三: - 第一个框输入等级名称,如:用户三级;第二个框输入玩家达到该等级所需达到的游戏账号级别数,如:30 -
-
- -
- - - - - - 返回 - -
- -
-
-
- - - -
- - - - - - - - - - + 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(); + $super_money_all = $pay_price[0]['pay_price'] == '' ? 0 : $pay_price[0]['pay_price']; + $page = set_pagination($count, $row); + $this->assign('_page', $page); + $this->assign('data', $data); + $this->assign('super_money_all', $super_money_all); + $this->display('superDetail'); + } + +} diff --git a/Application/Admin/View/SuperStatistical/superDetail.html b/Application/Admin/View/SuperStatistical/superDetail.html index cd1885c21..b644acaee 100644 --- a/Application/Admin/View/SuperStatistical/superDetail.html +++ b/Application/Admin/View/SuperStatistical/superDetail.html @@ -116,6 +116,7 @@ 设备号 游戏 购买时间 + 支付方式 超级签金额 @@ -129,6 +130,7 @@ {$vo.device_number} {$vo.game_name} {$vo.pay_time|date='Y-m-d H:i:s',###} + {$vo.pay_way} {$vo.pay_price} @@ -139,6 +141,7 @@ -- -- -- + -- {$super_money_all} @@ -146,7 +149,7 @@
- 导出 + 导出 {$_page|default=''}
@@ -163,10 +166,10 @@ \ No newline at end of file From befc2ef62bbf1e1a80a4baefad5d1b912b791df5 Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Thu, 26 Dec 2019 17:23:09 +0800 Subject: [PATCH 06/19] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AD=BE=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/SuperStatisticalController.class.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Controller/SuperStatisticalController.class.php b/Application/Admin/Controller/SuperStatisticalController.class.php index 7e1484ed8..19a44ca51 100644 --- a/Application/Admin/Controller/SuperStatisticalController.class.php +++ b/Application/Admin/Controller/SuperStatisticalController.class.php @@ -8,6 +8,12 @@ class SuperStatisticalController extends ThinkController private $ticketList_url = 'https://app.ipa365.com/Kirin/OpenApi/TicketList'; + private $pay_way = [ + 0 => '未知', + 1 => '支付宝', + 2 => '微信', + ]; + public function index() { $params = I('get.'); $startDate = empty($params['timestart']) ? '': $params['timestart']; @@ -148,9 +154,12 @@ class SuperStatisticalController extends ThinkController if(isset($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(); + 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(); $super_money_all = $pay_price[0]['pay_price'] == '' ? 0 : $pay_price[0]['pay_price']; $page = set_pagination($count, $row); From e3742a9d8a99146637955d3a0358804b063d74c4 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Thu, 26 Dec 2019 17:25:32 +0800 Subject: [PATCH 07/19] =?UTF-8?q?=E5=85=85=E5=80=BC=E7=8E=A9=E5=AE=B6--?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/QueryController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 2898fb1b7..73395f72c 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1863,7 +1863,7 @@ class QueryController extends BaseController ->field($field) ->join('join tab_user as u on u.id = s.user_id') ->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) ->buildSql(); $query = M()->alias('record') From a61e0f36b524796349403dc078a8fc3b5cfd03f4 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 26 Dec 2019 17:28:24 +0800 Subject: [PATCH 08/19] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BB=8A=E6=97=A5=E6=9C=AC=E5=91=A8=E6=9C=AC?= =?UTF-8?q?=E6=9C=88=E4=B8=8D=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PlatformController.class.php | 70 ++++++++++++++++--- 1 file changed, 62 insertions(+), 8 deletions(-) diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php index cdbf674c5..6e4a63871 100644 --- a/Application/Admin/Controller/PlatformController.class.php +++ b/Application/Admin/Controller/PlatformController.class.php @@ -454,19 +454,67 @@ class PlatformController extends ThinkController $data = M('promote', 'tab_')->alias('tp1') ->field('tp1.account as promote_account,tp1.id, 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 ' . $week . ',1,null)) as week, 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_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) + ->where($tmap) ->group('tp1.id') - ->order('count desc, register_time') + ->order('register_time') ->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.chain']); + unset($tmap['tp1.chain']); + unset($tmap['tp1.chain']); $map['promote_id'] = 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))) { //官方渠道数据添加 $authorityData = M('user', 'tab_')->alias('u') - ->field('date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time, - 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') + ->field('date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time,count(id) as count') ->where($map) ->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['id'] = "1"; From 31e045bdba67de0913dce80f8b843a03e0fbc810 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Thu, 26 Dec 2019 17:30:14 +0800 Subject: [PATCH 09/19] =?UTF-8?q?=E5=85=85=E5=80=BC=E7=8E=A9=E5=AE=B6--?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/QueryController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 2898fb1b7..73395f72c 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1863,7 +1863,7 @@ class QueryController extends BaseController ->field($field) ->join('join tab_user as u on u.id = s.user_id') ->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) ->buildSql(); $query = M()->alias('record') From 9b65fbaabbeb603abc545b1a522034e6391f4750 Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Thu, 26 Dec 2019 17:30:45 +0800 Subject: [PATCH 10/19] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AD=BE=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/ExportController.class.php | 4 ++++ .../Admin/Controller/SuperStatisticalController.class.php | 3 +++ Application/Admin/View/SuperStatistical/superDetail.html | 8 ++++++++ 3 files changed, 15 insertions(+) diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 5f1d4568b..5825a0213 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -2049,6 +2049,9 @@ class ExportController extends Controller if (isset($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'])) { $map['tab_user.account'] = $params['account']; } @@ -2166,6 +2169,7 @@ class ExportController extends Controller $map['tab_repair_pay.create_time'] = array('BETWEEN', [$startTime, $endTime]); } + if(isset($params['type'])) { $map['tab_repair_pay.type'] = $params['type']; } diff --git a/Application/Admin/Controller/SuperStatisticalController.class.php b/Application/Admin/Controller/SuperStatisticalController.class.php index 19a44ca51..ecab06174 100644 --- a/Application/Admin/Controller/SuperStatisticalController.class.php +++ b/Application/Admin/Controller/SuperStatisticalController.class.php @@ -132,6 +132,9 @@ class SuperStatisticalController extends ThinkController if (isset($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'])) { $map['tab_user.account'] = $params['account']; } diff --git a/Application/Admin/View/SuperStatistical/superDetail.html b/Application/Admin/View/SuperStatistical/superDetail.html index b644acaee..ddd9b5dff 100644 --- a/Application/Admin/View/SuperStatistical/superDetail.html +++ b/Application/Admin/View/SuperStatistical/superDetail.html @@ -96,6 +96,14 @@ +
+ +
From 5cf9ad9fd12109280c7346db4839929bb5b36914 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Thu, 26 Dec 2019 17:30:51 +0800 Subject: [PATCH 11/19] =?UTF-8?q?=E5=85=85=E5=80=BC=E7=8E=A9=E5=AE=B6--?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/DownloadController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 8a17b4c95..3d5ecca69 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -3233,7 +3233,7 @@ 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('join tab_user as u on u.id = uc.user_id') ->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(); $roles = M()->alias('record') ->table($subQuery) From 85b821081fa4fe96723fc84e735fe237ef4316e9 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 26 Dec 2019 17:39:46 +0800 Subject: [PATCH 12/19] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A8=E5=B9=BF?= =?UTF-8?q?=E5=91=98=E5=85=85=E5=80=BC=E7=BB=9F=E8=AE=A1=E4=BB=8A=E6=97=A5?= =?UTF-8?q?=E6=9C=AC=E5=91=A8=E6=9C=AC=E6=9C=88=E4=B8=8D=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PlatformController.class.php | 76 ++++++++++--------- 1 file changed, 42 insertions(+), 34 deletions(-) diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php index 6e4a63871..f31938318 100644 --- a/Application/Admin/Controller/PlatformController.class.php +++ b/Application/Admin/Controller/PlatformController.class.php @@ -594,20 +594,18 @@ class PlatformController extends ThinkController $map1['promote_id'] = $map['promote_id'] = array('egt', 0); $spend = M('Spend', 'tab_'); if (!empty($_REQUEST['timestart']) && !empty($_REQUEST['timeend'])) { - $map['create_time'] = ['between', array(strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399)]; - $pay_time = " between " . strtotime($_REQUEST['timestart']) . " and " . (strtotime($_REQUEST['timeend']) + 86399) . " "; + $map['pay_time'] = ['between', array(strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399)]; unset($_REQUEST['timestart']); unset($_REQUEST['timeend']); } elseif (!empty($_REQUEST['timestart']) && empty($_REQUEST['timeend'])) { - $map['create_time'] = ['between', array(strtotime($_REQUEST['timestart']), time())]; - $pay_time = " between " . strtotime($_REQUEST['timestart']) . " and " . time() . " "; + $map['pay_time'] = ['between', array(strtotime($_REQUEST['timestart']), time())]; unset($_REQUEST['timestart']); } elseif (empty($_REQUEST['timestart']) && !empty($_REQUEST['timeend'])) { - $map['create_time'] = ['elt', strtotime($_REQUEST['timeend']) + 86399]; - $pay_time = " between 0 and " . (strtotime($_REQUEST['timeend']) + 86399) . " "; + $map['pay_time'] = ['elt', strtotime($_REQUEST['timeend']) + 86399]; unset($_REQUEST['timeend']); } 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; $today = total(1); @@ -628,6 +626,17 @@ class PlatformController extends ThinkController $pcount = M("promote","tab_")->field("count(*) acount")->where($promote_map)->where($promote_map2)->find()['acount']; // 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(); for ($i=0; $i < count($promote); $i++) { # code... @@ -645,30 +654,29 @@ class PlatformController extends ThinkController $map['server_name'] = $_REQUEST['server_id']; unset($_REQUEST['server_id']); } - $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']; - } 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']; + } + $dbdata = $spend + ->field('floor(sum(IF(pay_time ' . $pay_time . ',pay_amount,0))*100) as count') + ->where($map) + ->find(); + $tmap = $map; + if(isset($map['pay_time'])){ + $tmap['pay_time'] = ['between', array($tmin,$tmonth[1][1])]; } + $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; } $count = count($data); @@ -812,10 +820,10 @@ class PlatformController extends ThinkController $data[$key]['today']=$adata['today']==''?0:$adata['today']; $data[$key]['week']=$adata['week']==''?0:$adata['week']; $data[$key]['mounth']=$adata['mounth']==''?0:$adata['mounth']; */ -// if ($data[$key]['promote_id'] == '0') { -// unset($data[$key]); -// } - } + // if ($data[$key]['promote_id'] == '0') { + // unset($data[$key]); + // } + } $total = $this->data_total($data); $this->assign('total', $total); if ($_REQUEST['data_order'] != '') { From 600d1a27f55ca6db62133524795b589561ae6ce8 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Thu, 26 Dec 2019 17:42:27 +0800 Subject: [PATCH 13/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Home/landingPage.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index 71b228d51..3ad065fdb 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -467,7 +467,7 @@
注册即表示同意
- 《用户协议》 + 《用户协议》
@@ -501,7 +501,7 @@
注册即表示同意
- 《用户协议》 + 《用户协议》
@@ -520,12 +520,12 @@
第一步:下载苹果官方TestFlight - +
首次安装必须打开应用,并点击“继续”按钮后,才可进行第二步操作
- 点击安装TestFlight平台 + 点击安装TestFlight平台
第二步:点击下方按钮安装游戏
点击安装游戏
From cb63520de56d7a23402a36f98042e89904447e7f Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Thu, 26 Dec 2019 17:48:29 +0800 Subject: [PATCH 14/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=90=BD=E5=9C=B0?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Home/landingPage.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index 3ad065fdb..f5c85bf82 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -525,7 +525,7 @@
首次安装必须打开应用,并点击“继续”按钮后,才可进行第二步操作
- 点击安装TestFlight平台 + 点击安装TestFlight平台
第二步:点击下方按钮安装游戏
点击安装游戏
From ee6c6e62b269220b4d8b05758ebd09aeb139da85 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Thu, 26 Dec 2019 17:51:16 +0800 Subject: [PATCH 15/19] =?UTF-8?q?=E5=85=85=E5=80=BC=E7=8E=A9=E5=AE=B6--?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/DownloadController.class.php | 8 ++++++-- Application/Home/Controller/QueryController.class.php | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 3d5ecca69..5f672dec9 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -3238,9 +3238,13 @@ class DownloadController extends BaseController { $roles = M()->alias('record') ->table($subQuery) ->select(); - $total = M('spend','tab_')->alias('uc') - ->field("$fieldS,$fieldToday as recharge_cost_today") + $totalSql = M('spend', 'tab_')->alias('uc') + ->field("$fieldS, $fieldToday as recharge_cost_today") ->where($map) + ->buildSql(); + $total = M()->table($totalSql) + ->alias('total') + ->field('sum(recharge_cost) as recharge_cost, sum(recharge_count) as recharge_count, sum(recharge_cost_today) as recharge_cost_today') ->find(); $total['recharge_cost_today'] = empty($total['recharge_cost_today']) ? '0.00' :$total['recharge_cost_today']; $csvFileName = $xlsName.'.csv'; diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 73395f72c..9a5c3059b 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1872,9 +1872,13 @@ class QueryController extends BaseController list($records, $pagination, $count) = $this->paginate($query); - $total = M('spend', 'tab_')->alias('s') + $totalSql = M('spend', 'tab_')->alias('s') ->field("$fieldS, $fieldToday as recharge_cost_today") ->where($map) + ->buildSql(); + $total = M()->table($totalSql) + ->alias('total') + ->field('sum(recharge_cost) as recharge_cost, sum(recharge_count) as recharge_count, sum(recharge_cost_today) as recharge_cost_today') ->find(); $total['recharge_cost_today'] = empty($total['recharge_cost_today']) ? '0.00' : $total['recharge_cost_today']; From cc83e0e5850f6875e67c4252f547fb418fc2741f Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Thu, 26 Dec 2019 18:01:13 +0800 Subject: [PATCH 16/19] =?UTF-8?q?=E5=85=85=E5=80=BC=E7=8E=A9=E5=AE=B6--?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/Controller/QueryController.class.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 9a5c3059b..6526204bc 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1872,14 +1872,15 @@ class QueryController extends BaseController list($records, $pagination, $count) = $this->paginate($query); - $totalSql = M('spend', 'tab_')->alias('s') - ->field("$fieldS, $fieldToday as recharge_cost_today") + $total = M('spend', 'tab_')->alias('s') + ->field($fieldS) ->where($map) - ->buildSql(); - $total = M()->table($totalSql) - ->alias('total') - ->field('sum(recharge_cost) as recharge_cost, sum(recharge_count) as recharge_count, sum(recharge_cost_today) as recharge_cost_today') ->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']; if (!empty($records)) { From ae2b498e45092a928f3027462351108fb662b6d5 Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Thu, 26 Dec 2019 18:01:41 +0800 Subject: [PATCH 17/19] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AD=BE=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/SuperStatistical/index.html | 4 +++- Application/Admin/View/SuperStatistical/superDetail.html | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Application/Admin/View/SuperStatistical/index.html b/Application/Admin/View/SuperStatistical/index.html index b0288070e..0b7b451f0 100644 --- a/Application/Admin/View/SuperStatistical/index.html +++ b/Application/Admin/View/SuperStatistical/index.html @@ -35,10 +35,12 @@
+
+ 返回 +
-
diff --git a/Application/Admin/View/SuperStatistical/superDetail.html b/Application/Admin/View/SuperStatistical/superDetail.html index ddd9b5dff..bec9f65a9 100644 --- a/Application/Admin/View/SuperStatistical/superDetail.html +++ b/Application/Admin/View/SuperStatistical/superDetail.html @@ -97,11 +97,11 @@
- - - - + + +
From 40da308a085f94ef0f378921f33b928869ff8019 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Thu, 26 Dec 2019 18:02:38 +0800 Subject: [PATCH 18/19] =?UTF-8?q?=E5=85=85=E5=80=BC=E7=8E=A9=E5=AE=B6--?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/Controller/DownloadController.class.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 5f672dec9..c29528030 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -3238,14 +3238,15 @@ class DownloadController extends BaseController { $roles = M()->alias('record') ->table($subQuery) ->select(); - $totalSql = M('spend', 'tab_')->alias('uc') - ->field("$fieldS, $fieldToday as recharge_cost_today") + $total = M('spend', 'tab_')->alias('uc') + ->field($fieldS) ->where($map) - ->buildSql(); - $total = M()->table($totalSql) - ->alias('total') - ->field('sum(recharge_cost) as recharge_cost, sum(recharge_count) as recharge_count, sum(recharge_cost_today) as recharge_cost_today') ->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']; $csvFileName = $xlsName.'.csv'; //设置好告诉浏览器要下载excel文件的headers From 1c2bb7e584c392196f6c7d2d4b35f29008aee2f3 Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Thu, 26 Dec 2019 18:03:54 +0800 Subject: [PATCH 19/19] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AD=BE=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/SuperStatistical/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/View/SuperStatistical/index.html b/Application/Admin/View/SuperStatistical/index.html index 0b7b451f0..d8401c275 100644 --- a/Application/Admin/View/SuperStatistical/index.html +++ b/Application/Admin/View/SuperStatistical/index.html @@ -36,7 +36,7 @@