update:小程序展示活动列表调整

application/services/marketing/MarketingService.php

@@ -223,6 +223,8 @@ class MarketingService
     private static function pindanMarketingList($params)
     {
         $params['activity_status'] = !empty($params['activity_status']) ? $params['activity_status'] : 0;
+        //默认from=0，主要是判断小程序（from=1）时候特殊逻辑
+        $params['from'] = !empty($params['from']) ? $params['from'] : 0;
         $params['page'] = !empty($params['page']) ? $params['page'] : 1;
         $limit = !empty($params['page_size']) ? $params['page_size'] : 20;
         $page = ($params['page'] - 1) * $limit;
@@ -245,6 +247,11 @@ class MarketingService
             $where["end_time[<]"] = $now;
         }
 
+        if (!empty($params['from'])) {
+            $beforeSevenDay = date("Y-m-d H:i:s", strtotime("-7 day"));
+            $where["start_time[>]"] = $beforeSevenDay;
+        }
+
         $where['ORDER'] = ["update_time" => "DESC"];
         $where['LIMIT'] = [$page, $limit];
         $list = Marketing::select(["marketing_id", "marketing_name", "start_time", "end_time",