Merge branch 'master' of http://59.57.98.130:3000/jjhc/jucai

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' => '抱歉，该项目已过报名时间！']);
                 }
@@ -1317,6 +1318,13 @@ class IndexController extends WebBaseController
 
                     }
                 } else {
+                    $log = [
+                        'type'       => 4,
+                        'appoint_id' => $appoint_info->id,
+                        'uid'        => $uid,
+                        'log'        => '用户修改资料',
+                    ];
+                    RecruitAppointLog::create($log);
                     return ['status' => 1, 'msg' => '资料保存成功，请尽快完善并提交', 'data' => $appoint_info->id];
                 }
             } catch (\Exception $e) {
@@ -1544,6 +1552,13 @@ class IndexController extends WebBaseController
                     }
                     //return ['status' => 1, 'msg' => '提交成功', 'data' => $result->id];
                 } else {
+                    $log = [
+                        'type'       => 4,
+                        'appoint_id' => $result->id,
+                        'uid'        => $uid,
+                        'log'        => '用户暂存资料',
+                    ];
+                    RecruitAppointLog::create($log);
                     return ['status' => 1, 'msg' => '资料保存成功，请尽快完善并提交', 'data' => $result->id];
                 }
 

routes/web.php

@@ -930,6 +930,8 @@ Route::group([
     $router->post('/create_mspfb', 'Web\Talent\JjhcController@create_mspfb')->name('talent.jjhc.create_mspfb');
     $router->post('/create_mstfb', 'Web\Talent\JjhcController@create_mstfb')->name('talent.jjhc.create_mstfb');
     $router->post('/create_word', 'Web\Talent\JjhcController@create_word')->name('talent.jjhc.create_word');
+    $router->post('/coze_callback', 'Web\Talent\JjhcController@callback')->name('talent.jjhc.coze_callback');
+    $router->get('/aibot', 'Web\Talent\JjhcController@aibot')->name('talent.jjhc.aibot');
 });
 
 Route::group([