diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/netty/PushToAppChannelHandlerAdapter.java b/src/main/java/com/chaozhanggui/system/cashierservice/netty/PushToAppChannelHandlerAdapter.java
index 4e42779..cda6d4f 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/netty/PushToAppChannelHandlerAdapter.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/netty/PushToAppChannelHandlerAdapter.java
@@ -54,6 +54,8 @@ public class PushToAppChannelHandlerAdapter extends NettyChannelHandlerAdapter {
     private RabbitProducer a;
     //注入为空
     public static RabbitProducer rabbitProducer;
+    @Autowired
+    private ShopUtils shopUtils;
 
     @PostConstruct
     public void b() {
@@ -139,8 +141,9 @@ public class PushToAppChannelHandlerAdapter extends NettyChannelHandlerAdapter {
                     return;
                 }
 
-                String tableCartKey = RedisCst.getTableCartKey(shopId, tableId, Integer.valueOf(userId));
-                log.info("netty连接 接收到数据 建立连接参数 param:{}",jsonObject);
+                ShopEatTypeInfoDTO eatModel = shopUtils.getEatModel(tableId, shopId);
+                String tableCartKey = RedisCst.getTableCartKey(shopId, eatModel.isOpenTakeout() ? tableId : null, Integer.valueOf(userId));
+                log.info("netty连接 接收到数据 建立连接参数 key: {} param:{}", tableCartKey, jsonObject);
                 this.tableId=tableId;
                 this.shopId=shopId;
                 if (webSocketMap.containsKey(tableCartKey)) {
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/redis/RedisCst.java b/src/main/java/com/chaozhanggui/system/cashierservice/redis/RedisCst.java
index 7b4ce50..c5e3907 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/redis/RedisCst.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/redis/RedisCst.java
@@ -68,8 +68,8 @@ public class RedisCst {
     }
 
     public static String getTakeoutTableCartKey(String shopId, Object userId) {
-//        return TAKEOUT_TABLE_CART + shopId + ":" + userId;
-        return DINE_IN_TABLE_CART + shopId + ":" + userId;
+        return TAKEOUT_TABLE_CART + shopId + ":" + userId;
+//        return DINE_IN_TABLE_CART + shopId + ":" + userId;
     }
 
     public static String getDineInTableCartKey(String shopId, String tableId) {