From 1cdd45acad15e94d84b98a3ada82353246e63689 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Sun, 29 Sep 2024 14:04:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=B1=E9=A4=90=E6=A8=A1=E5=BC=8F=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../netty/PushToAppChannelHandlerAdapter.java | 7 +++++-- .../chaozhanggui/system/cashierservice/redis/RedisCst.java | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) 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) {