diff --git a/app/controller/api/store/merchant/Merchant.php b/app/controller/api/store/merchant/Merchant.php index c6c31de9..32f832be 100644 --- a/app/controller/api/store/merchant/Merchant.php +++ b/app/controller/api/store/merchant/Merchant.php @@ -269,10 +269,10 @@ class Merchant extends BaseController return app('json')->fail('参数错误'); } $merchantInfo['unpaid_margin'] = $merchantInfo['margin']; - if ($merchant['first_margin'] > 0 && $merchant['first_margin_status'] == 0) { + if ($merchantInfo['first_margin'] > 0 && $merchantInfo['first_margin_status'] == 0) { $merchantInfo['margin'] = $merchantInfo['first_margin']; } else { - $merchantInfo['margin'] = $merchantTypeInfo['margin']; + $merchantInfo['margin'] = $merchantInfo['margin']; } return app('json')->success($merchantInfo); }