diff --git a/app/controller/api/store/merchant/Merchant.php b/app/controller/api/store/merchant/Merchant.php index 4bea5cf4..6013cc2f 100755 --- a/app/controller/api/store/merchant/Merchant.php +++ b/app/controller/api/store/merchant/Merchant.php @@ -319,7 +319,7 @@ class Merchant extends BaseController $_line = bcsub($merchant->mer_money, $extract_minimum_line, 2); $_extract = ($_line < 0) ? 0 : $_line; $merLockMoney = app()->make(UserBillRepository::class)->merchantLickMoney($merId); - + $merchant_intention= Db::name('merchant_intention')->where('mer_id',$merchant->mer_id)->find(); $data = [ 'mer_id' => $merchant->mer_id, //商户id 'mer_name' => $merchant->mer_name, //商户名称 @@ -329,10 +329,9 @@ class Merchant extends BaseController 'extract_minimum_line' => $extract_minimum_line, //提现最低额度 'extract_minimum_num' => $extract_minimum_num, //提现最低次数 'extract_money' => $_extract, //可提现金额 - '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_bank_bank' => $merchant_intention->bank_username ?? '', //银行账户姓名 + 'financial_bank_opening' => $merchant_intention->bank_opening ?? '', //开户行 + 'financial_bank_code' => $merchant_intention->bank_code ?? '', //银行账号 'financial_type' => $merchant->financial_type, //提现方式 'ot_margin' => $merchant->ot_margin, //提现方式