更新保证金支付
This commit is contained in:
parent
3319fc01a4
commit
870688ad17
@ -273,10 +273,8 @@ class Merchant extends BaseController
|
|||||||
if ($merchantTypeInfo['first_margin'] > 0) {
|
if ($merchantTypeInfo['first_margin'] > 0) {
|
||||||
if ($merchantInfo['first_margin_status']) {
|
if ($merchantInfo['first_margin_status']) {
|
||||||
$merchantInfo['margin'] = $merchantInfo['margin'];
|
$merchantInfo['margin'] = $merchantInfo['margin'];
|
||||||
$merchantInfo['unpaid_margin'] = $merchantInfo['margin'];
|
|
||||||
} else {
|
} else {
|
||||||
$merchantInfo['margin'] = $merchantTypeInfo['first_margin'];
|
$merchantInfo['margin'] = $merchantTypeInfo['first_margin'];
|
||||||
$merchantInfo['unpaid_margin'] = $merchantTypeInfo['margin'];
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return app('json')->success($merchantInfo);
|
return app('json')->success($merchantInfo);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user