修改换房接口

src/main/java/com/template/controller/HouseNumberStateController.java

@@ -1221,26 +1221,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         HouseOrder houseOrder = houseOrderService.getOne(wrapperHo);
 
         String orderStatus = houseOrder.getOrderStatus();
-        if ("3".equals(orderStatus)) {
-
-            String reserveLiveTime = houseOrder.getReserveLiveTime();
-            String reserveLeaveTime = houseOrder.getReserveLeaveTime();
-
-            //      判断该房间在该订单的时间内是否有使用
-            List<HouseNumberState> houseNumberStateList = houseNumberStateService.beBooked(houseNumberId, reserveLiveTime, reserveLeaveTime);
-
-            if (ObjectUtils.isNotEmpty(houseNumberStateList) && houseNumberStateList.size() > 0) {
-                return CommonResult.fail("此时间段内，该房间已被使用");
-            }
-
-//        修改订单
-            houseOrder.setHouseNumberId(houseNumberId);
-
-            houseOrderService.updateById(houseOrder);
-
-            return CommonResult.ok();
-        }else {
-
+        if("4".equals(orderStatus)){
 
             Date liveTime = houseOrder.getLiveTime();
 
@@ -1485,6 +1466,24 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             } else {
                 return CommonResult.ok(msg);
             }
+        }else {
+
+            String reserveLiveTime = houseOrder.getReserveLiveTime();
+            String reserveLeaveTime = houseOrder.getReserveLeaveTime();
+
+            //      判断该房间在该订单的时间内是否有使用
+            List<HouseNumberState> houseNumberStateList = houseNumberStateService.beBooked(houseNumberId, reserveLiveTime, reserveLeaveTime);
+
+            if (ObjectUtils.isNotEmpty(houseNumberStateList) && houseNumberStateList.size() > 0) {
+                return CommonResult.fail("此时间段内，该房间已被使用");
+            }
+
+//        修改订单
+            houseOrder.setHouseNumberId(houseNumberId);
+
+            houseOrderService.updateById(houseOrder);
+
+            return CommonResult.ok();
         }
 
     }