更新

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

@@ -411,10 +411,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                     HouseOrder houseOrder = houseOrderService.getOne(wrapperHo);
                     String reserveName = houseOrder.getReserveName();
                     vo.setName(reserveName);
-//                    入住时间
-                    vo.setLiveTime(houseOrder.getReserveLiveTime());
+//                    预定入住时间
+                    vo.setReserveLiveTime(houseOrder.getReserveLiveTime());
 //                    预定离店时间
-                    vo.setLeaveTime(houseOrder.getReserveLeaveTime());
+                    vo.setReserveLeaveTime(houseOrder.getReserveLeaveTime());
                     vo.setOrderNumber(houseOrder.getOrderNumber());
                 }
             } else if (status1 == 4) {
@@ -428,10 +428,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                     String statusBar = "7,8,9,10,11";
                     vo.setStatusBar(statusBar);
                     Date liveTime = houseOrder.getLiveTime();
-//                    入住时间
-                    vo.setLiveTime(houseOrder.getReserveLiveTime());
+//                    预定入住时间
+                    vo.setReserveLiveTime(houseOrder.getReserveLiveTime());
 //                    预定离店时间
-                    vo.setLeaveTime(houseOrder.getReserveLeaveTime());
+                    vo.setReserveLeaveTime(houseOrder.getReserveLeaveTime());
 //                  付款
                     vo.setPayPrice(houseOrder.getPayPrice());
 //                  密码
@@ -446,6 +446,8 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                     vo.setHouseOrderId(houseOrder.getId());
 //                    订单号
                     vo.setOrderNumber(houseOrder.getOrderNumber());
+                    vo.setLiveTime(houseOrder.getLiveTime());
+                    vo.setLeaveTime(houseOrder.getLeaveTime());
 
 //                    已入住时间
                     LocalDateTime now = LocalDateTime.now();
@@ -458,17 +460,6 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                     Integer minutes = (int) (m - hours * 60 - days * 24 * 60); //分钟
                     String checkTime = days + "天" + hours + "小时" + minutes + "分钟";
                     vo.setCheckTime(checkTime);
-//                    电起码，水起码
-                    LambdaQueryWrapper<HouseOrderBill> wrapperHOB = new LambdaQueryWrapper<>();
-                    wrapperHOB.eq(HouseOrderBill::getHotelOrderId, houseOrder.getId());
-                    HouseOrderBill houseOrderBill = houseOrderBillService.getOne(wrapperHOB);
-                    if (ObjectUtils.isNotEmpty(houseOrderBill)) {
-                        String startOfWater = houseOrderBill.getStartOfWater();
-                        vo.setStartWater(startOfWater);
-                        String startOfElectric = houseOrderBill.getStartOfElectric();
-                        vo.setStartElectric(startOfElectric);
-                    }
-
 
                 }
             } else if (status1 == 2) {

src/main/java/com/template/model/vo/HouseStateVo.java

@@ -45,4 +45,6 @@ public class HouseStateVo {
     private Integer orderStatus;
     private Integer houseOrderId;
     private Integer houseNumberStateId;
+    private String liveTime;
+    private String leaveTime;
 }

src/main/java/com/template/model/vo/ParticularHouseNumberStatusVo.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 @Data
 public class ParticularHouseNumberStatusVo {
@@ -20,10 +21,10 @@ public class ParticularHouseNumberStatusVo {
     private String name;
 
 //  入住时间
-    private String liveTime;
+    private Date liveTime;
 
 //    离开时间
-    private String leaveTime;
+    private Date leaveTime;
 
 //    付款金额
     private BigDecimal payPrice;
@@ -70,4 +71,8 @@ public class ParticularHouseNumberStatusVo {
 
     private String orderNumber;
 
+    //    预计入住时间
+    private String reserveLiveTime;
+    //    预计离开时间
+    private String reserveLeaveTime;
 }

src/main/resources/mapper/template/HouseNumberMapper.xml

@@ -11,8 +11,8 @@
         h.room_name as houseName,
         hns.`status` AS status,
         ho.reserve_name as reserveName,
-        hns.start_time as reserveLiveTime,
-        hns.end_time as reserveLeaveTime,
+        ho.reserve_live_time as reserveLiveTime,
+        ho.reserve_leave_time as reserveLeaveTime,
         h.room_live_time as roomLiveTime,
         h.receiving_time as receivingTime,
         hns.id as houseNumberStateId,
@@ -23,7 +23,9 @@
         ho.key_type as lockStatus,
         ho.key_pass_word as passWord,
         ho.order_status as orderStatus,
-        ho.id as houseOrderId
+        ho.id as houseOrderId,
+        ho.live_time AS liveTime,
+        ho.leave_time AS leaveTime
         FROM
         `house_number` hn
         LEFT JOIN house h ON h.id = hn.house_id