From f04923e13a24c16de48838a5e2fa05a9316b4ce0 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Mon, 8 Apr 2024 14:15:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E6=8F=90=E7=8E=B0?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=20-=20=E5=AF=BC=E5=87=BA=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/services/ExcelService.php | 28 ++++++++--------------------
 route/api.php                   |  6 ------
 2 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/crmeb/services/ExcelService.php b/crmeb/services/ExcelService.php
index 849251e..5d55d3e 100644
--- a/crmeb/services/ExcelService.php
+++ b/crmeb/services/ExcelService.php
@@ -723,7 +723,7 @@ class ExcelService
             '支付宝',
             '微信零钱',
         ];
-        $header = ['用户名','用户UID','提现金额','余额','审核状态','拒绝理由','提现方式','转账信息'];
+        $header = ['用户名','用户UID','提现金额','余额','审核状态','拒绝理由','提现方式','微信号','支付宝号','收款二维码地址','账户类型','持卡人','开户行','银行卡号'];
         $filename = '提现申请_'.time();
         $path = 'extract';
         $export = [];
@@ -731,24 +731,6 @@ class ExcelService
         $count = $query->count();
         $list = $query->page($page, $limit)->select();
         foreach ($list as $item) {
-            $acount = '';
-            if ($item->extract_type == 0) {
-                if($item->bank_name) $acount .= '银行名称：'.$item->bank_name."；";
-
-                if($item->bank_type == 1) $acount .= '账户类型：企业账户；';
-                else $acount .= '账户类型：个人账户；';
-
-                $acount .= '银行地址：'.$item->bank_address."；";
-                $acount .= '银行卡号：'.$item->bank_code;
-            }
-            if ($item->extract_type == 2) {
-                if($item->wechat) $acount .= '微信号：'.$item->wechat."；";
-                $acount .= '收款二维码地址：'.$item->extract_pic;
-            }
-            if ($item->extract_type == 1) {
-                if($item->alipay) $acount .= '支付宝号：'.$item->alipay."；";
-                $acount .= '收款二维码地址：'.$item->extract_pic;
-            }
             $export[] = [
                 $item->real_name,
                 $item->uid,
@@ -757,7 +739,13 @@ class ExcelService
                 $item->status == 1 ? '通过' : ($item->status == 0 ? '待审核' : '拒绝'),
                 $item->fail_msg,
                 $type[$item->extract_type],
-                $acount,
+                $item->wechat,
+                $item->alipay,
+                $item->extract_pic ?? '',
+                $item->extract_type == 0 ? ($item->bank_type == 1 ? '企业账户' : '个人账户') : '',
+                $item->real_name ?? '',
+                $item->bank_address ?? '',
+                $item->bank_code ?? ''
             ];
         }
         $foot = '';
diff --git a/route/api.php b/route/api.php
index 1f1d226..b49e429 100644
--- a/route/api.php
+++ b/route/api.php
@@ -469,12 +469,6 @@ Route::group('api/', function () {
             Route::get('getInviteInfo', '/inviteCodeInfo');
             Route::get('invitePayment', '/inviteCodePayment');
             Route::get('inviteUse', '/inviteUse');
-
-
-
-
-
-
         })->prefix('api.user.Svip');
         //社区
         Route::group('community', function () {