From 8b2d04f986bf0d8efd79e2c88a9d37fa7e4b432b Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Thu, 12 Dec 2019 10:31:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0=E6=96=B0?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/SuperSignController.class.php     | 10 +++++++++-
 .../Admin/Controller/TestWhiteListController.class.php |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/SuperSignController.class.php b/Application/Admin/Controller/SuperSignController.class.php
index b8c8ab129..1911c5a6d 100644
--- a/Application/Admin/Controller/SuperSignController.class.php
+++ b/Application/Admin/Controller/SuperSignController.class.php
@@ -45,15 +45,23 @@ class SuperSignController extends ThinkController
         $map['tab_game_supersign.pay_status'] = 1;
 
         $data = M('game_supersign','tab_')
-            ->field("order_id,ticket,pay_time,tab_user.account,tab_game.game_name,tab_user.promote_account,pay_price")
+            ->field("order_id,ticket,pay_time,tab_user.account,tab_game.game_name,tab_user.promote_account,pay_price,pay_way")
             ->join("left join tab_user on tab_game_supersign.user_id = tab_user.id")
             ->join("left join tab_game on tab_game_supersign.game_id = tab_game.id")
             ->page($p, $row)
+            ->order("pay_time DESC")
             ->where($map)
             ->select();
 
         foreach ($data as $key => $Value) {
             $data[$key]['pay_time'] = date('Y-m-d H:i:s',$Value['pay_time']);
+            if ($Value['pay_way']==1) {
+                $data[$key]['pay_way'] = '支付宝';
+            } else if ($Value['pay_way']==2) {
+                $data[$key]['pay_way'] = '微信';
+            } else {
+                $data[$key]['pay_way'] = '未知';
+            }
         }
 
         $count = M('game_supersign','tab_')
diff --git a/Application/Admin/Controller/TestWhiteListController.class.php b/Application/Admin/Controller/TestWhiteListController.class.php
index d9a0bd179..da0f11cc7 100644
--- a/Application/Admin/Controller/TestWhiteListController.class.php
+++ b/Application/Admin/Controller/TestWhiteListController.class.php
@@ -23,6 +23,7 @@ class TestWhiteListController extends ThinkController
         $data = M('test_white_list','tab_')
             ->page($p, $row)
             ->where($map)
+            ->order('create_ime DESC')
             ->select();
 
         foreach ($data as $key => $Value) {