diff --git a/Application/Admin/Common/function.php b/Application/Admin/Common/function.php index 1642dc963..f03c268e7 100644 --- a/Application/Admin/Common/function.php +++ b/Application/Admin/Common/function.php @@ -886,3 +886,37 @@ function getSDKTypeName($sdkType, $chinese = false) return $sdkName; } +//游戏名称取消 (安卓版),(苹果版) +function clearGameNameType($game_name) +{ + return preg_replace("/\(.*\)/","",$game_name); +} +//设备名称词典 +function getGameTypeName($id,$chinese=true) +{ + if(empty($id)){ + return '无'; + } + $android = 'Android'; + $ios = 'ios'; + if($chinese){ + $android = '安卓'; + $ios = '苹果'; + } + $data = array( + ["id"=>0,'name'=>"{$android}+{$ios}"], + ["id"=>1,'name'=>$android], + ["id"=>2,'name'=> $ios] + ); + if($id > -1){ + foreach($data as $k=>$v){ + if($v['id'] == $id){ + return $v['name']; + break; + } + } + }else{ + return $data; + } +} + diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 15339690a..2b664b965 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -2394,6 +2394,7 @@ class ExportController extends Controller array('user_account', '测试账号'), array('pay_time', '充值时间'), array('game_name', '游戏名称'), + array('sdk_version', '设备名称'), array('order_amount', '订单金额'), array('pay_amount', '实付金额'), array('pay_way', '充值方式'), @@ -2440,7 +2441,10 @@ class ExportController extends Controller } - $orderData = M('test_order', 'tab_')->where($map)->order('add_time desc')->select(); + $orderData =M('test_order t', 'tab_') + ->field("t.*,g.sdk_version") + ->join("tab_game g on t.game_id = g.id","left") + ->where($map)->order('add_time desc')->select(); $sum_order_amount = M('test_order', 'tab_')->where($map)->field('sum(order_amount) as sum_order_amount,count(1) as count')->find(); $sum_pay_amount = M('test_order', 'tab_')->where($map)->field('sum(pay_amount) as sum_order_amount')->find(); $xlsData = []; @@ -2450,12 +2454,14 @@ class ExportController extends Controller }else { $order_list['server_type'] = '测试外网'; } + $order_list['game_name'] =clearGameNameType($v['game_name']); + $order_list['sdk_version'] =getGameTypeName($v['sdk_version']); $order_list['order_type'] = get_order_type($v['order_type']); $order_list['order_no'] = $v['order_no']; $order_list['cp_order_no'] = $v['cp_order_no']; $order_list['user_account'] = $v['user_account']; $order_list['pay_time'] = date('Y-m-d H:i:s', $v['pay_time']); - $order_list['game_name'] = $v['game_name']; + // $order_list['game_name'] = $v['game_name']; $order_list['order_amount'] = $v['order_amount']; $order_list['pay_amount'] = $v['pay_amount']; $order_list['pay_way'] = get_pay_way($v['pay_way']); @@ -8021,7 +8027,7 @@ class ExportController extends Controller $xlsData = D("spend")->gameStatistics($map); foreach ($xlsData as $key => $value) { - $xlsData[$key]['game_name'] = substr($value["game_name"],0,strrpos($value["game_name"],'(')); + // $xlsData[$key]['game_name'] = substr($value["game_name"],0,strrpos($value["game_name"],'(')); $xlsData[$key]['all_cash_count'] = $value['cash_count'] + $value['balance_coin_count'] + $value['inside_cash_count']; if ($value['sdk_version'] == 1) { $xlsData[$key]['sdk_version'] = '安卓'; @@ -8029,7 +8035,6 @@ class ExportController extends Controller $xlsData[$key]['sdk_version'] = '苹果'; } } - $totalData = D("spend")->totalGameStatistics($map); $sumCash = $totalData['cash_count']; @@ -8138,6 +8143,7 @@ class ExportController extends Controller array('pay_time','充值时间'), array('user_account','玩家账号'), array('game_name','游戏名称'), + array('sdk_version','设备名称'), array('server_name','游戏区服'), array('game_player_name','角色名称'), array('cost','订单金额'), @@ -8202,7 +8208,7 @@ class ExportController extends Controller $map['tab_spend.game_player_name'] = array('like',I("user_nickname").'%'); } $field = "pay_order_number,FROM_UNIXTIME(pay_time) as pay_time,tab_spend.user_account, - tab_spend.user_nickname,tab_spend.game_name,tab_spend.promote_account,spend_ip,tab_spend.server_name, + tab_spend.user_nickname,tab_spend.game_name,tab_spend.promote_account,spend_ip,tab_spend.server_name,tab_spend.sdk_version, game_player_name,pay_amount,cost,pay_way"; $group = ""; $order = "pay_time DESC"; @@ -8224,6 +8230,8 @@ class ExportController extends Controller foreach($xlsData as $key => $value) { $xlsData[$key]['pay_way'] = getPayType($value['pay_way']); + $data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']); + $xlsData[$key]['sdk_version'] =getGameTypeName($xlsData[$key]['sdk_version']); } $map['pay_game_status'] = 1; diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index 0d42304af..af36e5c70 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/Application/Admin/Controller/FinanceController.class.php @@ -836,14 +836,41 @@ class FinanceController extends ThinkController $map['game_player_name'] = array('like',I("user_nickname").'%'); } // var_dump($map);die(); - $field = "pay_order_number,FROM_UNIXTIME(pay_time) as pay_time,user_account,user_nickname,game_name,promote_account,spend_ip,server_name,game_player_name,pay_amount,cost,pay_way"; + $field = "pay_order_number,FROM_UNIXTIME(pay_time) as pay_time,user_account,user_nickname,game_name,promote_account,spend_ip,server_name,game_player_name,pay_amount,cost,pay_way,sdk_version"; $group = ""; $order = "pay_time DESC"; - $data = D('spend')->getSpendData($map,$field,$group,$order,$page,$row); + if(isset($_REQUEST['export'])){ + $data = D('spend')->getSpendData($map,$field,$group,$order,0,0); + }else{ + $data = D('spend')->getSpendData($map,$field,$group,$order,$page,$row); + } foreach($data as $key => $value) { $data[$key]['pay_way'] = getPayType($value['pay_way']); + $data[$key]['sdk_version'] =getGameTypeName($data[$key]['sdk_version']); + $data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']); + } + if(isset($_REQUEST['export'])){ + //操作日志 + $GetData = $_GET; + unset($GetData['export']); + $dcop = array( + "pay_order_number"=>"支付订单号", + "pay_time"=>"充值时间", + "user_account"=>"玩家账号", + "game_name"=>"游戏名称", + "sdk_version"=>"设备类型", + "promote_account"=>"所属推广员", + "spend_ip"=>"充值ip", + "server_name"=>"游戏区服", + "game_player_name"=>"角色名称", + "cost"=>"订单金额", + "pay_amount"=>"实付金额", + "pay_way"=>"充值方式" + ); + addOperationLog(['op_type'=>3,'key'=>getNowDate(),'url'=>U(CONTROLLER_NAME.'/'.ACTION_NAME,$GetData),'menu'=>"充值-财务管理-游戏统计-订单查看-导出"]); + data2csv($data,"游戏统计订单查看",$dcop); } $totalData = D('spend')->totalGameStatistics($map, false); @@ -937,7 +964,7 @@ class FinanceController extends ThinkController } // var_dump($map);die(); $field = "pay_order_number,FROM_UNIXTIME(pay_time) as pay_time,tab_spend.user_account, - tab_spend.user_nickname,tab_spend.game_name,tab_spend.promote_account,spend_ip,tab_spend.server_name, + tab_spend.user_nickname,tab_spend.game_name,tab_spend.promote_account,spend_ip,tab_spend.server_name,tab_spend.sdk_version, game_player_name,pay_amount,cost,pay_way"; $group = ""; $order = "pay_time DESC"; @@ -949,16 +976,46 @@ class FinanceController extends ThinkController $field2 = $field . ',balance'; $join = 'left join tab_user as u on u.id = tab_spend.user_id'; } - - $data = D('spend')->getSpendData($map, $field2, $group, $order, $page, $row, $join); - + + if(isset($_REQUEST['export'])){ + $data = D('spend')->getSpendData($map, $field2, $group, $order, 0, 0, $join); + }else{ + $data = D('spend')->getSpendData($map, $field2, $group, $order, $page, $row, $join); + } foreach($data as $key => $value) { $data[$key]['pay_way'] = getPayType($value['pay_way']); - + $data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']); + $data[$key]['sdk_version'] =getGameTypeName($data[$key]['sdk_version']); $data[$key]['cost'] = number_format($value['cost'],2,'.',''); $data[$key]['pay_amount'] = number_format($value['pay_amount'],2,'.',''); } + if(isset($_REQUEST['export'])){ + //操作日志 + $GetData = $_GET; + unset($GetData['export']); + $dcop = array( + "pay_order_number"=>"支付订单号", + "pay_time"=>"充值时间", + "user_account"=>"玩家账号", + "game_name"=>"游戏名称", + "sdk_version"=>"设备名称", + "server_name"=>"游戏区服", + "game_player_name"=>"角色名称", + "cost"=>"订单金额", + "pay_amount"=>"实付金额", + "pay_way"=>"充值方式" + ); + if ($map['pay_way'] ==-1) { + $title = "内充支出明细"; + $dcop["bind_balance"]="绑定币余额"; + } elseif ($map['pay_way'] ==0) {//平台币 + $title = "平台币直充明细"; + $dcop["balance"]="平台币余额"; + } + addOperationLog(['op_type'=>3,'key'=>getNowDate(),'url'=>U(CONTROLLER_NAME.'/'.ACTION_NAME,$GetData),'menu'=>"充值-财务管理-游戏统计-{$title}-导出"]); + data2csv($data,$title,$dcop); + } $count = D("spend")->getSpendData($map,$field,$group,$order); $count = count($count); $page = set_pagination($count,$row); diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php index 50173fd69..73a4f30c2 100644 --- a/Application/Admin/Controller/FinancePromoteController.class.php +++ b/Application/Admin/Controller/FinancePromoteController.class.php @@ -456,7 +456,15 @@ class FinancePromoteController extends AdminController $value['inside_cash_count']?:0; $value['all_cash_count'] = number_format($value['cash_count'] + $value['balance_coin_count'] + $value['inside_cash_count'],2,'.',''); $value['company_belong'] =getCompanyBlong($value['company_belong']); + + $value['game_name'] =clearGameNameType($value['game_name']); + $value['sdk_version'] =getGameTypeName($value['sdk_version']); + if(!$value['game_name']) $value['game_name'] = "无"; + //按类型判断pid + if($_REQUEST['promote_type'] == 2 && $_REQUEST['promote_id']){ + $value['p_id'] = $_REQUEST['promote_id']; + } } if (isset($_REQUEST['export'])) { @@ -469,6 +477,7 @@ class FinancePromoteController extends AdminController "account"=>"会长账号", "company_belong"=>"团体类型", "game_name"=>"游戏", + "sdk_version"=>"设备", "cash_count"=>"游戏现金金额", "balance_coin_count"=>"平台币直充支出", "inside_cash_count"=>"内充支出", @@ -562,7 +571,7 @@ class FinancePromoteController extends AdminController if (!empty(I('user_nickname'))) { $map['game_player_name'] = array('like',I("user_nickname").'%'); } - $field = "pay_order_number,FROM_UNIXTIME(pay_time) as pay_time,user_account,user_nickname,game_name,promote_account,spend_ip,server_name,game_player_name,pay_amount,cost,pay_way"; + $field = "pay_order_number,FROM_UNIXTIME(pay_time) as pay_time,user_account,user_nickname,game_name,sdk_version,promote_account,spend_ip,server_name,game_player_name,pay_amount,cost,pay_way"; $group = ""; $order = "pay_time DESC"; if(isset($_REQUEST['export'])){ @@ -572,6 +581,8 @@ class FinancePromoteController extends AdminController } foreach($data as $key => $value) { $data[$key]['pay_way'] = getPayType($value['pay_way']); + $data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']); + $data[$key]['sdk_version'] =getGameTypeName($data[$key]['sdk_version']); } if (isset($_REQUEST['export'])) { @@ -584,6 +595,7 @@ class FinancePromoteController extends AdminController "pay_time"=>"充值时间", "user_account"=>"玩家账号", "game_name"=>"游戏名称", + "sdk_version"=>"设备名称", "promote_account"=>"所属推广员", "spend_ip"=>"充值ip", "server_name"=>"游戏区服", @@ -620,7 +632,7 @@ class FinancePromoteController extends AdminController { $map['s.pay_status']=1; $query = M("spend","tab_")->alias("s") - ->field("s.game_id,s.game_name,p.partner as partner_name, + ->field("s.game_id,s.game_name,s.sdk_version,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, @@ -713,7 +725,7 @@ class FinancePromoteController extends AdminController $map['tab_spend.game_player_name'] = array('like',I("user_nickname").'%'); } $field = "pay_order_number,FROM_UNIXTIME(pay_time) as pay_time,tab_spend.user_account, - tab_spend.user_nickname,tab_spend.game_name,tab_spend.promote_account,spend_ip,tab_spend.server_name, + tab_spend.user_nickname,tab_spend.game_name,tab_spend.promote_account,spend_ip,tab_spend.server_name,tab_spend.sdk_version, game_player_name,pay_amount,cost,pay_way"; $group = ""; $order = "pay_time DESC"; @@ -734,6 +746,9 @@ class FinancePromoteController extends AdminController foreach($data as $key => $value) { $data[$key]['pay_way'] = getPayType($value['pay_way']); + $data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']); + $data[$key]['sdk_version'] =getGameTypeName($data[$key]['sdk_version']); + $data[$key]['cost'] = number_format($value['cost'],2,'.',''); $data[$key]['pay_amount'] = number_format($value['pay_amount'],2,'.',''); @@ -747,6 +762,7 @@ class FinancePromoteController extends AdminController "pay_time"=>"充值时间", "user_account"=>"玩家账号", "game_name"=>"游戏名称", + "sdk_version"=>"设备名称", "server_name"=>"游戏区服", "game_player_name"=>"角色名称", "cost"=>"订单金额", @@ -1001,6 +1017,7 @@ class FinancePromoteController extends AdminController } $_POST['promote_level'] = $level; // } + // dd($map); } diff --git a/Application/Admin/Controller/PayChannelController.class.php b/Application/Admin/Controller/PayChannelController.class.php index 667021e46..c7f5f895e 100644 --- a/Application/Admin/Controller/PayChannelController.class.php +++ b/Application/Admin/Controller/PayChannelController.class.php @@ -10,7 +10,9 @@ use Org\WeixinSDK\Weixin; class PayChannelController extends ThinkController { public function index($p = 0) { - + if(!array_key_exists("timestart",$_REQUEST)){ + $this->redirect(ACTION_NAME, array('timestart' => date('Y-m-d',strtotime('-30 day')),"timeend"=>date('Y-m-d'))); + } $page = intval($p); $page = $page ? $page : 1; //默认显示第一页数据 $arraypage = $page; @@ -59,7 +61,7 @@ class PayChannelController extends ThinkController //游戏币计算 $data = M('spend use index(pay_channel)','tab_') - ->field("game_name,sum(pay_amount) as pay_amount,game_id") + ->field("game_name,sum(pay_amount) as pay_amount,game_id,sdk_version") ->where($map) ->group('game_id') ->order('pay_amount desc') @@ -73,7 +75,7 @@ class PayChannelController extends ThinkController $coinData = M('pay_info','tab_') ->join("inner join tab_deposit on tab_pay_info.order_id=tab_deposit.pay_order_number") - ->field("tab_pay_info.game_name,0 as pay_amount,sum(tab_deposit.pay_amount) as platform_coin,0 as test_coin,tab_pay_info.game_id") + ->field("tab_pay_info.game_name,0 as pay_amount,sum(tab_deposit.pay_amount) as platform_coin,0 as test_coin,tab_pay_info.game_id,tab_pay_info.sdk_version") ->where($coinMap) ->group("game_id") ->select(); @@ -125,7 +127,8 @@ class PayChannelController extends ThinkController $data[$key]['platform_coin'] = $handleCoinData[$value['game_id']]?$handleCoinData[$value['game_id']]:0; $data[$key]['test_coin'] = $handleTestData[$value['game_id']]?$handleTestData[$value['game_id']]:0; $data[$key]['test_platform_coin'] = $handleTestCoinData[$value['game_id']]?$handleTestCoinData[$value['game_id']]:0; - + $data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']); + $data[$key]['sdk_version'] =getGameTypeName($data[$key]['sdk_version']); } $superMap = $map; // unset($superMap['promote_id']); @@ -172,7 +175,7 @@ class PayChannelController extends ThinkController $bindRechargeData['pay_amount'] = $bindRechargeData['pay_amount']?$bindRechargeData['pay_amount']:0; $offcialData['sum'] = $offcialData['pay_amount']+$bindRechargeData['pay_amount']; - $offcialData['pay_amount'] = $offcialData['pay_amount']+$bindRechargeData['pay_amount']-$offcialData['test_coin']; + $offcialData['pay_amount'] = number_format($offcialData['pay_amount']+$bindRechargeData['pay_amount']-$offcialData['test_coin'],2,'.',''); $this->assign('offcialData',$offcialData); @@ -184,8 +187,8 @@ class PayChannelController extends ThinkController ->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; - $spreadData['sum'] = $spreadData['pay_amount']; + $spreadData['pay_amount'] = $spreadData['pay_amount']?number_format($spreadData['pay_amount'],2,'.',''):'0.00'; + $spreadData['sum'] = number_format($spreadData['pay_amount'],2,'.',''); $this->assign('spreadData',$spreadData); @@ -195,6 +198,8 @@ class PayChannelController extends ThinkController $payTypeData['支付宝支付金额'] = 0; $payTypeData['微信支付金额'] = 0; $payTypeData['快捷支付金额'] = 0; + $payTypeData['苹果支付金额'] = 0; + $payTypeData['易宝支付金额'] = 0; $payTypeData['其他支付金额'] = 0; foreach($channelData as $key => $value) { @@ -205,6 +210,10 @@ class PayChannelController extends ThinkController $payTypeData['微信支付金额'] += number_format($value['pay_amount'],2,'.',''); } else if ($value['pay_way']==15) { $payTypeData['快捷支付金额'] += number_format($value['pay_amount'],2,'.',''); + } else if($value['pay_way'] ==7){ + $payTypeData['苹果支付金额'] += number_format($value['pay_amount'],2,'.',''); + } else if($value['pay_way'] ==17){ + $payTypeData['易宝支付金额'] += number_format($value['pay_amount'],2,'.',''); } else if($value['pay_way']){ $payTypeData['其他支付金额'] += number_format($value['pay_amount'],2,'.',''); } @@ -229,6 +238,8 @@ class PayChannelController extends ThinkController // $channelData[$testOrderChannelData['pay_way']]['pay_amount'] = number_format($testOrderChannelData['pay_amount'],2,'.',''); $testorderChannelArr[$trkey]['pay_amount'] = number_format($testOrderChannelData['pay_amount'],2,'.',''); $testorderChannelArr[$trkey]['pay_way'] = get_pay_way($testOrderChannelData['pay_way']); + $channelData[$key]['pay_amount'] = number_format($value['pay_amount'],2,'.',''); + $channelData[$key]['pay_way'] = get_pay_way($value['pay_way']); } else { $channelData[$key]['pay_amount'] = number_format($value['pay_amount'],2,'.',''); @@ -253,7 +264,7 @@ class PayChannelController extends ThinkController $this->assign('_page', $page); } - $sumData['game'] = '汇总'; + $sumData['game_name'] = '汇总'; $sumData['pay_amount'] = 0; $sumData['platform_coin'] = 0; $sumData['test_coin'] = 0; @@ -272,56 +283,87 @@ class PayChannelController extends ThinkController } //汇总计算 - $sumData['pay_amount'] += $value['pay_amount'] - $value['test_coin']; - $sumData['platform_coin'] += $handleCoinData[$value['game_id']]?$handleCoinData[$value['game_id']]:0; - $sumData['test_coin'] += $handleTestData[$value['game_id']]?$handleTestData[$value['game_id']]:0; - $sumData['test_platform_coin'] +=$handleTestCoinData[$value['game_id']]?$handleTestCoinData[$value['game_id']]:0; + $sumData['pay_amount'] += number_format($value['pay_amount'] - $value['test_coin'],2,'.',''); + $sumData['platform_coin'] += $handleCoinData[$value['game_id']]?number_format($handleCoinData[$value['game_id']],2,'.',''):0; + $sumData['test_coin'] += $handleTestData[$value['game_id']]?number_format($handleTestData[$value['game_id']],2,'.',''):0; + $sumData['test_platform_coin'] +=$handleTestCoinData[$value['game_id']]?number_format($handleTestCoinData[$value['game_id']],2,'.',''):0; } // 汇总数据 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']; + $sumData['platform_coin'] = number_format($sumData['platform_coin'] - $sumData['test_platform_coin'],2,'.',''); + $sumData['test_coin'] = number_format($sumData['test_coin']+$sumData['test_platform_coin'],2,'.',''); + $sumData['sum'] = number_format($sumData['pay_amount'] +$sumData['test_coin'] + $sumData['platform_coin'],2,'.',''); } 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; + $sumData['pay_amount'] = number_format($sumData['pay_amount'] + $superSignData['pay_amount'] + $bindRechargeData['pay_amount'],2,'.',''); + $sumData['platform_coin'] = number_format($sumData['platform_coin'] - $sumData['test_platform_coin'] + $offcialData['pay_amount'] + $spreadData['pay_amount'],2,'.',''); + $sumData['test_coin'] = number_format($sumData['test_coin']+$offcialTestCost+$testSuperSignCost+$sumData['test_platform_coin'],2,'.',''); + $sumData['sum'] = number_format($sumData['pay_amount'] +$sumData['test_coin'] + $sumData['platform_coin'],2,'.',''); + $coinSum = number_format($coinSum + $offcialData['pay_amount'] + $spreadData['pay_amount']+$offcialTestCost,2,'.',''); } + $sum_pay_amount = M('test_order', 'tab_')->where($maptestorder)->field('sum(pay_amount) as sum_order_amount')->find(); + $moneyAllCount = array_sum(array_column($channelData, 'pay_amount')); if($_REQUEST['export'] == 1) { $title = array('产品名称','游戏现金金额','平台币直冲金额','测试金额','支付渠道内合计'); $superSignData['game_name'] = '超级签'; + $superSignData['platform_coin'] = '0'; + $superSignData['sdk_version'] = ''; + $offcialData['game_name'] = '官网'; - $spreadData['game_name'] = '推广后台'; + $offcialData['platform_coin'] = $offcialData['pay_amount']; + $offcialData['pay_amount'] = "0"; + $offcialData['sdk_version'] = ""; - $superSignData['platform_coin'] = '0'; - $offcialData['platform_coin'] = '0'; - $spreadData['platform_coin'] = '0'; + + $spreadData['game_name'] = '推广后台'; + $spreadData['platform_coin'] = $spreadData['pay_amount']; + $spreadData['pay_amount'] = '0'; $spreadData['test_coin'] = '0'; + $spreadData['sdk_version'] = ''; + + $sumData['sdk_version'] = ''; + + $testOrder["game_name"] = "测试环境内外网平台"; + $testOrder["sdk_version"] = ""; + $testOrder["pay_amount"] =$sum_pay_amount['sum_order_amount'] ?: "0"; + $testOrder["platform_coin"] ="0"; + $testOrder['test_coin'] = '0'; + $testOrder['sum'] = $sum_pay_amount['sum_order_amount'] ?: "0"; + + //充值方式统计 $payTypeDataExport['game_name'] = '充值方式统计'; foreach($payTypeData as $key => $value) { if ($value) { - $payTypeDataExport['pay_amount'] .= $key.'：'.$value." "; + $payTypeDataExport['sdk_version'] .= $key.'：'.$value." "; } } - $payTypeDataExport['pay_amount'] .= "平台币直充总金额(2019.12.18号以前的不显示在列表中，此项也不计入充值方式统计)：". + $payTypeDataExport['sdk_version'] .= "平台币直充总金额(2019.12.18号以前的不显示在列表中，此项也不计入充值方式统计)：". ($coinSum); - + if ($sum_platform_pay_amount['sum_order_amount'] != 0) { + $testOrderDataExport['pay_amount'] = $sum_noplatform_pay_amount['sum_order_amount']; + }else { + $testOrderDataExport['pay_amount'] = '0.00'; + } + if ($sum_noplatform_pay_amount['sum_order_amount'] != 0) { + $testOrderDataExport['platform_coin'] = $sum_platform_pay_amount['sum_order_amount']; + }else { + $testOrderDataExport['platform_coin'] = '0.00'; + } + $testOrderDataExport['test_coin'] = '0.00'; + $testOrderDataExport['sum'] = '0.00'; $channelDataExport['game_name'] = '支付渠道'; + $channelDataExport2['game_name'] = '支付渠道占比'; foreach($channelData as $key => $value) { if ($value) { - $channelDataExport['pay_amount'] .= $value['pay_way'].'：'.$value['pay_amount']." "; + $channelDataExport['sdk_version'] .= $value['pay_way'].'：'.$value['pay_amount']." "; + $channelDataExport2['sdk_version'] .= $value['pay_way'].'：'.round($value['pay_amount']*100/ $moneyAllCount,2)."% "; } } - unset($sumData['test_platform_coin']); if ($_REQUEST['game_id']) { @@ -333,10 +375,9 @@ class PayChannelController extends ThinkController $GetData = $_GET; unset($GetData['export']); addOperationLog(['op_type'=>3,'key'=>getNowDate(),'url'=>U(CONTROLLER_NAME.'/'.ACTION_NAME,$GetData),'menu'=>"充值-财务管理-支付渠道查看-导出"]); - - 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); + //处理导出数据 + data2csv(array_merge($data,[$superSignData],[$offcialData],[$spreadData],[$sumData],[$testOrder],[$payTypeDataExport],[$channelDataExport],[$channelDataExport2]),"支付渠道统计导出",array( + "game_name"=>"产品名称","sdk_version"=>"设备名称","pay_amount"=>"游戏现金金额","platform_coin"=>"平台币直冲金额","test_coin"=>"测试金额","sum"=>"支付渠道内合计")); } @@ -348,18 +389,19 @@ class PayChannelController extends ThinkController $this->meta_title = "支付渠道统计"; $size = $row;//每页显示的记录数 $data = array_slice($data, ($arraypage - 1) * $size, $size); - $sum_pay_amount = M('test_order', 'tab_')->where($maptestorder)->field('sum(pay_amount) as sum_order_amount')->find(); + //平台币直充金额，下面列表 $this->assign('coinSum',$coinSum); $channelData2 = $channelData; $arr_merge = array_merge($channelData2,$testorderChannelArr); - $this->assign('sumData',$sumData); - $this->assign('channelData',$arr_merge); - $this->assign('listdata',$data); + $this->assign('sumData',$sumData); + $this->assign('channelData',$arr_merge); + $this->assign('listdata',$data); //统计总额和比例 $this->assign('channelData2',$channelData); - $this->assign('sum_pay_amount',$sum_pay_amount); + $this->assign('sum_platform_pay_amount',$sum_platform_pay_amount); + $this->assign('sum_noplatform_pay_amount',$sum_noplatform_pay_amount); $moneyAllCount = array_sum(array_column($channelData, 'pay_amount')); $this->assign('moneyAllCount',$moneyAllCount); $this->display(); @@ -568,7 +610,7 @@ class PayChannelController extends ThinkController // setPowerPromoteIds($coinMap,'tab_deposit.promote_id'); $spendData = M('spend','tab_') - ->field("pay_order_number,pay_time,user_account,game_name,promote_account,spend_ip,server_name,game_player_name,cost,pay_amount,pay_way") + ->field("pay_order_number,pay_time,user_account,game_name,promote_account,spend_ip,server_name,game_player_name,cost,pay_amount,pay_way,sdk_version") ->where($map) ->select(false); // var_dump($spendData);die(); @@ -578,7 +620,7 @@ class PayChannelController extends ThinkController $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, - tab_deposit.pay_ip as spend_ip,tab_pay_info.server_name,tab_pay_info.game_player_name, + tab_deposit.pay_ip as spend_ip,tab_pay_info.server_name,tab_pay_info.game_player_name,tab_pay_info.sdk_version, tab_deposit.pay_amount as cost,tab_deposit.pay_amount,tab_deposit.pay_way") ->where($coinMap) ->select(false); @@ -635,6 +677,11 @@ class PayChannelController extends ThinkController foreach ($data as $key => $value) { $data[$key]['pay_time'] = date('Y-m-d H:i:s',$value['pay_time']); + + if ($model == 'spend') { + $data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']); + $data[$key]['sdk_version'] =getGameTypeName($data[$key]['sdk_version']); + } } $sql = "select count(1) as count from ({$unionSql})t;"; @@ -751,7 +798,7 @@ class PayChannelController extends ThinkController } $spendData = M('spend','tab_') - ->field("pay_order_number,pay_time,user_account,game_name,promote_account,spend_ip,server_name,game_player_name,cost,pay_amount,pay_way") + ->field("pay_order_number,pay_time,user_account,game_name,sdk_version,promote_account,spend_ip,server_name,game_player_name,cost,pay_amount,pay_way") ->where($map) ->select(false); // var_dump($spendData);die(); @@ -761,7 +808,7 @@ class PayChannelController extends ThinkController $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, + ->field("pay_order_number,tab_deposit.create_time as pay_time,tab_deposit.user_account,tab_pay_info.game_name,tab_pay_info.sdk_version,tab_deposit.promote_account, tab_deposit.pay_ip as spend_ip,tab_pay_info.server_name,tab_pay_info.game_player_name, tab_deposit.pay_amount as cost,tab_deposit.pay_amount,tab_deposit.pay_way") ->where($coinMap) @@ -804,7 +851,7 @@ class PayChannelController extends ThinkController if ($model == 'spend') { - $xlsCell = array('支付订单号', '充值时间', '玩家账号', '游戏名称', '所属推广员', '充值ip', '游戏区服', '角色名称', '订单金额', '实付金额', '充值方式'); + $xlsCell = array('支付订单号', '充值时间', '玩家账号', '游戏名称', '设备名称','所属推广员', '充值ip', '游戏区服', '角色名称', '订单金额', '实付金额', '充值方式'); $unionSql = "{$spendData} UNION ALL {$coinData}"; } elseif($model == 'coin_pay_order') { $xlsCell = array('支付订单号', '充值时间', '所属推广员', '订单金额', '实付金额', '充值方式'); @@ -842,8 +889,12 @@ class PayChannelController extends ThinkController $sql = "select * from ({$unionSql})t order by pay_time DESC limit {$page},{$perSize};"; $xlsData = M()->query($sql); - + foreach ($xlsData as $k => $v) { + if ($model == 'spend') { + $v['game_name'] =clearGameNameType($v['game_name']); + $v['sdk_version'] =getGameTypeName($v['sdk_version']); + } $v['pay_time'] = date('Y-m-d H:i:s',$v['pay_time']); $v['pay_way'] = get_pay_way($v['pay_way']); @@ -952,7 +1003,7 @@ class PayChannelController extends ThinkController } // setPowerPromoteIds($map,'promote_id'); $data = M('spend','tab_') - ->field("pay_order_number,order_number,user_account,pay_time,game_name,server_name,game_player_name,cost,pay_amount,pay_way as pay_type,pay_way,pay_game_status") + ->field("pay_order_number,order_number,user_account,pay_time,game_name,server_name,game_player_name,cost,pay_amount,pay_way as pay_type,pay_way,pay_game_status,sdk_version") ->join('inner join tab_test_white_list on tab_spend.user_id=tab_test_white_list.user_id') ->where($map) // ->order('tab_spend.id DESC') @@ -980,7 +1031,7 @@ class PayChannelController extends ThinkController ->join("inner join tab_deposit on tab_pay_info.order_id=tab_deposit.pay_order_number") ->join("inner join tab_test_white_list on tab_test_white_list.user_id=tab_pay_info.user_id") ->field("pay_order_number,tab_deposit.order_number,tab_deposit.user_account,tab_deposit.create_time as pay_time, - tab_pay_info.game_name,tab_pay_info.server_name,tab_pay_info.game_player_name,tab_deposit.pay_amount as cost, + tab_pay_info.game_name,tab_pay_info.server_name,tab_pay_info.game_player_name,tab_pay_info.sdk_version,tab_deposit.pay_amount as cost, tab_deposit.pay_amount,tab_deposit.pay_way as pay_type,tab_deposit.pay_way,'' as pay_game_status") ->where($coinMap) ->select(false); @@ -1006,12 +1057,19 @@ class PayChannelController extends ThinkController $data[$key]['pay_type'] = get_pay_way($value['pay_type']); + $data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']); + $data[$key]['sdk_version'] =getGameTypeName($data[$key]['sdk_version']); + if ($value['pay_way']==1 || $value['pay_way']==9 ) { $data[$key]['pay_way'] = '支付宝'; } else if ($value['pay_way']==2 || $value['pay_way']==3 ) { $data[$key]['pay_way'] = '微信支付'; } else if ($value['pay_way']==15) { $data[$key]['pay_way'] = '快捷支付'; + } else if ($value['pay_way']==7) { + $data[$key]['pay_way'] = '苹果支付'; + } else if ($value['pay_way']==17) { + $data[$key]['pay_way'] = '易宝支付'; } else if($value['pay_way']){ $data[$key]['pay_way'] = '其他支付'; } @@ -1077,6 +1135,8 @@ class PayChannelController extends ThinkController $data[$key]['pay_time'] = Date('Y-m-d H:i:s',$value['pay_time']); $data[$key]['pay_type'] = get_pay_way($value['pay_type']); + $data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']); + $data[$key]['sdk_version'] ="苹果"; if ($value['pay_way']==1 || $value['pay_way']==9 ) { $data[$key]['pay_way'] = '支付宝'; @@ -1084,6 +1144,10 @@ class PayChannelController extends ThinkController $data[$key]['pay_way'] = '微信支付'; } else if ($value['pay_way']==15) { $data[$key]['pay_way'] = '快捷支付'; + } else if ($value['pay_way']==7) { + $data[$key]['pay_way'] = '苹果支付'; + } else if ($value['pay_way']==17) { + $data[$key]['pay_way'] = '易宝支付'; } else if($value['pay_way']){ $data[$key]['pay_way'] = '其他支付'; } @@ -1126,6 +1190,10 @@ class PayChannelController extends ThinkController $data[$key]['pay_way'] = '微信支付'; } else if ($value['pay_way']==15) { $data[$key]['pay_way'] = '快捷支付'; + } else if ($value['pay_way']==7) { + $data[$key]['pay_way'] = '苹果支付'; + } else if ($value['pay_way']==17) { + $data[$key]['pay_way'] = '易宝支付'; } else if($value['pay_way']){ $data[$key]['pay_way'] = '其他支付'; } @@ -1175,6 +1243,8 @@ class PayChannelController extends ThinkController $payTypeData['支付宝支付金额'] = 0; $payTypeData['微信支付金额'] = 0; $payTypeData['快捷支付金额'] = 0; + $payTypeData['苹果支付金额'] = 0; + $payTypeData['易宝支付金额'] = 0; $payTypeData['其他支付金额'] = 0; foreach($sumData as $key => $value) { @@ -1185,6 +1255,10 @@ class PayChannelController extends ThinkController $payTypeData['微信支付金额'] += number_format($value['pay_amount'],2,'.',''); } else if ($value['pay_way']==15) { $payTypeData['快捷支付金额'] += number_format($value['pay_amount'],2,'.',''); + } else if ($value['pay_way']==7) { + $payTypeData['苹果支付金额'] += number_format($value['pay_amount'],2,'.',''); + } else if ($value['pay_way']==17) { + $payTypeData['易宝支付金额'] += number_format($value['pay_amount'],2,'.',''); } else if($value['pay_way']){ $payTypeData['其他支付金额'] += number_format($value['pay_amount'],2,'.',''); } @@ -1195,6 +1269,9 @@ class PayChannelController extends ThinkController $payTypeData['微信支付金额'] = number_format($payTypeData['微信支付金额'],2,'.',''); $payTypeData['快捷支付金额'] = number_format($payTypeData['快捷支付金额'],2,'.',''); $payTypeData['其他支付金额'] = number_format($payTypeData['其他支付金额'],2,'.',''); + $payTypeData['苹果支付金额'] = number_format($payTypeData['苹果支付金额'],2,'.',''); + $payTypeData['易宝支付金额'] = number_format($payTypeData['易宝支付金额'],2,'.',''); + $this->assign('payTypeData',$payTypeData); @@ -1267,7 +1344,7 @@ class PayChannelController extends ThinkController if ($model == 'spend') { - $xlsCell = array('支付订单号', 'cp订单号', '测试账号', '充值时间', '游戏名称', '游戏区服', + $xlsCell = array('支付订单号', 'cp订单号', '测试账号', '充值时间', '游戏名称','设备名称', '游戏区服', '角色名称', '订单金额', ' 实付金额 ', '充值方式', '支付渠道', '游戏通知状态',); mb_convert_variables('GBK', 'UTF-8', $xlsCell); @@ -1279,7 +1356,7 @@ class PayChannelController extends ThinkController // setPowerPromoteIds($map,'promote_id'); $data = M('spend','tab_') - ->field("pay_order_number,order_number,user_account,pay_time,game_name,server_name,game_player_name,cost,pay_amount,pay_way as pay_type,pay_way,pay_game_status") + ->field("pay_order_number,order_number,user_account,pay_time,game_name,sdk_version,server_name,game_player_name,cost,pay_amount,pay_way as pay_type,pay_way,pay_game_status") ->join('inner join tab_test_white_list on tab_spend.user_id=tab_test_white_list.user_id') ->where($map) // ->order('tab_spend.id DESC') @@ -1310,7 +1387,7 @@ class PayChannelController extends ThinkController ->join("inner join tab_deposit on tab_pay_info.order_id=tab_deposit.pay_order_number") ->join("inner join tab_test_white_list on tab_test_white_list.user_id=tab_pay_info.user_id") ->field("pay_order_number,tab_deposit.order_number,tab_deposit.user_account,tab_deposit.create_time as pay_time, - tab_pay_info.game_name,tab_pay_info.server_name,tab_pay_info.game_player_name,tab_deposit.pay_amount as cost, + tab_pay_info.game_name,tab_pay_info.sdk_version,tab_pay_info.server_name,tab_pay_info.game_player_name,tab_deposit.pay_amount as cost, tab_deposit.pay_amount,tab_deposit.pay_way as pay_type,tab_deposit.pay_way,'' as pay_game_status") ->where($coinMap) ->select(false); @@ -1333,6 +1410,8 @@ class PayChannelController extends ThinkController $value['pay_order_number'] = "'".$value['pay_order_number']; $value['order_number'] = "'".$value['order_number']; + $value['game_name'] =clearGameNameType($value['game_name']); + $value['sdk_version'] =getGameTypeName($value['sdk_version']); if (!$value['order_number']) { $data[$key]['order_number'] = '无'; @@ -1348,6 +1427,10 @@ class PayChannelController extends ThinkController $value['pay_way'] = '微信支付'; } else if ($value['pay_way'] == 15) { $value['pay_way'] = '快捷支付'; + } else if ($value['pay_way']==7) { + $data[$key]['pay_way'] = '苹果支付'; + } else if ($value['pay_way']==17) { + $data[$key]['pay_way'] = '易宝支付'; } else if ($value['pay_way']) { $value['pay_way'] = '其他支付'; } @@ -1391,7 +1474,7 @@ class PayChannelController extends ThinkController } elseif($model == 'game_supersign') { - $xlsCell = array('支付订单号', '测试账号', '充值时间', '游戏名称', + $xlsCell = array('支付订单号', '测试账号', '充值时间', '游戏名称','设备名称', '订单金额', ' 实付金额 ', '充值方式', '支付渠道',); mb_convert_variables('GBK', 'UTF-8', $xlsCell); @@ -1429,19 +1512,18 @@ class PayChannelController extends ThinkController $page = ($i - 1) * $perSize; $data = M('game_supersign', 'tab_') - ->field("order_id as pay_order_number,account as user_account,pay_time,game_name,pay_price as cost,pay_price as pay_amount,pay_way as pay_type,pay_way") + ->field("order_id as pay_order_number,account as user_account,pay_time,game_name,@t:='苹果' sdk_version,pay_price as cost,pay_price as pay_amount,pay_way as pay_type,pay_way") ->join('inner join tab_test_white_list on tab_game_supersign.user_id=tab_test_white_list.user_id') ->join('left join tab_game on tab_game_supersign.game_id= tab_game.id') ->where($map) ->limit($page ,$perSize) ->order('tab_game_supersign.id DESC') ->select(); - foreach ($data as $key => $value) { $value['pay_order_number'] = "'".$value['pay_order_number']; $value['pay_time'] = Date('Y-m-d H:i:s', $value['pay_time']); - + $value['game_name'] =clearGameNameType($value['game_name']); $value['pay_type'] = get_pay_way($value['pay_type']); if ($value['pay_way'] == 1 || $value['pay_way'] == 9) { @@ -1450,6 +1532,10 @@ class PayChannelController extends ThinkController $value['pay_way'] = '微信支付'; } else if ($value['pay_way'] == 15) { $value['pay_way'] = '快捷支付'; + } else if ($value['pay_way']==7) { + $data[$key]['pay_way'] = '苹果支付'; + } else if ($value['pay_way']==17) { + $data[$key]['pay_way'] = '易宝支付'; } else if ($value['pay_way']) { $value['pay_way'] = '其他支付'; } @@ -1478,7 +1564,7 @@ class PayChannelController extends ThinkController $map['create_time'] = $map['pay_time']; unset($map['pay_time']); } -// setPowerPromoteIds($map,'tab_deposit.promote_id'); + // setPowerPromoteIds($map,'tab_deposit.promote_id'); $accessNum = M('deposit','tab_') ->field("pay_order_number,order_number,user_account,create_time as pay_time,pay_amount as cost,pay_amount,pay_way as pay_type,pay_way") @@ -1514,6 +1600,10 @@ class PayChannelController extends ThinkController $value['pay_way'] = '微信支付'; } else if ($value['pay_way'] == 15) { $value['pay_way'] = '快捷支付'; + } else if ($value['pay_way']==7) { + $data[$key]['pay_way'] = '苹果支付'; + } else if ($value['pay_way']==17) { + $data[$key]['pay_way'] = '易宝支付'; } else if ($value['pay_way']) { $value['pay_way'] = '其他支付'; } @@ -1560,6 +1650,8 @@ class PayChannelController extends ThinkController $payTypeData['微信支付金额'] = 0; $payTypeData['快捷支付金额'] = 0; $payTypeData['其他支付金额'] = 0; + $payTypeData['苹果支付金额'] = number_format($payTypeData['苹果支付金额'],2,'.',''); + $payTypeData['易宝支付金额'] = number_format($payTypeData['易宝支付金额'],2,'.',''); foreach($sumData as $key => $value) { @@ -1569,6 +1661,10 @@ class PayChannelController extends ThinkController $payTypeData['微信支付金额'] += number_format($value['pay_amount'],2,'.',''); } else if ($value['pay_way']==15) { $payTypeData['快捷支付金额'] += number_format($value['pay_amount'],2,'.',''); + } else if ($value['pay_way']==7) { + $payTypeData['苹果支付金额'] += number_format($value['pay_amount'],2,'.',''); + } else if ($value['pay_way']==17) { + $payTypeData['易宝支付金额'] += number_format($value['pay_amount'],2,'.',''); } else if($value['pay_way']){ $payTypeData['其他支付金额'] += number_format($value['pay_amount'],2,'.',''); } diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php index 08799e5cf..946364192 100644 --- a/Application/Admin/Controller/PromoteController.class.php +++ b/Application/Admin/Controller/PromoteController.class.php @@ -1174,15 +1174,15 @@ class PromoteController extends ThinkController { if (IS_AJAX) { //获取所有游戏 - $game_list = M('game', 'tab_')->field('id,game_name,short')->where(['game_status'=>1,'down_port'=>1])->select(); + $game_list = M('game', 'tab_')->field('relation_game_id id,relation_game_name game_name,short')->where(['game_status'=>1,'down_port'=>1])->group("relation_game_id")->select(); $data['data']['game_list'] = empty($game_list) ? '' : $game_list; //获取推广员信息 $promote_info = M('promote', 'tab_')->field('id,account,game_ids')->where(['id'=>I('id', 0, 'intval')])->find(); if (!empty($promote_info['game_ids'])) { + $this->changeGameidToRelationGameid($promote_info['game_ids']); $promote_info['game_ids'] = explode(',', $promote_info['game_ids']); } $data['data']['promote_info'] = empty($promote_info) ? '' : $promote_info; - $data['msg'] = '请求成功'; $data['code'] = 1; @@ -1190,6 +1190,14 @@ class PromoteController extends ThinkController exit; } } + //普通游戏id转唯一游戏id + protected function changeGameidToRelationGameid(&$ids) + { + $rid = M('game', 'tab_')->field('relation_game_id')->where(["id"=>["in",$ids]])->group("relation_game_id")->select(); + if($rid){ + $ids = implode(",",array_column($rid,'relation_game_id')); + } + } //更新推广员可推广游戏 @@ -1203,6 +1211,7 @@ class PromoteController extends ThinkController $game_ids = I('game_ids', ''); if (!empty($game_ids)) { $game_ids = implode(',', $game_ids); + $this->changeRelationGameidToGameid($game_ids); } else { $game_ids = 0; } @@ -1214,6 +1223,14 @@ class PromoteController extends ThinkController } } } + //唯一游戏id转普通游戏id + protected function changeRelationGameidToGameid(&$ids) + { + $rid = M('game', 'tab_')->field('id')->where(["relation_game_id"=>["in",$ids]])->select(); + if($rid){ + $ids = implode(",",array_column($rid,'id')); + } + } public function shortCutMenu($p = 1) { diff --git a/Application/Admin/Controller/TestOrderController.class.php b/Application/Admin/Controller/TestOrderController.class.php index 6ba7a699a..ec50da15b 100644 --- a/Application/Admin/Controller/TestOrderController.class.php +++ b/Application/Admin/Controller/TestOrderController.class.php @@ -47,7 +47,14 @@ class TestOrderController extends ThinkController $timeend = strtotime($_REQUEST['timeend'])+86399; $map['pay_time'] = array("ELT",$timeend); } - $order_list = M('test_order', 'tab_')->where($map)->page($page,$row)->order('add_time desc')->select(); + $order_list = M('test_order t', 'tab_') + ->field("t.*,g.sdk_version") + ->join("tab_game g on t.game_id = g.id","left") + ->where($map)->page($page,$row)->order('add_time desc')->select(); + foreach ($order_list as $k => &$v) { + $v['game_name'] =clearGameNameType($v['game_name']); + $v['sdk_version'] =getGameTypeName($v['sdk_version']); + } $sum_order_amount = M('test_order', 'tab_')->where($map)->field('sum(order_amount) as sum_order_amount,count(1) as count')->find(); $sum_pay_amount = M('test_order', 'tab_')->where($map)->field('sum(pay_amount) as sum_order_amount')->find(); diff --git a/Application/Admin/Model/SpendModel.class.php b/Application/Admin/Model/SpendModel.class.php index 90c97f928..08a649334 100644 --- a/Application/Admin/Model/SpendModel.class.php +++ b/Application/Admin/Model/SpendModel.class.php @@ -841,7 +841,7 @@ class SpendModel extends Model public function gameStatistics($map, $row = 0, $page = 1) { $query = M("Spend s use index(game_time)","tab_") - ->field("s.game_id,s.game_name,p.partner as partner_name, g.game_type_name, + ->field("s.game_id,g.relation_game_name game_name,p.partner as partner_name, g.game_type_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,g.sdk_version") diff --git a/Application/Admin/View/Finance/coinDetail.html b/Application/Admin/View/Finance/coinDetail.html index d9ba26176..1b8a7e8bd 100644 --- a/Application/Admin/View/Finance/coinDetail.html +++ b/Application/Admin/View/Finance/coinDetail.html @@ -50,16 +50,7 @@ 搜索 - 导出 + 导出 @@ -76,6 +67,7 @@ 充值时间 玩家账号 游戏名称 + 设备名称 游戏区服 角色名称 订单金额 @@ -94,6 +86,7 @@ {$data.pay_time} {$data.user_account} {$data.game_name} + {$data.sdk_version} {$data.server_name} {$data.game_player_name} {$data.cost} @@ -108,7 +101,7 @@ - 总计 + 总计 {$total_cost}0.00 {$total_pay_amount}0.00 diff --git a/Application/Admin/View/Finance/gameStatisticsDetail.html b/Application/Admin/View/Finance/gameStatisticsDetail.html index 67a583667..57681aea9 100644 --- a/Application/Admin/View/Finance/gameStatisticsDetail.html +++ b/Application/Admin/View/Finance/gameStatisticsDetail.html @@ -93,16 +93,7 @@ 搜索 - 导出 + 导出 @@ -123,6 +114,7 @@ 玩家账号 游戏名称 + 设备类型 所属推广员 @@ -158,6 +150,7 @@ {$data.pay_time} {$data.user_account} {$data.game_name} + {$data.sdk_version} {$data.promote_account} {$data.spend_ip} {$data.server_name} diff --git a/Application/Admin/View/FinancePromote/gameCoinDetail.html b/Application/Admin/View/FinancePromote/gameCoinDetail.html index e49138ea4..fed4c5f48 100644 --- a/Application/Admin/View/FinancePromote/gameCoinDetail.html +++ b/Application/Admin/View/FinancePromote/gameCoinDetail.html @@ -105,6 +105,7 @@ 充值时间 玩家账号 游戏名称 + 设备名称 游戏区服 角色名称 订单金额 @@ -123,6 +124,7 @@ {$data.pay_time} {$data.user_account} {$data.game_name} + {$data.sdk_version} {$data.server_name} {$data.game_player_name} {$data.cost} @@ -137,7 +139,7 @@ - 总计 + 总计 {$total_cost}0.00 {$total_pay_amount}0.00 @@ -190,7 +192,7 @@ // console.log(str); $("#game_name").empty(); $("#game_name").append(str); - // $("#server_id").select2(); + $("#game_name").select2(); } }) diff --git a/Application/Admin/View/FinancePromote/gameStatistics.html b/Application/Admin/View/FinancePromote/gameStatistics.html index 2b42d54c4..64890d9d2 100644 --- a/Application/Admin/View/FinancePromote/gameStatistics.html +++ b/Application/Admin/View/FinancePromote/gameStatistics.html @@ -180,6 +180,7 @@ 团体类型 游戏 + 设备
游戏现金金额第三方支付（微信，支付宝，快捷）。
@@ -211,6 +212,7 @@ {$data.account} {$data.company_belong} {$data.game_name} + {$data.sdk_version} {$data.cash_count} {$data.balance_coin_count} @@ -223,7 +225,7 @@ - 总计 + 总计 {$sumCash}0 {$sumBalance}0 {$sumInside}0 diff --git a/Application/Admin/View/FinancePromote/gameStatisticsDetail.html b/Application/Admin/View/FinancePromote/gameStatisticsDetail.html index a380574d6..6239bbe8c 100644 --- a/Application/Admin/View/FinancePromote/gameStatisticsDetail.html +++ b/Application/Admin/View/FinancePromote/gameStatisticsDetail.html @@ -164,6 +164,7 @@ 玩家账号 游戏名称 + 设备名称 所属推广员 @@ -199,6 +200,7 @@ {$data.pay_time} {$data.user_account} {$data.game_name} + {$data.sdk_version} {$data.promote_account} {$data.spend_ip} {$data.server_name} diff --git a/Application/Admin/View/FinancePromote/index.html b/Application/Admin/View/FinancePromote/index.html index 4c66fc343..0a59f4741 100644 --- a/Application/Admin/View/FinancePromote/index.html +++ b/Application/Admin/View/FinancePromote/index.html @@ -105,7 +105,7 @@
@@ -238,6 +238,11 @@ 渠道查看 + @@ -438,9 +443,6 @@ dataType: 'json', success: function (response) { str = ''; - if(company_id == 0 || company_id ==-1){ - str +=''; - } data = response.data; for (var i in data) { str += "" diff --git a/Application/Admin/View/PayChannel/gameDetail.html b/Application/Admin/View/PayChannel/gameDetail.html index a185fecf9..3839b3798 100644 --- a/Application/Admin/View/PayChannel/gameDetail.html +++ b/Application/Admin/View/PayChannel/gameDetail.html @@ -124,6 +124,7 @@ 玩家账号 游戏名称 + 设备名称 所属推广员 @@ -159,6 +160,7 @@ {$data.pay_time} {$data.user_account} {$data.game_name} + {$data.sdk_version} {$data.promote_account} {$data.spend_ip} {$data.server_name} diff --git a/Application/Admin/View/PayChannel/index.html b/Application/Admin/View/PayChannel/index.html index 59fdfc13c..0a626a9e9 100644 --- a/Application/Admin/View/PayChannel/index.html +++ b/Application/Admin/View/PayChannel/index.html @@ -137,6 +137,7 @@
产品名称平台官网，超级签，游戏等等产品
+
设备名称游戏的设备名称
游戏现金金额第三方支付充值到游戏的金额
@@ -165,6 +166,7 @@ {$data.game_name} + {$data.sdk_version} {$data['pay_amount']} @@ -179,6 +181,7 @@ 超级签 + {$superSignData['pay_amount']}0.00 0.00 {$superSignData.test_coin}0.00 @@ -189,6 +192,7 @@ 官网 + 0.00 {$offcialData['pay_amount']} {$offcialData.test_coin}0.00 @@ -199,6 +203,7 @@ 推广后台 + 0.00 {$spreadData['pay_amount']} 0.00 @@ -210,6 +215,7 @@ 汇总 + {$sumData['pay_amount']}0.00 {$sumData['platform_coin']}0.00 {$sumData['test_coin']} @@ -220,6 +226,7 @@ 测试环境内外网平台 + {$sum_pay_amount['sum_order_amount']}0.00 0.00 0.00 @@ -231,7 +238,7 @@ 充值方式统计 - + {$key}：{$payTypeData}          @@ -242,7 +249,7 @@ 支付渠道 - + {$channelData.pay_way}：{$channelData.pay_amount}          @@ -250,7 +257,7 @@ 支付渠道占比 - + {$channel.pay_way}: diff --git a/Application/Admin/View/PayChannel/testDetail.html b/Application/Admin/View/PayChannel/testDetail.html index 95a64b1b0..3df675051 100644 --- a/Application/Admin/View/PayChannel/testDetail.html +++ b/Application/Admin/View/PayChannel/testDetail.html @@ -124,6 +124,7 @@ 充值时间 游戏名称 + 设备名称 游戏区服 @@ -160,6 +161,7 @@ {$data.user_account} {$data.pay_time} {$data.game_name} + {$data.sdk_version} {$data.server_name} {$data.game_player_name} {$data.cost} @@ -175,6 +177,7 @@ ------ ------ ------ + ------ ------ ------ {$sumAllData.cost} diff --git a/Application/Admin/View/Promote/lists.html b/Application/Admin/View/Promote/lists.html index edbecdcb0..eb5d3837f 100644 --- a/Application/Admin/View/Promote/lists.html +++ b/Application/Admin/View/Promote/lists.html @@ -395,7 +395,7 @@ 全选 -
    +
    diff --git a/Application/Admin/View/TestOrder/lists.html b/Application/Admin/View/TestOrder/lists.html index e12feddc6..2595921aa 100644 --- a/Application/Admin/View/TestOrder/lists.html +++ b/Application/Admin/View/TestOrder/lists.html @@ -124,6 +124,7 @@ 充值时间 游戏名称 + 设备名称 订单金额 @@ -158,6 +159,7 @@ {$data.user_account} {$data.pay_time|date='Y-m-d H:i:s',###} {$data.game_name} + {$data.sdk_version} {$data.order_amount} {$data.pay_amount} {$data.pay_way|get_pay_way} @@ -173,6 +175,7 @@ ------ ------ ------ + ------ {$sum_order_amount['sum_order_amount']} {$sum_pay_amount['sum_order_amount']} ------