update:处理冲突

application/services/goods/GoodsService.php

@@ -847,6 +847,7 @@ class GoodsService
                 }
 
                 $data["goods_info"]["original_price"] = empty($sku["original_price"]) ? '' : (string)($sku["original_price"] / 100);
+                $data["goods_info"]["clear_price"] = empty($sku["clear_price"]) ? 0 : $sku["clear_price"] / 100;
                 $data["goods_info"]["price"] = $sku["price"] / 100;
                 $data["goods_info"]["inventory"] = $sku["inventory_rest"];
                 
@@ -947,6 +948,7 @@ class GoodsService
         $data["goods_info"] = $sku;
         $data["goods_info"]["original_price"] = empty($sku["original_price"]) ? '' : (string)($sku["original_price"] / 100);
         $data["goods_info"]["price"] = $sku["price"] / 100;
+        $data["goods_info"]["clear_price"] = empty($sku["clear_price"]) ? 0 : $sku["clear_price"] / 100;
         $data["goods_info"]["desc_pic_url_list"] = [];
         if (!empty($sku["desc_pic_url"])) {
             $ksyun = self::getUrlList($sku["desc_pic_url"]);

application/services/marketing/MarketingService.php

@@ -17,7 +17,7 @@ use App\Models\marketing\mysql\TakePlace;
 use App\Services\common\CommonService;
 use App\Services\goods\GoodsService;
 use Daemon\Goods;
-
+use App\Exception\custom\GoodsException;
 
 class MarketingService
 {
@@ -334,7 +334,7 @@ class MarketingService
      */
     private static function addFenxiaoMarketing($params)
     {
-        $commissionMode = !empty($params['commission_mode']) ? $params['commission_mode'] : '';
+        $commissionMode = !empty($params['commission_mode']) ? $params['commission_mode'] : 1;
         $marketingName = !empty($params['marketing_name']) ? $params['marketing_name'] : '';
 
         $firstCommissionRate = !empty($params['first_commission_value']) ? $params['first_commission_value']*100 : 0;
@@ -345,11 +345,13 @@ class MarketingService
         $type = !empty($params['marketing_type']) ? $params['marketing_type'] : 1;
         $goodsSkuId = !empty($params['goods_sku_id']) ? explode(",", $params['goods_sku_id']) : [];
 
-        $rate = $firstCommissionRate + $secondCommissionRate;
-        if ($rate > 5000) {
-            throw new MarketingException(['cus'=>15]);
+        if ($commissionMode == 1) {
+            $rate = $firstCommissionRate + $secondCommissionRate;
+            if ($rate > 5000) {
+                throw new MarketingException(['cus'=>15]);
+            } 
         }
-
+        
         if (empty($goodsSkuId)) {
             throw new MarketingException(['cus'=>12]);
         }
@@ -463,6 +465,22 @@ class MarketingService
         $goodCount = !empty($goodsSkuId) ? count($goodsSkuId) : 0;
         $goodsSkuList = GoodsSku::select('*', ['goods_sku_id' => $goodsSkuId]);
         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]);
+                }
+            }
+
             $colums[$key]['marketing_id'] = $marketingId;
             $colums[$key]['goods_spu_id'] = $value['goods_spu_id'];
             $colums[$key]['goods_sku_id'] = $value['goods_sku_id'];