Merge branch 'marketing_20210824' into test

application/services/goods/GoodsService.php

@@ -12,6 +12,7 @@ use Api\PhpUtils\Common\BaseConvert;
 use Api\PhpUtils\Common\GoodsSkuId;
 use Api\PhpUtils\Http\HttpUtil;
 use App\Exception\custom\GoodsException;
+use App\Exception\custom\MarketingException;
 use App\Models\goods\mysql\Category;
 use App\Models\goods\mysql\GoodsOperationRecord;
 use App\Models\goods\mysql\GoodsSku;
@@ -37,6 +38,7 @@ use App\Services\common\CommonService;
 use Api\PhpUtils\Http\Request;
 use App\Exception\custom\InterfaceException;
 
+
 class GoodsService
 {
     const CHARGEFEE = 0.006;
@@ -781,10 +783,8 @@ class GoodsService
             "goods_version" => (int)$skuData["goods_version"] + 1,
         ];
 
-        //验证结算价格
-        if (!empty($params["clear_price"])) {
-            self::checkClearPrice($goodsSkuId, $skuParams);
-        }
+        //验证结算价格/分销金额
+        self::checkClearPrice($goodsSkuId, $skuParams);
 
         if (self::isInitGoodsStatus($params, $skuData)) {
             $skuParams["audit_status"] = GoodsSku::STATUS_AUDIT;
@@ -851,22 +851,41 @@ class GoodsService
             
             if (!empty($marketings)) {
                 foreach ($marketings as $marketing) {
-                    if ($marketing["commission_mode"] == Marketing::COMMISSION_MODE_RATE) {
-                        $commissionTotal = ($marketing["first_commission_value"] + $marketing["second_commission_value"]) / 10000 * $price;
-                        if (($price - $commissionTotal - $chargeFee) < $clearPrice) {
-                            throw new GoodsException(['cus' => 40]);
+                    if ($clearPrice > 0) {
+                        if ($marketing["commission_mode"] == Marketing::COMMISSION_MODE_RATE) {
+                            $commissionTotal = ($marketing["first_commission_value"] + $marketing["second_commission_value"]) / 10000 * $price;
+                            if (($price - $commissionTotal - $chargeFee) < $clearPrice) {
+                                throw new GoodsException(['cus' => 40]);
+                            }
                         }
-                    }
 
-                    if ($marketing["commission_mode"] == Marketing::COMMISSION_MODE_FIXED) {
-                        $commissionTotal = ($marketing["first_commission_value"] + $marketing["second_commission_value"]);
-                        if (($price - $commissionTotal - $chargeFee) < $clearPrice) {
-                            throw new GoodsException(['cus' => 40]);
+                        if ($marketing["commission_mode"] == Marketing::COMMISSION_MODE_FIXED) {
+                            $commissionTotal = ($marketing["first_commission_value"] + $marketing["second_commission_value"]);
+                            if (($price - $commissionTotal - $chargeFee) < $clearPrice) {
+                                throw new GoodsException(['cus' => 40]);
+                            }
+                        }
+                    }else{
+
+                        //比例计算
+                        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]);
+                            }
+                        }
+
+                        //固定金额
+                        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]);
+                            }
                         }
                     }
                 }
             }else{
-                if (($price - $chargeFee) < $clearPrice) {
+                if ($clearPrice > 0 && (($price - $chargeFee) < $clearPrice)) {
                     throw new GoodsException(['cus' => 40]);
                 }
             }