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

application/services/marketing/MarketingService.php

@@ -301,11 +301,6 @@ class MarketingService
         } elseif ($params["activity_status"] == MarketingPindan::ACTIVITY_STATUS_IN_PROGRESS) {
             $where["start_time[<=]"] = $now;
             $where["end_time[>=]"] = $now;
-            //七日内开始的活动
-            if (!empty($params['from']) && $params['from'] == 1) {
-                $beforeSevenDay = date("Y-m-d H:i:s", strtotime("-7 day"));
-                $where["start_time[>]"] = $beforeSevenDay;
-            }
         } elseif ($params["activity_status"] == MarketingPindan::ACTIVITY_STATUS_FINISHED) {
             $where["end_time[<]"] = $now;
             //七日内结束的活动