完善功能

app/admin/controller/sys_manage/RestaurantTableController.php

@@ -86,7 +86,9 @@ class RestaurantTableController extends Curd{
     {
         $uid = JwtToken::getCurrentId();
         $user = SysUser::where('user_id',$uid)->first();
-        $restaurant = SysDept::where('dept_super_id',$user->join_user_dept_id)->where('dept_category','餐厅')->first();
+        $restaurant = SysDept::where('dept_category','餐厅')->where(function($query) use ($user) {
+            $query->where('dept_id',$user->join_user_dept_id)->orWhere('dept_super_id',$user->join_user_dept_id);
+        })->first();
         if(!$restaurant){
             return  json_fail('您所在的营业场所没有餐厅，请联系管理员添加！');
         }
@@ -135,7 +137,9 @@ class RestaurantTableController extends Curd{
 
         $uid = JwtToken::getCurrentId();
         $user = SysUser::where('user_id',$uid)->first();
-        $restaurant = SysDept::where('dept_super_id',$user->join_user_dept_id)->where('dept_category','餐厅')->first();
+        $restaurant = SysDept::where('dept_category','餐厅')->where(function($query) use ($user) {
+            $query->where('dept_id',$user->join_user_dept_id)->orWhere('dept_super_id',$user->join_user_dept_id);
+        })->first();
         if(!$restaurant){
             return  json_fail('您所在的营业场所没有餐厅，请联系管理员添加！');
         }
@@ -200,11 +204,26 @@ class RestaurantTableController extends Curd{
     {
         $uid = JwtToken::getCurrentId();
         $user = SysUser::where('user_id',$uid)->first();
-        $restaurant = SysDept::where('dept_super_id',$user->join_user_dept_id)->where('dept_category','餐厅')->first();
+        $restaurant = SysDept::where('dept_category','餐厅')->where(function($query) use ($user) {
+            $query->where('dept_id',$user->join_user_dept_id)->orWhere('dept_super_id',$user->join_user_dept_id);
+        })->first();
         if(!$restaurant){
             return  json_fail('您所在的营业场所没有餐厅，请联系管理员添加！');
         }
 
+        $premisesId = '';
+        if($restaurant->dept_category != '营业场所'){
+            $premisesId = $restaurant->dept_id;
+        }else{
+            $dept = SysDept::where('dept_id',$restaurant->dept_super_id)->first();
+            if ($dept && $dept->dept_category == '营业场所'){
+                $premisesId = $restaurant->dept_id;
+            }
+        }
+        if (empty($premisesId)){
+            return json_fail('没有查找到营业场所');
+        }
+
         $deptId = $request->get('dept_id',[]);
         $deptName = $request->get('dept_name','');
 
@@ -221,7 +240,14 @@ class RestaurantTableController extends Curd{
             $data[] = [
                 'dept_name'=>  $table['dept_name'],
                 'dept_code'=> $table['dept_code'],
-                'qrcode_content'=>json_encode(['code'=>$table['dept_code']]),
+                'qrcode_content'=>json_encode([
+                    'action'=>'scan-dishes',
+                    'data'=>[
+                        'premises'=>$premisesId,
+                        'table'=>$table['dept_name'],
+                        'dept'=>$table['dept_id']
+                    ]
+                ]),
             ];
         }