1

app/Http/Controllers/Api/V1/AlbumController.php

@@ -979,13 +979,13 @@ class AlbumController extends Controller
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'open_id' => 'required',
-            'end' => 'required',
-            'start' => 'required',
+           // 'end' => 'required',
+            //'start' => 'required',
         ],[
             'store_id.required'=>'缺少商户参数',
             'open_id.required'=>'缺少风格参数',
-            'end.required'=>'缺少结束时间参数',
-            'start.required'=>'缺少开始时间参数',
+           // 'end.required'=>'缺少结束时间参数',
+            //'start.required'=>'缺少开始时间参数',
         ]);
         if ($validator->fails()) {
             return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '传入参数不正确!', $validator->messages());
@@ -994,6 +994,12 @@ class AlbumController extends Controller
         $open_id = $request->input('open_id');
         $end = $request->input('end');
         $start = $request->input('start');
+        if (!$end) {
+            $end = time();
+        }
+        if (!$start) {
+            $start = 0;
+        }
         $end= date('Y-m-d H:i:s',$end);
         $start= date('Y-m-d H:i:s',$start);
         if($userAuth->is_dealer!=1) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '该用户不是经销商!', $validator->messages());
@@ -2238,13 +2244,13 @@ class AlbumController extends Controller
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'open_id' => 'required',
-            'end' => 'required',
-            'start' => 'required',
+//            'end' => 'required',
+//            'start' => 'required',
         ],[
             'store_id.required'=>'缺少商户参数',
             'open_id.required'=>'缺少用户参数',
-            'end.required'=>'缺少结束时间参数',
-            'start.required'=>'缺少开始时间参数',
+//            'end.required'=>'缺少结束时间参数',
+//            'start.required'=>'缺少开始时间参数',
         ]);
         if ($validator->fails()) {
             return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '传入参数不正确!', $validator->messages());
@@ -2253,6 +2259,12 @@ class AlbumController extends Controller
         $open_id = $request->input('open_id');
         $end = $request->input('end');
         $start = $request->input('start');
+        if (!$end) {
+            $end = time();
+        }
+        if (!$start) {
+            $start = 0;
+        }
         $end= date('Y-m-d H:i:s',$end);
         $start= date('Y-m-d H:i:s',$start);
         if($userAuth->is_dealer!=1) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '该用户不是经销商!', $validator->messages());
@@ -2314,13 +2326,13 @@ class AlbumController extends Controller
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'open_id'=>'required',
-            'end' => 'required',
-            'start' => 'required',
+//            'end' => 'required',
+//            'start' => 'required',
         ],[
             'store_id.required'=>'缺少商户参数',
             'open_id.required'=>'缺少用户参数',
-            'end.required'=>'缺少结束时间参数',
-            'start.required'=>'缺少开始时间参数',
+//            'end.required'=>'缺少结束时间参数',
+//            'start.required'=>'缺少开始时间参数',
         ]);
         if ($validator->fails()) {
             return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '传入参数不正确!', $validator->messages());
@@ -2329,6 +2341,12 @@ class AlbumController extends Controller
         $open_id = $request->input('open_id');
         $end = $request->input('end');
         $start = $request->input('start');
+        if (!$end) {
+            $end = time();
+        }
+        if (!$start) {
+            $start = 0;
+        }
         $end= date('Y-m-d H:i:s',$end);
         $start= date('Y-m-d H:i:s',$start);
         if($userAuth->is_dealer!=1) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '该用户不是经销商!', $validator->messages());
@@ -2579,14 +2597,14 @@ class AlbumController extends Controller
             'store_id' => 'required',
             'open_id' => 'required',
             'type' => 'required',
-            'end' => 'required',
-            'start' => 'required',
+//            'end' => 'required',
+//            'start' => 'required',
         ],[
             'store_id.required'=>'缺少商户参数',
             'open_id.required'=>'缺少用户参数',
             'type.required'=>'缺少类型参数',
-            'end.required'=>'缺少结束时间参数',
-            'start.required'=>'缺少开始时间参数',
+//            'end.required'=>'缺少结束时间参数',
+//            'start.required'=>'缺少开始时间参数',
         ]);
         if ($validator->fails()) {
             return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '传入参数不正确!', $validator->messages());
@@ -2595,6 +2613,12 @@ class AlbumController extends Controller
         $res = array();
         $end = $request->input('end');
         $start = $request->input('start');
+        if (!$end) {
+            $end = time();
+        }
+        if (!$start) {
+            $start = 0;
+        }
         $end= date('Y-m-d H:i:s',$end);
         $start= date('Y-m-d H:i:s',$start);
         if($userAuth->is_dealer!=1) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '该用户不是经销商!', $validator->messages());