fix():修改配置

application/api/controller/Order.php

@@ -64,7 +64,7 @@ class Order extends BaseController {
         $model->setPageSize($input['pageSize'] ?? 10);
         $where = [];
 
-        $model::where([['status', '=', 1], ['create_time', '<',
+        $model::where([['status', '=', 1], ['order_type','<>', 2] ,['create_time', '<',
                                             date('Y-m-d H:i:s', strtotime('-15minutes'))]])
             ->update(['status' => OrderModel::IS_CLOSE]);
         if (!empty($input['orderSn'])) {

application/api/controller/Room.php

@@ -133,7 +133,7 @@ class Room extends BaseController {
     /**
      * @OA\Post(path="/api/room/updateStatus",
      *   tags={"房间管理"},
-     *   summary="保存房间信息",
+     *   summary="修改房间状态",
      *   @OA\Parameter(name="token", in="header", description="token", @OA\Schema(type="string")),
      *   @OA\RequestBody(
      *     @OA\MediaType(

application/api/model/OrderModel.php

@@ -39,7 +39,7 @@ class OrderModel  extends BaseModel {
             p.product_name,p.product_img,p.type as productType,
             u.name as userName,ad.name as writeOffName,u.real_name as realName,
             ad2.name as payAdminName,ad3.name as allocateAdminName,ad4.name as orderAdminName,
-            as.status as allocateStatus,or.id as roomId')
+            as.status as allocateStatus,or.id as roomId,room.room_name')
             ->join('store store', 'store.id = o.store_id','left')
             ->join('staff staff', 'staff.id = o.staff_id','left')
             ->join('product p', 'p.id = o.product_id','left')
@@ -53,6 +53,7 @@ class OrderModel  extends BaseModel {
             ->join('admin ad3','ad3.id = as.admin_id','left')
             ->join('admin ad4','ad4.id = o.admin_id','left')
             ->join('order_room or','or.order_id = o.id','left')
+            ->join('room room','room.id = or.room_id','left')
             ->order('o.id desc');
         return $this->joinModelPageList($countModel, $selectModel);
 

public/api.yaml

@@ -1820,7 +1820,7 @@ paths:
     post:
       tags:
         - 房间管理
-      summary: 保存房间信息
+      summary: 修改房间状态
       operationId: 'app\api\controller\Room::updateStatus'
       parameters:
         -