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

application/services/marketing/MarketingService.php

@@ -25,7 +25,7 @@ class MarketingService
     {
         $startTime = !empty($params['start_time']) ? $params['start_time'] : '';
         $endTime = !empty($params['end_time']) ? $params['end_time'] : '';
-        $goodsSkuId = !empty($params['goods_sku_id']) ? $params['goods_sku_id'] : '';
+        $goodsSpuId = !empty($params['goods_spu_id']) ? $params['goods_spu_id'] : '';
         $lifeAccountId = !empty($params['life_account_id']) ? $params['life_account_id'] : '';
 
         if (empty($startTime)) {
@@ -80,7 +80,7 @@ class MarketingService
         }
 
         if (!empty($goodsSkuId)) {
-            $where['goods_sku_id'] = $goodsSkuId;
+            $where['goods_spu_id'] = $goodsSpuId;
         }
 
         if (!empty($lifeAccountId)) {
@@ -97,6 +97,7 @@ class MarketingService
         $list = [];
         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'] : '';  
@@ -139,9 +140,9 @@ class MarketingService
             }
         }
 
-        if (!empty($params['goods_sku_id'])) {
-            $goodsSkuId = $params['goods_sku_id'];
-            $marketingGoodsList = MarketingGoods::marketingGoodsList(['goods_sku_id' => $goodsSkuId]);
+        if (!empty($params['goods_spu_id'])) {
+            $goodsSpuId = $params['goods_spu_id'];
+            $marketingGoodsList = MarketingGoods::marketingGoodsList(['goods_spu_id' => $goodsSpuId]);
 
             if (empty($marketingGoodsList)) {
                 $where['marketing_id'] = "-1";
@@ -233,7 +234,6 @@ class MarketingService
             throw new MarketingException(['cus'=>14]);
         }
 
-        
         $tmpMarketingId = [];
         $tmpGoodsSkuId = [];
         $goodsData = [
@@ -241,8 +241,12 @@ class MarketingService
                 "start_time[>=]" => $startTime,
                 "end_time[>=]" => $startTime,
             ],
+            "online_status" => 1,
         ];
+
+        //存在的活动
         $tmpMarketingList = Marketing::getMarketingList($goodsData);
+
         if (!empty($tmpMarketingList)) {
             $tmpMarketingId = array_column($tmpMarketingList, 'marketing_id');
         }
@@ -300,11 +304,11 @@ class MarketingService
         }
         $colums = [];
         $goodCount = !empty($goodsSkuId) ? count($goodsSkuId) : 0;
-
-        foreach ($goodsSkuId as $key => $value) {
+        $goodsSkuList = GoodsSku::select('*', ['goods_sku_id' => $goodsSkuId]);
+        foreach ($goodsSkuList as $key => $value) {
             $colums[$key]['marketing_id'] = $marketingId;
-            $colums[$key]['goods_spu_id'] = '';
-            $colums[$key]['goods_sku_id'] = $value;
+            $colums[$key]['goods_spu_id'] = $value['goods_spu_id'];
+            $colums[$key]['goods_sku_id'] = $value['goods_sku_id'];
             $colums[$key]['update_time'] = date("Y-m-d H:i:s");
             $colums[$key]['create_time'] = date("Y-m-d H:i:s");
         }