update:set

application/services/marketing/MarketingService.php

@@ -24,23 +24,13 @@ class MarketingService
 {
     const ONLINE_LIFE_ACCOUNT_ID = "19019625839230981";
     const ONLINE_LIFE_ACCOUNT_ID_TEST = "17963416161910792";
+    const CHARGEFEE = 0.006;
     /**
      * 写死的自营生活号
      * @return string
      */
     public static function getPublicLifeAccountId()
     {
-        /**
-        $env = \Yaf\Application::app()->environ();
-        if (in_array($env, ['dev'])) {
-            $lifeAccountId = "13076446786650120";
-        } elseif (in_array($env, ['test'])) {
-            $lifeAccountId = "15559498695737346";
-        }else {
-//            $lifeAccountId = self::ONLINE_LIFE_ACCOUNT_ID;
-            $lifeAccountId = self::ONLINE_LIFE_ACCOUNT_ID_TEST;//测试用
-        }
-        */
         $lifeAccountId = config('lifeaccount','life_account_id');
         return $lifeAccountId;
     }
@@ -491,28 +481,30 @@ 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; //手续费
+
+
             if (!empty($clearPrice) && $clearPrice > 0) {
                 if ($commissionMode == Marketing::COMMISSION_MODE_RATE) {
-                    $commissionTotal = ($firstCommissionRate + $secondCommissionRate) / 1000 * $price;
-                    if ($price - $commissionTotal < $clearPrice) {
+                    $commissionTotal = ($firstCommissionRate + $secondCommissionRate) / 10000 * $price;
+                    if (($price - $commissionTotal-$chargeFee) < $clearPrice) {
                         throw new GoodsException(['cus' => 48]);
                     }
                 }
 
                 if ($commissionMode == Marketing::COMMISSION_MODE_FIXED) {
-                    $commissionTotal = ($firstCommissionRate + $secondCommissionRate);
-                    if ($price - $commissionTotal < $clearPrice) {
+                    $commissionTotal = ($firstCommissionRate + $secondCommissionRate)/100;
+                    if (($price - $commissionTotal -$chargeFee)< $clearPrice) {
                         throw new GoodsException(['cus' => 48]);
                     }
                 }
             }
-            
+
             $colums[$key]['marketing_id'] = $marketingId;
             $colums[$key]['goods_spu_id'] = $value['goods_spu_id'];
             $colums[$key]['goods_sku_id'] = $value['goods_sku_id'];