From c6aba2caa98c58b847ad21f8b7ea467206519a38 Mon Sep 17 00:00:00 2001
From: GYJ <1157756119@qq.com>
Date: Thu, 31 Oct 2024 14:42:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=B0=E6=A1=8C=E7=BB=9F=E8=AE=A1=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ysk/cashier/repository/order/TbOrderDetailRepository.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java
index fe3ab82f..62cd4b5d 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java
@@ -206,7 +206,7 @@ public interface TbOrderDetailRepository extends JpaRepository<TbOrderDetail, In
             "LEFT JOIN TbShopCategory cate ON cate.id = pro.categoryId " +
             "WHERE info.shopId = :shopId " +
             "AND info.createTime > :startTime AND info.createTime < :endTime " +
-            "AND (info.status = 'closed' OR info.status = 'refund') " +
+            "AND (orders.status = 'closed' OR orders.orderType = 'return') " +
             "GROUP BY info.productId, info.productSkuId, orders.tableId " +
             "ORDER BY salesNum DESC")
     List<TbOrderSalesCountByTable> queryTbOrderSalesCountByTable(@Param("shopId") Integer shopId, @Param("startTime") Date startTime, @Param("endTime") Date endTime);