Merge remote-tracking branch 'origin/master'

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdOrderDetailsServiceImpl.java

@@ -80,8 +80,8 @@ public class JdOrderDetailsServiceImpl extends ServiceImpl<JdOrderDetailsMapper,
                     .or().like(JdOrderDetails::getWareId, dto.getKeyword())
                     .or().like(JdOrderDetails::getProductId, dto.getKeyword()))
                 .orderByAsc(JdOrderDetails::getHandleStatus)
-                .ge(ObjectUtil.isNotNull(dto.getStartTime()), JdOrderDetails::getCreateTime, DateUtil.beginOfDay(dto.getStartTime()))
-                .le(ObjectUtil.isNotNull(dto.getEndTime()), JdOrderDetails::getCreateTime, DateUtil.endOfDay(dto.getEndTime()))
+                .ge(ObjectUtil.isNotNull(dto.getStartTime()), JdOrderDetails::getCreateTime, ObjectUtil.isNotNull(dto.getStartTime())?DateUtil.beginOfDay(dto.getStartTime()):dto.getStartTime())
+                .le(ObjectUtil.isNotNull(dto.getEndTime()), JdOrderDetails::getCreateTime, ObjectUtil.isNotNull(dto.getEndTime())?DateUtil.endOfDay(dto.getEndTime()):dto.getEndTime())
                 .orderByDesc(JdOrderDetails::getUpdateTime)
                 .page(new Page<>(dto.getPageNum(), dto.getPageSize()));