From 728e87f90bb4a67690a18dde67671d02c4aaa562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=89=9B=E5=8F=89=E9=97=AA=E9=97=AA?= <18322780655@163.com> Date: Mon, 29 Jul 2024 16:00:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A2=E5=8D=95=E5=A4=87?= =?UTF-8?q?=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/rabbit/ConsMsgConsumer.java | 1 - .../system/cashierservice/service/LoginService.java | 1 + src/main/resources/mapper/TbOrderInfoMapper.xml | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsMsgConsumer.java b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsMsgConsumer.java index 2498e6d..5ead41e 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsMsgConsumer.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsMsgConsumer.java @@ -119,7 +119,6 @@ public class ConsMsgConsumer { log.info("conwarning:{},stockNumber:{}",tbConsInfo.getConWarning(),tbConsInfo.getStockNumber().subtract(tbConsInfo.getStockConsume()).abs()); if (N.egt(tbConsInfo.getConWarning(), tbConsInfo.getStockNumber().subtract(tbConsInfo.getStockConsume()).abs())) { - List tbUserShopMsgs = tbUserShopMsgMapper.selectAllByShopId(tbConsInfo.getShopId()); if (Objects.nonNull(tbUserShopMsgs) && tbUserShopMsgs.size()>0) { tbUserShopMsgs.parallelStream().forEach(tbUserShopMsg->{ diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java index aed562d..c760ea8 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java @@ -124,6 +124,7 @@ public class LoginService { accountMap.put("accountId", account.getId()); accountMap.put("merchantName", account.getAccount()); accountMap.put("loginName", tbPlussShopStaff.getAccount()); + accountMap.put("loginAccount",tbPlussShopStaff.getName()); accountMap.put("clientType", loginReq.getClientType()); accountMap.put("shopId", account.getShopId()); accountMap.put("staffId", tbPlussShopStaff.getId()); diff --git a/src/main/resources/mapper/TbOrderInfoMapper.xml b/src/main/resources/mapper/TbOrderInfoMapper.xml index b423482..b5de222 100644 --- a/src/main/resources/mapper/TbOrderInfoMapper.xml +++ b/src/main/resources/mapper/TbOrderInfoMapper.xml @@ -76,7 +76,8 @@ toi.STATUS, toi.out_number AS outNumber, toi.table_name AS tableName, - toi.remark + toi.remark, + toi.master_id FROM