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 2cbaaa54..e5efa3ec 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
@@ -5,11 +5,14 @@ import cn.ysk.cashier.dto.shop.ShopTableSeleInfoDto;
 import cn.ysk.cashier.enums.PayTypeEnum;
 import cn.ysk.cashier.exception.BadRequestException;
 import cn.ysk.cashier.mybatis.service.TbShopUserFlowService;
+import cn.ysk.cashier.pojo.shop.TbShopTable;
 import cn.ysk.cashier.repository.ShopUserDutyDetailRepository;
 import cn.ysk.cashier.repository.ShopUserDutyRepository;
 import cn.ysk.cashier.repository.TbTokenRepository;
 import cn.ysk.cashier.repository.order.TbOrderDetailRepository;
 import cn.ysk.cashier.repository.order.TbOrderInfoRepository;
+import cn.ysk.cashier.repository.shop.TbShopAreaRepository;
+import cn.ysk.cashier.repository.shop.TbShopTableRepository;
 import cn.ysk.cashier.repository.shop.TbShopUserRepository;
 import cn.ysk.cashier.service.SummaryService;
 import cn.ysk.cashier.utils.DateUtil;
@@ -56,6 +59,12 @@ public class SummaryServiceImpl implements SummaryService {
     @Resource
     private TbShopUserFlowService tbShopUserFlowService;
 
+    @Resource
+    private TbShopTableRepository shopTableRepository;
+
+    @Resource
+    TbShopAreaRepository tbShopAreaRepository;
+
 
     @Override
     public SummaryVO selectSummary(Integer shopId) {
@@ -487,6 +496,16 @@ public class SummaryServiceImpl implements SummaryService {
         List<ShopTableSaleInfoVo> list = new ArrayList<>();
         for (String shopTableCode : shopTableCodes) {
             ShopTableSaleInfoVo shopTableSaleInfoVo = tbOrderInfoRepository.queryShopTableSaleInfo(shopId.toString(), shopTableCode, start, end);
+            if (shopTableSaleInfoVo.getTableId() == null) {
+                TbShopTable table = shopTableRepository.findByQrcode(shopTableCode);
+                if (table != null) {
+                    shopTableSaleInfoVo.setShopId(shopId);
+                    shopTableSaleInfoVo.setTableId(table.getId());
+                    shopTableSaleInfoVo.setTableName(table.getName());
+                    shopTableSaleInfoVo.setAreaId(table.getAreaId());
+                    shopTableSaleInfoVo.setAreaName(tbShopAreaRepository.findById(table.getAreaId()).get().getName());
+                }
+            }
             list.add(shopTableSaleInfoVo);
         }
 
@@ -495,7 +514,7 @@ public class SummaryServiceImpl implements SummaryService {
                 // 先比较 orderAmount
                 BigDecimal aAmount = a.getOrderAmount() == null ? BigDecimal.ZERO : new BigDecimal(a.getOrderAmount().toString());
                 BigDecimal bAmount = b.getOrderAmount() == null ? BigDecimal.ZERO : new BigDecimal(b.getOrderAmount().toString());
-                int compareAmount = aAmount.compareTo(bAmount);
+                int compareAmount = bAmount.compareTo(aAmount);
                 if (compareAmount != 0) {
                     return compareAmount;
                 }
@@ -504,7 +523,7 @@ public class SummaryServiceImpl implements SummaryService {
                 Integer aCount = a.getOrderCount() == null ? 0 : Integer.parseInt(a.getOrderCount().toString());
                 Integer bCount = b.getOrderCount() == null ? 0 : Integer.parseInt(b.getOrderCount().toString());
 
-                return aCount - bCount;
+                return bCount - aCount;
             });
         }