Merge branch 'colonel' of https://git.yidian-inc.com:8021/bp/goods into colonel

application/services/marketing/PindanActivityInviteOrderService.php

@@ -32,14 +32,7 @@ class PindanActivityInviteOrderService
             return true;
         }
 
-        $hour = date("H");
-        if ($hour < 10 && $hour > 0) {
-            $date = date("Y-m-d", strtotime("-1 day"));
-        } elseif ($hour > 16) {
         $date = date("Y-m-d");
-        } else {
-            $date = date("Y-m-d");
-        }
 
         $inviteOrderNumData = [
             "colonel_user_id" => $params["colonel_user_id"],
@@ -82,14 +75,7 @@ class PindanActivityInviteOrderService
                 "order_id" => $orderId,
             ];
 
-            $hour = date("H");
-            if ($hour < 10 && $hour > 0) {
-                $date = date("Y-m-d", strtotime("-1 day"));
-            } elseif ($hour > 16) {
-                $date = date("Y-m-d");
-            } else {
             $date = date("Y-m-d");
-            }
             $inviteOrderNumData = [
                 "colonel_user_id" => $inviteOrder[0]["colonel_user_id"],
                 "date" => $date,
@@ -241,18 +227,13 @@ class PindanActivityInviteOrderService
         $lastId = empty($params["last_id"]) ? "" : $params["last_id"];
         $limit = empty($params["page_size"]) ? 10 : $params["page_size"];
 
-        $hour = date("H");
-        $startTime = date("Y-m-d", strtotime("-1 day"))." 12:00:00";
-        $endTime = date("Y-m-d")." 12:00:00";
-        if($hour >= 12){
-            $startTime = date("Y-m-d")." 12:00:00";
-            $endTime = date("Y-m-d", strtotime("+1 day"))." 12:00:00";
-        }
+        $dateRange = PindanActivityColonelConfigService::getActivityTimeRange();
+
 
         $where = [];
         $where["colonel_user_id"] = $userId;
-        $where["create_time[>]"] = $startTime;
-        $where["create_time[<]"] = $endTime;
+        $where["create_time[>]"] = $dateRange['start_time'];
+        $where["create_time[<]"] = $dateRange['end_time'];
         $where["LIMIT"] = $limit;
         $where["ORDER"] = ["invite_order_id" => "DESC"];