From 5ef762f6709e9892e77dc5c410846acd91ecbd0c Mon Sep 17 00:00:00 2001
From: GYJ <1157756119@qq.com>
Date: Thu, 31 Oct 2024 11:20:00 +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=86tableId=E4=B8=BAnu?=
 =?UTF-8?q?ll=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ysk/cashier/service/impl/SummaryServiceImpl.java | 12 +++++++-----
 .../cn/ysk/cashier/vo/TbOrderSalesCountByTable.java  |  7 +++++++
 2 files changed, 14 insertions(+), 5 deletions(-)

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 2b694b89..8445a2cf 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
@@ -477,12 +477,14 @@ public class SummaryServiceImpl implements SummaryService {
                             shopTableSaleInfoDto.getShopId(),
                             start, end);
 
-                    Map<String, List<TbOrderSalesCountByTable>> ctMap = countByTables.stream()
-                            .collect(Collectors.groupingBy(TbOrderSalesCountByTable::getTableId));
+                    if (countByTables != null && !countByTables.isEmpty()) {
+                        Map<String, List<TbOrderSalesCountByTable>> ctMap = countByTables.stream()
+                                .collect(Collectors.groupingBy(TbOrderSalesCountByTable::getTableId));
 
-                    ctMap.forEach((k, v) -> {
-                        countByTableMap.put(dateKey + "-" + k, v);
-                    });
+                        ctMap.forEach((k, v) -> {
+                            countByTableMap.put(dateKey + "-" + k, v);
+                        });
+                    }
 
                     for (ShopTableSaleInfoVo infoVo : infoVos) {
                         tableCodeSet.add(infoVo.getTableCode());
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderSalesCountByTable.java b/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderSalesCountByTable.java
index c8875f73..b1b8a8ed 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderSalesCountByTable.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderSalesCountByTable.java
@@ -61,4 +61,11 @@ public class TbOrderSalesCountByTable {
         salesNum=salesNum-refNum;
         salesAmount=salesAmount.subtract(refAmount);
     }
+
+    public String getTableId() {
+        if (tableId == null) {
+            return "";
+        }
+        return tableId;
+    }
 }