Merge branch 'master' into jielong

application/services/goods/ElasticGoodService.php

@@ -159,7 +159,7 @@ class ElasticGoodService
                 $result["list"][$key]["life_account_id"] = $source["_source"]["life_account_id"];
                 $result["list"][$key]["life_account_name"] = $source["_source"]["life_account_name"];
                 $result["list"][$key]["life_account_icon"] = $source["_source"]["life_account_icon"];
-                $result["list"][$key]["distance"] = empty(end($source["sort"])) ? "" : round(end($source["sort"]), 2) . "km";
+                $result["list"][$key]["distance"] = empty($source["sort"]) ? "" : round(end($source["sort"]), 2) . "km";
                 $result["list"][$key]["update_time"] = $source["_source"]["update_time"];
             }
         }

application/services/marketing/MarketingService.php

@@ -278,6 +278,7 @@ class MarketingService
             $publishLifeAccountIds = array_unique(array_column($marketingPindanData, "publish_life_account_id"));
             $lifeAccountList = CommonService::getlifeAccountList(['life_account_id' => $publishLifeAccountIds]);
 
+            $defaultPic = "SHQ_goods_0_012Xh1AQcMqu";
             foreach ($list as $key => $value) {
                 $lists[$key] = $value;
                 $lists[$key]["online_status_desc"] = Marketing::$onlineStatusDesc[$value["online_status"]];
@@ -296,7 +297,8 @@ class MarketingService
                     $lists[$key]["pindan_desc"] = $priceData[$value["marketing_id"]]["pindan_desc"];
                     $lists[$key]["participate_number"] = $priceData[$value["marketing_id"]]["participate_number"];
 
-                    $strList = explode(",", $priceData[$value["marketing_id"]]["pindan_pic"]);
+                    $shareDefaultStr = empty($priceData[$value["marketing_id"]]["pindan_pic"]) ? $defaultPic : $priceData[$value["marketing_id"]]["pindan_pic"];
+                    $strList = explode(",", $shareDefaultStr);
                     $shareStr = $strList[0];
                     $shareRes = Ks3Api::picEncryptUrl($shareStr, 500, 400);
                     $shareUrl = empty($shareRes["response"]["data"]["url"]) ? "" :  $shareRes["response"]["data"]["url"];
@@ -474,19 +476,19 @@ class MarketingService
         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]);
-                }
-            }
+//            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'];
@@ -912,7 +914,9 @@ class MarketingService
         $marketingData["participate_number"] = $pindanMarketing["participate_number"];
         $marketingData["create_time"] = $marketingInfo["create_time"];
 
-        $strList = explode(",", $marketingData["pindan_pic"]);
+        $defaultPic = "SHQ_goods_0_012Xh1AQcMqu";
+        $shareDefaultStr = empty($marketingData["pindan_pic"]) ? $defaultPic : $marketingData["pindan_pic"];
+        $strList = explode(",", $shareDefaultStr);
         $shareStr = $strList[0];
         $shareRes = Ks3Api::picEncryptUrl($shareStr, 500, 400);
         $shareUrl = empty($shareRes["response"]["data"]["url"]) ? "" :  $shareRes["response"]["data"]["url"];