From cda8e4c1c0ad8b7d509a8058313f94b9e228243a Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Mon, 30 Dec 2019 14:33:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E7=BB=93=E7=AE=97--=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/QueryController.class.php      | 16 +++++++++++++-
 Application/Admin/View/Query/settlement.html  | 21 +++++++++++--------
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/Application/Admin/Controller/QueryController.class.php b/Application/Admin/Controller/QueryController.class.php
index 49bf60ecb..22631c5e9 100644
--- a/Application/Admin/Controller/QueryController.class.php
+++ b/Application/Admin/Controller/QueryController.class.php
@@ -123,6 +123,7 @@ class QueryController extends ThinkController
                 $this->display();
             }
         } elseif ($group == 2) {
+            $map = '1 = 1';
             $createTime = strtotime(I('create_time', ''));
             if ($createTime) {
                 $createTimeEnd = $createTime + 3600 * 24 - 1;
@@ -132,7 +133,20 @@ class QueryController extends ThinkController
                 $map['promote_id'] = $promoteId;
             }
 
-            $records = M('withdraw', 'tab_');
+            $records = M('withdraw', 'tab_')->where($map)->select();
+            if (!empty($records)) {
+                foreach ($records as &$record) {
+                    $record['settlement_begin_time'] = date('Y-m-d H:i:s', $record['settlement_begin_time']);
+                    $record['settlement_end_time'] = date('Y-m-d H:i:s', $record['settlement_end_time']);
+                    $record['create_time'] = date('Y-m-d H:i:s', $record['create_time']);
+                    $record['status_text'] = promoteWithdrawStatus($record['status']);
+                    if ($record['status'] == -2) {
+                        $record['status_text'] = '<span style="color: #999;">' . $record['status_text'] . '</span>';
+                    }
+                }
+            }
+
+            $this->assign('records', $records);
             $this->display();
         }
     }
diff --git a/Application/Admin/View/Query/settlement.html b/Application/Admin/View/Query/settlement.html
index 4e409a67a..3bc44d840 100644
--- a/Application/Admin/View/Query/settlement.html
+++ b/Application/Admin/View/Query/settlement.html
@@ -152,22 +152,25 @@
                       <th>结算开始时间</th>
                       <th>结算截止时间</th>
                       <th>提现时间</th>
-                      <th>详情</th>
+                      <th>提现状态</th>
+                      <th>说明</th>
                       <th>操作</th>
                     </tr>
                     </thead>
                     <!-- 列表 -->
                     <tbody>
-                    <volist name="list_data" id="data">
+                    <volist name="records" id="record">
                         <tr>
                             <td></td>
-                            <td>{$data.settlement_number}</td>
-                            <td>{$data.total_money}</td>
-                            <td>{$data.create_time|date='Y-m-d',###}</td>
-                            <td>{$data.create_time|date='Y-m-d',###}</td>
-                            <td>{$data.create_time|date='Y-m-d',###}</td>
-                            <td>{$data.create_time|date='Y-m-d',###}</td>
-                            <td>{$data.create_time|date='Y-m-d',###}</td>
+                            <td>{$record.promote_account}</td>
+                            <td>{$record.widthdraw_number}</td>
+                            <td>{$record.sum_money}</td>
+                            <td>{$record.settlement_begin_time}</td>
+                            <td>{$record.settlement_end_time}</td>
+                            <td>{$record.create_time}</td>
+                            <td>{$record.status_text}</td>
+                            <td>{$record.respond}</td>
+                            <td></td>
                         </tr>
                     </volist>
                     <tr class="data_summary">