mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新保证金支付

Browse Source
This commit is contained in:
yaooo 2023-09-27 10:26:51 +08:00
parent 86d76c5c2b
commit da4132807d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controller/api/store/merchant/Merchant.php
View File

@ -269,10 +269,10 @@ class Merchant extends BaseController
return app('json')->fail('参数错误'); return app('json')->fail('参数错误');
} }
$merchantInfo['unpaid_margin'] = $merchantInfo['margin']; $merchantInfo['unpaid_margin'] = $merchantInfo['margin'];
if ($merchant['first_margin'] > 0 && $merchant['first_margin_status'] == 0) { if ($merchantInfo['first_margin'] > 0 && $merchantInfo['first_margin_status'] == 0) {
$merchantInfo['margin'] = $merchantInfo['first_margin']; $merchantInfo['margin'] = $merchantInfo['first_margin'];
} else { } else {
$merchantInfo['margin'] = $merchantTypeInfo['margin']; $merchantInfo['margin'] = $merchantInfo['margin'];
} }
return app('json')->success($merchantInfo); return app('json')->success($merchantInfo);
} }