Merge branch 'develop' of https://git.yidian-inc.com:8021/bp/goods into develop

application/services/marketing/MarketingService.php

@@ -303,12 +303,16 @@ class MarketingService
         }
         $lifeAccountList = CommonService::getlifeAccountList(['life_account_id' => $lifeAccountIds]);
         $list = [];
-        foreach ($goodsSkuList as $key => $value) {
-            $list[$key]['goods_sku_id'] = $value['goods_sku_id'];
-            $list[$key]['life_account_id'] = $value['life_account_id'];
-            $list[$key]['goods_name'] = $value['goods_name'];
-            $list[$key]['life_account_name'] = !empty($lifeAccountList[$value['life_account_id']]['life_account_name']) ? $lifeAccountList[$value['life_account_id']]['life_account_name'] : '';  
+
+        if (!empty($goodsSkuList)) {
+            foreach ($goodsSkuList as $key => $value) {
+                $list[$key]['goods_sku_id'] = $value['goods_sku_id'];
+                $list[$key]['life_account_id'] = $value['life_account_id'];
+                $list[$key]['goods_name'] = $value['goods_name'];
+                $list[$key]['life_account_name'] = !empty($lifeAccountList[$value['life_account_id']]['life_account_name']) ? $lifeAccountList[$value['life_account_id']]['life_account_name'] : '';  
+            }
         }
+        
         $info['marketing_info'] = $marketing_info;
         $info['goods_list'] = $list;
         return $info;