diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/QueryReceiveDto.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/QueryReceiveDto.java
index fac0aebc..f0a1962b 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/QueryReceiveDto.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/QueryReceiveDto.java
@@ -1,6 +1,7 @@
 package com.czg.account.dto;
 
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -11,9 +12,9 @@ import java.time.LocalDateTime;
  */
 @Data
 public class QueryReceiveDto {
-    @NotBlank(message = "优惠券id 不可为空")
+    @NotNull(message = "优惠券id 不可为空")
     private Long couponId;
-    @NotBlank(message = "店铺Id 不可为空")
+    @NotNull(message = "店铺Id 不可为空")
     private Long shopId;
     //用户昵称 手机号 模糊
     private String value;
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/HistoryOrderVo.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/HistoryOrderVo.java
index 76ac20d4..106107f3 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/HistoryOrderVo.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/HistoryOrderVo.java
@@ -12,7 +12,7 @@ import java.util.Map;
  * @description
  */
 @Data
-public class HistoryOrderVo {
-    private OrderInfo info;
+public class HistoryOrderVo extends OrderInfo {
+//    private OrderInfo info;
     private Map<Integer, List<OrderDetail>> detailMap;
 }
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderDetailSmallVO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderDetailSmallVO.java
index 441e979c..6032e582 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderDetailSmallVO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderDetailSmallVO.java
@@ -30,7 +30,11 @@ public class OrderDetailSmallVO implements Serializable {
     private String skuName;
     private BigDecimal num;
     private BigDecimal packNum;
+    private BigDecimal returnNum;
     private BigDecimal refundNum;
+    private BigDecimal price;
+    private BigDecimal payAmount;
+    private String remark;
 
 }
 
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 715ba041..1df503dc 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
@@ -135,19 +135,19 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             throw new ValidateException("订单id或台桌码不可为空");
         }
         HistoryOrderVo historyOrderVo = new HistoryOrderVo();
-        OrderInfo orderInfo;
+//        OrderInfo orderInfo;
         if (orderId == null) {
-            orderInfo = queryChain()
+            historyOrderVo = queryChain()
                     .select()
                     .eq(OrderInfo::getTableCode, tableCode)
-                    .one();
+                    .eq(OrderInfo::getStatus, OrderStatusEnums.UNPAID.getCode())
+                    .gt(OrderInfo::getCreateTime, DateUtil.offsetDay(new Date(), -1))
+                    .oneAs(HistoryOrderVo.class);
         } else {
-            orderInfo = getById(orderId);
+            historyOrderVo = getOneAs(new QueryWrapper().eq(OrderInfo::getId, orderId), HistoryOrderVo.class);
         }
-        AssertUtil.isNull(orderInfo, "订单不存在");
-        historyOrderVo.setInfo(orderInfo);
         List<OrderDetail> orderDetails = orderDetailService.queryChain().select()
-                .eq(OrderDetail::getOrderId, orderInfo.getId()).list();
+                .eq(OrderDetail::getOrderId, historyOrderVo.getId()).list();
         Map<Integer, List<OrderDetail>> resultMap = new HashMap<>();
         // 遍历订单详情列表
         for (OrderDetail orderDetail : orderDetails) {