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

添加订单备注

Browse Source
This commit is contained in:
牛叉闪闪
2024-07-29 16:00:06 +08:00
parent 365067887b
commit 728e87f90b
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsMsgConsumer.java
View File

@@ -119,7 +119,6 @@ public class ConsMsgConsumer {
log.info("conwarning:{},stockNumber:{}",tbConsInfo.getConWarning(),tbConsInfo.getStockNumber().subtract(tbConsInfo.getStockConsume()).abs()); log.info("conwarning:{},stockNumber:{}",tbConsInfo.getConWarning(),tbConsInfo.getStockNumber().subtract(tbConsInfo.getStockConsume()).abs());
if (N.egt(tbConsInfo.getConWarning(), tbConsInfo.getStockNumber().subtract(tbConsInfo.getStockConsume()).abs())) { if (N.egt(tbConsInfo.getConWarning(), tbConsInfo.getStockNumber().subtract(tbConsInfo.getStockConsume()).abs())) {
List<TbUserShopMsg> tbUserShopMsgs = tbUserShopMsgMapper.selectAllByShopId(tbConsInfo.getShopId()); List<TbUserShopMsg> tbUserShopMsgs = tbUserShopMsgMapper.selectAllByShopId(tbConsInfo.getShopId());
if (Objects.nonNull(tbUserShopMsgs) && tbUserShopMsgs.size()>0) { if (Objects.nonNull(tbUserShopMsgs) && tbUserShopMsgs.size()>0) {
tbUserShopMsgs.parallelStream().forEach(tbUserShopMsg->{ tbUserShopMsgs.parallelStream().forEach(tbUserShopMsg->{

1
src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
View File

@@ -124,6 +124,7 @@ public class LoginService {
accountMap.put("accountId", account.getId()); accountMap.put("accountId", account.getId());
accountMap.put("merchantName", account.getAccount()); accountMap.put("merchantName", account.getAccount());
accountMap.put("loginName", tbPlussShopStaff.getAccount()); accountMap.put("loginName", tbPlussShopStaff.getAccount());
accountMap.put("loginAccount",tbPlussShopStaff.getName());
accountMap.put("clientType", loginReq.getClientType()); accountMap.put("clientType", loginReq.getClientType());
accountMap.put("shopId", account.getShopId()); accountMap.put("shopId", account.getShopId());
accountMap.put("staffId", tbPlussShopStaff.getId()); accountMap.put("staffId", tbPlussShopStaff.getId());

3
src/main/resources/mapper/TbOrderInfoMapper.xml
View File

@@ -76,7 +76,8 @@
toi.STATUS, toi.STATUS,
toi.out_number AS outNumber, toi.out_number AS outNumber,
toi.table_name AS tableName, toi.table_name AS tableName,
toi.remark toi.remark,
toi.master_id
FROM FROM