diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
index 835c0f1..d5897fd 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
@@ -185,10 +185,15 @@ public class CartService {
             LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>()
                     .eq(TbCashierCart::getShopId, shopId)
                     .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime())
-                    .eq(TbCashierCart::getUserId, userId)
                     .isNull(TbCashierCart::getOrderId)
                     .eq(TbCashierCart::getStatus, "create");
 
+            if (StrUtil.isNotBlank(tableId)) {
+                queryWrapper.eq(TbCashierCart::getTableId, tableId);
+            }else {
+                queryWrapper.eq(TbCashierCart::getUserId, userId);
+            }
+
             List<TbCashierCart> tbCashierCarts =  mpCashierCartMapper.selectList(queryWrapper);;
             if (!CollectionUtils.isEmpty(tbCashierCarts)) {
                 for (TbCashierCart cashierCart : tbCashierCarts) {
@@ -628,13 +633,8 @@ public class CartService {
                 queryWrapper.eq(TbCashierCart::getUserId, userId);
                 // 台桌点单
             } else {
-                queryWrapper
-                        .and(q -> {
-                            q.eq(TbCashierCart::getUserId, userId).or().isNull(TbCashierCart::getUserId);
-                        })
-                        .and(q -> {
-                            q.eq(TbCashierCart::getTableId, tableId).or().isNull(TbCashierCart::getTableId).or().eq(TbCashierCart::getTableId, "");
-                        });
+                queryWrapper.eq(TbCashierCart::getTableId, tableId)
+                        .and(q -> q.eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType()).or().isNull(TbCashierCart::getUseType));
 
                 shopTable = mpShopTableMapper.selectOne(new LambdaQueryWrapper<TbShopTable>()
                         .eq(TbShopTable::getQrcode, tableId));
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
index c639433..458c3ce 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -485,7 +485,7 @@ public class OrderService {
         groupedByPlaceNum.forEach((k, v) -> {
             HashMap<String, Object> item = new HashMap<>();
             item.put("placeNum", k);
-            item.put("placeTime", v.isEmpty() ? null : DateUtil.format(v.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
+            item.put("placeTime", v.isEmpty() ? null : DateUtil.format(v.get(0).getCreateTime(), "HH:mm:ss"));
             item.put("info", v);
             BigDecimal totalPrice = BigDecimal.ZERO;
             for (TbOrderDetail d : v) {