Commit e6d13874 authored by jianghaiming's avatar jianghaiming

Merge branch 'marketing_20210824' into test

parents be8f4c58 c3b7e1d6
...@@ -552,7 +552,7 @@ class MarketingService ...@@ -552,7 +552,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'=>23]); throw new MarketingException(['cus'=>33]);
} }
} }
...@@ -560,7 +560,7 @@ class MarketingService ...@@ -560,7 +560,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'=>23]); throw new MarketingException(['cus'=>33]);
} }
} }
} }
......
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