mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
shengchanzhe 2023-12-23 11:15:54 +08:00
parent e6df1e710b
commit 4e5e187763
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/controller/api/store/merchant/Merchant.php
View File

@ -268,15 +268,16 @@ class Merchant extends BaseController
if (empty($id)) { if (empty($id)) {
return app('json')->fail('参数错误'); return app('json')->fail('参数错误');
} }
$merchant = app()->make(MerchantRepository::class)->search(['mer_id' => $id])->find();
$data = Db::name('merchant')->where('mer_id', $id)->find(); // $data = Db::name('merchant')->where('mer_id', $id)->find();
$data['mer_certificate'] = merchantConfig($id, 'mer_certificate'); $merchant['mer_certificate'] = merchantConfig($id, 'mer_certificate');
$data['mer_certificate'] = $data['mer_certificate'][0] ?? ''; // $data['mer_certificate'] = $data['mer_certificate'][0] ?? '';
// $append = ['merchantCategory', 'merchantType', 'mer_certificate']; $append = ['merchantCategory', 'merchantType', 'mer_certificate'];
// if ($merchant['is_margin'] == -10) if ($merchant['is_margin'] == -10)
// $append[] = 'refundMarginOrder'; $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']); $delivery = $repository->get($id) + systemConfig(['tx_map_key']);
$data = array_merge($data, $delivery); $data = array_merge($data, $delivery);
$data['sys_bases_status'] = systemConfig('sys_bases_status') === '0' ? 0 : 1; $data['sys_bases_status'] = systemConfig('sys_bases_status') === '0' ? 0 : 1;