wangzhengliang před 3 roky
rodič
revize
dce70d90d0

+ 16 - 6
src/main/java/com/chuanghai/ihotel/controller/request/OrderQueryRequest.java

@@ -46,25 +46,35 @@ public class OrderQueryRequest {
      */
      */
     private String statu;
     private String statu;
     /**
     /**
-     * 最早入住时间 最早可入住时间
+     * 最早入住时间 最早可入住时间 yyyy-MM-dd HH:mm:ss
      */
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime enableStartTime;
     private LocalDateTime enableStartTime;
     /**
     /**
-     * 最晚离店时间 最晚要离店时间
+     * 最晚离店时间 最晚要离店时间 yyyy-MM-dd HH:mm:ss
      */
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime enableEndTime;
     private LocalDateTime enableEndTime;
     /**
     /**
-     * 支付时间
+     * 支付时间开始 yyyy-MM-dd HH:mm:ss
      */
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime payTime;
+    private LocalDateTime payTime1;
     /**
     /**
-     * 创建时间
+     * 支付时间结束 yyyy-MM-dd HH:mm:ss
      */
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime createTime;
+    private LocalDateTime payTime2;
+    /**
+     * 创建时间开始 yyyy-MM-dd HH:mm:ss
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime1;
+    /**
+     * 创建时间结束 yyyy-MM-dd HH:mm:ss
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime2;
     /**
     /**
      * 删除标识 1正常,0删除
      * 删除标识 1正常,0删除
      */
      */

+ 4 - 2
src/main/java/com/chuanghai/ihotel/service/impl/HotelOrderServiceImpl.java

@@ -127,8 +127,10 @@ public class HotelOrderServiceImpl extends ServiceImpl<HotelOrderDao, HotelOrder
 
 
         queryWrapper.ge(request.getEnableStartTime() != null, "enable_start_time", request.getEnableStartTime());
         queryWrapper.ge(request.getEnableStartTime() != null, "enable_start_time", request.getEnableStartTime());
         queryWrapper.le(request.getEnableStartTime() != null, "enable_end_time", request.getEnableStartTime());
         queryWrapper.le(request.getEnableStartTime() != null, "enable_end_time", request.getEnableStartTime());
-        queryWrapper.eq(request.getPayTime() != null, "pay_time", request.getPayTime());
-        queryWrapper.eq(request.getCreateTime() != null, "create_time", request.getCreateTime());
+        queryWrapper.ge(request.getPayTime1() != null, "pay_time", request.getPayTime1());
+        queryWrapper.le(request.getPayTime2() != null, "pay_time", request.getPayTime2());
+        queryWrapper.ge(request.getCreateTime1() != null, "create_time", request.getCreateTime1());
+        queryWrapper.le(request.getCreateTime2() != null, "create_time", request.getCreateTime2());
 
 
         IPage<HotelOrderEntity> page = this.page(
         IPage<HotelOrderEntity> page = this.page(
                 new MyQuery<HotelOrderEntity>().getPage(pageParam),
                 new MyQuery<HotelOrderEntity>().getPage(pageParam),

+ 2 - 1
src/main/resources/application.yml

@@ -20,7 +20,8 @@ spring:
   cache:
   cache:
     type: redis
     type: redis
     redis:
     redis:
-      time-to-live: 3600000
+      # 缓存时间 600s
+      time-to-live: 600
       key-prefix: SPRING_CACHE_
       key-prefix: SPRING_CACHE_
       use-key-prefix: true
       use-key-prefix: true
       cache-null-values: true
       cache-null-values: true