diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php index d5cd50c0..bd0a4424 100644 --- a/app/controller/api/Auth.php +++ b/app/controller/api/Auth.php @@ -282,9 +282,7 @@ class Auth extends BaseController } $merchantTypeInfo = Db::name('merchant_type')->where('mer_type_id', $merchant['type_id'])->find(); if ($merchantTypeInfo['first_margin'] > 0) { - if ($merchant['first_margin_status']) { - $merchant['margin'] = bcsub($merchant['margin'], $merchantTypeInfo['first_margin'], 2); - } else { + if (!$merchant['first_margin_status']) { $merchant['margin'] = $merchantTypeInfo['first_margin']; } } diff --git a/app/controller/api/store/merchant/Merchant.php b/app/controller/api/store/merchant/Merchant.php index 4502a1d2..44af882f 100644 --- a/app/controller/api/store/merchant/Merchant.php +++ b/app/controller/api/store/merchant/Merchant.php @@ -272,7 +272,7 @@ class Merchant extends BaseController $merchantTypeInfo = Db::name('merchant_type')->where('mer_type_id', $merchantInfo['type_id'])->find(); if ($merchantTypeInfo['first_margin'] > 0) { if ($merchantInfo['first_margin_status']) { - $merchantInfo['margin'] = bcsub($merchantInfo['margin'], $merchantTypeInfo['first_margin'], 2); + $merchantInfo['margin'] = $merchantInfo['margin']; $merchantInfo['unpaid_margin'] = $merchantInfo['margin']; } else { $merchantInfo['margin'] = $merchantTypeInfo['first_margin'];