diff --git a/app/controller/api/store/merchant/Merchant.php b/app/controller/api/store/merchant/Merchant.php index 15152888..64630419 100644 --- a/app/controller/api/store/merchant/Merchant.php +++ b/app/controller/api/store/merchant/Merchant.php @@ -169,8 +169,13 @@ class Merchant extends BaseController if ($sys_bases_status && empty($data['mer_certificate'])) return app('json')->fail('店铺资质不可为空'); + $merCertificate = merchantConfig($id, 'mer_certificate'); + if (!is_array($merCertificate)) { + $merCertificate = explode( ',', $merCertificate); + } + $merCertificate[0] = $data['mer_certificate']; app()->make(ConfigValueRepository::class)->setFormData([ - 'mer_certificate' => $data['mer_certificate'] + 'mer_certificate' => $merCertificate ], $id); unset($data['mer_certificate']); @@ -222,6 +227,8 @@ class Merchant extends BaseController } $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';