Merge branch 'master' of qk:yulf/general_channel

src/Services/LandingPage/LandingPageLinkService.php

@@ -203,15 +203,38 @@ class LandingPageLinkService
             ->where('orders.status', 'PAID')
             ->select('orders.*')
             ->orderBy('orders.id', 'desc');
+
+        //限制用户的创建时间
+        if (isset($params['user_begin_time']) || isset($params['user_end_time'])) {
+            $sql->join('users','users.id','orders.uid');
+            if (isset($params['user_begin_time']) && $params['user_begin_time']) {
+                $date = substr($params['user_begin_time'],0,10);
+                $sql->where('users.created_at', '>=', $date. ' 00:00:00');
+            }
+            if (isset($params['user_end_time']) && $params['user_end_time']) {
+                $date = substr($params['user_end_time'],0,10);
+                $sql->where('users.created_at', '<=',  $date. ' 23:59:59');
+            }
+        }
         if (isset($params['begin_time']) && $params['begin_time']) {
-            $sql->where('orders.created_at', '>=', $params['begin_time']);
+            $date = substr($params['begin_time'],0,10);
+            $sql->where('orders.created_at', '>=', $date. ' 00:00:00');
         }
-        if (isset($params['end_time']) && $params['end_time']) {
-            $sql->where('orders.created_at', '<', date('Y-m-d', strtotime('+1 day',strtotime($params['end_time']))));
+
+        if (isset($params['end_time']) && $params['begin_time']) {
+            $date = substr($params['end_time'],0,10);
+            $sql->where('orders.created_at', '<=', $date. ' 23:59:59');
         }
         if (isset($params['uid']) && $params['uid']) {
             $sql->where('orders.uid', $params['uid']);
         }
+
+
+
+        //限制派单ID
+        if (isset($params['send_order_id']) && $params['send_order_id']) {
+            $sql->where('orders.send_order_id', $params['send_order_id']);
+        }
         if (isset($params['adid']) && $params['adid']) {
             $sql->whereExists(function ($query) use ($params) {
                 $query->select(DB::raw(1))
@@ -236,6 +259,11 @@ class LandingPageLinkService
         if (!empty($qapp_account)) {
             $sql->join('qapp_send_orders', 'orders.send_order_id', 'qapp_send_orders.send_order_id')
             ->where('qapp_send_orders.account', $params['qapp_account']);
+
+            // 限制 回传方式--》 根据回传方式找派单
+            if(isset($params['report_type']) && $params['report_type']){
+                $sql->where('report_type',$params['report_type']);
+            }
         }
         
         if ($is_page) {