diff --git a/app/controller/admin/system/merchant/Merchant.php b/app/controller/admin/system/merchant/Merchant.php index 14dbbc9d..4435efbc 100644 --- a/app/controller/admin/system/merchant/Merchant.php +++ b/app/controller/admin/system/merchant/Merchant.php @@ -146,7 +146,7 @@ class Merchant extends BaseController unset($data['mer_account'], $data['mer_password']); $margin = $this->repository->checkMargin($id, $data['type_id']); $data['margin'] = $margin['margin']; - $data['is_margin'] = $margin['is_margin']; + $data['is_margin'] = $data['paid_margin'] > 0 ? MerchantRepository::PaidMargin : $margin['is_margin']; $data['ot_margin'] = $data['paid_margin']; $datas=$data; $this->repository->update($id, $datas);