Merge branch 'marketing_20210824' into test

application/services/goods/GoodsService.php

@@ -897,7 +897,7 @@ class GoodsService
                         if ($marketing["commission_mode"] == Marketing::COMMISSION_MODE_RATE) {
                             $commissionTotal = ($marketing["first_commission_value"] + $marketing["second_commission_value"]) / 10000 * $price;
                             if ($price < ($commissionTotal+$chargeFee)) {
-                                throw new MarketingException(['cus'=>23]);
+                                throw new MarketingException(['cus'=>33]);
                             }
                         }
 
@@ -905,7 +905,7 @@ class GoodsService
                         if ($marketing["commission_mode"] == Marketing::COMMISSION_MODE_FIXED) {
                             $commissionTotal = ($marketing["first_commission_value"] + $marketing["second_commission_value"]);
                             if ($price < ($commissionTotal+$chargeFee)) {
-                                throw new MarketingException(['cus'=>23]);
+                                throw new MarketingException(['cus'=>33]);
                             }
                         }
                     }