From bff2ad2250e119227723769d64c2e2f4470b22c7 Mon Sep 17 00:00:00 2001
From: GYJ <1157756119@qq.com>
Date: Thu, 8 Aug 2024 10:42:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=B0=E6=A1=8C=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/TbOrderInfoRepository.java          | 24 +------------------
 .../service/impl/SummaryServiceImpl.java      |  4 +---
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderInfoRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderInfoRepository.java
index 13b0badc..aa889297 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderInfoRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderInfoRepository.java
@@ -171,28 +171,6 @@ public interface TbOrderInfoRepository extends JpaRepository<TbOrderInfo, Intege
             "AND ((info.status = 'closed') OR ( info.status ='refund' AND info.orderType != 'return' )) ")
     TbOrderPayCountVo queryOrderPayCash(@Param("shopId") String shopId, @Param("startTime") Long startTime, @Param("endTime") Long endTime);
 
-    @Query("SELECT new cn.ysk.cashier.vo.ShopTableSaleInfoVo(" +
-            "info.id," +
-            "info.shopId," +
-            "info.tableId," +
-            "table.name," +
-            "table.areaId," +
-            "area.name," +
-            "COUNT(1)," +
-            "SUM( info.orderAmount)) " +
-            "FROM TbOrderInfo info " +
-            "LEFT JOIN TbShopTable table ON info.tableId = table.qrcode " +
-            "LEFT JOIN TbShopArea as area on table.areaId = area.id " +
-            "WHERE info.shopId = :shopId " +
-            "AND info.createdAt > :startTime AND info.createdAt < :endTime " +
-            "AND ((info.status = 'closed') OR ( info.status ='refund' AND info.orderType != 'return' )) " +
-            "AND info.tableId = :qrcode ")
-    ShopTableSaleInfoVo queryShopTableSaleInfo(@Param("shopId") String shopId, @Param("qrcode") String qrcode,
-                                               @Param("startTime") Long startTime, @Param("endTime") Long endTime);
-
-    @Query("select table.qrcode from TbShopTable table where table.shopId = :shopId")
-    List<String> queryShopTableIds(@Param("shopId") Integer shopId);
-
     @Query("SELECT new cn.ysk.cashier.vo.ShopTableVo(" +
             "table.qrcode," +
             "table.shopId," +
@@ -225,6 +203,6 @@ public interface TbOrderInfoRepository extends JpaRepository<TbOrderInfo, Intege
             "AND table.qrcode is not null " +
             "AND table.qrcode != '' " +
             "GROUP BY info.tableId ")
-    List<ShopTableSaleInfoVo> queryShopTableSaleInfo2(@Param("shopId") String shopId,
+    List<ShopTableSaleInfoVo> queryShopTableSaleInfo(@Param("shopId") String shopId,
                                                @Param("startTime") Long startTime, @Param("endTime") Long endTime);
 }
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
index 69e81850..d38473e8 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
@@ -506,8 +506,6 @@ public class SummaryServiceImpl implements SummaryService {
 
     @Override
     public List<ShopTableSaleInfoVo> selectSummaryTable(Integer shopId, Date startTime, Date endTime) {
-//        List<String> shopTableCodes = tbOrderInfoRepository.queryShopTableIds(shopId);
-
         List<ShopTableVo> tableVos = tbOrderInfoRepository.queryShopTableVoByShopId(shopId);
 
         long start = 1704038400000L;
@@ -517,7 +515,7 @@ public class SummaryServiceImpl implements SummaryService {
             end = endTime.getTime();
         }
 
-        List<ShopTableSaleInfoVo> saleInfoVo = tbOrderInfoRepository.queryShopTableSaleInfo2(shopId.toString(), start, end);
+        List<ShopTableSaleInfoVo> saleInfoVo = tbOrderInfoRepository.queryShopTableSaleInfo(shopId.toString(), start, end);
 
         Map<String, ShopTableVo> tableMap = tableVos.stream()
                 .collect(Collectors.toMap(ShopTableVo::getQrcode, Function.identity()));