From 3a7c4c9bad1e19e9712d370d59f0fa9969257dbe Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Thu, 26 Dec 2019 10:09:09 +0800 Subject: [PATCH 01/39] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AD=BE=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1--=E5=90=88=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/SuperStatisticalController.class.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Application/Admin/Controller/SuperStatisticalController.class.php b/Application/Admin/Controller/SuperStatisticalController.class.php index cd7366a57..7e1484ed8 100644 --- a/Application/Admin/Controller/SuperStatisticalController.class.php +++ b/Application/Admin/Controller/SuperStatisticalController.class.php @@ -151,6 +151,8 @@ class SuperStatisticalController extends ThinkController $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(); $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(); + $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); From f8092fa9e5fa920352bb759572ee412e8240b2d8 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 26 Dec 2019 11:31:43 +0800 Subject: [PATCH 02/39] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=E8=AE=A2=E5=8D=95bug=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/PayChannelController.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Application/Admin/Controller/PayChannelController.class.php b/Application/Admin/Controller/PayChannelController.class.php index c0a53ccf6..dfcd2939e 100644 --- a/Application/Admin/Controller/PayChannelController.class.php +++ b/Application/Admin/Controller/PayChannelController.class.php @@ -463,6 +463,7 @@ class PayChannelController extends ThinkController // var_dump($spendData);die(); $coinMap['pay_status'] = 1; $coinMap['pay_source'] = 2; + $coinMap['extend'] = ''; $coinData = M('pay_info','tab_') ->join("inner join tab_deposit on tab_pay_info.order_id=tab_deposit.pay_order_number") ->field("pay_order_number,tab_deposit.create_time as pay_time,tab_deposit.user_account,tab_pay_info.game_name,tab_deposit.promote_account, From 79f74dfbd44631d8379726dffeda5f7c70bc09f0 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 26 Dec 2019 13:45:43 +0800 Subject: [PATCH 03/39] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=87=BAbug?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/PayChannelController.class.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Application/Admin/Controller/PayChannelController.class.php b/Application/Admin/Controller/PayChannelController.class.php index dfcd2939e..5396be178 100644 --- a/Application/Admin/Controller/PayChannelController.class.php +++ b/Application/Admin/Controller/PayChannelController.class.php @@ -638,6 +638,9 @@ class PayChannelController extends ThinkController ->select(false); // var_dump($spendData);die(); $coinMap['pay_status'] = 1; + $coinMap['pay_source'] = 2; + $coinMap['extend'] = ''; + $coinData = M('pay_info','tab_') ->join("inner join tab_deposit on tab_pay_info.order_id=tab_deposit.pay_order_number") ->field("pay_order_number,tab_deposit.create_time as pay_time,tab_deposit.user_account,tab_pay_info.game_name,tab_deposit.promote_account, From e8313dd92ba580acdd5992d1a01ea3614a148430 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 26 Dec 2019 13:49:29 +0800 Subject: [PATCH 04/39] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E8=AE=B0=E5=BD=95=E5=8E=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Finance/payTypeStatistics.html | 4 ++-- Application/Admin/View/PayChannel/gameDetail.html | 4 ++-- Application/Admin/View/PayChannel/index.html | 4 ++-- Application/Admin/View/PayChannel/testDetail.html | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Application/Admin/View/Finance/payTypeStatistics.html b/Application/Admin/View/Finance/payTypeStatistics.html index 3c1f1eaf0..2a15991a3 100644 --- a/Application/Admin/View/Finance/payTypeStatistics.html +++ b/Application/Admin/View/Finance/payTypeStatistics.html @@ -86,11 +86,11 @@
+ placeholder="开始时间" autocomplete="off"/> -
+ placeholder="结束时间" autocomplete="off"/>
diff --git a/Application/Admin/View/PayChannel/gameDetail.html b/Application/Admin/View/PayChannel/gameDetail.html index 8b049486f..1f7a8750f 100644 --- a/Application/Admin/View/PayChannel/gameDetail.html +++ b/Application/Admin/View/PayChannel/gameDetail.html @@ -62,11 +62,11 @@
+ placeholder="开始时间" autocomplete="off"/> -
+ placeholder="结束时间" autocomplete="off"/>
diff --git a/Application/Admin/View/PayChannel/index.html b/Application/Admin/View/PayChannel/index.html index c87a2767e..3fde629f7 100644 --- a/Application/Admin/View/PayChannel/index.html +++ b/Application/Admin/View/PayChannel/index.html @@ -107,10 +107,10 @@
- + -
- +
diff --git a/Application/Admin/View/PayChannel/testDetail.html b/Application/Admin/View/PayChannel/testDetail.html index 543864127..57ea61fc1 100644 --- a/Application/Admin/View/PayChannel/testDetail.html +++ b/Application/Admin/View/PayChannel/testDetail.html @@ -67,11 +67,11 @@
+ placeholder="开始时间" autocomplete="off"/> -
+ placeholder="结束时间" autocomplete="off"/>
From c1e16ed8d49d7d554c371e3caa14fa2cb36f3c53 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 26 Dec 2019 14:15:08 +0800 Subject: [PATCH 05/39] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=91=98=E5=85=85?= =?UTF-8?q?=E5=80=BC=E7=BB=9F=E8=AE=A1=E6=B1=87=E6=80=BB=E4=B8=BA=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=80=BB=E9=A2=9D=EF=BC=8C?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=89=80=E6=9C=89=E6=95=B0=E6=8D=AE=E7=9A=84?= =?UTF-8?q?=E6=80=BB=E5=92=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/PlatformController.class.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php index 0ccf54ea5..64efba111 100644 --- a/Application/Admin/Controller/PlatformController.class.php +++ b/Application/Admin/Controller/PlatformController.class.php @@ -513,7 +513,7 @@ class PlatformController extends ThinkController setPowerPromoteIds($map); $promote_map2 = array(); setPowerPromoteIds($promote_map2, 'id'); - $promote = M("promote","tab_")->field("id,account")->page($page,$row)->where($promote_map)->where($promote_map2)->select(); + $promote = M("promote","tab_")->field("id,account")->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,10 +584,11 @@ class PlatformController extends ThinkController $this->assign('userarpu_order_type', $data_order_type); } - $page = set_pagination($pcount, $row); + $page = set_pagination($count, $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 fe06fded2abb418040e5b66b3168f64626e04e6f Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 26 Dec 2019 15:05:38 +0800 Subject: [PATCH 06/39] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8C=BA=E6=9C=8D?= =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8C=E9=9A=90=E8=97=8F=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9Eid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/ServerController.class.php | 23 +++++++--- Application/Admin/View/Server/lists.html | 44 ++++++++++--------- 2 files changed, 41 insertions(+), 26 deletions(-) diff --git a/Application/Admin/Controller/ServerController.class.php b/Application/Admin/Controller/ServerController.class.php index bfdd48ea1..0af4e3057 100644 --- a/Application/Admin/Controller/ServerController.class.php +++ b/Application/Admin/Controller/ServerController.class.php @@ -10,7 +10,12 @@ use Admin\Event\BatchImportExcelEvent; class ServerController extends ThinkController { const model_name = 'Server'; - public function lists(){ + public function lists($p=0){ + $page = intval($p); + $page = $page ? $page : 1; //默认显示第一页数据 + $arraypage = $page; //默认显示第一页数据 + if(isset($_REQUEST['row'])) {$row = $_REQUEST['row'];}else{$row = 10;} + if(isset($_REQUEST['show_status'])){ $extend['show_status']=$_REQUEST['show_status']; unset($_REQUEST['show_status']); @@ -50,11 +55,19 @@ class ServerController extends ThinkController { $this->assign('show_status',1); } - $this->m_title = '区服列表'; - $this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Server/lists','status'=>1])->find()); - + $this->m_title = '区服列表'; + $this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Server/lists','status'=>1])->find()); - parent::order_lists(self::model_name,$_GET["p"],$extend); + $data = M("Server","tab_")->field("id,game_name,server_name,server_id,show_status,start_time,server_version,developers")->where($extend)->page($page,$row)->select(); + foreach($data as $k=>&$v){ + $v["start_time"] = set_show_time($v["start_time"]); + $v["server_version"] = get_systems_name($v["server_version"]); + } + $count = M("Server","tab_")->where($extend)->count("id"); + $this->assign('list_data', $data); + $page = set_pagination($count,$row); + if($page) {$this->assign('_page', $page);} + $this->display(); } public function add(){ diff --git a/Application/Admin/View/Server/lists.html b/Application/Admin/View/Server/lists.html index a7ae99cff..8eaf145c6 100644 --- a/Application/Admin/View/Server/lists.html +++ b/Application/Admin/View/Server/lists.html @@ -45,14 +45,14 @@
- -
+ +
@@ -126,10 +126,11 @@ 游戏名称 区服名称 + 区服ID 运营平台 显示状态 开服时间 - 操作 + @@ -143,27 +144,28 @@ {$data.game_name} {$data.server_name} - {:get_systems_name($data['server_version'])} + {$data.server_id} + {$data['server_version']}
- - - - 已开启 - - - - 已关闭 - - - -
+ + + + 已开启 + + + + 已关闭 + + + +
- {:set_show_time($data['start_time'])} - + {$data['start_time']} + @@ -258,7 +260,7 @@ $(".select_gallery").select2(); - - + - +namespace Admin\Controller; - -
-
- -

编辑游戏【{$data.relation_game_name}】

-

说明：查看和编辑游戏的基础信息、下载设置、参数信息等。

-
+ 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 11/39] =?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 a61e0f36b524796349403dc078a8fc3b5cfd03f4 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 26 Dec 2019 17:28:24 +0800 Subject: [PATCH 12/39] =?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 13/39] =?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 14/39] =?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 15/39] =?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 16/39] =?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 ee6c6e62b269220b4d8b05758ebd09aeb139da85 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Thu, 26 Dec 2019 17:51:16 +0800 Subject: [PATCH 17/39] =?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 18/39] =?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 19/39] =?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 20/39] =?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 21/39] =?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 @@
- 返回 + 返回
From 4e3206a5c1708f4b37c63cb37acd7559a6fffc97 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 26 Dec 2019 18:12:56 +0800 Subject: [PATCH 22/39] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1bug=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PayChannelController.class.php | 57 +++++++++++++---- Application/Admin/View/Deposit/lists.html | 30 ++++----- Application/Admin/View/PayChannel/index.html | 64 ++++++++++--------- 3 files changed, 93 insertions(+), 58 deletions(-) diff --git a/Application/Admin/Controller/PayChannelController.class.php b/Application/Admin/Controller/PayChannelController.class.php index 0e704efb2..b076bb96d 100644 --- a/Application/Admin/Controller/PayChannelController.class.php +++ b/Application/Admin/Controller/PayChannelController.class.php @@ -74,12 +74,11 @@ class PayChannelController extends ThinkController ->group("game_id") ->select(); - unset($coinMap['game_id']); +// unset($coinMap['game_id']); //平台币充值 $coinSum = M('deposit','tab_') ->where($coinMap) ->sum('tab_deposit.pay_amount'); -// var_dump($coinSum);die(); $data = array_merge($data,$coinData); $data = $this->unique_multi_array($data,'game_id'); @@ -177,7 +176,7 @@ class PayChannelController extends ThinkController // setPowerPromoteIds($spreadMap,'promote_id'); //推广后台 $spreadData = M("coin_pay_order","tab_") - ->field("0 as game_name,sum(real_amount) as pay_amount,0 as platform_coin,id as test_coin") + ->field("0 as game_name,sum(pay_amount) as pay_amount,0 as platform_coin,id as test_coin") ->where($spreadMap) ->find(); $spreadData['pay_amount'] = $spreadData['pay_amount']?$spreadData['pay_amount']:0; @@ -250,11 +249,18 @@ class PayChannelController extends ThinkController } //汇总数据 - $sumData['pay_amount'] = $sumData['pay_amount'] + $superSignData['pay_amount'] + $bindRechargeData['pay_amount']; - $sumData['platform_coin'] = $sumData['platform_coin'] - $sumData['test_platform_coin'] + - $offcialData['pay_amount'] + $spreadData['pay_amount']; - $sumData['test_coin'] = $sumData['test_coin']+$offcialTestCost+$testSuperSignCost+$sumData['test_platform_coin']; - $sumData['sum'] = $sumData['pay_amount'] +$sumData['test_coin'] + $sumData['platform_coin']; + if ($_REQUEST['game_id']) { + $sumData['platform_coin'] = $sumData['platform_coin'] - $sumData['test_platform_coin']; + $sumData['test_coin'] = $sumData['test_coin']+$sumData['test_platform_coin']; + $sumData['sum'] = $sumData['pay_amount'] +$sumData['test_coin'] + $sumData['platform_coin']; + } else { + $sumData['pay_amount'] = $sumData['pay_amount'] + $superSignData['pay_amount'] + $bindRechargeData['pay_amount']; + $sumData['platform_coin'] = $sumData['platform_coin'] - $sumData['test_platform_coin'] + + $offcialData['pay_amount'] + $spreadData['pay_amount']; + $sumData['test_coin'] = $sumData['test_coin']+$offcialTestCost+$testSuperSignCost+$sumData['test_platform_coin']; + $sumData['sum'] = $sumData['pay_amount'] +$sumData['test_coin'] + $sumData['platform_coin']; + $coinSum = $coinSum + $offcialData['pay_amount'] + $spreadData['pay_amount']+$offcialTestCost; + } if($_REQUEST['export'] == 1) { @@ -276,7 +282,7 @@ class PayChannelController extends ThinkController $payTypeDataExport['pay_amount'] .= $key.'：'.$value." "; } } - $payTypeDataExport['pay_amount'] .= "平台币直充金额(2019.12.18号以前的不显示在列表中，此项也不计入充值方式统计)：". + $payTypeDataExport['pay_amount'] .= "平台币直充总金额(2019.12.18号以前的不显示在列表中，此项也不计入充值方式统计)：". ($coinSum + $offcialData['pay_amount'] + $spreadData['pay_amount']+$offcialTestCost); $channelDataExport['game_name'] = '支付渠道'; @@ -288,6 +294,12 @@ class PayChannelController extends ThinkController unset($sumData['test_platform_coin']); + if ($_REQUEST['game_id']) { + unset($superSignData); + unset($offcialData); + unset($spreadData); + } + db2csv(array_merge(array_merge(array_merge(array_merge( array_merge(array_merge( array_merge($data,[0=>$superSignData]),[0=>$offcialData])),[0=>$spreadData],[0=>$sumData])),[0=>$payTypeDataExport]),[0=>$channelDataExport]),'支付渠道统计导出',$title); @@ -296,8 +308,9 @@ class PayChannelController extends ThinkController $this->meta_title = "支付渠道统计"; $size = $row;//每页显示的记录数 $data = array_slice($data, ($arraypage - 1) * $size, $size); + //平台币直充金额，下面列表 - $this->assign('coinSum',$coinSum + $offcialData['pay_amount'] + $spreadData['pay_amount']+$offcialTestCost); + $this->assign('coinSum',$coinSum); $this->assign('sumData',$sumData); $this->assign('channelData',$channelData); @@ -374,6 +387,20 @@ class PayChannelController extends ThinkController ->where($map) ->group('pay_way') ->select(false); + if ($_REQUEST['game_id']) { + $map['tab_deposit.pay_way'] = $map['pay_way']; + $map['tab_deposit.create_time'] = $map['create_time']; + $map['tab_deposit.pay_source'] = 2; + $map['tab_pay_info.extend'] = ''; + unset($map['pay_way']); + unset($map['create_time']); + $depositData = M('pay_info','tab_') + ->join("inner join tab_deposit on tab_pay_info.order_id=tab_deposit.pay_order_number") + ->field('sum(pay_amount) as pay_amount,tab_deposit.pay_way as pay_way') + ->where($map) + ->group('tab_deposit.pay_way') + ->select(false); + } $bindMap['pay_status'] = 1; $bindMap['pay_way'] = array('egt',1); @@ -390,8 +417,14 @@ class PayChannelController extends ThinkController ->where($bindMap) ->select(false); + if(!$_REQUEST['game_id']) { + $sql = "{$channelData} UNION ALL {$depositData} UNION ALL {$superSignDataPay} UNION ALL {$spreadDataPay} UNION ALL {$bindRechargeData}"; + } else { + $sql = "{$channelData} UNION ALL {$depositData}"; + } + //将语句整合起来查询 - $channelData = "select sum(pay_amount) as pay_amount,pay_way from ({$channelData} UNION ALL {$depositData} UNION ALL {$superSignDataPay} UNION ALL {$spreadDataPay} UNION ALL {$bindRechargeData})t group by pay_way;"; + $channelData = "select sum(pay_amount) as pay_amount,pay_way from ({$sql})t group by pay_way;"; // var_dump($channelData);die(); $channelData = M()->query($channelData); @@ -482,7 +515,7 @@ class PayChannelController extends ThinkController // setPowerPromoteIds($spreadMap,'promote_id'); // $spreadMap['pay_way'] = array('egt',1); $coin_pay_order = M('coin_pay_order','tab_') - ->field("pay_order_number,create_time as pay_time,promote_account,pay_amount as cost,real_amount as pay_amount,pay_way") + ->field("pay_order_number,create_time as pay_time,promote_account,pay_amount,real_amount as cost,pay_way") ->where($spreadMap) ->select(false); diff --git a/Application/Admin/View/Deposit/lists.html b/Application/Admin/View/Deposit/lists.html index 488c82a12..2f11a20f0 100644 --- a/Application/Admin/View/Deposit/lists.html +++ b/Application/Admin/View/Deposit/lists.html @@ -78,21 +78,21 @@
-
- - - -
-
- -
+ + + + + + + + + + + + + + +
diff --git a/Application/Admin/View/PayChannel/index.html b/Application/Admin/View/PayChannel/index.html index 195d04db9..4ff7ed276 100644 --- a/Application/Admin/View/PayChannel/index.html +++ b/Application/Admin/View/PayChannel/index.html @@ -176,36 +176,38 @@ - - 超级签 - {$superSignData['pay_amount']}0 - 0 - {$superSignData.test_coin}0 - {$superSignData['sum']}0 - - 订单查看 - - - - 官网 - 0 - {$offcialData['pay_amount']} - {$offcialData.test_coin}0 - {$offcialData['sum']}0 - - 订单查看 - - - - 推广后台 - 0 - {$spreadData['pay_amount']} - 0 - {$spreadData['sum']}0 - - 订单查看 - - + + + 超级签 + {$superSignData['pay_amount']}0 + 0 + {$superSignData.test_coin}0 + {$superSignData['sum']}0 + + 订单查看 + + + + 官网 + 0 + {$offcialData['pay_amount']} + {$offcialData.test_coin}0 + {$offcialData['sum']}0 + + 订单查看 + + + + 推广后台 + 0 + {$spreadData['pay_amount']} + 0 + {$spreadData['sum']}0 + + 订单查看 + + + 汇总 {$sumData['pay_amount']}0 @@ -225,7 +227,7 @@ {$key}：{$payTypeData}          - 平台币直充金额(2019.12.18号以前的不显示在列表中，此项也不计入充值方式统计)：{$coinSum}0 + 平台币直充总金额(2019.12.18号以前的无法对应游戏记录不显示在列表中，此项也不计入充值方式统计)：{$coinSum}0 From dd86fbaddff63878fc2dfa16bdd171776217cf55 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 26 Dec 2019 18:31:29 +0800 Subject: [PATCH 23/39] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1bug=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PayChannelController.class.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Application/Admin/Controller/PayChannelController.class.php b/Application/Admin/Controller/PayChannelController.class.php index b076bb96d..effe09071 100644 --- a/Application/Admin/Controller/PayChannelController.class.php +++ b/Application/Admin/Controller/PayChannelController.class.php @@ -65,6 +65,7 @@ class PayChannelController extends ThinkController //平台币充值金额计算 $coinMap['pay_source'] = 2; $coinMap['extend'] = array('eq',''); + $coinMap['tab_deposit.pay_way'] = array('egt',1); // setPowerPromoteIds($coinMap,'tab_deposit.promote_id'); $coinData = M('pay_info','tab_') @@ -388,18 +389,24 @@ class PayChannelController extends ThinkController ->group('pay_way') ->select(false); if ($_REQUEST['game_id']) { - $map['tab_deposit.pay_way'] = $map['pay_way']; - $map['tab_deposit.create_time'] = $map['create_time']; + if ($map['pay_way']) { + $map['tab_deposit.pay_way'] = $map['pay_way']; + unset($map['pay_way']); + } + if ($map['create_time']) { + $map['tab_deposit.create_time'] = $map['create_time']; + unset($map['create_time']); + } $map['tab_deposit.pay_source'] = 2; $map['tab_pay_info.extend'] = ''; - unset($map['pay_way']); - unset($map['create_time']); + $depositData = M('pay_info','tab_') ->join("inner join tab_deposit on tab_pay_info.order_id=tab_deposit.pay_order_number") ->field('sum(pay_amount) as pay_amount,tab_deposit.pay_way as pay_way') ->where($map) ->group('tab_deposit.pay_way') ->select(false); +// var_dump($depositData);die(); } $bindMap['pay_status'] = 1; From 660e0063f75569a2e5b59aba159ed4963a6b9d51 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Thu, 26 Dec 2019 18:37:27 +0800 Subject: [PATCH 24/39] =?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 | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index fbc0ab997..c1d2aafa9 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -5,7 +5,7 @@ - + @@ -729,8 +729,7 @@ var PhoneObj = { }, success: function (result) { if (result.code == '0000') { - Cookies.set('is_landing_login', 1, { expires: 1 }) - isLogin = true; + setLoginStatus() $(".phone").hide(); showMounting() } else { @@ -740,6 +739,13 @@ var PhoneObj = { }) }) + function setLoginStatus() + { + var expireTime = new Date(new Date().getTime() + 10 * 60 * 1000); + Cookies.set('is_landing_login', 1, { expires: expireTime }) + isLogin = true; + } + function showMounting() { $('.mounting').show(); @@ -784,8 +790,7 @@ var PhoneObj = { cache: false, success: function (result) { if (result.code == '0000') { - Cookies.set('is_landing_login', 1, { expires: 1 }) - isLogin = true; + setLoginStatus() $('.login').hide(); showMounting() } else { @@ -832,8 +837,7 @@ var PhoneObj = { }, success: function (result) { if (result.code == '0000') { - Cookies.set('is_landing_login', 1, { expires: 1 }) - isLogin = true; + setLoginStatus() $(".common").hide(); showMounting() } else { From 5b81f89308c057665e6a72c46bc860854b9588d5 Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Thu, 26 Dec 2019 19:00:37 +0800 Subject: [PATCH 25/39] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Game/edit.html | 2332 +++++++++++++++++++++++-- 1 file changed, 2184 insertions(+), 148 deletions(-) diff --git a/Application/Admin/View/Game/edit.html b/Application/Admin/View/Game/edit.html index 19a44ca51..f35767f1f 100644 --- a/Application/Admin/View/Game/edit.html +++ b/Application/Admin/View/Game/edit.html @@ -1,172 +1,2208 @@ - + + + + + + + + + -namespace Admin\Controller; + + -class SuperStatisticalController extends ThinkController -{ + +
+
+ +

