修复
This commit is contained in:
parent
f7a9d0c291
commit
e8dfbec970
@ -269,7 +269,7 @@ class Merchant extends BaseController
|
|||||||
return app('json')->fail('参数错误');
|
return app('json')->fail('参数错误');
|
||||||
}
|
}
|
||||||
$margin = Db::name('MerchantType')->where('mer_type_id', $merchantInfo['type_id'])->value('margin');
|
$margin = Db::name('MerchantType')->where('mer_type_id', $merchantInfo['type_id'])->value('margin');
|
||||||
$merchantInfo['unpaid_margin'] = bcsub($margin,$merchantInfo['paid_margin']);
|
$merchantInfo['unpaid_margin'] = bcsub($margin,$merchantInfo['paid_margin'],2);
|
||||||
if($merchantInfo['margin']==0){
|
if($merchantInfo['margin']==0){
|
||||||
$merchantInfo['margin']=$merchantInfo['unpaid_margin'];
|
$merchantInfo['margin']=$merchantInfo['unpaid_margin'];
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user