Merge branch 'test' of https://gitlab.yidian-inc.com/bp/goods into test

7e483a9c · jianghaiming · 57e60634 · 421772ac · 7e483a9c
Commit 7e483a9c authored Sep 28, 2021 by jianghaiming
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

MarketingService.php application/services/marketing/MarketingService.php +3 -0

No files found.
--- a/application/services/marketing/MarketingService.php
+++ b/application/services/marketing/MarketingService.php
@@ -435,6 +435,9 @@ class MarketingService
        if($excludeMarketingId && isset($list[$excludeMarketingId])){
            unset($list[$excludeMarketingId]);
        }
+        if (empty($list)) {
+            return [];//排除后已无数据
+        }
        //获取活动sku列表
        if($needSkuList) {
            $skuList = self::getGoodsSkuListByMarketingIds(array_keys($list),false);