编辑游戏【{$data.relation_game_name}】

+

说明：查看和编辑游戏的基础信息、下载设置、参数信息等。

+
- 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)) { + + + + - $where['pay_time'] = array('BETWEEN', [$startTime, $endTime]); - $map['pay_time'] = array('BETWEEN', [$startTime, $endTime]); - } - if(isset($params['game_id'])) { - $where['game_id'] = $params['game_id']; - $map['game_id'] = $params['game_id']; - } - $map['supersign_token'] = ['NEQ','']; - $supersign_game = M('game', 'tab_')->field('id,game_name,supersign_token')->where(['supersign_token' => ['NEQ','']])->select(); - $supersign_token = array_column($supersign_game, 'supersign_token'); - $authorization_all_num = 0; - foreach($supersign_token as $k => $v) { - $authorization_all_num += count($this->game_supersign_num($v)); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
游戏名称： + + +
游戏类型： + + +
运营平台 + + + + + + + 显示该游戏所适用的平台，一般为安卓平台和苹果平台 +
混服设置 + + + + +
开放类型 + + + + + 显示当前游戏的开放状态，一般为公测，删档内测，不删档内测等。主要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 +
+
+ +
+ + + + + + 返回 + +
+ +
+
+
+ +
+ +
+ + +
+ 已添加添加至常用设置 +
+ + + + + + + + + + + + From 13f5128dd840156fb09ae970a9636116ecdc63d7 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 26 Dec 2019 20:00:56 +0800 Subject: [PATCH 26/39] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=AF=BC=E5=87=BAbug=E4=BF=AE=E6=AD=A3,?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=E5=85=85=E5=80=BC=E5=85=85=E5=80=BC=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E6=A3=80=E7=B4=A2=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/extend.php | 23 +++++++++++++++++++ .../Controller/PayChannelController.class.php | 2 +- Application/Admin/View/Spend/lists.html | 2 +- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index aa9ee0cc8..a6bf48085 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -1770,4 +1770,27 @@ function data2csv(&$data,$title,$fields){ fclose($fp); //每生成一个文件关闭 die(); } + +//所有支付方式 +function all_pay_way_other($type=false) +{ + + if($type){ + $pay_way[0]=array('key'=>0,'value'=>"平台币"); + } + $pay_way[1]=array('key'=>-1,'value'=>"绑币"); + $pay_way[2]=array('key'=>1,'value'=>"支付宝"); + $pay_way[3]=array('key'=>2,'value'=>"微信"); + $pay_way[7]=array('key'=>7,'value'=>'金猪'); + $pay_way[9]=array('key'=>9,'value'=>"双乾支付-支付宝"); + $pay_way[10]=array('key'=>10,'value'=>"双乾支付-银联"); +// $pay_way[3]=array('key'=>3,'value'=>'微信APP'); +// $pay_way[4]=array('key'=>4,'value'=>'威富通'); + /* $pay_way[4]=array('key'=>5,'value'=>'聚宝云'); */ +// $pay_way[5]=array('key'=>6,'value'=>'汇付宝'); + /* $pay_way[6]=array('key'=>7,'value'=>"苹果支付"); + */ + $pay_way[15]=array('key'=>15,'value'=>'双乾支付-快捷'); + return $pay_way; +} ?> diff --git a/Application/Admin/Controller/PayChannelController.class.php b/Application/Admin/Controller/PayChannelController.class.php index effe09071..5137e6ebe 100644 --- a/Application/Admin/Controller/PayChannelController.class.php +++ b/Application/Admin/Controller/PayChannelController.class.php @@ -284,7 +284,7 @@ class PayChannelController extends ThinkController } } $payTypeDataExport['pay_amount'] .= "平台币直充总金额(2019.12.18号以前的不显示在列表中，此项也不计入充值方式统计)：". - ($coinSum + $offcialData['pay_amount'] + $spreadData['pay_amount']+$offcialTestCost); + ($coinSum); $channelDataExport['game_name'] = '支付渠道'; foreach($channelData as $key => $value) { diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html index 79a45ad5a..39ac2ed7b 100644 --- a/Application/Admin/View/Spend/lists.html +++ b/Application/Admin/View/Spend/lists.html @@ -83,7 +83,7 @@
From fd23b640eabb8cce4cac27ae15e0ae20e1a1339f Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 26 Dec 2019 20:04:12 +0800 Subject: [PATCH 27/39] =?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=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PlatformController.class.php | 268 +++++++++--------- .../View/Platform/promotepay_statistics.html | 184 +++++++----- 2 files changed, 255 insertions(+), 197 deletions(-) diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php index f31938318..3928991ad 100644 --- a/Application/Admin/Controller/PlatformController.class.php +++ b/Application/Admin/Controller/PlatformController.class.php @@ -56,7 +56,6 @@ class PlatformController extends ThinkController ->group('fgame_id') ->order('count desc,register_time') ->select(); -// dd($data); $map2 = array(); $map2['fgame_id'] = array('egt', 0); $map2['puid'] = 0; @@ -69,7 +68,6 @@ class PlatformController extends ThinkController ->group('fgame_id') ->select(); $data2 = array_column($data2, null, 'fgame_id'); -// dd($data2); $count = count($data); foreach ($data as $key => $value) { static $i = 0; @@ -612,19 +610,6 @@ class PlatformController extends ThinkController $week = total(2); $mounth = total(3); unset( $map['create_time']); - - //获取所有会长 - $promote_map = "`chain` = '/'"; - if (isset($_REQUEST['promote_id'])) { - $promote_map = "`chain` = '%/{$_REQUEST['promote_id']}/%' OR id = {$_REQUEST['promote_id']}"; - } - //为数据权限添加 - setPowerPromoteIds($map); - $promote_map2 = array(); - setPowerPromoteIds($promote_map2, 'id'); - $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); $tweek = total(2,false); $tmonth = total(3,false); @@ -635,50 +620,68 @@ class PlatformController extends ThinkController }else{ $tmin = $tmonth[1][0]; } + + //为数据权限添加 + setPowerPromoteIds($map, 'tp1.id'); + if (isset($_REQUEST['promote_id'])) { + $map['tp1.id'] = $_REQUEST['promote_id']; + } else { + $map['tp1.chain'] = '/'; + } - $data =array(); - for ($i=0; $i < count($promote); $i++) { - # code... - $proid = M("promote","tab_")->field("id")->where("`chain` like '%/{$promote[$i]['id']}/%'")->select(); - $str = ''; - for($k=0; $kfield('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])]; + + if (isset($_REQUEST['game_name'])) { + $map['s.game_name'] = $_REQUEST['game_name']; + if (isset($_REQUEST['server_id'])) { + $map['s.server_name'] = $_REQUEST['server_id']; + unset($_REQUEST['server_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 = M('promote', 'tab_')->alias('tp1') + ->field('tp1.account as promote_account,tp1.id, + floor(sum(pay_amount)*100) as count') + ->join("tab_promote AS tp2 ON tp2.`chain` LIKE CONCAT('%/', tp1.id, '/%') OR tp2.id = tp1.id", 'left') + ->join("tab_spend as s on tp2.id = s.promote_id", 'left') + ->where($map) + ->group('tp1.id') + ->order('count desc') + ->select(); + //今日/本周/本月不变 + $tmap = $map; + if(isset($map['pay_time'])){ + $tmap['pay_time'] = ['between', array($tmin,$tmonth[1][1])]; + } + $tdata = M('promote', 'tab_')->alias('tp1') + ->field('tp1.account as promote_account,tp1.id, + floor(sum(IF(s.pay_time ' . $today . ',pay_amount,0))*100) as today, + floor(sum(IF(s.pay_time ' . $week . ',pay_amount,0))*100) as week, + floor(sum(IF(s.pay_time ' . $mounth . ',pay_amount,0))*100) as mounth') + ->join("tab_promote AS tp2 ON tp2.`chain` LIKE CONCAT('%/', tp1.id, '/%') OR tp2.id = tp1.id", 'left') + ->join("tab_spend as s on tp2.id = s.promote_id", 'left') + ->where($tmap) + ->group('tp1.id') + ->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[] = $dbdata; } + $data = []; + foreach($tmdata as $k => $v){ + $data[] = $v; + } + // dd($data); + $count = count($data); foreach ($data as $key => $value) { $value['count'] ?: 0; @@ -703,7 +706,7 @@ class PlatformController extends ThinkController $this->assign('userarpu_order_type', $data_order_type); } - $page = set_pagination($pcount, $row); + $page = set_pagination($count, $row); if ($page) { $this->assign('_page', $page); } @@ -712,13 +715,14 @@ class PlatformController extends ThinkController $size = $row;//每页显示的记录数 $pnum = ceil(count($data) / $size); //总页数，ceil()函数用于求大于数字的最小整数 + $data = array_slice($data, ($arraypage - 1) * $size, $size); $this->meta_title = '渠道充值统计列表'; $this->assign('list_data', $data); $this->assign("is_admin",is_administrator()); $this->display(); } - function promotepay_statistics_1($p = 0) + public function promotepay_statistics1($p = 0) { $page = intval($p); $page = $page ? $page : 1; //默认显示第一页数据 @@ -731,84 +735,97 @@ 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); $week = total(2); $mounth = total(3); - // $map1['pay_way'] = $map['pay_way'] = array('gt', 0); - - $bindrecharge_data = M('bind_recharge', 'tab_') - ->field('max(id) as id,promote_account,promote_id,create_time as ordertime,date_format(FROM_UNIXTIME(create_time),"%Y-%m-%d") AS time, - floor(sum(IF(create_time ' . $pay_time . ',real_amount,0))*100) as scount, - floor(sum(IF(create_time ' . $today . ',real_amount,0))*100) as today, - floor(sum(IF(create_time ' . $week . ',real_amount,0))*100) as week, - floor(sum(IF(create_time ' . $mounth . ',real_amount,0))*100) as mounth') - ->where($map1) - ->group('promote_id') - ->select(false); - - $deposit_data = M('deposit', 'tab_') - ->field('max(id) as id,promote_account,promote_id,create_time as ordertime,date_format(FROM_UNIXTIME(create_time),"%Y-%m-%d") AS time, - floor(sum(IF(create_time ' . $pay_time . ',pay_amount,0))*100) as scount, - floor(sum(IF(create_time ' . $today . ',pay_amount,0))*100) as today, - floor(sum(IF(create_time ' . $week . ',pay_amount,0))*100) as week, - floor(sum(IF(create_time ' . $mounth . ',pay_amount,0))*100) as mounth') - ->where($map1) - ->group('promote_id') - ->select(false); - if (isset($_REQUEST['game_name'])) { - $map['game_name'] = $_REQUEST['game_name']; - if (isset($_REQUEST['server_id'])) { - $map['server_name'] = $_REQUEST['server_id']; - unset($_REQUEST['server_id']); + unset( $map['create_time']); + + //获取所有会长 + $promote_map = "`chain` = '/'"; + if (isset($_REQUEST['promote_id'])) { + $promote_map = "`chain` = '%/{$_REQUEST['promote_id']}/%' OR id = {$_REQUEST['promote_id']}"; + } + //为数据权限添加 + setPowerPromoteIds($map); + $promote_map2 = array(); + setPowerPromoteIds($promote_map2, 'id'); + $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); + $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... + $proid = M("promote","tab_")->field("id")->where("`chain` like '%/{$promote[$i]['id']}/%'")->select(); + $str = ''; + for($k=0; $kfield('max(id) as id,promote_account,promote_id,pay_time as ordertime,date_format(FROM_UNIXTIME(pay_time),"%Y-%m-%d") AS time, - floor(sum(IF(pay_time ' . $pay_time . ',pay_amount,0))*100) as scount, - 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) - ->group('promote_id') - ->select(false); - } else { - $data = $spend - ->field('max(id) as id,promote_account,promote_id,pay_time as ordertime,date_format(FROM_UNIXTIME(pay_time),"%Y-%m-%d") AS time, - floor(sum(IF(pay_time ' . $pay_time . ',pay_amount,0))*100) as scount, - 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') + $str .= "{$promote[$i]['id']}"; + $map['promote_id'] = array("in",$str); + if (isset($_REQUEST['game_name'])) { + $map['game_name'] = $_REQUEST['game_name']; + if (isset($_REQUEST['server_id'])) { + $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') ->where($map) - // ->union(' (' . $bindrecharge_data . ') ') - // ->union(' (' . $deposit_data . ') ') - ->group('promote_id') - ->select(false); - } - $promote_map = "tp1.`chain` = '/'"; - if (isset($_REQUEST['promote_id'])) { - $promote_map = "tp1.`id` = {$_REQUEST['promote_id']}"; - unset($_REQUEST['promote_id']); + ->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; } - $data = $spend->field('t.pid as promote_id,t.promote_account,sum(a.scount) AS count,sum(a.today) AS today,sum(a. WEEK) AS WEEK,sum(a.mounth) AS mounth') - ->join("inner JOIN (SELECT tp2.*, tp1.id AS pid, tp1.account as promote_account FROM tab_promote tp1 LEFT JOIN tab_promote tp2 ON tp2.`chain` LIKE CONCAT('%/', tp1.id, '/%') where $promote_map ) AS t ON promote_id = t.id or promote_id = t.pid") - ->where($condition)->table('(' . $data . ') as a')->group('t.pid')->order('count desc,a.ordertime')->select(); $count = count($data); foreach ($data as $key => $value) { + $value['count'] ?: 0; + $value['today'] ?: 0; + $value['week'] ?: 0; + $value['mounth'] ?: 0; static $i = 0; $i++; $data[$key]['rand'] = $i; @@ -816,14 +833,8 @@ class PlatformController extends ThinkController $data[$key]['today'] = $value['today'] / 100; $data[$key]['week'] = $value['week'] / 100; $data[$key]['mounth'] = $value['mounth'] / 100; - /* $adata=$this->day_data('Spend',array('promote_id'=>$value['promote_id'])); - $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]); - // } - } + } + $total = $this->data_total($data); $this->assign('total', $total); if ($_REQUEST['data_order'] != '') { @@ -833,19 +844,20 @@ 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 = my_sort($data, $data_order_type, (int)$data_order); + $size = $row;//每页显示的记录数 $pnum = ceil(count($data) / $size); //总页数，ceil()函数用于求大于数字的最小整数 - //用array_slice(array,offset,length) 函数在数组中根据条件取出一段值;array(数组),offset(元素的开始位置),length(组的长度) - $data = array_slice($data, ($arraypage - 1) * $size, $size); $this->meta_title = '渠道充值统计列表'; $this->assign('list_data', $data); + $this->assign("is_admin",is_administrator()); $this->display(); + } public function data_total($data) diff --git a/Application/Admin/View/Platform/promotepay_statistics.html b/Application/Admin/View/Platform/promotepay_statistics.html index d951b5063..e9fbdd1a8 100644 --- a/Application/Admin/View/Platform/promotepay_statistics.html +++ b/Application/Admin/View/Platform/promotepay_statistics.html @@ -88,21 +88,51 @@ - - + + + --> + + + + + + + + + + + + @@ -121,7 +151,7 @@ - + @@ -131,7 +161,7 @@ - + @@ -209,69 +239,85 @@ // }); // }); $(".paixu").click(function(){ - $ddd=$(this).attr('date-url'); - $lzhuce="{:I('lzhuce')}"; - $phb = "{:I('phb')}"; - $dzhuce = "{:I('dzhuce')}"; - $wzhuce = "{:I('wzhuce')}"; - $mzhuce = "{:I('mzhuce')}"; - // $sss="{:I('group')}"; - if($ddd=='lzhuce'){ - if($lzhuce==1){ - $(".sortBy").attr('name','lzhuce'); - $(".sortBy").attr('value',2); - $("#search").click(); - }else{ - $(".sortBy").attr('name','lzhuce'); - $(".sortBy").attr('value',1); - $("#search").click(); - } - } - if($ddd=='phb'){ - if($phb==1){ - $(".sortBy").attr('name','phb'); - $(".sortBy").attr('value',2); - $("#search").click(); - }else{ - $(".sortBy").attr('name','phb'); - $(".sortBy").attr('value',1); - $("#search").click(); - } - } - if($ddd=='dzhuce'){ - if($dzhuce==1){ - $(".sortBy").attr('name','dzhuce'); - $(".sortBy").attr('value',2); - $("#search").click(); - }else{ - $(".sortBy").attr('name','dzhuce'); - $(".sortBy").attr('value',1); - $("#search").click(); - } - } - if($ddd=='wzhuce'){ - if($wzhuce==1){ - $(".sortBy").attr('name','wzhuce'); - $(".sortBy").attr('value',2); - $("#search").click(); - }else{ - $(".sortBy").attr('name','wzhuce'); - $(".sortBy").attr('value',1); - $("#search").click(); - } - } - if($ddd=='mzhuce'){ - if($mzhuce==1){ - $(".sortBy").attr('name','mzhuce'); - $(".sortBy").attr('value',2); - $("#search").click(); - }else{ - $(".sortBy").attr('name','mzhuce'); - $(".sortBy").attr('value',1); - $("#search").click(); - } + var that=$(this); + $data_order=that.attr('data-order'); + $order_type='{$userarpu_order}'; + if($order_type==''||$order_type=='4'){ + $(".sortBy").attr('name','data_order'); + val='3,'+$data_order; + $(".sortBy").attr('value',val); + $("#search").click(); + }else if($order_type=='3'){ + $(".sortBy").attr('name','data_order'); + val='4,'+$data_order; + $(".sortBy").attr('value',val); + $("#search").click(); } - }) + }); + // $(".paixu").click(function(){ + // $ddd=$(this).attr('date-url'); + // $lzhuce="{:I('lzhuce')}"; + // $phb = "{:I('phb')}"; + // $dzhuce = "{:I('dzhuce')}"; + // $wzhuce = "{:I('wzhuce')}"; + // $mzhuce = "{:I('mzhuce')}"; + // // $sss="{:I('group')}"; + // if($ddd=='lzhuce'){ + // if($lzhuce==1){ + // $(".sortBy").attr('name','lzhuce'); + // $(".sortBy").attr('value',2); + // $("#search").click(); + // }else{ + // $(".sortBy").attr('name','lzhuce'); + // $(".sortBy").attr('value',1); + // $("#search").click(); + // } + // } + // if($ddd=='phb'){ + // if($phb==1){ + // $(".sortBy").attr('name','phb'); + // $(".sortBy").attr('value',2); + // $("#search").click(); + // }else{ + // $(".sortBy").attr('name','phb'); + // $(".sortBy").attr('value',1); + // $("#search").click(); + // } + // } + // if($ddd=='dzhuce'){ + // if($dzhuce==1){ + // $(".sortBy").attr('name','dzhuce'); + // $(".sortBy").attr('value',2); + // $("#search").click(); + // }else{ + // $(".sortBy").attr('name','dzhuce'); + // $(".sortBy").attr('value',1); + // $("#search").click(); + // } + // } + // if($ddd=='wzhuce'){ + // if($wzhuce==1){ + // $(".sortBy").attr('name','wzhuce'); + // $(".sortBy").attr('value',2); + // $("#search").click(); + // }else{ + // $(".sortBy").attr('name','wzhuce'); + // $(".sortBy").attr('value',1); + // $("#search").click(); + // } + // } + // if($ddd=='mzhuce'){ + // if($mzhuce==1){ + // $(".sortBy").attr('name','mzhuce'); + // $(".sortBy").attr('value',2); + // $("#search").click(); + // }else{ + // $(".sortBy").attr('name','mzhuce'); + // $(".sortBy").attr('value',1); + // $("#search").click(); + // } + // } + // }) //点击排序 $('.list_sort').click(function(){ var url = $(this).attr('url'); From c590b948ef51324e6c659fbdc67fe4bc684b8a10 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 26 Dec 2019 20:11:56 +0800 Subject: [PATCH 28/39] =?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=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/PlatformController.class.php | 10 ++++++++++ .../Admin/View/Platform/promotepay_statistics.html | 5 ++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php index 3928991ad..349a1c216 100644 --- a/Application/Admin/Controller/PlatformController.class.php +++ b/Application/Admin/Controller/PlatformController.class.php @@ -715,6 +715,16 @@ class PlatformController extends ThinkController $size = $row;//每页显示的记录数 $pnum = ceil(count($data) / $size); //总页数，ceil()函数用于求大于数字的最小整数 + if(isset($_REQUEST['export'])){ + data2csv($data,'推广员充值统计',array( + "promote_account"=>"推广员账号", + "count"=>"累计充值", + "rand"=>"排行榜", + "today"=>"今日充值", + "week"=>"本周充值", + "mounth"=>"本月充值", + )); + } $data = array_slice($data, ($arraypage - 1) * $size, $size); $this->meta_title = '渠道充值统计列表'; $this->assign('list_data', $data); diff --git a/Application/Admin/View/Platform/promotepay_statistics.html b/Application/Admin/View/Platform/promotepay_statistics.html index e9fbdd1a8..ef0284de1 100644 --- a/Application/Admin/View/Platform/promotepay_statistics.html +++ b/Application/Admin/View/Platform/promotepay_statistics.html @@ -172,9 +172,8 @@
- 导出 + 导出 {$_page|default=''}
From 47595c81b8205b3fad148e0d90551c38e9adb9ec Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 26 Dec 2019 20:38:44 +0800 Subject: [PATCH 29/39] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=AC=E4=BC=9A?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=85=AC=E5=8F=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinancePromoteController.class.php | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php index 9e4cf147a..0ba98edde 100644 --- a/Application/Admin/Controller/FinancePromoteController.class.php +++ b/Application/Admin/Controller/FinancePromoteController.class.php @@ -56,19 +56,19 @@ class FinancePromoteController extends AdminController $senddata[$v['p_id']] = $v; }; } - if(array_key_exists(0,$senddata) || $_REQUEST['promote_id']==0){ - $pmap['status']=1; - if($istimeselect){ - $pmap['create_time'] = $istimeselect; - } - $admininside = M("provide_user p","tab_")->field("sum(amount) amount")->where($pmap)->find(); - if($admininside['amount'] >0){ - $senddata[0]['inside_cash_count']= $admininside['amount']; + if(!empty($senddata)){ + if(array_key_exists(0,$senddata) || $_REQUEST['promote_id']==0){ + $pmap['status']=1; + if($istimeselect){ + $pmap['create_time'] = $istimeselect; + } + $admininside = M("provide_user p","tab_")->field("sum(amount) amount")->where($pmap)->find(); + if($admininside['amount'] >0){ + $senddata[0]['inside_cash_count']= $admininside['amount']; + } + } - } - - $data = []; $count =array( "cash_count"=>0, @@ -132,6 +132,9 @@ class FinancePromoteController extends AdminController } } } + if (isset($_REQUEST['company_id'])) { + $map['promote.company_id'] = $_REQUEST['company_id']; + } if($type == "spend"){ if (isset($_REQUEST['game_name']) || isset($_REQUEST['game_type'])) { $map["s.game_id"] = array("in",implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')) ); From f38e007d802a52522b75fbbecddf9c844607ed90 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 26 Dec 2019 20:42:43 +0800 Subject: [PATCH 30/39] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E7=9A=84=E5=85=AC=E5=8F=B8=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/FinancePromoteController.class.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php index 0ba98edde..63409d2dc 100644 --- a/Application/Admin/Controller/FinancePromoteController.class.php +++ b/Application/Admin/Controller/FinancePromoteController.class.php @@ -292,6 +292,9 @@ class FinancePromoteController extends AdminController } } } + if (isset($_REQUEST['company_id'])) { + $map['promote.company_id'] = $_REQUEST['company_id']; + } if ($type == "spend") { if (isset($_REQUEST['game_name']) || isset($_REQUEST['game_type'])) { $map["s.game_id"] = array("in",implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')) ); From 1d69c616d61b44a77aedfdbce8389d74c62ff36e Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 26 Dec 2019 20:51:27 +0800 Subject: [PATCH 31/39] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=AC=E4=BC=9A?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/FinancePromote/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/View/FinancePromote/index.html b/Application/Admin/View/FinancePromote/index.html index 836fdadf4..9f60ea626 100644 --- a/Application/Admin/View/FinancePromote/index.html +++ b/Application/Admin/View/FinancePromote/index.html @@ -239,8 +239,8 @@ From b96e65b8fe9b320d7acee2a0e4a706a527c06a9e Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 26 Dec 2019 21:05:11 +0800 Subject: [PATCH 32/39] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E5=85=85=E5=80=BC?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/FinanceController.class.php | 2 +- Application/Admin/Controller/PlatformController.class.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index 76b31514d..f3a6da5fb 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/Application/Admin/Controller/FinanceController.class.php @@ -1079,7 +1079,7 @@ class FinanceController extends ThinkController //推广后台 $spreadData = M("coin_pay_order","tab_") - ->field("pay_way,'' as pay_type,sum(real_amount) as pay_amount") + ->field("pay_way,'' as pay_type,sum(pay_amount) as pay_amount") ->where([ 'order_status'=>['egt',1], 'pay_way'=>['egt',1],'pay_time'=>$time diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php index 349a1c216..fa791fe73 100644 --- a/Application/Admin/Controller/PlatformController.class.php +++ b/Application/Admin/Controller/PlatformController.class.php @@ -137,12 +137,12 @@ class PlatformController extends ThinkController //为数据权限添加 setPowerPromoteIds($map); + $map['game_id'] = array('gt', 0); // var_dump($_REQUEST);exit; if (isset($_REQUEST['game_name']) && $_REQUEST['game_name'] != '') { $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); From 9bf45ae0d33bbb4fbfb92c09a03d6877241c8dd9 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Thu, 26 Dec 2019 21:26:52 +0800 Subject: [PATCH 33/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/ConsoleController.class.php | 40 +++++++++++++++++++ .../Home/Controller/HomeController.class.php | 2 +- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Controller/ConsoleController.class.php b/Application/Admin/Controller/ConsoleController.class.php index 602063e05..3fd04ec0b 100644 --- a/Application/Admin/Controller/ConsoleController.class.php +++ b/Application/Admin/Controller/ConsoleController.class.php @@ -7,6 +7,7 @@ use Admin\Model\SpendModel; use Think\Think; use Base\Tool\Printer; use Base\Service\PromoteService; +use GuzzleHttp\Client; class ConsoleController extends Think { @@ -263,4 +264,43 @@ class ConsoleController extends Think { } } } + + public function testLogin() + { + /* $client = new Client([ + 'base_uri' => 'http://47.111.118.107:9501', + 'timeout' => 10.0, + ]); + $response = $client->post('/game-event/login', [ + 'form_params' => [ + 'user_id' => 28747, + 'game_id' => 153, + 'login_time' => 1577361998 + ] + ]); + $result = (string)$response->getBody(); + echo $result; */ + + $data = [ + 'user_id' => 28747, + 'game_id' => 153, + 'login_time' => 1577361998 + ]; + $client = new Client([ + 'base_uri' => 'http://47.111.118.107:9501', + 'timeout' => 5.0, + ]); + $promise = $client->requestAsync('POST', '/game-event/login', [ + 'form_params' => $data + ]); + $promise->then( + function (ResponseInterface $res) { + echo $res->getStatusCode() . PHP_EOL; + }, + function (RequestException $e) { + echo $e->getMessage() . PHP_EOL; + echo $e->getRequest()->getMethod(); + } + ); + } } diff --git a/Application/Home/Controller/HomeController.class.php b/Application/Home/Controller/HomeController.class.php index adc53ef6a..0c8145339 100644 --- a/Application/Home/Controller/HomeController.class.php +++ b/Application/Home/Controller/HomeController.class.php @@ -227,7 +227,7 @@ class HomeController extends Controller } // 调试 - $isIOS = true; + // $isIOS = true; $downloadUrl = ''; if (!$isNewIos && $isIOS13) { From 2f25386518d3c166756c4d650a62987ef5c1a0b9 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 26 Dec 2019 21:45:26 +0800 Subject: [PATCH 34/39] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E5=85=85=E5=80=BC?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/PlatformController.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php index fa791fe73..1b745bba0 100644 --- a/Application/Admin/Controller/PlatformController.class.php +++ b/Application/Admin/Controller/PlatformController.class.php @@ -674,7 +674,9 @@ class PlatformController extends ThinkController $tmdata[$v['id']]['today'] = $v['today']; $tmdata[$v['id']]['week'] = $v['week']; $tmdata[$v['id']]['mounth'] = $v['mounth']; - + if (!$tmdata[$v['id']]['promote_account']) { + $tmdata[$v['id']]['promote_account'] = $v['promote_account']; + } } $data = []; foreach($tmdata as $k => $v){ From ea80b8fd4442495f80a6962fc51e89183ab24565 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 26 Dec 2019 21:50:10 +0800 Subject: [PATCH 35/39] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E5=85=85=E5=80=BC?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/PlatformController.class.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php index 1b745bba0..24d2b4c87 100644 --- a/Application/Admin/Controller/PlatformController.class.php +++ b/Application/Admin/Controller/PlatformController.class.php @@ -502,6 +502,12 @@ class PlatformController extends ThinkController $tmdata[$v['id']]['today'] = $v['today']; $tmdata[$v['id']]['week'] = $v['week']; $tmdata[$v['id']]['mounth'] = $v['mounth']; + + if (!$tmdata[$v['id']]['promote_account']) { + $tmdata[$v['id']]['promote_account'] = $v['promote_account']; + $tmdata[$v['id']]['count'] = 0; + } + } $data = []; @@ -676,6 +682,7 @@ class PlatformController extends ThinkController $tmdata[$v['id']]['mounth'] = $v['mounth']; if (!$tmdata[$v['id']]['promote_account']) { $tmdata[$v['id']]['promote_account'] = $v['promote_account']; + $tmdata[$v['id']]['count'] = 0; } } $data = []; From 6dbfd09e917f73b929096346532ccfb669d49043 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Fri, 27 Dec 2019 09:22:34 +0800 Subject: [PATCH 36/39] =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=8E=A8=E5=B9=BF?= =?UTF-8?q?=E5=91=98=E6=97=B6=E6=8E=A8=E5=B9=BF=E5=85=AC=E5=8F=B8=E5=BF=85?= =?UTF-8?q?=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/PromoteController.class.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php index a76becf9a..b53e4ffc9 100644 --- a/Application/Admin/Controller/PromoteController.class.php +++ b/Application/Admin/Controller/PromoteController.class.php @@ -284,6 +284,9 @@ class PromoteController extends ThinkController if ($this->accountExist($data['account'], $_POST['id'])) { $this->error('该账号已存在'); } + if (empty(I('company_id'))) { + $this->error('请选择推广公司'); + } $pdata = D('Promote')->where($map1)->find(); if ($pdata) { From e49ed7aa30f0b1b94f16909b6de02ed15111b9f3 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 27 Dec 2019 10:27:22 +0800 Subject: [PATCH 37/39] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=AE=A1=E6=B7=BB=E5=8A=A0=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E5=B8=81=E7=9B=B4=E5=85=85=E9=87=91=E9=A2=9D=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/PayChannel/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/View/PayChannel/index.html b/Application/Admin/View/PayChannel/index.html index 4ff7ed276..983f44e80 100644 --- a/Application/Admin/View/PayChannel/index.html +++ b/Application/Admin/View/PayChannel/index.html @@ -71,7 +71,7 @@

