From 086c95b826c33e2afd3fcfdad80f3b017d943689 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Tue, 26 Nov 2019 20:25:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/ExportController.class.php      | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index cc38b611b..a68b8924e 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -532,15 +532,17 @@ class ExportController extends Controller
                             }
                             unset($xlsData[$k]['age_status']);
                             unset($xlsData[$k]['register_way']);
+                            mb_convert_variables('GBK', 'UTF-8', $v);
+                            fputcsv($fp, $v);
                         }
 
                     }
 
-                    foreach($xlsData as $value) {
-                        mb_convert_variables('GBK', 'UTF-8', $value);
-                        fputcsv($fp, $value);
-                        $lastId = $value['id'];
-                    }
+//                    foreach($xlsData as $value) {
+//                        mb_convert_variables('GBK', 'UTF-8', $value);
+//                        fputcsv($fp, $value);
+//                        $lastId = $value['id'];
+//                    }
                     unset($xlsData);//释放变量的内存
                     //刷新输出缓冲到浏览器
                     ob_flush();

From d80febf3ac1e0df7f2782b33fd8d1fd65c057c72 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Tue, 26 Nov 2019 20:31:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=8E=A9=E5=AE=B6=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E8=84=9A=E6=9C=AC--?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/AutoController.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Application/Admin/Controller/AutoController.class.php b/Application/Admin/Controller/AutoController.class.php
index 97377d250..21da2b965 100644
--- a/Application/Admin/Controller/AutoController.class.php
+++ b/Application/Admin/Controller/AutoController.class.php
@@ -924,6 +924,7 @@ public function  auto_rrdae(){
             $map['pay_status'] = 1;
             $map['pay_game_status'] = 1;
             $map['game_player_id'] = ['gt', 0];
+            $map['server_id'] = ['gt', 0];
             $field = 'FROM_UNIXTIME(pay_time, "%Y-%m-%d") as day,promote_id,user_id,game_id,server_id,game_player_id,sum(pay_amount) as recharge_cost,count(id) as recharge_count';
             $spendData = M('spend', 'tab_')->field($field)
                 ->where($map)