From 6683a34aad92758943af500a7d067d9019e1502a Mon Sep 17 00:00:00 2001
From: elf <360197197@qq.com>
Date: Tue, 12 Dec 2023 22:27:45 +0800
Subject: [PATCH] =?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/SpendController.class.php | 18 +++++++-----------
 .../Spend/{lists1.html => lists_mime.html}     | 10 +---------
 2 files changed, 8 insertions(+), 20 deletions(-)
 rename Application/Admin/View/Spend/{lists1.html => lists_mime.html} (98%)

diff --git a/Application/Admin/Controller/SpendController.class.php b/Application/Admin/Controller/SpendController.class.php
index 9851e66..f2895d9 100644
--- a/Application/Admin/Controller/SpendController.class.php
+++ b/Application/Admin/Controller/SpendController.class.php
@@ -80,6 +80,8 @@ class SpendController extends ThinkController
                 $map['pay_way'] = $_REQUEST['pay_way'];
             }
             unset($_REQUEST['pay_way']);
+        } else {
+            $map['pay_way'] = ['not in', ['41']];
         }
         if (isset($_REQUEST['pay_game_status'])) {
             $map['pay_game_status'] = $_REQUEST['pay_game_status'];
@@ -192,11 +194,11 @@ class SpendController extends ThinkController
         $this->display();
     }
 
-    public function lists1()
+    public function lists_mime()
     {
         $startDate = empty($_REQUEST['timestart']) ? date('Y-m-d', strtotime('-6 day', time())) : $_REQUEST['timestart'];
         $endDate = empty($_REQUEST['timeend']) ? date('Y-m-d') : $_REQUEST['timeend'];
-        $payStatus = isset($_REQUEST['pay_status']) ? $_REQUEST['pay_status'] : 1;
+        $payStatus = isset($_REQUEST['pay_real_status']) ? $_REQUEST['pay_real_status'] : 1;
 
         $startTime = strtotime($startDate);
         $endTime = strtotime($endDate) + 86399;
@@ -207,7 +209,7 @@ class SpendController extends ThinkController
             $map['spend_time'] = array('BETWEEN', array($startTime, $endTime));
         }
         
-        $map['pay_status'] = $payStatus;
+        $map['pay_real_status'] = $payStatus;
 
         unset($_REQUEST['timestart']);
         unset($_REQUEST['timeend']);
@@ -252,14 +254,8 @@ class SpendController extends ThinkController
             unset($_REQUEST['extend']);
         }
         
-        if (isset($_REQUEST['pay_way'])) {
-            if ($_REQUEST['pay_way'] == 2) {
-                $map['pay_way'] = ['in', '2,3,4'];
-            } else {
-                $map['pay_way'] = $_REQUEST['pay_way'];
-            }
-            unset($_REQUEST['pay_way']);
-        }
+        $map['pay_way'] = ['in', '41'];
+
         if (isset($_REQUEST['pay_game_status'])) {
             $map['pay_game_status'] = $_REQUEST['pay_game_status'];
             unset($_REQUEST['pay_game_status']);
diff --git a/Application/Admin/View/Spend/lists1.html b/Application/Admin/View/Spend/lists_mime.html
similarity index 98%
rename from Application/Admin/View/Spend/lists1.html
rename to Application/Admin/View/Spend/lists_mime.html
index 604c7c1..364cd55 100644
--- a/Application/Admin/View/Spend/lists1.html
+++ b/Application/Admin/View/Spend/lists_mime.html
@@ -114,16 +114,8 @@
                     <option value="">区服名称</option>
                 </select>
             </div>
-            <div class="input-list input-list-spend search_label_rehab">
-                <select id="pay_way_id" name="pay_way" class="select_gallery" style="width:120px;">
-                    <option value="">充值方式</option>
-                    <volist name=":all_pay_way_other(1)" id="vo">
-                        <option value="{$vo.key}">{$vo.value}</option>
-                    </volist>
-                </select>
-            </div>
             <div class="input-list search_item input-list-orderstatus">
-                <select name="pay_status" style="color:#444" class="select_gallery" id="sel_order">
+                <select name="pay_real_status" style="color:#444" class="select_gallery" id="sel_order">
                     <!-- <option value="">订单状态</option> -->
                     <option value="1" <?php echo $payStatus == 1 ? "selected" : ''?>>充值成功</option>
                     <option value="0" <?php echo $payStatus == 0 ? "selected" : ''?>>下单未付款</option>