Merge branch 'sxh_master_0812' into 'master'

update:注释掉结算价

See merge request bp/goods!3

application/services/marketing/MarketingService.php

@@ -474,19 +474,19 @@ class MarketingService
         foreach ($goodsSkuList as $key => $value) {
             $clearPrice = !empty($value["clear_price"]) ? $value["clear_price"]*100 : 0;
             $price = !empty($value["price"]) ? $value["price"]*100 : 0;
-            if ($commissionMode == Marketing::COMMISSION_MODE_RATE) {
-                $commissionTotal = ($firstCommissionRate + $secondCommissionRate) / 1000 * $price;
-                if ($price - $commissionTotal < $clearPrice) {
-                    throw new GoodsException(['cus' => 36]);
-                }
-            }
-
-            if ($commissionMode == Marketing::COMMISSION_MODE_FIXED) {
-                $commissionTotal = ($firstCommissionRate + $secondCommissionRate);
-                if ($price - $commissionTotal < $clearPrice) {
-                    throw new GoodsException(['cus' => 36]);
-                }
-            }
+//            if ($commissionMode == Marketing::COMMISSION_MODE_RATE) {
+//                $commissionTotal = ($firstCommissionRate + $secondCommissionRate) / 1000 * $price;
+//                if ($price - $commissionTotal < $clearPrice) {
+//                    throw new GoodsException(['cus' => 36]);
+//                }
+//            }
+//
+//            if ($commissionMode == Marketing::COMMISSION_MODE_FIXED) {
+//                $commissionTotal = ($firstCommissionRate + $secondCommissionRate);
+//                if ($price - $commissionTotal < $clearPrice) {
+//                    throw new GoodsException(['cus' => 36]);
+//                }
+//            }
 
             $colums[$key]['marketing_id'] = $marketingId;
             $colums[$key]['goods_spu_id'] = $value['goods_spu_id'];