dyjh 6 years ago
parent
commit
ac527a1eb1

+ 11 - 33
app/Http/Controllers/Api/V1/AlbumBossController.php

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -59,9 +59,7 @@ class AlbumBossController extends Controller
     public function getTop(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::ERROR_POWER, '登陆过期!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required'
         ], [
@@ -136,9 +134,7 @@ class AlbumBossController extends Controller
     public function agentCustomer(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::ERROR_POWER, '登陆过期!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'agent_id' => 'required',
@@ -234,9 +230,7 @@ class AlbumBossController extends Controller
     public function agentStatistical(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::ERROR_POWER, '登陆过期!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'agent_id' => 'required',
@@ -344,9 +338,7 @@ class AlbumBossController extends Controller
     {
 
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::ERROR_POWER, '登陆过期!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
         ], [
@@ -421,9 +413,7 @@ class AlbumBossController extends Controller
     {
 
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::ERROR_POWER, '登陆过期!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
         ], [
@@ -519,9 +509,7 @@ class AlbumBossController extends Controller
     {
 
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::ERROR_POWER, '登陆过期!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
         ], [
@@ -589,9 +577,7 @@ class AlbumBossController extends Controller
     {
 
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::ERROR_POWER, '登陆过期!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
         ], [
@@ -671,9 +657,7 @@ class AlbumBossController extends Controller
     {
 
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::ERROR_POWER, '登陆过期!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
         ], [
@@ -761,9 +745,7 @@ class AlbumBossController extends Controller
     {
 
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::ERROR_POWER, '登陆过期!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
         ], [
@@ -840,9 +822,7 @@ class AlbumBossController extends Controller
     public function agentAnalysis(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::ERROR_POWER, '登陆过期!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
         ], [
@@ -900,9 +880,7 @@ class AlbumBossController extends Controller
     public function BossInteractive(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::ERROR_POWER, '登陆过期!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
         ], [

+ 24 - 42
app/Http/Controllers/Api/V1/AlbumController.php

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -333,9 +333,7 @@ class AlbumController extends Controller
     public function albumGoods(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::ERROR_POWER, '登陆过期!');
-        }
+
         $validator = Validator::make($request->all(), [
             'cat_id' => 'required',
             'parent_id' => 'required',
@@ -486,9 +484,7 @@ class AlbumController extends Controller
     {
         //  $userAuth = AlbumXyxUserModel::find(1);
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
-        }
+
         $validator = Validator::make($request->all(), [
             'goods_id' => 'required',
             'store_id' => 'required',
@@ -638,9 +634,7 @@ class AlbumController extends Controller
     public function albumFavoriteList(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
         ], [
@@ -704,9 +698,7 @@ class AlbumController extends Controller
     public function albumGetWatchRecord(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'type' => 'required'
@@ -848,9 +840,7 @@ class AlbumController extends Controller
     public function albumGetDataGoods(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required'
         ], [
@@ -928,9 +918,7 @@ class AlbumController extends Controller
     public function albumGetDataCat(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'parent_id' => 'required'
@@ -1005,9 +993,7 @@ class AlbumController extends Controller
     public function albumGetDataCatSingle(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'open_id' => 'required',
@@ -1105,9 +1091,7 @@ class AlbumController extends Controller
     public function albumGetCartOfWatch(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'end' => 'required',
@@ -1241,7 +1225,7 @@ class AlbumController extends Controller
     {
         //$userAuth = AlbumXyxUserModel::find(1);
         $userAuth = Auth('api')->user();
-        if(!$userAuth) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'favorite_id' => 'required',
@@ -1307,7 +1291,7 @@ class AlbumController extends Controller
     public function albumSaveFormId(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if(!$userAuth) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'form_id' => 'required',
@@ -1366,7 +1350,7 @@ class AlbumController extends Controller
     public function albumAddFavorite(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if(!$userAuth) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'product_id' => 'required',
@@ -1643,7 +1627,7 @@ class AlbumController extends Controller
     public function albumSavePhone(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if(!$userAuth) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'code' => 'required',
@@ -1729,7 +1713,7 @@ class AlbumController extends Controller
     public function albumSetWatch(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if(!$userAuth) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'type' => 'required',
@@ -2004,7 +1988,7 @@ class AlbumController extends Controller
     public function albumAddAgent(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if(!$userAuth) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
+
         $validator = Validator::make($request->all(), [
             'realname' => 'required',
             'address' => 'required',
@@ -2096,7 +2080,7 @@ class AlbumController extends Controller
     public function albumGetAgentAdress(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if(!$userAuth) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
         ],[
@@ -2209,7 +2193,7 @@ class AlbumController extends Controller
     public function albumGetCustomer(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if(!$userAuth) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'open_id'=>'required'
@@ -2281,7 +2265,7 @@ class AlbumController extends Controller
     public function albumSetCustomer(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if(!$userAuth) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'key' => 'required',
@@ -2359,7 +2343,7 @@ class AlbumController extends Controller
     public function albumCustomerGoods(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if(!$userAuth) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'open_id' => 'required',
@@ -2441,9 +2425,7 @@ class AlbumController extends Controller
     public function albumCustomerGoodsDetail(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'open_id' => 'required',
@@ -2557,7 +2539,7 @@ class AlbumController extends Controller
     public function albumGetCountOfFavorite(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if(!$userAuth) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
         ],[
@@ -2626,7 +2608,7 @@ class AlbumController extends Controller
     public function albumGetUserInfo(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if(!$userAuth) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
+
         if($userAuth->is_dealer == 1){
             $user_agent = AlbumAgentModel::where([['user_id',$userAuth->id],['status',1]])->first();
             $agent_id = $user_agent['id'];
@@ -2669,7 +2651,7 @@ class AlbumController extends Controller
     public function albumStatistical(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if(!$userAuth) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
         ],[
@@ -2748,7 +2730,7 @@ class AlbumController extends Controller
     public function albumGetStatistical(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if(!$userAuth) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'open_id' => 'required',
@@ -2848,7 +2830,7 @@ class AlbumController extends Controller
     public function albumAgentPriceSet(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if(!$userAuth) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
+
         $validator = Validator::make($request->all(), [
             'is_show_ma_price' => 'required',
             'store_id' => 'required',

+ 2 - 6
app/Http/Controllers/Api/V1/AlbumPosterController.php

xqd xqd
@@ -61,9 +61,7 @@ class AlbumPosterController extends Controller
     public function posterInfo(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
         ], [
@@ -198,9 +196,7 @@ class AlbumPosterController extends Controller
     public function createPoster(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'image' => 'required',