cqpCow 1 år sedan
förälder
incheckning
9912640cd2
3 ändrade filer med 10 tillägg och 5 borttagningar
  1. 1 2
      app/Http/Controllers/Api/WxController.php
  2. 8 2
      app/Service/Wx/WxEmployeeService.php
  3. 1 1
      routes/wx.php

+ 1 - 2
app/Http/Controllers/Api/WxController.php

@@ -108,8 +108,7 @@ class WxController extends BaseController
 
     public function getTopMessage(Request $request){
         $service = new WxEmployeeService();
-        $userData = $request->userData->toArray();
-        list($status, $data) = $service->getTopMessage($request->all(),$userData);
+        list($status, $data) = $service->getTopMessage($request->all());
 
         if ($status) {
             return $this->json_return(200, '', $data);

+ 8 - 2
app/Service/Wx/WxEmployeeService.php

@@ -119,8 +119,14 @@ class WxEmployeeService extends Service
         return [true, $res];
     }
 
-    public function getTopMessage($data,$user){
-        $return = EmployeeService::getLoginMessage($user['id']);
+    public function getTopMessage($data){
+        if($this->isEmpty($data,'openid')) return [false,'openid不能为空!'];
+
+        $employee = WxEmployee::where('openid',$data['openid'])->select('employee_id')->first();
+        if(empty($employee)) return [false,'未找到用户信息!'];
+        $employee = $employee->toArray();
+
+        $return = EmployeeService::getLoginMessage($employee['employee_id']);
         return [true,$return];
     }
 }

+ 1 - 1
routes/wx.php

@@ -17,9 +17,9 @@ Route::any('wxSetMobile', 'Api\WxController@setMobile');
 Route::any('wxLogin', 'Api\WxController@login');
 Route::any('wxH5', 'Api\WxController@wxH5');
 Route::any('ttt', 'Api\WxController@ttt');
+Route::any('getTopMessage', 'Api\WxController@getTopMessage');
 
 Route::group(['middleware'=> ['checkWx']],function ($route){
-    $route->any('getTopMessage', 'Api\WxController@getTopMessage');
     $route->any('oaCheck', 'Api\OaController@oaCheck');
     $route->any('oaOrderState', 'Api\OaController@oaOrderState');
     $route->any('checkAllOver', 'Api\OaController@checkAllOver');