From 27c0c008d1054e66e8c839eaad975305f855bf25 Mon Sep 17 00:00:00 2001 From: Tankaikai Date: Wed, 9 Oct 2024 14:21:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=B6=88=E6=81=AF=E9=98=9F?= =?UTF-8?q?=E5=88=97=E6=96=B0=E5=A2=9E=E9=80=8F=E4=BC=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/ysk/cashier/dto/CallNumPrintDTO.java | 5 +++-- .../cn/ysk/cashier/utils/RabbitMsgUtils.java | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/CallNumPrintDTO.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/CallNumPrintDTO.java index 2bd34c0c..1fd4a808 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/CallNumPrintDTO.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/CallNumPrintDTO.java @@ -2,10 +2,11 @@ package cn.ysk.cashier.dto; import lombok.Data; -import java.util.Date; - @Data public class CallNumPrintDTO { private Integer callQueueId; private Integer shopId; + + private Long currentUserId; + private String currentUserName; } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/utils/RabbitMsgUtils.java b/eladmin-system/src/main/java/cn/ysk/cashier/utils/RabbitMsgUtils.java index 273322cb..3328a9d2 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/utils/RabbitMsgUtils.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/utils/RabbitMsgUtils.java @@ -54,6 +54,7 @@ public class RabbitMsgUtils implements RabbitTemplate.ConfirmCallback { jsonObject.put("orderId", orderId); jsonObject.put("orderDetailIds", orderIds); jsonObject.put("isReturn", true); + buildCurrentUserInfo(jsonObject); sendMsg(RabbitConstants.EXCHANGE_PRINT, RabbitConstants.ROUTING_KEY_PRINT_DISHES, jsonObject, "菜品退单", true); } @@ -62,6 +63,7 @@ public class RabbitMsgUtils implements RabbitTemplate.ConfirmCallback { jsonObject.put("orderId", orderId); jsonObject.put("orderDetailIds", detailOrderIds); jsonObject.put("isReturn", isReturn); + buildCurrentUserInfo(jsonObject); sendMsg(RabbitConstants.EXCHANGE_PRINT, RabbitConstants.ROUTING_KEY_PRINT_DISHES, jsonObject, "菜品打印", true); } @@ -69,6 +71,7 @@ public class RabbitMsgUtils implements RabbitTemplate.ConfirmCallback { JSONObject jsonObject = new JSONObject(); jsonObject.put("orderId", id); jsonObject.put("isReturn", isReturn); + buildCurrentUserInfo(jsonObject); sendMsg(RabbitConstants.EXCHANGE_PRINT, RabbitConstants.ROUTING_KEY_PRINT_PLACE, jsonObject, "订单打印", true); } @@ -77,6 +80,12 @@ public class RabbitMsgUtils implements RabbitTemplate.ConfirmCallback { CallNumPrintDTO printDTO = new CallNumPrintDTO(); printDTO.setCallQueueId(callQueueId); printDTO.setShopId(shopId); + try { + printDTO.setCurrentUserId(SecurityUtils.getCurrentUserId()); + printDTO.setCurrentUserName(SecurityUtils.getCurrentUsername()); + }catch (Exception e){ + log.error("获取当前用户信息失败", e); + } sendMsg(RabbitConstants.EXCHANGE_PRINT, RabbitConstants.ROUTING_KEY_CALL_TABLE, printDTO, "排号小票打印", true); } @@ -88,4 +97,13 @@ public class RabbitMsgUtils implements RabbitTemplate.ConfirmCallback { sendMsg(RabbitConstants.EXCHANGE_CONS, RabbitConstants.ROUTING_KEY_CONS, jsonObject1, "储值卡记录", true); } + + public void buildCurrentUserInfo(JSONObject jsonObject){ + try { + jsonObject.put("currentUserId", SecurityUtils.getCurrentUserId()); + jsonObject.put("currentUserName", SecurityUtils.getCurrentUsername()); + }catch (Exception e){ + log.error("获取当前用户信息失败", e); + } + } }