diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index a62291e34..1660278f3 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -2172,7 +2172,13 @@ class ExportController extends Controller $xlsData[0]['authorization_all_num'] = $authorization_all_num; break; case 25: - $xlsCell = array( + //补单记录导出操作日志 + $GetData = $_GET; + unset($GetData['xlsname']); + unset($GetData['id']); + addOperationLog(['op_type'=>3,'key'=>getNowDate(),'url'=>U('BehaviorLog/singleSupplement',$GetData),'menu'=>'充值-游戏订单-补单记录管理-导出']); + + $xlsCell = array( array('type', '类型'), array('pay_order_number', '支付订单号'), array('extend', 'CP订单号'), diff --git a/Application/Admin/Controller/RechargeSumController.class.php b/Application/Admin/Controller/RechargeSumController.class.php index 42571a658..848f4e11c 100644 --- a/Application/Admin/Controller/RechargeSumController.class.php +++ b/Application/Admin/Controller/RechargeSumController.class.php @@ -10,6 +10,9 @@ class RechargeSumController extends ThinkController $startDateTime = empty($_REQUEST['timeStart']) ? date('Y-m-d', strtotime('-6 day', time())) : $_REQUEST['timeStart']; $endDateTime = empty($_REQUEST['timeEnd']) ? date('Y-m-d') : $_REQUEST['timeEnd']; + $_GET['timeStart'] = $startDateTime; + $_GET['timeEnd'] = $endDateTime; + $startTime = strtotime($startDateTime); $endTime = strtotime($endDateTime); $key = 0; @@ -138,6 +141,12 @@ class RechargeSumController extends ThinkController //判断是否执行导出 if (I('export') == 1) { + //操作日志 + $GetData = $_GET; + unset($GetData['xlsname']); + unset($GetData['export']); + addOperationLog(['op_type'=>3,'key'=>getNowDate(),'url'=>U('RechargeSum/summation',$GetData),'menu'=>'充值-游戏订单-充值汇总-导出']); + $this->exportSum($export_data); } $this->assign('meta_title', "充值汇总"); diff --git a/Application/Admin/Controller/RepairController.class.php b/Application/Admin/Controller/RepairController.class.php index d0093e5e3..9f111b602 100644 --- a/Application/Admin/Controller/RepairController.class.php +++ b/Application/Admin/Controller/RepairController.class.php @@ -211,16 +211,26 @@ class RepairController extends ThinkController { } // todo: 分红 上级奖励等 - // if ($tab == 'spend' && $cpFlag == 0) { - // $this->ajaxReturn(['status'=>0,'msg'=>'充值补单成功,通知CP失败!']); - // } + if ($tab == 'spend' && $cpFlag == 0) { + $this->ajaxReturn(['status'=>0,'msg'=>'充值补单成功,通知CP失败!']); + } //操作日志 - addOperationLog(array( + $optionarr = array( "op_type"=>1, - "key"=> $orderNo, - "menu"=>"充值-游戏订单-游戏充值-通知到账", - "url"=>U("Spend/lists",array("pay_order_number"=>$orderNo)) - )); + "key"=> $orderNo + ); + $pay_where = substr($orderNo, 0, 2); + if($pay_where == 'SP'){ + //游戏充值通知到账 + $optionarr['menu'] = "充值-游戏订单-游戏充值-通知到账"; + $optionarr['url'] = U("Spend/lists",array("pay_order_number"=>$orderNo)); + }elseif($pay_where == 'PF'){ + //平台币充值通知到账 + $optionarr['menu'] = "充值-平台币订单-平台币充值-通知到账"; + $optionarr['url'] = U("Deposit/lists",array("pay_order_number"=>$orderNo)); + } + addOperationLog($optionarr); + $this->ajaxReturn(['status'=>1,'msg'=>'充值补单成功!']); } else { M('spend', 'tab_')->rollback();