支付渠道统计

-

+

说明：平台币直充金额2019.12.18以前sdk新包数据及sdk旧包数据，无法对应相关游戏无法计入以上平台币列表中，充值方式统计一栏统计平台币直充总金额

游戏充值统计 充值方式统计 From e055cc27d59396512139da4621a407e83ab222f2 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 27 Dec 2019 10:35:25 +0800 Subject: [PATCH 38/39] =?UTF-8?q?ajax=E6=B8=B8=E6=88=8F=E5=8C=BA=E6=9C=8D?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E8=AE=BE=E5=A4=87=E9=9D=9E=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/AjaxController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/AjaxController.class.php b/Application/Admin/Controller/AjaxController.class.php index 3dcc0cc60..2d6092dec 100644 --- a/Application/Admin/Controller/AjaxController.class.php +++ b/Application/Admin/Controller/AjaxController.class.php @@ -83,7 +83,7 @@ class AjaxController extends ThinkController{ if ($sdk_version) { $map['server_version'] = $game_map['sdk_version'] = $sdk_version; }else { - $this->AjaxReturn([]); +// $this->AjaxReturn([]); } $game = M("Game", 'tab_')->where($game_map)->getField('id', true); From 12f00ad2680829c3de2792ae83ba9c9710eb9db7 Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Fri, 27 Dec 2019 11:52:46 +0800 Subject: [PATCH 39/39] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/StatisticsController.class.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Application/Admin/Controller/StatisticsController.class.php b/Application/Admin/Controller/StatisticsController.class.php index d7b4b3765..5bb786fd6 100644 --- a/Application/Admin/Controller/StatisticsController.class.php +++ b/Application/Admin/Controller/StatisticsController.class.php @@ -1035,15 +1035,17 @@ class StatisticsController extends ThinkController { $map = " 1=1 "; $game_map = ""; - if (isset($_REQUEST['game_name'])) { + if (isset($_REQUEST['game_name']) && isset($_REQUEST['server_name'])) { $game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')); $map .= " AND game_id in ({$game_ids})"; $game_map = " AND EXISTS (SELECT upi.user_id FROM tab_user_play_info as upi where upi.game_id in ({$game_ids}) AND upi.user_id = u.id "; if (isset($_REQUEST['server_name'])) $game_map .= " AND upi.server_name = '{$_REQUEST['server_name']}' "; $game_map .= ") "; - } - if (isset($_REQUEST['server_name'])) { - $map .= " AND server_name = '{$_REQUEST['server_name']}' "; + } else if (isset($_REQUEST['game_name'])) { + $game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')); + $map .= " AND game_id in ({$game_ids})"; + $game_map = " AND EXISTS (SELECT upi.user_id FROM tab_user_play as upi where upi.game_id in ({$game_ids}) AND upi.user_id = u.id "; + $game_map .= ") "; } // 获取包含的用户id $users = M()->query("
排行榜 今日充值 本周充值 本月充值
推广员账号累计充值▲ + 累计充值▼ + 累计充值 + 排行榜▲ + 排行榜▼ + 排行榜 + + 今日充值▲ + 今日充值▼ + 今日充值 + + 本周充值▲ + 本周充值▼ + 本周充值 + + + 本月充值▲ + 本月充值▼ + 本月充值 +
{$data['promote_account']} {$data.count}{$data.rand}{$data.rand}{$data.rand}{$data.rand} {$data.today} {$data.week} {$data.mounth}
汇总 {$total.sum_count}--- {$total.sum_today} {$total.sum_week} {$total.sum_mounth}{$all_count['all_count']} 游戏查看 - 渠道查看 + href="{:U('FinancePromote/gameStatistics',array_merge(I('get.'),['promote_type'=>1,'p'=>1]))}">游戏查看 + 渠道查看