diff --git a/Application/Admin/Controller/CompanyGameRatioController.class.php b/Application/Admin/Controller/CompanyGameRatioController.class.php index 096dc1c88..12b7dc362 100644 --- a/Application/Admin/Controller/CompanyGameRatioController.class.php +++ b/Application/Admin/Controller/CompanyGameRatioController.class.php @@ -143,7 +143,7 @@ class CompanyGameRatioController extends AdminController ->join("JOIN tab_promote_company p ON ( m.company_id = p.id".$pwhere.")") ->where($where)->find()['count']; $this->assign('data', $dbres); - $page = set_pagination($count, $row); + $page = set_pagination($count, $row,$params); if($page) { $this->assign('_page', $page); } @@ -317,7 +317,7 @@ class CompanyGameRatioController extends AdminController ->join("JOIN tab_promote_company p ON ( m.company_id = p.id".$pwhere.")") ->where($where)->find()['count']; $this->assign('data', $dbres); - $page = set_pagination($count, $row); + $page = set_pagination($count, $row,$params); if($page) { $this->assign('_page', $page); } diff --git a/Application/Admin/Controller/CompanyRelationController.class.php b/Application/Admin/Controller/CompanyRelationController.class.php index ea53aec9e..ae08d1d68 100644 --- a/Application/Admin/Controller/CompanyRelationController.class.php +++ b/Application/Admin/Controller/CompanyRelationController.class.php @@ -107,7 +107,7 @@ class CompanyRelationController extends AdminController $count = $this->DBModel->field("count(id) count")->where($where)->find()['count']; $this->assign('data', $dbres); - $page = set_pagination($count, $row); + $page = set_pagination($count, $row,$params); if($page) { $this->assign('_page', $page); } @@ -223,7 +223,7 @@ class CompanyRelationController extends AdminController $count = $this->DBlogModel->field("count(id) count")->where($where)->find()['count']; $this->assign('data', $dbres); - $page = set_pagination($count, $row); + $page = set_pagination($count, $row,$params); if($page) { $this->assign('_page', $page); } diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php index d52539bf1..67e945a4d 100644 --- a/Application/Admin/Controller/CompanyStatementController.class.php +++ b/Application/Admin/Controller/CompanyStatementController.class.php @@ -178,9 +178,9 @@ class CompanyStatementController extends ThinkController } $count = M("company_statement","tab_")->field("count(id) count,IFNULL(SUM(CASE WHEN withdraw_type < 2 THEN platform_amount ELSE 0 END),0) as platform_amount,SUM(statement_money) as statement_money")->where($map)->find(); // dd($count); - $parameter['p'] = $page; - $parameter['row'] = $row; - $page = set_pagination($count['count'], $row, $parameter); + $params['p'] = $page; + $params['row'] = $row; + $page = set_pagination($count['count'], $row, $params); if ($page) { $this->assign('_page', $page); } diff --git a/Application/Admin/Controller/CompanyStatementLackController.class.php b/Application/Admin/Controller/CompanyStatementLackController.class.php index ecc86fd4b..6e5d63cc3 100644 --- a/Application/Admin/Controller/CompanyStatementLackController.class.php +++ b/Application/Admin/Controller/CompanyStatementLackController.class.php @@ -83,9 +83,9 @@ class CompanyStatementLackController extends ThinkController $count = $this->DBModel->field("count(id) count,sum(statement_money) statement_money")->where($map)->find(); // dd($count); - $parameter['p'] = $page; - $parameter['row'] = $row; - $page = set_pagination($count['count'], $row, $parameter); + $params['p'] = $page; + $params['row'] = $row; + $page = set_pagination($count['count'], $row, $params); if ($page) { $this->assign('_page', $page); } diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index 3444a8998..8882d4205 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -165,9 +165,9 @@ class CompanyStatementPoolController extends ThinkController } $count = $this->DBModel->field("count(id) count,SUM(statement_money) as statement_money")->where($map)->find(); // dd($count); - $parameter['p'] = $page; - $parameter['row'] = $row; - $page = set_pagination($count['count'], $row, $parameter); + $params['p'] = $page; + $params['row'] = $row; + $page = set_pagination($count['count'], $row, $params); if ($page) { $this->assign('_page', $page); } diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index ef187639e..05ae0c7ee 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -252,7 +252,7 @@ class CompanyStatementSetController extends Controller { $game['pay_amount'] =$va['pay_money']; $game['game_name'] =$ke; //获取游戏id及比例 - $game_id = $GameDb->where("game_name='{$ke}' OR relation_game_name='{$ke}'")->field("id,relation_game_id")->find(); + $game_id = $GameDb->where("game_name='{$ke}' OR original_package_name='{$ke}'")->field("id,relation_game_id")->find(); if(empty($game_id)){ $game['relation_game_id']=0; // $game['sum_money']=0; diff --git a/Application/Admin/Controller/GameRatioMouldController.class.php b/Application/Admin/Controller/GameRatioMouldController.class.php index d1d02b081..1183e0b55 100644 --- a/Application/Admin/Controller/GameRatioMouldController.class.php +++ b/Application/Admin/Controller/GameRatioMouldController.class.php @@ -81,7 +81,7 @@ class GameRatioMouldController extends AdminController $count = $this->DBModel->alias('m')->field("count(id) count")->join("INNER JOIN ({$gameres}) g ON m.relation_game_id = g.relation_game_id")->where($where)->find()['count']; $this->assign('data', $dbres); - $page = set_pagination($count, $row); + $page = set_pagination($count, $row,$params); if($page) { $this->assign('_page', $page); } diff --git a/Application/Admin/Controller/PayChannelController.class.php b/Application/Admin/Controller/PayChannelController.class.php index 3e1012b2e..4b7477f9b 100644 --- a/Application/Admin/Controller/PayChannelController.class.php +++ b/Application/Admin/Controller/PayChannelController.class.php @@ -449,11 +449,15 @@ class PayChannelController extends ThinkController ->group('pay_way') ->select(false); - + $superMap = $map; + if ($map['payed_time']){ + $superMap['pay_time'] = $map['payed_time']; + unset($superMap['payed_time']); + } //超级签数据 $superSignDataPay = M('game_supersign','tab_') ->field("sum(pay_price) as pay_amount,pay_way") - ->where($map) + ->where($superMap) ->group('pay_way') ->select(false); @@ -462,8 +466,8 @@ class PayChannelController extends ThinkController //推广后台充值数据 $spreadMap['order_status'] = array('egt',1); $spreadMap['pay_way'] = array('egt',1); - if($map['pay_time']) { - $spreadMap['create_time'] = $map['pay_time']; + if($map['payed_time']) { + $spreadMap['pay_time'] = $map['payed_time']; } // $spreadMap['promote_id'] = $map['promote_id']; //推广后台 @@ -472,9 +476,9 @@ class PayChannelController extends ThinkController ->where($spreadMap) ->select(false); - if ($map['pay_time']) { - $map['create_time'] = $map['pay_time']; - $testMap['pay_time'] = $map['pay_time']; + if ($map['payed_time']) { +// $map['payed_time'] = $map['payed_time']; + $testMap['pay_time'] = $map['payed_time']; unset($map['pay_time']); } //充值平台币数据 @@ -488,10 +492,10 @@ class PayChannelController extends ThinkController $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']); - } +// 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'] = ''; @@ -532,6 +536,9 @@ class PayChannelController extends ThinkController //将语句整合起来查询 $channelData = "select sum(pay_amount) as pay_amount,pay_way from ({$sql})t group by pay_way;"; // var_dump($channelData);die(); + +// $channelData = M()->table("({$channelData})a")->where()->select(); + $channelData = M()->query($channelData); return $channelData; diff --git a/Application/Admin/View/CompanyStatement/lists.html b/Application/Admin/View/CompanyStatement/lists.html index 8ac880843..1aaafbdae 100644 --- a/Application/Admin/View/CompanyStatement/lists.html +++ b/Application/Admin/View/CompanyStatement/lists.html @@ -252,9 +252,6 @@
- - - {$_page|default=''}