diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index 77ee795e0..e426dd5f1 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -1916,6 +1916,25 @@ class ExportController extends Controller
}
break;
case 23:
+ $params = I('get.');
+ $map['tab_game_supersign.pay_status'] = 1;
+ if (isset($params['order_id'])) {
+ $map['tab_game_supersign.order_id'] = $params['order_id'];
+ }
+ if (isset($params['account'])) {
+ $map['tab_user.account'] = $params['account'];
+ }
+ if (isset($params['promote_id'])) {
+ $promoteId = $params['promote_id'];
+ if ($promoteId == 0) {
+ $map['promote_id'] = 0;
+ } else {
+ $promoteMap['chain'] = ['like', "%/$promoteId/%"];
+ $promoteIds = M('Promote', 'tab_')->where($promoteMap)->getField('id', true);
+ $promoteIds[] = $promoteId;
+ $map['tab_user.promote_id'] = ['in', $promoteIds];
+ }
+ }
$xlsCell = array(
array('order_id', '订单号'),
array('account', '游戏账号'),
@@ -1925,7 +1944,7 @@ class ExportController extends Controller
array('pay_time', '购买时间'),
array('super_money', '超级签金额'),
);
- $xlsData = M('game_supersign', 'tab_')->field('tab_game_supersign.id,tab_game_supersign.order_id,tab_user.account,tab_user.promote_account,tab_user.device_number,tab_game.game_name,tab_game_supersign.pay_time')->join('tab_user on tab_game_supersign.user_id = tab_user.id')->join('tab_game on tab_game_supersign.game_id = tab_game.id')->where(['tab_game_supersign.pay_status' => 1])->order('id DESC')->select();
+ $xlsData = M('game_supersign', 'tab_')->field('tab_game_supersign.id,tab_game_supersign.order_id,tab_user.account,tab_user.promote_account,tab_user.device_number,tab_game.game_name,tab_game_supersign.pay_time')->join('tab_user on tab_game_supersign.user_id = tab_user.id')->join('tab_game on tab_game_supersign.game_id = tab_game.id')->where($map)->order('id DESC')->select();
foreach($xlsData as $k => $v) {
$xlsData[$k]['pay_time'] = date('Y-m-d H:i:s',$v['pay_time']);
}
diff --git a/Application/Admin/Controller/SuperStatisticalController.class.php b/Application/Admin/Controller/SuperStatisticalController.class.php
index a2bfc3b93..5b11bc33f 100644
--- a/Application/Admin/Controller/SuperStatisticalController.class.php
+++ b/Application/Admin/Controller/SuperStatisticalController.class.php
@@ -102,8 +102,27 @@ class SuperStatisticalController extends ThinkController
public function superDetail($p = 1,$row = 10) {
$page = $p ? $p : 1;
$row = $row ? $row : 10;
- $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')->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(['tab_game_supersign.pay_status' => 1])->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(['tab_game_supersign.pay_status' => 1])->count();
+ $params = I('get.');
+ $map['tab_game_supersign.pay_status'] = 1;
+ if (isset($params['order_id'])) {
+ $map['tab_game_supersign.order_id'] = $params['order_id'];
+ }
+ if (isset($params['account'])) {
+ $map['tab_user.account'] = $params['account'];
+ }
+ if (isset($params['promote_id'])) {
+ $promoteId = $params['promote_id'];
+ if ($promoteId == 0) {
+ $map['promote_id'] = 0;
+ } else {
+ $promoteMap['chain'] = ['like', "%/$promoteId/%"];
+ $promoteIds = M('Promote', 'tab_')->where($promoteMap)->getField('id', true);
+ $promoteIds[] = $promoteId;
+ $map['tab_user.promote_id'] = ['in', $promoteIds];
+ }
+ }
+ $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')->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();
$super_money_all = $count * $this->super_money;
$page = set_pagination($count, $row);
diff --git a/Application/Admin/View/SuperStatistical/superDetail.html b/Application/Admin/View/SuperStatistical/superDetail.html
index f1c5a3f59..16f891d1c 100644
--- a/Application/Admin/View/SuperStatistical/superDetail.html
+++ b/Application/Admin/View/SuperStatistical/superDetail.html
@@ -11,8 +11,10 @@
+
+