Merge branch 'pindan_activity_list_optimize' into test

application/services/marketing/MarketingService.php

@@ -486,8 +486,11 @@ class MarketingService
         $params['activity_status'] = MarketingPindan::ACTIVITY_STATUS_START_TODAY;//1 未开始，2进行中，3已结束, 4当日上新（即将开始）
         $list['prepare'] = self::marketingList($params)['result'];
         $list['prepare'] = $list['prepare'] ? array_column((array)$list['prepare'], null, 'marketing_id') : [];
+        $marketingIdsPrepare = array_keys($list['prepare']);
 
-        return self::_fillSkuAndOrderInfo($marketingIdsDoing,$list);
+        $marketingIds = array_merge($marketingIdsDoing, $marketingIdsPrepare);
+
+        return self::_fillSkuAndOrderInfo($marketingIds,$list);
     }
 
     /**