From a4377c017e1331e79ba5f8acfee458e2f1954b41 Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Fri, 8 May 2020 16:15:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/extend.php | 4 ++-- .../Controller/FinanceController.class.php | 5 ++-- .../FinancePromoteController.class.php | 2 +- .../Controller/PayChannelController.class.php | 24 +++++++++++-------- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index a05e905ce..056adc6c4 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -293,7 +293,7 @@ function get_pay_way($id=null) return "微信APP"; break; case 4: - return "威富通"; + return "汇付宝"; break; case 5: return "聚宝云"; @@ -1823,7 +1823,7 @@ function all_pay_way_other($type=false) // $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[5]=array('key'=>4,'value'=>'汇付宝'); /* $pay_way[6]=array('key'=>7,'value'=>"苹果支付"); */ $pay_way[15]=array('key'=>15,'value'=>'双乾支付-快捷'); diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index 26a51e2db..d13f9f4f9 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/Application/Admin/Controller/FinanceController.class.php @@ -718,7 +718,7 @@ class FinanceController extends ThinkController if (!empty(I('timestart'))) { $timestart = strtotime(I('timestart')); - $map['_string'] = "s.pay_time >= {$timestart}"; + $map['_string'] = "s.payed_time >= {$timestart}"; } if (!empty(I('timeend'))) { @@ -726,7 +726,7 @@ class FinanceController extends ThinkController if (!empty($map['_string'])) { $map['_string'] .= " and "; } - $map['_string'] .= " s.pay_time < {$timeend}"; + $map['_string'] .= " s.payed_time < {$timeend}"; } if (!empty(I('game_type_id'))) { @@ -736,7 +736,6 @@ class FinanceController extends ThinkController //游戏统计列表 $data = D("spend")->gameStatistics($map, $row, $p); $endTime = time(); - foreach ($data as $key => $value) { $data[$key]['all_cash_count'] = number_format($value['cash_count'] + $value['balance_coin_count'] + $value['inside_cash_count'],2,'.',''); } diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php index 24fbd3190..c62f93426 100644 --- a/Application/Admin/Controller/FinancePromoteController.class.php +++ b/Application/Admin/Controller/FinancePromoteController.class.php @@ -215,7 +215,7 @@ class FinancePromoteController extends AdminController $map["s.game_id"] = array("in",implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')) ); } if($istimeselect){ - $map['s.pay_time']=$istimeselect; + $map['s.payed_time']=$istimeselect; } $map['s.pay_status']=1; $field= "SUM(CASE WHEN pay_way > 0 THEN pay_amount ELSE 0 END) as cash_count, diff --git a/Application/Admin/Controller/PayChannelController.class.php b/Application/Admin/Controller/PayChannelController.class.php index f6393070d..b2550f3ba 100644 --- a/Application/Admin/Controller/PayChannelController.class.php +++ b/Application/Admin/Controller/PayChannelController.class.php @@ -25,23 +25,23 @@ class PayChannelController extends ThinkController $map = []; if (!empty($_REQUEST['timestart']) && !empty($_REQUEST['timeend'])) { - $map['pay_time'] = array('between', [strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399]); - $coinMap['tab_deposit.create_time'] = array('between', [strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399]); - $bindMap['create_time'] = array('between', [strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399]); + $map['payed_time'] = array('between', [strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399]); + $coinMap['tab_deposit.payed_time'] = array('between', [strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399]); + $bindMap['payed_time'] = array('between', [strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399]); $offcialmap['create_time'] = array('between', [strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399]); $spreadMap['create_time'] = array('between', [strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399]); $maptestorder['pay_time'] = array('between', [strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399]); } elseif (!empty($_REQUEST['timestart']) && empty($_REQUEST['timeend'])) { - $map['pay_time'] = array('between', [strtotime($_REQUEST['timestart']), time()]); - $coinMap['tab_deposit.create_time'] = array('between', [strtotime($_REQUEST['timestart']), time()]); - $bindMap['create_time'] = array('between', [strtotime($_REQUEST['timestart']), time()]); + $map['payed_time'] = array('between', [strtotime($_REQUEST['timestart']), time()]); + $coinMap['tab_deposit.payed_time'] = array('between', [strtotime($_REQUEST['timestart']), time()]); + $bindMap['payed_time'] = array('between', [strtotime($_REQUEST['timestart']), time()]); $offcialmap['create_time'] = array('between', [strtotime($_REQUEST['timestart']), time()]); $spreadMap['create_time'] = array('between', [strtotime($_REQUEST['timestart']), time()]); $maptestorder['pay_time'] = array('between', [strtotime($_REQUEST['timestart']), time()]); } elseif (empty($_REQUEST['timestart']) && !empty($_REQUEST['timeend'])) { - $map['pay_time'] = array('elt', (strtotime($_REQUEST['timeend']) + 86399)); - $coinMap['tab_deposit.create_time'] = array('elt', (strtotime($_REQUEST['timeend']) + 86399)); - $bindMap['create_time'] = array('elt', (strtotime($_REQUEST['timeend']) + 86399)); + $map['payed_time'] = array('elt', (strtotime($_REQUEST['timeend']) + 86399)); + $coinMap['tab_deposit.payed_time'] = array('elt', (strtotime($_REQUEST['timeend']) + 86399)); + $bindMap['payed_time'] = array('elt', (strtotime($_REQUEST['timeend']) + 86399)); $offcialmap['create_time'] = array('elt', (strtotime($_REQUEST['timeend']) + 86399)); $spreadMap['create_time'] = array('elt', (strtotime($_REQUEST['timeend']) + 86399)); $maptestorder['pay_time'] = array('elt', (strtotime($_REQUEST['timeend']) + 86399)); @@ -131,6 +131,8 @@ class PayChannelController extends ThinkController $data[$key]['sdk_version'] =getGameTypeName($data[$key]['sdk_version']); } $superMap = $map; + unset($superMap['payed_time']); + $superMap['pay_time'] = $map['payed_time']; // unset($superMap['promote_id']); //超级签数据 $superSignData = M('game_supersign','tab_') @@ -193,12 +195,12 @@ class PayChannelController extends ThinkController $this->assign('spreadData',$spreadData); $channelData = $this->getPayChannel($map); - $testOrderChannelDatas = $this->getTestOrderPayChannel($maptestorder); $payTypeData['支付宝支付金额'] = 0; $payTypeData['微信支付金额'] = 0; $payTypeData['快捷支付金额'] = 0; $payTypeData['苹果支付金额'] = 0; + $payTypeData['汇付宝支付金额'] = 0; $payTypeData['易宝支付金额'] = 0; $payTypeData['其他支付金额'] = 0; @@ -206,6 +208,8 @@ class PayChannelController extends ThinkController if ($value['pay_way']==1 || $value['pay_way']==9 ) { $payTypeData['支付宝支付金额'] += number_format($value['pay_amount'],2,'.',''); + } else if ($value['pay_way']==4 ) { + $payTypeData['汇付宝支付金额'] += number_format($value['pay_amount'],2,'.',''); } else if ($value['pay_way']==2 || $value['pay_way']==3 ) { $payTypeData['微信支付金额'] += number_format($value['pay_amount'],2,'.',''); } else if ($value['pay_way']==15) { From d7e61edaa17e682741bfd808996bd988ca14675d Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Tue, 26 May 2020 16:06:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B1=87=E4=BB=98=E5=AE=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/extend.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index 056adc6c4..949fb7081 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -1485,6 +1485,7 @@ function cash_pay_way() $pay_way[3]=array('key'=>2,'value'=>"微信"); // $pay_way[3]=array('key'=>3,'value'=>'微信APP'); // $pay_way[4]=array('key'=>4,'value'=>'威富通'); + $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'=>"苹果支付");