From 80ed740eb72e469ac0a214d76d139093c8eeb232 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 28 Feb 2025 10:18:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E5=AD=97=E7=AC=A6=E4=B8=B2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/czg/order/dto/OrderInfoQueryDTO.java    | 2 --
 .../czg/service/order/service/impl/OrderInfoServiceImpl.java  | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoQueryDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoQueryDTO.java
index 43e9fbb5..20283c94 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoQueryDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoQueryDTO.java
@@ -1,14 +1,12 @@
 
 package com.czg.order.dto;
 
-import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * 订单表 实体类。
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
index 2b57da6f..7cc742d7 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
@@ -116,8 +116,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 .eq(OrderInfo::getUserId, param.getUserId())
                 .eq(OrderInfo::getTableCode, CzgStrUtils.getStrOrNull(param.getTableCode()))
                 .eq(OrderInfo::getOrderNo, CzgStrUtils.getStrOrNull(param.getOrderNo()))
-                .gt(OrderInfo::getCreateTime, param.getStartTime())
-                .le(OrderInfo::getCreateTime, param.getEndTime())
+                .gt(OrderInfo::getCreateTime, CzgStrUtils.getStrOrNull(param.getStartTime()))
+                .le(OrderInfo::getCreateTime, CzgStrUtils.getStrOrNull(param.getEndTime()))
                 .in(OrderInfo::getId, like);
         Page<OrderInfoVo> orderInfoVoPage = pageAs(PageUtil.buildPage(), queryWrapper, OrderInfoVo.class);
         orderInfoVoPage.getRecords().parallelStream().forEach(s -> {