提交首次跟非首次报名

app/Admin/Controllers/Recruit/RecruitController.php

@@ -1757,6 +1757,11 @@ class RecruitController extends Controller
                         $member = Member::where('id',$v['uid'])->first();
                         $user = $member->username;
                         break;
+                    case '4':
+                        $level = '用户暂存';
+                        $member = Member::where('id',$v['uid'])->first();
+                        $user = $member->username;
+                        break;
                 }
                 switch ($v['step']){
                     case '1':

app/Http/Controllers/Web/Recruit/IndexController.php

@@ -885,9 +885,9 @@ class IndexController extends WebBaseController
                     return response()->json(['status' => 0, 'msg' => '抱歉，该项目已过审核时间，无法继续报名！']);
                 }
                 //如果有报名记录，先查询首次报名是什么时候
-                $first_post = RecruitAppointLog::where('type', 3)->where('uid', $uid)->orderBy('created_at', 'asc')->first();
+                $first_post = RecruitAppointLog::where('appoint_id',$appoint_info->id)->where('type', 3)->where('uid', $uid)->orderBy('created_at', 'asc')->first();
                 if (!$first_post) {//没有记录代表只是暂存
-                    return response()->json(['status' => 0, 'msg' => '抱歉，该项目已过报名时间！']);
+                    return response()->json(['status' => 0, 'msg' => '抱歉，该项目已过报名时间1！']);
                 }
             }
         }else{
@@ -912,6 +912,7 @@ class IndexController extends WebBaseController
                     return response()->json(['status' => 0, 'msg' => '抱歉，该项目已过报名时间！']);
                 }
                 $first_post = RecruitAppointLog::where('appoint_id',$id)->where('type', 3)->where('uid', $uid)->orderBy('created_at', 'asc')->first();
+
                 if (!$first_post) {//没有记录代表只是暂存
                     return response()->json(['status' => 0, 'msg' => '抱歉，该项目已过报名时间！']);
                 }
@@ -1303,7 +1304,7 @@ class IndexController extends WebBaseController
                 DB::commit();
                 if ($operation == 2) {
                     $log = [
-                        'type'       => 3,
+                        'type'       => 4,
                         'appoint_id' => $appoint_info->id,
                         'uid'        => $uid,
                         'log'        => '用户提交报名',