Merge branch 'online_time' into test

application/services/marketing/MarketingGoodsService.php

@@ -156,12 +156,12 @@ class MarketingGoodsService
                     //比例
                     if (!empty($secondCommission) && $commissionMode == 1) {
                         $price = !empty($list[$i]['price']) ? $list[$i]['price'] : 0;
-                        $list[$i]['share_price'] =  substr(sprintf("%.4f",$secondCommission*$price/100),0,-2);
+                        $list[$i]['share_price'] = (float) substr(sprintf("%.4f",$secondCommission*$price/100),0,-2);
                     }
 
                     //固定
                     if (!empty($commissionMode) && $commissionMode == 2) {
-                        $list[$i]['share_price'] =  substr(sprintf("%.4f",$secondCommission/100),0,-2);
+                        $list[$i]['share_price'] =  (float) substr(sprintf("%.4f",$secondCommission),0,-2);
                     }
 
                     $content = $userId .'_' .$value['marketing_id'];
@@ -201,9 +201,13 @@ class MarketingGoodsService
 
             $data = [];
             foreach ($marketingInfoIds as $goodsSkuId => $marketingId) {
-                if (!empty($marketingList[$marketingId]["second_commission_value"])) {
+                if (!empty($marketingList[$marketingId]["second_commission_value"]) && $marketingList[$marketingId]["second_commission_value"] == 1) {
                     $data[$goodsSkuId] =  substr(sprintf("%.4f", $marketingList[$marketingId]["second_commission_value"]/10000), 0, -2);
                 }
+
+                if (!empty($marketingList[$marketingId]["second_commission_value"]) && $marketingList[$marketingId]["second_commission_value"] == 2) {
+                    $data[$goodsSkuId] =  substr(sprintf("%.4f", $marketingList[$marketingId]["second_commission_value"]/100), 0, -2);
+                }
             }
             return $data;
         }