From cb7a65bbf58baedd9fb491d50ac8eb773705adcf Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Mon, 8 Apr 2024 11:39:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=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=EF=BC=9A=E5=A2=9E=E5=8A=A0=E9=93=B6=E8=A1=8C?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=92=8C=E8=B4=A6=E6=88=B7=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/services/ExcelService.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/crmeb/services/ExcelService.php b/crmeb/services/ExcelService.php
index ffb7d4d..849251e 100644
--- a/crmeb/services/ExcelService.php
+++ b/crmeb/services/ExcelService.php
@@ -733,15 +733,20 @@ class ExcelService
         foreach ($list as $item) {
             $acount = '';
             if ($item->extract_type == 0) {
-                $acount .= '银行地址：'.$item->bank_address.PHP_EOL;
+                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) {
-                $acount .= '微信号：'.$item->wechat.PHP_EOL;
+                if($item->wechat) $acount .= '微信号：'.$item->wechat."；";
                 $acount .= '收款二维码地址：'.$item->extract_pic;
             }
             if ($item->extract_type == 1) {
-                $acount .= '支付宝号：'.$item->alipay.PHP_EOL;
+                if($item->alipay) $acount .= '支付宝号：'.$item->alipay."；";
                 $acount .= '收款二维码地址：'.$item->extract_pic;
             }
             $export[] = [