wesmiler 报恩寺项目提交

app/Http/Controllers/Api/v1/MasterController.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Http\Controllers\Api\v1;
+
+use App\Http\Controllers\Api\BaseController;
+use App\Http\Validator\MasterValidator;
+use App\Services\MasterService;
+use Illuminate\Http\Request;
+
+/**
+ * 法师控制器类
+ * @author wesmiler
+ * @since 2020/11/10
+ * Class MasterController
+ * @package App\Http\Controllers
+ */
+class MasterController extends BaseController
+{
+    /**
+     * 构造函数
+     * @author wesmiler
+     * @since 2020/11/11
+     * MasterController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->service = new MasterService();
+    }
+
+    /**
+     * 获取用户信息
+     * @return array|mixed
+     */
+    public function info(){
+        $userId = request()->get('user_id', 0);
+        $info = $this->service->getUserInfo($userId, $this->userId);
+        return message(MESSAGE_OK,true, $info);
+    }
+
+    /**
+     * 法师申请
+     * @param MasterValidator $validator
+     * @return array
+     */
+    public function apply(MasterValidator $validator){
+        $params = $validator->check(request()->all(),'save');
+        if(!is_array($params)){
+            return message($params, false);
+        }
+
+        return $this->service->apply($this->userId);
+    }
+
+    /**
+     * 法师列表
+     * @return mixed
+     */
+    public function index(){
+        return $this->service->getDataList($this->userId);
+    }
+
+}

app/Http/Controllers/Api/v1/MemberController.php

@@ -34,7 +34,6 @@ class MemberController extends BaseController
 
         $this->service = new MemberService();
         $this->yigongService = new YigongService();
-        $this->masterService = new MasterService();
         $this->withdrawService = new WithdrawService();
     }
 
@@ -50,16 +49,6 @@ class MemberController extends BaseController
     }
 
     /**
-     * 获取用户信息
-     * @return array|mixed
-     */
-    public function master(){
-        $userId = request()->get('user_id', 0);
-        $info = $this->masterService->getUserInfo($userId,$this->userId);
-        return message(MESSAGE_OK,true, $info);
-    }
-
-    /**
      * 保存资料
      * @param MemberValidator $validator
      * @return array
@@ -73,27 +62,6 @@ class MemberController extends BaseController
         return $this->service->saveInfo($this->userId);
     }
 
-    /**
-     * 法师申请
-     * @param MasterValidator $validator
-     * @return array
-     */
-    public function masterApply(MasterValidator $validator){
-        $params = $validator->check(request()->all(),'save');
-        if(!is_array($params)){
-            return message($params, false);
-        }
-
-        return $this->masterService->apply($this->userId);
-    }
-
-    /**
-     * 法师列表
-     * @return mixed
-     */
-    public function masterList(){
-        return $this->masterService->getDataList($this->userId);
-    }
 
     /**
      * 加入会员

routes/api.php

@@ -47,7 +47,6 @@ Route::any('/notify/refund/{scene}', [\App\Http\Controllers\Api\v1\NotifyControl
 
 // 用户
 Route::post('/member/info', [\App\Http\Controllers\Api\v1\MemberController::class, 'info']);
-Route::post('/member/master', [\App\Http\Controllers\Api\v1\MemberController::class, 'master']);
 Route::post('/member/save', [\App\Http\Controllers\Api\v1\MemberController::class, 'saveInfo']);
 Route::post('/member/vip', [\App\Http\Controllers\Api\v1\MemberController::class, 'vip']);
 Route::post('/member/sign', [\App\Http\Controllers\Api\v1\MemberController::class, 'sign']);
@@ -56,14 +55,15 @@ Route::post('/member/followList', [\App\Http\Controllers\Api\v1\MemberController
 Route::post('/member/gdList', [\App\Http\Controllers\Api\v1\MemberController::class, 'gdList']);
 Route::post('/member/yigong', [\App\Http\Controllers\Api\v1\MemberController::class, 'yigong']);
 Route::post('/member/yigongApply', [\App\Http\Controllers\Api\v1\MemberController::class, 'yigongApply']);
-Route::post('/member/masterApply', [\App\Http\Controllers\Api\v1\MemberController::class, 'masterApply']);
 Route::post('/member/activity', [\App\Http\Controllers\Api\v1\ActivityController::class, 'bookList']);
 Route::post('/member/withdraw', [\App\Http\Controllers\Api\v1\MemberController::class, 'withdraw']);
 Route::post('/member/recommand', [\App\Http\Controllers\Api\v1\MemberController::class, 'recommand']);
 Route::post('/member/logout', [\App\Http\Controllers\Api\v1\MemberController::class, 'logout']);
 
 // 法师
-Route::post('/master/list', [\App\Http\Controllers\Api\v1\MemberController::class, 'masterList']);
+Route::post('/master/list', [\App\Http\Controllers\Api\v1\MasterController::class, 'index']);
+Route::post('/master/info', [\App\Http\Controllers\Api\v1\MasterController::class, 'info']);
+Route::post('/master/apply', [\App\Http\Controllers\Api\v1\MasterController::class, 'apply']);
 
 // 资讯收藏
 Route::post('/collect/list', [\App\Http\Controllers\Api\v1\CollectController::class, 'index']);