修改补贴金额的错误
This commit is contained in:
parent
de9a758c22
commit
49fa0bcd76
@ -145,7 +145,8 @@ class Store extends BaseController
|
|||||||
$purchaseFinishRate = bcmul(min($purchaseFinishRate, 1), 100, 0);
|
$purchaseFinishRate = bcmul(min($purchaseFinishRate, 1), 100, 0);
|
||||||
$officialPurchaseFinishRate = $officialPurchaseTarget <= 0 ? 0 : bcdiv($merchant['official_purchase_amount'], $officialPurchaseTarget, 2);
|
$officialPurchaseFinishRate = $officialPurchaseTarget <= 0 ? 0 : bcdiv($merchant['official_purchase_amount'], $officialPurchaseTarget, 2);
|
||||||
$officialPurchaseFinishRate = bcmul(min($officialPurchaseFinishRate, 1), 100, 0);
|
$officialPurchaseFinishRate = bcmul(min($officialPurchaseFinishRate, 1), 100, 0);
|
||||||
$springSubsidyRate = $saleTarget <= 0 ? 0 : bcdiv(bcadd($merchant['purchase_amount'], $merchant['official_purchase_amount'], 2), $saleTarget, 2);
|
$springSubsidyUsed = bcsub($saleTarget, $merchant['balance'] ?? '0.00', 2);
|
||||||
|
$springSubsidyRate = $saleTarget <= 0 ? 0 : bcdiv($springSubsidyUsed, $saleTarget, 2);
|
||||||
$springSubsidyRate = bcmul(min($springSubsidyRate, 1), 100, 0);
|
$springSubsidyRate = bcmul(min($springSubsidyRate, 1), 100, 0);
|
||||||
return app('json')->success([
|
return app('json')->success([
|
||||||
'subsidy_amount' => empty($subsidyAmount) ? '0.00' : $subsidyAmount,
|
'subsidy_amount' => empty($subsidyAmount) ? '0.00' : $subsidyAmount,
|
||||||
@ -161,7 +162,7 @@ class Store extends BaseController
|
|||||||
'official_purchase_amount' => $merchant['official_purchase_amount'],
|
'official_purchase_amount' => $merchant['official_purchase_amount'],
|
||||||
'official_purchase_finish_rate' => $officialPurchaseFinishRate,
|
'official_purchase_finish_rate' => $officialPurchaseFinishRate,
|
||||||
'spring_subsidy' => $saleTarget,
|
'spring_subsidy' => $saleTarget,
|
||||||
'spring_subsidy_amount' => $merchant['purchase_amount'],
|
'spring_subsidy_amount' => $springSubsidyUsed,
|
||||||
'spring_subsidy_rate' => $springSubsidyRate,
|
'spring_subsidy_rate' => $springSubsidyRate,
|
||||||
'balance' => $merchant['balance'] ?? '0.00',
|
'balance' => $merchant['balance'] ?? '0.00',
|
||||||
]);
|
]);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user