完善功能

app/admin/controller/sys_manage/RestaurantController.php

@@ -4,10 +4,12 @@ namespace app\admin\controller\sys_manage;
 
 use app\controller\Curd;
 use app\model\SysDept;
+use app\model\SysUser;
 use support\Db;
 use support\exception\BusinessException;
 use support\Request;
 use support\Response;
+use Tinywan\Jwt\JwtToken;
 
 class RestaurantController extends Curd{
     public function __construct()
@@ -152,7 +154,6 @@ class RestaurantController extends Curd{
         try{
             $premise = SysDept::where('dept_name',$premiseName)->where('dept_category','营业场所')->first();
             $resraurant = SysDept::where('dept_super_id',$premise->dept_id)->where('dept_category','餐厅')->first();
-            dump($resraurant);
             if (!empty($resraurant->dept_extend_json)){
                 $deptExtendJson = json_decode($resraurant->dept_extend_json,true);
                 if (isset($deptExtendJson['printer'])){
@@ -163,4 +164,32 @@ class RestaurantController extends Curd{
         
         return json_success('',$printerList);
     }
+
+    /**
+     * 获取用户所在餐厅
+     */
+    public function getByUser(Request $request)
+    {
+        $userId = $request->get('user_id',JwtToken::getCurrentId());
+
+        $user = SysUser::where('user_id',$userId)->first();
+        $restaurant = SysDept::where('dept_id',$user->join_user_dept_id)->where('dept_category','餐厅')->get()->toArray();
+        
+        if(empty($restaurant)){
+            $premise = SysDept::where('dept_id',$user->join_user_dept_id)->where('dept_category','营业场所')->first();
+            if (!empty($premise)){
+                $restaurant = SysDept::where('dept_super_id',$premise->dept_id)->where('dept_category','餐厅')->get()->toArray();
+            }
+        }
+
+        $data = [];
+        foreach ($restaurant as $item){
+            $data[] = [
+                'key'=>$item['dept_id'],
+                'label' => $item['dept_name']
+            ];
+        }
+
+        return json_success('success',$data);
+    }
 }

app/admin/service/order/AppointmentService.php

@@ -215,7 +215,8 @@ class AppointmentService
                 'order_status_payment' => 'PENDING',
                 'order_status_storage' => 'PENDING',
                 'order_platform' => 'SYSTEM',
-                'order_addtimes' => time()
+                'order_addtimes' => time(),
+                'order_config_json' => json_encode(['premises'=>$applyJson['premises']])
             ];
             Order::insert($order);
             // 订单号更新到预约

route/admin.php

@@ -182,6 +182,7 @@ Route::group('/admin', function () {
             Route::post('/update', [\app\admin\controller\sys_manage\RestaurantController::class, 'update']);
             Route::delete('/delete', [\app\admin\controller\sys_manage\RestaurantController::class, 'delete']);
             Route::get('/getPrinterByPremiseName', [\app\admin\controller\sys_manage\RestaurantController::class, 'getPrinterByPremiseName']);
+            Route::get('/getByUser', [\app\admin\controller\sys_manage\RestaurantController::class, 'getByUser']);
             
         })->middleware([
             \app\middleware\AdminAuthCheck::class