From 8dee357578f7cc6b32c1948fbd7ef9c709d2dcfa Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 29 Dec 2023 19:09:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/Auth.php                    | 2 +-
 app/controller/api/store/merchant/Merchant.php | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index eb615d63..86dfd516 100644
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -1614,7 +1614,7 @@ class Auth extends BaseController
                     $datas['business_status']=2;
                     $datas['mer_settlement_agree_status']=1;
                     $datas['financial_bank']=json_encode(['name'=>$merchant_intention['company_name'],
-                    'bank_code'=>$merchant_intention['bank_code'],'bank'=>$merchant_intention['bank_username'],'bank_branch'=>""]);
+                    'bank_code'=>$merchant_intention['bank_code'],'bank'=>$merchant_intention['bank_username'],'bank_branch'=>$merchant_intention['bank_opening']]);
                 }else{
                     $datas['business_status']=3;
                 }
diff --git a/app/controller/api/store/merchant/Merchant.php b/app/controller/api/store/merchant/Merchant.php
index 0c309dbc..df132182 100755
--- a/app/controller/api/store/merchant/Merchant.php
+++ b/app/controller/api/store/merchant/Merchant.php
@@ -328,9 +328,10 @@ class Merchant extends BaseController
             'extract_minimum_line' => $extract_minimum_line, //提现最低额度
             'extract_minimum_num' => $extract_minimum_num, //提现最低次数
             'extract_money' => $_extract, //可提现金额
-            'financial_bank_bank' => $merchant->financial_bank->name ?? '', //银行账户姓名
-            'financial_bank_opening' => $merchant->financial_bank->bank ?? '', //开户行
+            'financial_bank_name' => $merchant->financial_bank->name ?? '', //银行账户姓名
+            'financial_bank_bank' => $merchant->financial_bank->bank ?? '', //开户行
             'financial_bank_code' => $merchant->financial_bank->bank_code ?? '', //银行账号
+            'financial_bank_branch' => $merchant->financial_bank->bank_branch ?? '', //开户行地址
             'financial_type' => $merchant->financial_type, //提现方式
             'ot_margin' => $merchant->ot_margin, //提现方式