diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index ad2411cd3..c407ebd3f 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/Application/Admin/Controller/FinanceController.class.php @@ -129,7 +129,11 @@ class FinanceController extends ThinkController $page = intval($p); $page = $page ? $page : 1; //默认显示第一页数据 $row=10; - if(isset($_REQUEST['row'])) {$row = $_REQUEST['row'];}else{$row = 10;} + if(isset($_REQUEST['row'])) { + $row = $_REQUEST['row']; + }else{ + $row = 10; + } $map = []; if(!empty(I('count_date'))){ @@ -720,11 +724,19 @@ class FinanceController extends ThinkController } //游戏统计列表 - $data = D("spend")->gameStatistics($map); + $data = D("spend")->gameStatistics($map, $row, $p); foreach ($data as $key => $value) { $data[$key]['all_cash_count'] = $value['cash_count'] + $value['balance_coin_count'] + $value['inside_cash_count']; } + $allData = D("spend")->gameStatistics($map);//列表总数 + $count = count($allData); + $page = set_pagination($count, $row); + if ($page) { + $this->assign('_page', $page);//分页 + } + + //统计合计 $totalData = D("spend")->totalGameStatistics($map); $sumCash = $totalData['cash_count']; @@ -757,6 +769,14 @@ class FinanceController extends ThinkController $map['promote_id'] = $_REQUEST['root_id']; } + if (isset($_REQUEST['pay_way'])) { + $map['pay_way'] = $_REQUEST['pay_way']; + } + + if (!empty($_REQUEST['pay_order_number'])) { + $map['pay_order_number'] = $_REQUEST['pay_order_number']; + } + if (!empty(I("parent_id"))) { $parent_id = I("parent_id"); $promote_id = $this->getPromoteList($parent_id); @@ -809,20 +829,49 @@ class FinanceController extends ThinkController $data[$key]['pay_way'] = getPayType($value['pay_way']); } - $sum = D('spend')->sumSpend($map,'pay_amount'); + $totalData = D('spend')->totalGameStatistics($map, false); + $sumCash = $totalData['cash_count']; + $sumBalance = $totalData['balance_coin_count']; + $sumInside = $totalData['inside_cash_count']; + $sumAll = $sumCash + $sumBalance + $sumInside; + + $this->assign('sumCash', $sumCash); + $this->assign('sumBalance', $sumBalance); + $this->assign('sumInside', $sumInside); + $this->assign('sumAll', $sumAll); $count = D("spend")->getSpendData($map,$field,$group,$order); $count = count($count); $page = set_pagination($count,$row); if($page) {$this->assign('_page', $page);} - $this->meta_title = '游戏充值流水'; + $this->meta_title = '游戏订单查看'; $this->assign('data',$data); - $this->assign('sum_amount',$sum); $this->display(); + } + + /** + *获取合作公司 + */ + public function getPartnetList() + { + $game_ids = array_column(getGameByName(I("game_name"), I("sdk_type")), 'id'); + if ($game_ids) { + $map['g.id'] = ['in', $game_ids]; + } + if (I('sdk_type')) { + $map['sdk_version'] = I('sdk_type'); + } + $data = M('partner','tab_')->alias('p') + ->join('left join tab_game as g on g.partner_id = p.id') + ->field("partner, p.id") + ->where($map) + ->group('p.id') + ->select(); + $this->ajaxReturn($data,'json'); } } \ No newline at end of file diff --git a/Application/Admin/Model/SpendModel.class.php b/Application/Admin/Model/SpendModel.class.php index 66ca69505..c761281c6 100644 --- a/Application/Admin/Model/SpendModel.class.php +++ b/Application/Admin/Model/SpendModel.class.php @@ -831,34 +831,43 @@ class SpendModel extends Model /** *获取游戏统计列表数据 + * @param $map array 查询条件 + * @param $row int 每页条数 + * @param $page int 第几页 */ - public function gameStatistics($map) + public function gameStatistics($map, $row = 0, $page = 1) { - $data = $this->alias("s") - ->field("s.game_id,s.game_name,p.partner as partner_name,SUM(CASE WHEN pay_way > 0 THEN pay_amount ELSE 0 END) as cash_count, + $query = $this->alias("s") + ->field("s.game_id,s.game_name,p.partner as partner_name, + SUM(CASE WHEN pay_way > 0 THEN pay_amount ELSE 0 END) as cash_count, SUM(CASE WHEN pay_way = 0 THEN pay_amount ELSE 0 END) as balance_coin_count, SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as inside_cash_count") ->join('LEFT JOIN tab_game as g ON s.game_id=g.id') ->join('LEFT JOIN tab_partner as p ON g.partner_id=p.id') ->where(['s.pay_status' => 1]) ->where($map) - ->group('s.game_id') - ->select(); + ->group('s.game_id'); + if ($row) { + $query = $query->page($page,$row); + } + $data = $query->select(); return $data; } /** *获取游戏统计列表数据 */ - public function totalGameStatistics($map) + public function totalGameStatistics($map, $join = true) { - $data = $this->alias("s") + $query = $this->alias("s") ->field("SUM(CASE WHEN pay_way > 0 THEN pay_amount ELSE 0 END) as cash_count, SUM(CASE WHEN pay_way = 0 THEN pay_amount ELSE 0 END) as balance_coin_count, -SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as inside_cash_count") - ->join('LEFT JOIN tab_game as g ON s.game_id=g.id') - ->join('LEFT JOIN tab_partner as p ON g.partner_id=p.id') - ->where(['s.pay_status' => 1]) +SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as inside_cash_count"); + if ($join) { + $query = $query->join('LEFT JOIN tab_game as g ON s.game_id=g.id') + ->join('LEFT JOIN tab_partner as p ON g.partner_id=p.id'); + } + $data = $query->where(['s.pay_status' => 1]) ->where($map) ->find(); return $data; diff --git a/Application/Admin/View/Finance/gameStatistics.html b/Application/Admin/View/Finance/gameStatistics.html index 5c3af308e..7855bbd89 100644 --- a/Application/Admin/View/Finance/gameStatistics.html +++ b/Application/Admin/View/Finance/gameStatistics.html @@ -183,11 +183,10 @@ {$data.all_cash_count}0 查看 @@ -296,7 +295,7 @@ $.ajax({ url:"{:U('Finance/getGameList')}", type:"post", - data:{partner_id:$("#partner_id option:selected").attr('partner-id'), sdk_type:$("#sdk_version1 option:selected").val()}, + data:{partner_id:$("#partner_id option:selected").val(), sdk_type:$("#sdk_version1 option:selected").val()}, dataType:'json', success:function(data){ var str = ""; @@ -350,6 +349,33 @@ }); $("#partner_id").change(); + + function get_partnet_list() + { + var partner_id = "{:I('partner_id')}"; + $.ajax({ + url:"{:U('Finance/getPartnetList')}", + type:"post", + data:{game_name:$("#game_name option:selected").val(), sdk_type:$("#sdk_version1 option:selected").val()}, + dataType:'json', + success:function(data){ + var str = ""; + for (var i in data){ + str += "" + } + // console.log(str); + $("#partner_id").empty(); + $("#partner_id").append(str); + // $("#server_id").select2(); + + } + }) + } + $("#game_name, #sdk_type").change(function(){ + get_partnet_list(); + }); + + $("#game_name").change(); }) diff --git a/Application/Admin/View/Finance/gameStatisticsDetail.html b/Application/Admin/View/Finance/gameStatisticsDetail.html index 72c538978..453ace6ef 100644 --- a/Application/Admin/View/Finance/gameStatisticsDetail.html +++ b/Application/Admin/View/Finance/gameStatisticsDetail.html @@ -30,7 +30,7 @@
-

{$_REQUEST['game_name']}充值流水

+

{$_REQUEST['game_name']}游戏订单查看

@@ -42,26 +42,67 @@
返回 - - 导出 -
+ +
+   +
-   +  
+ + + +
+ + - +
+ + +
+
-   +
+
+
- 搜索 + + 导出 +
@@ -127,7 +168,9 @@ 总计 - {$sum_amount}0 + 累计充值：{$sumAll}0 + （现金金额：{$sumCash} 平台币：{$sumBalance} 绑币：{$sumInside}） + @@ -156,7 +199,7 @@