Skip to content

G
goods
Commit 0910811d authored by jianghaiming's avatar jianghaiming
Browse files
Options

Merge branch 'jiang_fix_20210824' into test

parents 1ea89c25 95ee2f8d
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
application/services/marketing/MarketingService.php
View file @ 0910811d
...@@ -508,7 +508,7 @@ class MarketingService ...@@ -508,7 +508,7 @@ class MarketingService
//比例计算 //比例计算
if ($commissionMode == Marketing::COMMISSION_MODE_RATE) { if ($commissionMode == Marketing::COMMISSION_MODE_RATE) {
$commissionTotal = ($firstCommissionRate + $secondCommissionRate) / 10000 * $price; $commissionTotal = ($firstCommissionRate + $secondCommissionRate) / 10000 * $price;
if ($price > ($commissionTotal+$chargeFee)) { if ($price < ($commissionTotal+$chargeFee)) {
throw new MarketingException(['cus'=>15]); throw new MarketingException(['cus'=>15]);
} }
} }
...@@ -516,7 +516,7 @@ class MarketingService ...@@ -516,7 +516,7 @@ class MarketingService
//固定金额 //固定金额
if ($commissionMode == Marketing::COMMISSION_MODE_FIXED) { if ($commissionMode == Marketing::COMMISSION_MODE_FIXED) {
$commissionTotal = ($firstCommissionRate + $secondCommissionRate); $commissionTotal = ($firstCommissionRate + $secondCommissionRate);
if ($price >($commissionTotal+$chargeFee)) { if ($price < ($commissionTotal+$chargeFee)) {
throw new MarketingException(['cus'=>15]); throw new MarketingException(['cus'=>15]);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment