id返回类型改为string

src/main/java/com/chuanghai/ihotel/controller/request/RoomLockRequest.java

@@ -1,6 +1,7 @@
 package com.chuanghai.ihotel.controller.request;
 
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
@@ -26,12 +27,14 @@ public class RoomLockRequest {
     /**
      * 锁定开始时间 yyyy-MM-dd
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @NotNull(message = "不能为空")
     private LocalDate startDate;
 
     /**
      * 锁定结束时间 yyyy-MM-dd
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @NotNull(message = "不能为空")
     private LocalDate endDate;
 

src/main/java/com/chuanghai/ihotel/controller/request/RoomTypeQueryRequest.java

@@ -4,7 +4,7 @@ import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotNull;
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 
 /**
  * @Author: codingliang
@@ -16,15 +16,15 @@ import java.time.LocalDateTime;
 public class RoomTypeQueryRequest {
 
     /**
-     * 入住时间 yyyy-MM-dd HH:mm:ss
+     * 入住时间 yyyy-MM-dd
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @NotNull(message = "入住时间不能为空")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime startTime;
+    private LocalDate startDate;
     /**
-     * 离店时间 yyyy-MM-dd HH:mm:ss
+     * 离店时间 yyyy-MM-dd
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @NotNull(message = "离店时间不能为空")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime endTime;
+    private LocalDate endDate;
 }

src/main/java/com/chuanghai/ihotel/entity/HotelAdminEntity.java

@@ -2,6 +2,7 @@ package com.chuanghai.ihotel.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -23,6 +24,7 @@ public class HotelAdminEntity implements Serializable {
 	/**
 	 * id
 	 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING)
 	@TableId
 	private Long id;
 	/**

src/main/java/com/chuanghai/ihotel/entity/HotelOderRefundEntity.java

@@ -2,6 +2,7 @@ package com.chuanghai.ihotel.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -23,6 +24,7 @@ public class HotelOderRefundEntity implements Serializable {
 	/**
 	 * id
 	 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING)
 	@TableId
 	private Long id;
 	/**

src/main/java/com/chuanghai/ihotel/entity/HotelOrderBillEntity.java

@@ -3,6 +3,7 @@ package com.chuanghai.ihotel.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -24,6 +25,7 @@ public class HotelOrderBillEntity implements Serializable {
 	/**
 	 * id
 	 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING)
 	@TableId
 	private Long id;
 	/**

src/main/java/com/chuanghai/ihotel/entity/HotelOrderEntity.java

@@ -27,6 +27,7 @@ public class HotelOrderEntity implements Serializable {
 	/**
 	 * id
 	 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING)
 	@TableId(type = IdType.ASSIGN_ID)
 	private Long id;
 	/**

src/main/java/com/chuanghai/ihotel/entity/HotelStaffEntity.java

@@ -2,6 +2,7 @@ package com.chuanghai.ihotel.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -23,6 +24,7 @@ public class HotelStaffEntity implements Serializable {
 	/**
 	 * id
 	 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING)
 	@TableId
 	private Long id;
 	/**

src/main/java/com/chuanghai/ihotel/entity/HotelUserEntity.java

@@ -2,6 +2,7 @@ package com.chuanghai.ihotel.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -23,6 +24,7 @@ public class HotelUserEntity implements Serializable {
 	/**
 	 * id
 	 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING)
 	@TableId
 	private Long id;
 	/**

src/main/java/com/chuanghai/ihotel/entity/RoomDoorLockDataEntity.java

@@ -2,6 +2,7 @@ package com.chuanghai.ihotel.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -22,6 +23,7 @@ public class RoomDoorLockDataEntity implements Serializable {
 	/**
 	 * id
 	 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING)
 	@TableId
 	private Long id;
 	/**

src/main/java/com/chuanghai/ihotel/entity/RoomEntity.java

@@ -2,6 +2,7 @@ package com.chuanghai.ihotel.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -24,6 +25,7 @@ public class RoomEntity implements Serializable {
 	/**
 	 * id，新增时不需要传
 	 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING)
 	@TableId
 	private Long id;
 	/**

src/main/java/com/chuanghai/ihotel/entity/RoomRealtimeStatuEntity.java

@@ -3,6 +3,7 @@ package com.chuanghai.ihotel.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -23,6 +24,7 @@ public class RoomRealtimeStatuEntity implements Serializable {
 	/**
 	 * id
 	 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING)
 	@TableId(type = IdType.ASSIGN_ID)
 	private Long id;
 	/**

src/main/java/com/chuanghai/ihotel/entity/RoomThirdSettingEntity.java

@@ -1,6 +1,7 @@
 package com.chuanghai.ihotel.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -21,6 +22,7 @@ public class RoomThirdSettingEntity implements Serializable {
     /**
      * id
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long id;
     /**
      * 房间id

src/main/java/com/chuanghai/ihotel/entity/RoomTypeEntity.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.chuanghai.ihotel.util.BigDecimalSerializer;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -32,6 +33,7 @@ public class RoomTypeEntity implements Serializable {
 	/**
 	 * id，新增时不用传
 	 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING)
 	@TableId(type = IdType.ASSIGN_ID)
 	private Long id;
 	/**

src/main/java/com/chuanghai/ihotel/entity/SystemNoticeEntity.java

@@ -2,6 +2,7 @@ package com.chuanghai.ihotel.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -22,6 +23,7 @@ public class SystemNoticeEntity implements Serializable {
 	/**
 	 * id
 	 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING)
 	@TableId
 	private Long id;
 	/**

src/main/java/com/chuanghai/ihotel/entity/SystemSettingEntity.java

@@ -2,6 +2,7 @@ package com.chuanghai.ihotel.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import javax.validation.constraints.Min;
@@ -24,6 +25,7 @@ public class SystemSettingEntity implements Serializable {
 	/**
 	 * id
 	 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING)
 	@TableId
 	@NotNull(message = "id不能为空")
 	private Long id;

src/main/java/com/chuanghai/ihotel/service/impl/HotelOrderServiceImpl.java

@@ -444,6 +444,7 @@ public class HotelOrderServiceImpl extends ServiceImpl<HotelOrderDao, HotelOrder
         HotelOrderEntity orderEntity = userGetOrderById(orderId);
 
         UserOrderDetailVO detailVO = new UserOrderDetailVO();
+        detailVO.setOrderId(orderId);
         BeanUtils.copyProperties(orderEntity, detailVO);
 
         RoomTypeEntity roomType = roomTypeService.myGetById(orderEntity.getRoomTypeId());

src/main/java/com/chuanghai/ihotel/service/impl/RoomTypeServiceImpl.java

@@ -1,7 +1,9 @@
 package com.chuanghai.ihotel.service.impl;
 
+import com.chuanghai.ihotel.constant.TimeConstant;
 import com.chuanghai.ihotel.controller.request.RoomTypeQueryRequest;
 import com.chuanghai.ihotel.service.RoomRealtimeStatuService;
+import com.chuanghai.ihotel.util.CommonUtil;
 import com.chuanghai.ihotel.vo.RoomTypeShortDescVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +21,7 @@ import com.chuanghai.ihotel.dao.RoomTypeDao;
 import com.chuanghai.ihotel.entity.RoomTypeEntity;
 import com.chuanghai.ihotel.service.RoomTypeService;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -39,10 +42,12 @@ public class RoomTypeServiceImpl extends ServiceImpl<RoomTypeDao, RoomTypeEntity
         return new PageUtils(page);
     }
 
-    @Cacheable(value = {"roomType"}, key = "#root.method.name + '-' + #request.startTime + '-' + #request.endTime")
+    @Cacheable(value = {"roomType"}, key = "#root.method.name + '-' + #request.startDate + '-' + #request.endDate")
     @Override
     public List<RoomTypeShortDescVO> listForClientIndex(RoomTypeQueryRequest request) {
         List<RoomTypeEntity> all = this.list();
+        LocalDateTime startTime = CommonUtil.localDateToTime(request.getStartDate(), TimeConstant.INTO_TIME);
+        LocalDateTime endTime = CommonUtil.localDateToTime(request.getEndDate(), TimeConstant.OUT_TIME);
         List<RoomTypeShortDescVO> vos = all.stream().map(e -> {
             RoomTypeShortDescVO vo = new RoomTypeShortDescVO();
             BeanUtils.copyProperties(e, vo);
@@ -52,7 +57,7 @@ public class RoomTypeServiceImpl extends ServiceImpl<RoomTypeDao, RoomTypeEntity
             vo.setMasterImage(masterImage);
 
             // 获取当前时间繁忙状态的房间数量
-            int num = roomRealtimeStatuService.getBusyNum(e.getId(), request.getStartTime(), request.getEndTime());
+            int num = roomRealtimeStatuService.getBusyNum(e.getId(), startTime, endTime);
             int enableNum = e.getRoomNum() - num;
             vo.setEnableNum(enableNum >= 0 ? enableNum : 0);
             return vo;

src/main/java/com/chuanghai/ihotel/vo/UserOrderDetailVO.java

@@ -20,7 +20,7 @@ public class UserOrderDetailVO {
      * 订单id
      */
     @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long id;
+    private Long orderId;
     /**
      * 订单编号
      */