Merge branch 'colonel' into test

0606e88d · suntengda · 12c63ffe · 1ecafde5 · 0606e88d
Commit 0606e88d authored Sep 03, 2021 by suntengda
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

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

No files found.
--- a/application/services/marketing/MarketingService.php
+++ b/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;
            //七日内结束的活动