Merge branch 'jiang_fix_20210824' into test

0910811d · jianghaiming · 1ea89c25 · 95ee2f8d · 0910811d
Commit 0910811d authored Aug 24, 2021 by jianghaiming
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

MarketingService.php application/services/marketing/MarketingService.php +2 -2

No files found.
--- a/application/services/marketing/MarketingService.php
+++ b/application/services/marketing/MarketingService.php
@@ -508,7 +508,7 @@ class MarketingService
                //比例计算
                if ($commissionMode == Marketing::COMMISSION_MODE_RATE) {
                    $commissionTotal = ($firstCommissionRate + $secondCommissionRate) / 10000 * $price;
-                    if ($price > ($commissionTotal+$chargeFee)) {
+                    if ($price < ($commissionTotal+$chargeFee)) {
                        throw new MarketingException(['cus'=>15]);
                    }
                }
@@ -516,7 +516,7 @@ class MarketingService
                //固定金额
                if ($commissionMode == Marketing::COMMISSION_MODE_FIXED) {
                    $commissionTotal = ($firstCommissionRate + $secondCommissionRate);
-                    if ($price >($commissionTotal+$chargeFee)) {
+                    if ($price < ($commissionTotal+$chargeFee)) {
                        throw new MarketingException(['cus'=>15]);
                    }
                }