修复押金
This commit is contained in:
parent
c5a8aafa62
commit
f7a9d0c291
@ -270,6 +270,9 @@ class Merchant extends BaseController
|
|||||||
}
|
}
|
||||||
$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']);
|
||||||
|
if($merchantInfo['margin']==0){
|
||||||
|
$merchantInfo['margin']=$merchantInfo['unpaid_margin'];
|
||||||
|
}
|
||||||
return app('json')->success($merchantInfo);
|
return app('json')->success($merchantInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user