From bec8203d47968cb911d3201141d813a1aeaacab5 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 16 Dec 2019 15:42:36 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>?= =?UTF-8?q?=E6=88=91=E7=9A=84=E6=B8=B8=E6=88=8F--=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/View/default/Apply/my_game.html | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/Application/Home/View/default/Apply/my_game.html b/Application/Home/View/default/Apply/my_game.html index 2fae01956..a709f5dd2 100644 --- a/Application/Home/View/default/Apply/my_game.html +++ b/Application/Home/View/default/Apply/my_game.html @@ -876,9 +876,20 @@ fontname: 'Ubuntu', fontcolor: '#ff9818', }; - var logo = $(linkTag).parents('.game-li').eq(0).find('.img-box').children('img')[0] - $('#game_link_ercode').empty().qrcode(options); - $("#game_link_ercode canvas")[0].getContext('2d').drawImage(logo, (qrcodeWidth - logoWidth) / 2, (qrcodeHeight - logoHeight) / 2, logoWidth, logoHeight); + + var logo = null; + var logoSrc = $(linkTag).parents('.game-li').eq(0).find('.img-box').children('img').attr('src'); + console.log(isImg(logoSrc)); + if (isImg(logoSrc)) { + logo = $(linkTag).parents('.game-li').eq(0).find('.img-box').children('img')[0] + } else { + var img = document.createElement('img'); + img.src = '__IMG__/game_icon.png'; + logo = img; + } + + $('#game_link_ercode').empty().qrcode(options); + $("#game_link_ercode canvas")[0].getContext('2d').drawImage(logo, (qrcodeWidth - logoWidth) / 2, (qrcodeHeight - logoHeight) / 2, logoWidth, logoHeight); $('#clipboard-btn').attr('data-text', response.data.url) $('#clipboard-btn').click() @@ -896,6 +907,15 @@ }); }); + function isImg(src) { + var img = new Image(); + img.src = src; + if (img.width > 0 || img.height > 0) { + return true; + } + return false; + } + var clipboard = new ClipboardJS('#clipboard-btn', { text: function(trigger) { return trigger.getAttribute('data-text'); From 9c9396351b0ebad03e1d5b03d2971d9229f1ed33 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 16 Dec 2019 16:51:05 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86>=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2--=E6=A3=80=E7=B4=A2bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/Controller/QueryController.class.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 31add93cd..dcdf36f6b 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -211,6 +211,7 @@ class QueryController extends BaseController $parameter['level_promote_3'] = $levelPromote[1]; $parameter['level_promote_4'] = $levelPromote[2]; !isset($_REQUEST['pay_way']) || $parameter['pay_way'] = I('pay_way'); + !isset($_REQUEST['pay_status']) || $parameter['pay_status'] = I('pay_status', -1); $serverData = $this->getServer(I('relation_game_id'), I('sdk_version')); $page = set_pagination($count, $row, $parameter); @@ -1857,7 +1858,7 @@ class QueryController extends BaseController } $map['uc.create_time'] = ['between', [$begTime, $endTime - 1]]; - $fieldUC = "sum(uc.recharge_cost) recharge_cost,sum(uc.recharge_count) recharge_count,sum(if(uc.create_time = {$nowTime},uc.recharge_cost,0)) as recharge_cost_today"; + $fieldUC = "sum(uc.recharge_cost) recharge_cost,sum(uc.recharge_count) recharge_count,sum(if(uc.create_time = {$nowTime},uc.recharge_cost,0)) as recharge_cost_today,uc.user_id"; $fieldUI = "ui.user_account,ui.game_name,ui.role_name,ui.role_level,ui.server_name,ui.play_time,ui.play_ip,ui.promote_account,ui.sdk_version,ui.create_time"; $loginRecordMap['lr.create_time'] = $map['uc.create_time']; @@ -1869,22 +1870,25 @@ class QueryController extends BaseController $field = $fieldUC . ',' . $fieldUI . ',' . $fieldLR . ' as user_game_login_count'; $subQuery = M('user_play_data_count', 'tab_')->alias('uc') ->field($field) - ->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.role_id = uc.role_id') ->where($map) - ->group('uc.role_id,uc.server_id,uc.game_id') + ->group('uc.role_id,uc.game_id,uc.user_id,uc.id') ->buildSql(); $query = M()->alias('record') ->table($subQuery) ->order($orderBy); $total = M('user_play_data_count', 'tab_')->alias('uc') ->field($fieldUC) - ->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') ->where($map) ->find(); list($records, $pagination, $count) = $this->paginate($query); foreach ($records as &$list) { + if (empty($list['user_account']) ) { + $list['user_account'] = M('user', 'tab_')->where("id = {$list['user_id']}")->getField('account'); + $list['user_account'] = empty($list['user_account']) ? '--' : encryption($list['user_account']); + } $list['user_account'] = empty($list['user_account']) ? '--' : encryption($list['user_account']); $list['game_name'] = empty($list['game_name']) ? '--' : $list['game_name']; $list['sdk_version'] = empty($list['sdk_version']) ? '--' : getSDKTypeName($list['sdk_version']); @@ -1897,7 +1901,6 @@ class QueryController extends BaseController $list['promote_account'] = empty($list['promote_account']) ? '--' : $list['promote_account']; } } - $games = get_promote_serach_game(); $this->assign('games', $games); From 03edc87f4fb68298eb5bd304d0cb573e4acb6e44 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 16 Dec 2019 17:33:17 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86>=E5=85=85=E5=80=BC?= =?UTF-8?q?=E7=8E=A9=E5=AE=B6--=E6=A3=80=E7=B4=A2bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/QueryController.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index dcdf36f6b..06e4a4e6c 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1879,6 +1879,7 @@ class QueryController extends BaseController ->order($orderBy); $total = M('user_play_data_count', 'tab_')->alias('uc') ->field($fieldUC) + ->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.role_id = uc.role_id') ->where($map) ->find(); From cb89467f6b3d0cbff7a1c86a45d1580b9edee172 Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Mon, 16 Dec 2019 17:36:32 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/DownloadController.class.php | 7 ++++--- Application/Home/Controller/PlayersController.class.php | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 1b4ba9afa..468fbd5f1 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -1196,13 +1196,14 @@ class DownloadController extends BaseController { empty(I('extend')) || $map['tab_pay_info.extend'] = I('extend'); empty(I('user_id')) || $map['tab_pay_info.game_player_id'] = I('user_id'); if (!empty($begTime) && !empty($endTime)) { - $map['tab_pay_info.create_time'] = ['between', [strtotime($begTime), strtotime($endTime) - 1]]; + $map['tab_pay_info.create_time'] = ['between', [strtotime($begTime), strtotime($endTime) +24*3600- 1]]; }else if (empty($begTime) && !empty($endTime)) { - $map['tab_pay_info.create_time'] = ['elt',strtotime($endTime)]; + $map['tab_pay_info.create_time'] = ['elt',strtotime($endTime) + 24*3600]; }else if (!empty($begTime) && empty($endTime)) { - $map['tab_pay_info.create_time'] = ['EGT',strtotime($begTime)]; + $map['tab_pay_info.create_time'] = ['EGT',strtotime($begTime) + 24*3600]; } + $conditions = json_encode($map,TRUE); $addtime = time(); $data = [ diff --git a/Application/Home/Controller/PlayersController.class.php b/Application/Home/Controller/PlayersController.class.php index b9172645d..742c5b773 100644 --- a/Application/Home/Controller/PlayersController.class.php +++ b/Application/Home/Controller/PlayersController.class.php @@ -22,7 +22,7 @@ class PlayersController extends BaseController { $userId = trim(I('user_id', '')); $extend = trim(I('extend', '')); //cp订单号 $begTime = strtotime(I('begtime')); - $endTime = strtotime(I('endtime')); + $endTime = strtotime(I('endtime')) + 24*3600; $levelPromote = $this->getLevelPromote(); $queryPromote = $this->getQueryPromote($levelPromote); // $loginPromote = $this->getLoginPromote(); From dc2c4ee6529e20603a926fedb51bf7723411dcdd Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 16 Dec 2019 17:50:20 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86>=E5=85=85=E5=80=BC?= =?UTF-8?q?=E7=8E=A9=E5=AE=B6--=E6=A3=80=E7=B4=A2bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/Controller/QueryController.class.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 06e4a4e6c..9af3fa9a9 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1877,14 +1877,20 @@ class QueryController extends BaseController $query = M()->alias('record') ->table($subQuery) ->order($orderBy); - $total = M('user_play_data_count', 'tab_')->alias('uc') + + list($records, $pagination, $count) = $this->paginate($query); + + $totalQuery = M('user_play_data_count', 'tab_')->alias('uc') ->field($fieldUC) - ->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.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 uc.server_id = ui.server_id and ui.role_id = uc.role_id') + ->group('uc.role_id,uc.game_id,uc.server_id,uc.user_id,uc.id') ->where($map) + ->buildSql(); + $total = M()->alias('totals') + ->table($totalQuery) + ->field('sum(recharge_cost) recharge_cost,sum(recharge_count) recharge_count,sum(recharge_cost_today) as recharge_cost_today') ->find(); - list($records, $pagination, $count) = $this->paginate($query); - foreach ($records as &$list) { if (empty($list['user_account']) ) { $list['user_account'] = M('user', 'tab_')->where("id = {$list['user_id']}")->getField('account'); From 9233d1568f789667c793c42f8f32fd90c8736f56 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Mon, 16 Dec 2019 18:10:40 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=8E=A9=E5=AE=B6?= =?UTF-8?q?=E8=BF=81=E7=A7=BB=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Promote/mychlid.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Home/View/default/Promote/mychlid.html b/Application/Home/View/default/Promote/mychlid.html index e7addedbb..51378a3aa 100644 --- a/Application/Home/View/default/Promote/mychlid.html +++ b/Application/Home/View/default/Promote/mychlid.html @@ -94,7 +94,7 @@ 取消渠道迁移 - + 玩家迁移 From 3ce289a194e9763eb200ba05d9f28028bd3f1770 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Mon, 16 Dec 2019 18:11:41 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=8E=A9=E5=AE=B6?= =?UTF-8?q?=E8=BF=81=E7=A7=BB=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Promote/children.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Home/View/default/Promote/children.html b/Application/Home/View/default/Promote/children.html index 3637f855b..25894b64b 100644 --- a/Application/Home/View/default/Promote/children.html +++ b/Application/Home/View/default/Promote/children.html @@ -109,7 +109,7 @@ - + 玩家迁移 From fa5a47ea75089d56073579f73e95de81777d5397 Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Mon, 16 Dec 2019 18:25:02 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E8=A1=8C=E4=B8=BA=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/Controller/DownloadController.class.php | 5 ++++- .../Home/Controller/PlayersController.class.php | 16 ++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 468fbd5f1..7fb7f3c61 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -1897,13 +1897,16 @@ class DownloadController extends BaseController { foreach($data as $key => $v) { $v['create_time'] = date('Y-m-d H:i:s',$v['create_time']); $promoteInfo = M('promote','tab_')->field("nickname")->where(['id' => intval($v['promote_id'])])->find(); + $serverId = $v['server_id']; + $gameId = $v['game_id']; + $serverInfo = M('server','tab_')->field('server_name')->where(['server_num'=>$serverId,'game_id'=>$gameId])->find(); $v['promote_id']= $promoteInfo['nickname']; $csvData['extend'] = $this->encryption($v['extend']); $csvData['create_time'] = $v['create_time']; $csvData['user_account'] = $v['user_account']; $csvData['game_name'] = $v['game_name']; $csvData['promote_id'] = $v['promote_id']; - $csvData['server_name'] = $v['server_name']; + $csvData['server_name'] = $serverInfo['server_name']; $csvData['user_id'] = $v['game_player_id']; $csvData['game_player_name'] = $v['game_player_name']; $csvData['price'] = $v['price']; diff --git a/Application/Home/Controller/PlayersController.class.php b/Application/Home/Controller/PlayersController.class.php index 742c5b773..f067ef786 100644 --- a/Application/Home/Controller/PlayersController.class.php +++ b/Application/Home/Controller/PlayersController.class.php @@ -22,7 +22,7 @@ class PlayersController extends BaseController { $userId = trim(I('user_id', '')); $extend = trim(I('extend', '')); //cp订单号 $begTime = strtotime(I('begtime')); - $endTime = strtotime(I('endtime')) + 24*3600; + $endTime = strtotime(I('endtime')); $levelPromote = $this->getLevelPromote(); $queryPromote = $this->getQueryPromote($levelPromote); // $loginPromote = $this->getLoginPromote(); @@ -60,11 +60,11 @@ class PlayersController extends BaseController { $map['tab_pay_info.game_player_id'] = $userId; } if (!empty($begTime) && !empty($endTime)) { - $map['tab_pay_info.create_time'] = ['between', [$begTime, $endTime - 1]]; + $map['tab_pay_info.create_time'] = ['between', [$begTime, $endTime + 24*3600 - 1]]; }else if (empty($begTime) && !empty($endTime)) { - $map['tab_pay_info.create_time'] = ['elt',$endTime]; + $map['tab_pay_info.create_time'] = ['elt',$endTime + 24*3600]; }else if (!empty($begTime) && empty($endTime)) { - $map['tab_pay_info.create_time'] = ['EGT',$begTime]; + $map['tab_pay_info.create_time'] = ['EGT',$begTime + 24*3600]; } $page = intval(I('get.p', 1)); $page = $page ? $page : 1; //默认显示第一页数据arraypage @@ -73,8 +73,12 @@ class PlayersController extends BaseController { foreach($rs as $key => $v) { $rs[$key]['extend'] = encryption($v['extend']); $rs[$key]['create_time'] = date('Y-m-d H:i:s',$v['create_time']); - $promoteInfo = M('promote','tab_')->field("nickname")->where(['id' => intval($v['promote_id'])])->find(); - $rs[$key]['promote_id']= $promoteInfo['nickname']; + $promoteInfo = M('promote','tab_')->field("account")->where(['id' => intval($v['promote_id'])])->find(); + $serverId = $v['server_id']; + $gameId = $v['game_id']; + $serverInfo = M('server','tab_')->field('server_name')->where(['server_num'=>$serverId,'game_id'=>$gameId])->find(); + $rs[$key]['server_name'] = $serverInfo['server_name']; + $rs[$key]['promote_id']= $promoteInfo['account']; } $count = M('pay_info', 'tab_') ->field('tab_pay_info.id')