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

application/services/marketing/MarketingService.php

@@ -79,7 +79,7 @@ class MarketingService
             $where['goods_sku_id[!]'] = $tmpGoodsSkuId;
         }
 
-        if (!empty($goodsSkuId)) {
+        if (!empty($goodsSpuId)) {
             $where['goods_spu_id'] = $goodsSpuId;
         }
 
@@ -363,6 +363,7 @@ class MarketingService
         if (!empty($goodsSkuList)) {
             foreach ($goodsSkuList as $key => $value) {
                 $list[$key]['goods_sku_id'] = $value['goods_sku_id'];
+                $list[$key]['goods_spu_id'] = $value['goods_spu_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'] : '';