Merge branch 'clear_price_0816' into test

application/services/goods/GoodsService.php

@@ -38,6 +38,7 @@ use App\Exception\custom\InterfaceException;
 
 class GoodsService
 {
+    const CHARGEFEE = 0.006;
     /**
      * 通过发号器拿 id （非雪花）
      * number，获取店铺shop_id用生活号id后两位，商品相关的这里是shop_id的后两位
@@ -740,6 +741,7 @@ class GoodsService
     {
         $clearPrice = $skuParams["clear_price"];
         $price = $skuParams["price"];
+        $chargeFee = !empty($price) ? bcmul($price , self::CHARGEFEE,2) : 0; //手续费 (分)
         if ($clearPrice > 0 && $clearPrice > $price) {
             throw new GoodsException(['cus' => 39]);
         }
@@ -756,14 +758,15 @@ 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"]) / 1000 * $price;
-                        if ($price - $commissionTotal < $clearPrice) {
+                        $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 < $clearPrice) {
+                        if (($price - $commissionTotal - $chargeFee) < $clearPrice) {
                             throw new GoodsException(['cus' => 40]);
                         }
                     }
@@ -847,7 +850,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"]["clear_price"] = empty($sku["clear_price"]) ? "" : $sku["clear_price"] / 100;
                 $data["goods_info"]["price"] = $sku["price"] / 100;
                 $data["goods_info"]["inventory"] = $sku["inventory_rest"];
                 

application/services/marketing/MarketingService.php

@@ -482,14 +482,12 @@ class MarketingService
             throw new MarketingException(['cus' => 5]);
         }
         $colums = [];
-        $goodCount = !empty($goodsSkuId) ? count($goodsSkuId) : 0;        
+        $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"] : 0;
             $price = !empty($value["price"]) ? $value["price"] : 0;
-            $chargeFee = !empty($price) ? bcmul($price , self::CHARGEFEE,2) : 0; //手续费
-
-
+            $chargeFee = !empty($price) ? bcmul($price , self::CHARGEFEE,2) : 0; //手续费 (分)
             if (!empty($clearPrice) && $clearPrice > 0) {
                 if ($commissionMode == Marketing::COMMISSION_MODE_RATE) {
                     $commissionTotal = ($firstCommissionRate + $secondCommissionRate) / 10000 * $price;
@@ -499,8 +497,8 @@ class MarketingService
                 }
 
                 if ($commissionMode == Marketing::COMMISSION_MODE_FIXED) {
-                    $commissionTotal = ($firstCommissionRate + $secondCommissionRate)/100;
-                    if (($price - $commissionTotal -$chargeFee)< $clearPrice) {
+                    $commissionTotal = ($firstCommissionRate + $secondCommissionRate);
+                    if (($price - $commissionTotal - $chargeFee)< $clearPrice) {
                         throw new GoodsException(['cus' => 48]);
                     }
                 }