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