diff --git a/app/controller/api/store/merchant/Merchant.php b/app/controller/api/store/merchant/Merchant.php index c421199d..826a6831 100644 --- a/app/controller/api/store/merchant/Merchant.php +++ b/app/controller/api/store/merchant/Merchant.php @@ -270,6 +270,9 @@ class Merchant extends BaseController } $margin = Db::name('MerchantType')->where('mer_type_id', $merchantInfo['type_id'])->value('margin'); $merchantInfo['unpaid_margin'] = bcsub($margin,$merchantInfo['paid_margin']); + if($merchantInfo['margin']==0){ + $merchantInfo['margin']=$merchantInfo['unpaid_margin']; + } return app('json')->success($merchantInfo); }