fix():修改配置

application/api/controller/Order.php

@@ -16,7 +16,9 @@ use app\api\model\CartModel;
 use app\api\model\GroupModel;
 use app\api\model\OrderModel;
 use app\api\model\OrderProductModel;
+use app\api\model\OrderRoomModel;
 use app\api\model\ProductModel;
+use app\api\model\RoomModel;
 use app\api\model\UserModel;
 use app\api\model\WriteOffModel;
 use app\common\service\OrderService;
@@ -400,6 +402,7 @@ class Order extends BaseController {
         Until::check($rule, $input);
         $allocateModel = new AllocateModel();
         $model = new OrderModel();
+        $roomOrder = new OrderRoomModel();
         $order = $model::where(['id' => $input['orderId']])->find();
         if (empty($order)) {
             throw new ApiException('无此订单');
@@ -418,6 +421,11 @@ class Order extends BaseController {
                 throw new ApiException('该服务正在进行');
             }
         }
+        $orderRoomRs = $roomOrder::where(['order_id' => $input['orderId']])->find();
+        if ($orderRoomRs === null) {
+            throw new ApiException('请分配房间');
+        }
+        (new RoomModel())::where(['id' => $orderRoomRs['room_id']])->update(['room_server_status' => 2]);
         $allocateModel::where(['id' => $rs['id']])->update(['status' => 2, 'start_admin_id' => $this->adminId,'server_start_time' => date('Y-m-d H:i:s')]);
         Until::output();
     }
@@ -456,6 +464,8 @@ class Order extends BaseController {
         }
         $allocateModel::where(['id' => $rs['id']])->update(['status' => 3,'server_end_time' => date('Y-m-d H:i:s'),'end_admin_id' => $this->adminId]);
         $model::where(['id' => $input['orderId']])->update(['status' => 5]);
+        $orderRoomRs = (new OrderRoomModel())::where(['order_id' => $input['orderId']])->find();
+        (new RoomModel())::where(['id' => $orderRoomRs['room_id']])->update(['room_server_status' => 3]);
         Until::output();
     }
 

application/api/controller/Room.php

@@ -26,8 +26,9 @@ class Room extends BaseController {
      *   @OA\Parameter(name="page", in="query", description="页码", @OA\Schema(type="ineger",default="1")),
      *   @OA\Parameter(name="pageSize", in="query", description="页尺寸", @OA\Schema(type="integer",default="10")),
      *   @OA\Parameter(name="storeId", in="query", description="门店id", @OA\Schema(type="integer",default="1")),
-     *   @OA\Parameter(name="status", in="query", description="1正常 2禁用", @OA\Schema(type="integer",default="1")),
-     *   @OA\Parameter(name="name", in="query", description="名字或code", @OA\Schema(type="integer",default="666")),
+     *   @OA\Parameter(name="date", in="query", description="服务开始时间", @OA\Schema(type="string",default="2021-04-09")),
+     *   @OA\Parameter(name="status", in="query", description="1正常(待使用) 2使用中 3空闲 999禁用", @OA\Schema(type="integer",default="1")),
+     *   @OA\Parameter(name="name", in="query", description="名字或code", @OA\Schema(type="string",default="666")),
      *   @OA\RequestBody(
      *     ),
      *   @OA\Response(response="200", description="请求成功")
@@ -44,8 +45,14 @@ class Room extends BaseController {
             $where[] = ['r.store_id', '=', (int)$input['storeId']];
         }
         if (!empty($input['status'])) {
-            $where[] = ['r.status', '=', (int)$input['status']];
+            if ($input['status'] != 999) {
+                $where[] = ['r.status', '=', 1];
+                $where[] = ['r.room_server_status', '=', (int)$input['status']];
+            }else{
+                $where[] = ['r.status', '=', 2];
+            }
         }
+
         if (!empty($input['name'])) {
             $where[] = ['r.room_name|r.room_code', 'like', "%{$input['name']}%"];
         }
@@ -195,6 +202,7 @@ class Room extends BaseController {
         } else {
             $model::where(['order_id' => $input['orderId']])->update(['room_id' => $input['id']]);
         }
+        (new RoomModel())::where(['id' => $input['id']])->update(['room_server_status' => 1]);
         Until::output();
     }
 

public/api.yaml

@@ -1752,9 +1752,16 @@ paths:
             type: integer
             default: '1'
         -
+          name: date
+          in: query
+          description: 服务开始时间
+          schema:
+            type: string
+            default: '2021-04-09'
+        -
           name: status
           in: query
-          description: '1正常 2禁用'
+          description: '1正常(待使用) 2使用中 3禁用 4空闲'
           schema:
             type: integer
             default: '1'
@@ -1763,7 +1770,7 @@ paths:
           in: query
           description: 名字或code
           schema:
-            type: integer
+            type: string
             default: '666'
       requestBody: {  }
       responses:
@@ -1938,7 +1945,6 @@ paths:
             schema:
               required:
                 - storeId
-                - status
               properties:
                 storeId:
                   description: 门店id
@@ -1948,10 +1954,6 @@ paths:
                   description: 日期(默认今天)
                   type: string
                   default: '2021-04-29'
-                status:
-                  description: '状态 1未开始 2服务中 3已完成(多个逗号分隔)'
-                  type: integer
-                  default: '1'
               type: object
       responses:
         '200':