Merge branch 'jielong' into 'test'

Jielong

See merge request bp/goods!5

application/services/marketing/MarketingService.php

@@ -891,10 +891,14 @@ class MarketingService
         $lifeAccountList = CommonService::getlifeAccountList(['life_account_id' => [$pindanMarketing["publish_life_account_id"]]]);
 
         $goodsSkuList = MarketingGoods::marketingGoodsList(['marketing_id' => $params['marketing_id']]);
-        $goodsSkuList = !empty($goodsSkuList) ? $goodsSkuList : [];
 
-        $goodsSkuId = array_column($goodsSkuList , 'goods_sku_id');
-        $goodsSkuList = PindanGoodsSku::select('*', ['goods_sku_id' => $goodsSkuId]);
+        if (!empty($goodsSkuList)) {
+            $goodsSkuId = array_column($goodsSkuList , 'goods_sku_id');
+            $goodsSkuList = PindanGoodsSku::select('*', ['goods_sku_id' => $goodsSkuId]);
+        }
+        empty($goodsSkuList) && $goodsSkuList = [];
+
+
 
         $marketingData["life_account_name"] = $marketingData["life_account_icon"] = "";
         if (!empty($lifeAccountList[$pindanMarketing["publish_life_account_id"]])) {