1

app/Http/Controllers/Api/WxController.php

@@ -47,7 +47,7 @@ class WxController extends BaseController
     public function saleOrderList(Request $request){
         $service = new SalesOrderService();
         $userData = $request->userData->toArray();
-        list($status,$data) = $service->salesOrderWxList($request->all(),$userData);
+        list($status,$data) = $service->salesOrderListsalesOrderWxList($request->all(),$userData);
 
         if($status){
             return $this->json_return(200,'',$data);

app/Http/Kernel.php

@@ -64,6 +64,7 @@ class Kernel extends HttpKernel
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
         'checkLogin' => \App\Http\Middleware\CheckLogin::class,
+        'checkWx' => \App\Http\Middleware\CheckWx::class,
     ];
 
     /**

app/Http/Middleware/CheckWx.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Middleware;
 
+use App\Model\Employee;
 use App\Model\WxEmployee;
 use App\Service\EmployeeService;
 use App\Service\Wx\WxEmployeeService;
@@ -24,36 +25,36 @@ class CheckWx
         $openid = $data['openid'];
         //校验openid是否绑定
         $employee = new WxEmployee();
-        $employee_id = $employee->where('openid',$openid)->value('employee_id');
-        if ($employee_id <= 0) return response()->json(['code'=> 202,'msg'=>'用户信息错误！','data'=>null]);
+        $employee_id = $employee->where('openid',$openid)->value('mobile');
+        if ($employee_id <= 0) return response()->json(['code'=> 202,'msg'=>'用户手机号信息不存在！','data'=>null]);
 
         //校验用户
-        $service = new WxEmployeeService();
-        $checkResult = $service->checkWxUser($employee_id);
-        list($state, $data) = $checkResult;
-        if(! $state) return response()->json(['code'=> 202,'msg'=>$data,'data'=>null]);
+//        $service = new WxEmployeeService();
+//        $checkResult = $service->checkWxUser($employee_id);
+//        list($state, $data) = $checkResult;
+//        if(! $state) return response()->json(['code'=> 202,'msg'=>$data,'data'=>null]);
 
         //人员角色
-        $data['role'] = EmployeeService::getPersonRole($employee_id);
-        $return = EmployeeService::getLoginDepart($employee_id);
-        //所属部门
-        $data['rule_depart'] = $return[0] ?? [];
-        //顶级公司
-        $data['depart_top'] = $return[1] ?? [];
-        //部门对应的顶级公司
-        $data['depart_map'] = $return[2] ?? [];
-        //权限范围内的部门以及公司
-        $data['depart_range'] = $return[3] ?? [];
-        //是否有所有的部门权限
-        $data['is_all_depart'] = $return[4] ?? 0;
-        //总公司
-        $data['head'] = $return[5] ?? [];
-        //是否是总公司下的人
-        $data['is_behind_main'] = $return[6] ?? 0;
-        //是否库存校验
-        $data['is_check_stock'] = true;
-
-        $request->userData = $data;
+//        $data['role'] = EmployeeService::getPersonRole($employee_id);
+//        $return = EmployeeService::getLoginDepart($employee_id);
+//        //所属部门
+//        $data['rule_depart'] = $return[0] ?? [];
+//        //顶级公司
+//        $data['depart_top'] = $return[1] ?? [];
+//        //部门对应的顶级公司
+//        $data['depart_map'] = $return[2] ?? [];
+//        //权限范围内的部门以及公司
+//        $data['depart_range'] = $return[3] ?? [];
+//        //是否有所有的部门权限
+//        $data['is_all_depart'] = $return[4] ?? 0;
+//        //总公司
+//        $data['head'] = $return[5] ?? [];
+//        //是否是总公司下的人
+//        $data['is_behind_main'] = $return[6] ?? 0;
+//        //是否库存校验
+//        $data['is_check_stock'] = true;
+
+        $request->userData = new Employee();
 
         return $next($request);
     }