wesmiler 报恩寺项目提交

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

@@ -100,7 +100,7 @@ class MemberController extends BaseController
      * @return mixed
      */
     public function yigong(){
-        return $this->yigongService->info($this->userId);
+        return $this->yigongService->applyInfo($this->userId);
     }
 
     /**
@@ -110,10 +110,11 @@ class MemberController extends BaseController
      * @return array
      */
     public function yigongApply(Request $request, YigongValidator $validate){
-        $params = $validate->check($request->all(),'books');
+        $params = $validate->check($request->all(),'apply');
         if(!is_array($params)){
             return message($params, false);
         }
+
         return $this->yigongService->apply($this->userId);
     }
 

app/Http/Validator/BaseValidator.php

@@ -34,7 +34,7 @@ class BaseValidator extends Validator
         if($scene){
             $sceneFields = isset(self::$scenes[$scene])? self::$scenes[$scene] : [];
             if(empty($sceneFields)){
-                return 1007;
+                return 1008;
             }
 
             foreach (self::$rules as $key => $rule){

app/Http/Validator/YigongValidator.php

@@ -5,7 +5,7 @@ class YigongValidator extends BaseValidator
     // 当前模型所有验证规则
     public static $rules = [
         'id' => 'required',
-        'siyuan_id' => 'required|string|min:1|max:10',
+        'siyuan_id' => 'required|min:1|max:10',
         'realname' => 'required|string|min:2|max:20',
         'phone' => 'required|string|min:8|max:20',
         'idcard' => 'required|string|min:12|max:20',

app/Services/YigongService.php

@@ -136,7 +136,7 @@ class YigongService extends BaseService
             ->select(['id','user_id','mark','status'])
             ->first();
         if($info && $info->mark==1 && $info->status == 1){
-            return message('您已提交申请，请耐心等候审核', false);
+            return message('您已提交过申请，请耐心等候审核', false);
         }else if($info && $info->mark==1 && $info->status == 2){
             return message('您的申请已通过，请不要重复提交', false);
         }
@@ -173,4 +173,20 @@ class YigongService extends BaseService
         return message('操作失败，请刷新页面后重试', false);
     }
 
+    /**
+     * 获取申请信息
+     * @param $userId
+     * @return mixed
+     */
+    public function applyInfo($userId){
+        $params = request()->all();
+        $siyuanId = isset($params['siyuan_id'])? $params['siyuan_id'] : 0;
+        $info = $this->model::from('yigong as y')
+            ->leftJoin('siyuan as s','s.id','=','y.siyuan_id')
+            ->where(['y.siyuan_id'=> $siyuanId,'user_id'=> $userId, 'y.mark'=> 1])
+            ->select(['y.id','y.user_id','y.siyuan_id','y.realname','y.phone','y.idcard','y.description','y.reason','y.create_time','y.status','s.title as siyuan_text'])
+            ->orderBy('y.create_time','desc')
+            ->first();
+        return message(1005, true, $info? $info : []);
+    }
 }

routes/api.php

@@ -52,8 +52,8 @@ Route::post('/member/sign', [\App\Http\Controllers\Api\v1\MemberController::clas
 Route::post('/member/follow', [\App\Http\Controllers\Api\v1\MemberController::class, 'follow']);
 Route::post('/member/followList', [\App\Http\Controllers\Api\v1\MemberController::class, 'followList']);
 Route::post('/member/gdList', [\App\Http\Controllers\Api\v1\MemberController::class, 'gdList']);
-Route::post('/member/siyuan', [\App\Http\Controllers\Api\v1\MemberController::class, 'siyuan']);
-Route::post('/member/siyuanApply', [\App\Http\Controllers\Api\v1\MemberController::class, 'siyuanApply']);
+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/activity', [\App\Http\Controllers\Api\v1\ActivityController::class, 'bookList']);
 Route::post('/member/logout', [\App\Http\Controllers\Api\v1\MemberController::class, 'logout']);