Merge branch 'pindan_activity_list_optimize' into develop

5f530313 · suntengda · 6b317be3 · 128a59c3 · 5f530313
Commit 5f530313 authored Sep 27, 2021 by suntengda
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);