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 @@