From 1fe3cf7c57b94d4d8c354934cb5e607fd65b2278 Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Tue, 25 Jan 2022 17:56:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E6=AC=BE=E5=8D=95?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/DealerWalletToBankLogController.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/Admin/Controllers/DealerWalletToBankLogController.php b/app/Admin/Controllers/DealerWalletToBankLogController.php
index 23b30b47..3910c2ea 100644
--- a/app/Admin/Controllers/DealerWalletToBankLogController.php
+++ b/app/Admin/Controllers/DealerWalletToBankLogController.php
@@ -182,14 +182,15 @@ class DealerWalletToBankLogController extends AdminController
             $writer = WriterEntityFactory::createXLSXWriter();
             $writer->openToBrowser('打款单'.date('Ymd').'.xlsx');
             $writer->addRow(WriterEntityFactory::createRowFromArray([
-                '提现手机号', '打款金额', '收款人', '收款银行', '收款账号', '开户行', '提现时间',
+                '提现手机号', '打款金额', '状态', '收款人', '收款银行', '收款账号', '开户行', '提现时间',
             ]));
             $query = DealerWalletToBankLogModel::with('dealer', 'user');
             foreach ($request->input() as $key => $value) {
-                dump($key);
                 switch ($key) {
                     case 'created_at':
-                        $query->whereBetween('created_at', $value);
+                        if ($value['start'] || $value['end']) {
+                            $query->whereBetween('created_at', $value);
+                        }
                         break;
                     case 'status':
                         if ($value) {
@@ -209,11 +210,17 @@ class DealerWalletToBankLogController extends AdminController
                         break;
                 }
             }
+            $statusArr = [
+                DealerWalletToBankLogModel::STATUS_PENDING=>'待处理',
+                DealerWalletToBankLogModel::STATUS_AGREE=>'同意',
+                DealerWalletToBankLogModel::STATUS_REFUSE=>'拒绝',
+            ];
             foreach ($query->cursor() as $log) {
                 $payInfo = $log->getPayInfo();
                 $writer->addRow(WriterEntityFactory::createRowFromArray([
                     $log->user->phone,
                     $log->account_amount,
+                    $statusArr[$log->status],
                     $payInfo ? $payInfo['bank']['user_name'] : '',
                     $payInfo ? $payInfo['bank']['bank_name'] : '',
                     $payInfo ? $payInfo['bank']['bank_number'] : '',