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-26 17:45:13 +08:00
parent bd894ee4c8
commit 3319fc01a4
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controller/api/Auth.php
View File

@ -282,9 +282,7 @@ class Auth extends BaseController
} }
$merchantTypeInfo = Db::name('merchant_type')->where('mer_type_id', $merchant['type_id'])->find(); $merchantTypeInfo = Db::name('merchant_type')->where('mer_type_id', $merchant['type_id'])->find();
if ($merchantTypeInfo['first_margin'] > 0) { if ($merchantTypeInfo['first_margin'] > 0) {
if ($merchant['first_margin_status']) { if (!$merchant['first_margin_status']) {
$merchant['margin'] = bcsub($merchant['margin'], $merchantTypeInfo['first_margin'], 2);
} else {
$merchant['margin'] = $merchantTypeInfo['first_margin']; $merchant['margin'] = $merchantTypeInfo['first_margin'];
} }
} }

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

@ -272,7 +272,7 @@ class Merchant extends BaseController
$merchantTypeInfo = Db::name('merchant_type')->where('mer_type_id', $merchantInfo['type_id'])->find(); $merchantTypeInfo = Db::name('merchant_type')->where('mer_type_id', $merchantInfo['type_id'])->find();
if ($merchantTypeInfo['first_margin'] > 0) { if ($merchantTypeInfo['first_margin'] > 0) {
if ($merchantInfo['first_margin_status']) { if ($merchantInfo['first_margin_status']) {
$merchantInfo['margin'] = bcsub($merchantInfo['margin'], $merchantTypeInfo['first_margin'], 2); $merchantInfo['margin'] = $merchantInfo['margin'];
$merchantInfo['unpaid_margin'] = $merchantInfo['margin']; $merchantInfo['unpaid_margin'] = $merchantInfo['margin'];
} else { } else {
$merchantInfo['margin'] = $merchantTypeInfo['first_margin']; $merchantInfo['margin'] = $merchantTypeInfo['first_margin'];