From a9f984d0aa1f7a759ed6067bb03c8b5363069233 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Fri, 28 Feb 2020 14:10:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC=E5=A4=A7=E5=9D=97-=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E6=97=A5=E5=BF=97ok?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/ExportController.class.php    | 14 +++++++-------
 .../Admin/Controller/TestOrderController.class.php |  7 +++++++
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index 0485c58ff..c010b6ed3 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -7253,7 +7253,7 @@ class ExportController extends Controller
             'balance_coin_count'=>$sumData['balance_coin_count'],
             'all_count'=>$sumData['all_count']]];
         $xlsData = array_merge($xlsData,$sumData);
-
+        $this->exportAddOperationLog("Finance/index","充值-财务管理-月结统计-导出");
         $this->exportExcel($xlsName, $xlsCell, $xlsData);
 
     }
@@ -7359,7 +7359,7 @@ class ExportController extends Controller
             'inside_cash_count'=>$sumInside,
             'all_cash_count'=>$sumAll]];
         $xlsData = array_merge($xlsData,$sumData);
-
+        $this->exportAddOperationLog("Finance/index","充值-财务管理-月结统计-游戏查看-导出");
         $this->exportExcel($xlsName, $xlsCell, $xlsData);
     }
 
@@ -7726,7 +7726,7 @@ class ExportController extends Controller
             'pay_way'=>$sum]];
 //        $xlsData = array_merge($xlsData,$sumData);
 //        dump($xlsData);die();
-
+        $this->exportAddOperationLog("Finance/gameFinanceDetail","充值-财务管理-月结统计-充值流水-导出");
         $this->exportNewExcel($xlsName, $xlsCell, $xlsData);
     }
 
@@ -7854,7 +7854,7 @@ class ExportController extends Controller
             'all_count'=>$sumData['all_count'],
         ]];
         $xlsData = array_merge($xlsData,$sumData);
-
+        $this->exportAddOperationLog("Finance/getRootUser","充值-财务管理-月结统计-渠道查看-会长-导出");
         $this->exportExcel($xlsName, $xlsCell, $xlsData);
 
     }
@@ -7932,7 +7932,7 @@ class ExportController extends Controller
             'all_count'=>$sumData['all_count'],
         ]];
         $xlsData = array_merge($xlsData,$sumData);
-
+        $this->exportAddOperationLog("Finance/getMiniterUser","充值-财务管理-月结统计-渠道查看-部门长-导出");
         $this->exportExcel($xlsName, $xlsCell, $xlsData);
     }
 
@@ -8012,7 +8012,7 @@ class ExportController extends Controller
             'all_count'=>$sumData['all_count'],
         ]];
         $xlsData = array_merge($xlsData,$sumData);
-
+        $this->exportAddOperationLog("Finance/getParentUser","充值-财务管理-月结统计-渠道查看-组长-导出");
         $this->exportExcel($xlsName, $xlsCell, $xlsData);
 
     }
@@ -8082,7 +8082,7 @@ class ExportController extends Controller
             'all_count'=>$sumData['all_count'],
         ]];
         $xlsData = array_merge($xlsData,$sumData);
-
+        $this->exportAddOperationLog("Finance/getPromoteUser","充值-财务管理-月结统计-渠道查看-组员-导出");
         $this->exportExcel($xlsName, $xlsCell, $xlsData);
 
     }
diff --git a/Application/Admin/Controller/TestOrderController.class.php b/Application/Admin/Controller/TestOrderController.class.php
index ffda1457e..7feb70082 100644
--- a/Application/Admin/Controller/TestOrderController.class.php
+++ b/Application/Admin/Controller/TestOrderController.class.php
@@ -85,6 +85,13 @@ class TestOrderController extends ThinkController
         $isSuccess = M('test_order','tab_')->add($data);
 
         if ($isSuccess) {
+            //操作日志
+            addOperationLog(array(
+                "op_type"=>0,
+                "key"=>$data['order_no'],
+                "menu"=>"充值-财务管理-测试服订单管理-订单录入",
+                "url"=>U("TestOrder/lists",array("order_no"=>$data['order_no']))
+            ));
             $this->ajaxReturn(['status'=>1,'msg'=>'订单录入成功']);
         } else {
             $this->ajaxReturn(['status'=>0,'msg'=>'订单录入失败']);