diff --git a/app/controller/api/store/merchant/Merchant.php b/app/controller/api/store/merchant/Merchant.php index 559e979d..cbbcb097 100755 --- a/app/controller/api/store/merchant/Merchant.php +++ b/app/controller/api/store/merchant/Merchant.php @@ -268,15 +268,16 @@ class Merchant extends BaseController if (empty($id)) { return app('json')->fail('参数错误'); } + $merchant = app()->make(MerchantRepository::class)->search(['mer_id' => $id])->find(); - $data = Db::name('merchant')->where('mer_id', $id)->find(); - $data['mer_certificate'] = merchantConfig($id, 'mer_certificate'); - $data['mer_certificate'] = $data['mer_certificate'][0] ?? ''; - // $append = ['merchantCategory', 'merchantType', 'mer_certificate']; - // if ($merchant['is_margin'] == -10) - // $append[] = 'refundMarginOrder'; + // $data = Db::name('merchant')->where('mer_id', $id)->find(); + $merchant['mer_certificate'] = merchantConfig($id, 'mer_certificate'); + // $data['mer_certificate'] = $data['mer_certificate'][0] ?? ''; + $append = ['merchantCategory', 'merchantType', 'mer_certificate']; + if ($merchant['is_margin'] == -10) + $append[] = 'refundMarginOrder'; - // $data = $merchant->append($append)->hidden(['mark', 'reg_admin_id', 'sort'])->toArray(); + $data = $merchant->append($append)->hidden(['mark', 'reg_admin_id', 'sort','financial_bank'])->toArray(); $delivery = $repository->get($id) + systemConfig(['tx_map_key']); $data = array_merge($data, $delivery); $data['sys_bases_status'] = systemConfig('sys_bases_status') === '0' ? 0 : 1;