czg_team/wx-cashier-service
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

就餐模式获取修改

Browse Source
This commit is contained in:
SongZhang
2024-09-29 14:04:58 +08:00
parent ca7ce2b7c7
commit 1cdd45acad
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/chaozhanggui/system/cashierservice/netty/PushToAppChannelHandlerAdapter.java
View File

@@ -54,6 +54,8 @@ public class PushToAppChannelHandlerAdapter extends NettyChannelHandlerAdapter {
private RabbitProducer a; private RabbitProducer a;
//注入为空 //注入为空
public static RabbitProducer rabbitProducer; public static RabbitProducer rabbitProducer;
@Autowired
private ShopUtils shopUtils;
@PostConstruct @PostConstruct
public void b() { public void b() {
@@ -139,8 +141,9 @@ public class PushToAppChannelHandlerAdapter extends NettyChannelHandlerAdapter {
return; return;
} }
String tableCartKey = RedisCst.getTableCartKey(shopId, tableId, Integer.valueOf(userId)); ShopEatTypeInfoDTO eatModel = shopUtils.getEatModel(tableId, shopId);
log.info("netty连接 接收到数据 建立连接参数 param:{}",jsonObject); String tableCartKey = RedisCst.getTableCartKey(shopId, eatModel.isOpenTakeout() ? tableId : null, Integer.valueOf(userId));
log.info("netty连接 接收到数据 建立连接参数 key: {} param:{}", tableCartKey, jsonObject);
this.tableId=tableId; this.tableId=tableId;
this.shopId=shopId; this.shopId=shopId;
if (webSocketMap.containsKey(tableCartKey)) { if (webSocketMap.containsKey(tableCartKey)) {

4
src/main/java/com/chaozhanggui/system/cashierservice/redis/RedisCst.java
View File

@@ -68,8 +68,8 @@ public class RedisCst {
} }
public static String getTakeoutTableCartKey(String shopId, Object userId) { public static String getTakeoutTableCartKey(String shopId, Object userId) {
// return TAKEOUT_TABLE_CART + shopId + ":" + userId; return TAKEOUT_TABLE_CART + shopId + ":" + userId;
return DINE_IN_TABLE_CART + shopId + ":" + userId; // return DINE_IN_TABLE_CART + shopId + ":" + userId;
} }
public static String getDineInTableCartKey(String shopId, String tableId) { public static String getDineInTableCartKey(String shopId, String tableId) {