优化渠道核销统计

app/Merchant/Controllers/Coupon/IndexController.php

@@ -16,6 +16,14 @@ class IndexController extends Controller
     {
         $user = Auth::guard('merchant')->user();
 
+        if ($request->start) {
+            $request->start = $request->start . ' 00:00:00';
+        }
+
+        if ($request->end) {
+            $request->end = $request->end . ' 23:59:59';
+        }
+
         $outlet            = $request->outlet;
         $status            = $request->status;
         $redemptionCode    = $request->redemptionCode;
@@ -24,14 +32,6 @@ class IndexController extends Controller
         $thirdPartyGoodsId = $request->thirdPartyGoodsId;
         $action            = $request->action ?? 'search';
 
-        if ($start) {
-            $start = $start . ' 00:00:00';
-        }
-
-        if ($end) {
-            $end = $end . ' 23:59:59';
-        }
-
         $coupons = Coupon::where('user_id', $user->id)
                          ->when($outlet, function ($q) use ($outlet) {
                              $q->whereHas('outlet', function ($q) use ($outlet) {
@@ -75,18 +75,14 @@ class IndexController extends Controller
         ];
 
         if ($action == 'search') {
-            return view('Merchant::coupon.index', compact('coupons', 'data'));
+            $rules = ActivityRule::get();
+
+            return view('Merchant::coupon.index', compact('coupons', 'data', 'rules'));
 
         } else {
             $this->excel($request, $user);
-            die();
-            response()->stream($this->excel($request, $user), 200, [
-                'Content-Encoding'    => 'UTF-8',
-                'Content-Type'        => 'text/csv;charset=UTF-8',
-                'Content-Disposition' => "attachment;filename=\"12346.csv\"",
-            ])->send();
 
-            return (new CouponExport($request->all(), $user))->download();
+            //            return (new CouponExport($request->all(), $user))->download();
         }
     }
 
@@ -142,6 +138,7 @@ class IndexController extends Controller
     //获取分数据
     public function getData($request, $type, $user)
     {
+
         switch ($type) {
             case 'all':
                 return Coupon::where('user_id', $user->id)