Merge branch 'master' of qk:zy_duanju/duanju_manage into test

modules/Statistic/Http/Controllers/VideoStatController.php

@@ -29,10 +29,13 @@ class VideoStatController extends CatchController
         }
 
         $limit = $request->get('limit',15);
+        $is_export = $request->get('is_export');
         $where = $this->requestParam($request);
-
-        $result = $this->videoStatByCompany->where($where)->select('day','video_name','video_id','amount','charge_count','charge_user_num','play_count')->paginate($limit);
-        
+        if($is_export){
+            $result = $this->videoStatByCompany->where($where)->select('day','video_name','video_id','amount','charge_count','charge_user_num','play_count')->get();
+        }else{
+            $result = $this->videoStatByCompany->where($where)->select('day','video_name','video_id','amount','charge_count','charge_user_num','play_count')->paginate($limit);
+        }
         return $result;
     }
 

modules/Tuiguang/Http/Controllers/PromotionController.php

@@ -52,9 +52,9 @@ class PromotionController extends CatchController
                 return $query->where('promotions.created_at', '<=', $endTime . ' 23:59:59');
             })->orderBy('created_at', 'desc')
             ->select('promotions.id', 'promotions.name', 'promotions.created_at',
-                'videos.name as video_name', 'promotions.series_sequence', 'promotions.callback_type',
+            'videos.name as video_name', 'promotions.series_sequence', 'promotions.callback_type',
                 'promotions.callback_config_id', 'promotions.video_id', 'promotions.remark', 'promotions.status',
-                'promotions.first_charge_template_id', 'promotions.not_first_charge_template_id')
+            'promotions.first_charge_template_id', 'promotions.not_first_charge_template_id')
             ->paginate($request->input('limit', 15));
         $chargeTemplateIds = $result->pluck('first_charge_template_id')->merge($result->pluck('not_first_charge_template_id'))->unique();